First cut at eliminating non jruby-9k code and updating specs

Author: jkutner

.travis.yml

@@ -1,26 +1,15 @@
 rvm:
-  - jruby-1.7.8
+  - jruby-9.0.0.0.pre1
 branches:
   only:
     - master
-env:
-  - JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-  - JRUBY_OPTS="--1.9 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+    - 2.x-dev
 matrix:
   include:
     - rvm: jruby-head
       env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-    - rvm: jruby-1.7.19
+    - rvm: jruby-9.0.0.0.pre1
       env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-    - rvm: 1.8.7
-      env: ''
-    - rvm: 1.9.2
-      env: ''
-    - rvm: 1.9.3
-      env: ''
-    - rvm: jruby
-      env: MAVEN_OPTS="-XX:MaxPermSize=128m"
-      script: mvn clean verify
   allow_failures:
     - rvm: jruby-head
 notifications:

Gemfile

@@ -8,7 +8,3 @@ group :development do
   gem "childprocess", :platform => :mri
   gem "maven-tools", "~> 0.34.5"
 end
-
-if RUBY_VERSION < "1.9"
-  gem 'rubyzip', '~> 0.9'
-end

History.txt

@@ -1,4 +1,6 @@
-== Master
+== 2x-dev
+
+- #319: Adds capacity to use the jruby-jars gem version for JRuby 9k.
 
 == 1.4.6
 - #318: polish *scripts/rails* - require_relative should no longer be used
@@ -7,7 +9,6 @@
 - #313: Update Jetty to 9.2.10
 - #311: Don't clear the environment if a java executable is found
 - #268: Compile's clearing of ENV vars makes it impossible to use custom compile vars
-- Adds capacity to use the jruby-jars gem version for JRuby 9k.
 
 == 1.4.5
 - #282: Wrong default GEM_HOME in generated META-INF/init.rb
@@ -252,7 +253,7 @@
 - RailsConf 2009 edition.
 - Only bundled JRuby and JRuby-Rack upgrades. Bug fixes will have to come in 0.9.14.
 - This should also be the last release with bundled JRuby and JRuby-Rack.
-- Upgrade to JRuby 1.3.0RC1 and JRuby-Rack 0.9.4. The latter allows 
+- Upgrade to JRuby 1.3.0RC1 and JRuby-Rack 0.9.4. The latter allows
   Rails 2.3 to work with Warbler.
 
 == 0.9.12

lib/warbler/zip_support.rb

@@ -1,15 +1,7 @@
-module Warbler
-  class ZipSupportRubyZip0_9
-    def self.create(filename, &blk)
-      Zip::ZipFile.open(filename, Zip::ZipFile::CREATE, &blk)
-    end
+require 'zip'
 
-    def self.open(filename, &blk)
-      Zip::ZipFile.open(filename, &blk)
-    end
-  end
-
-  class ZipSupportRubyZip1_0
+module Warbler
+  class ZipSupport
     def self.create(filename, &blk)
       Zip::File.open(filename, Zip::File::CREATE, &blk)
     end
@@ -19,13 +11,3 @@ def self.open(filename, &blk)
     end
   end
 end
-
-begin
-  require 'zip/zip'
-  Warbler::ZipSupport = Warbler::ZipSupportRubyZip0_9
-rescue LoadError => e
-  raise e unless e.message =~ /zip/
-
-  require 'zip'
-  Warbler::ZipSupport = Warbler::ZipSupportRubyZip1_0
-end

spec/drb_default_id_conv.rb

@@ -2,62 +2,60 @@
 
 if defined?(JRUBY_VERSION)
   require 'jruby'
-  if JRuby.runtime.is1_9 # only changing for jruby --1.9 !
-    
-    require 'weakref'
-    class DRb::WeakRefDRbIdConv
-      
-      def initialize
-        @id2ref = {}
-      end
 
-      # Convert an object reference id to an object.
-      #
-      # This implementation looks up the reference id in the local object
-      # space and returns the object it refers to.
-      def to_obj(ref)
-        _get(ref) || super
-      end
+  require 'weakref'
+  class DRb::WeakRefDRbIdConv
 
-      # Convert an object into a reference id.
-      #
-      # This implementation returns the object's __id__ in the local
-      # object space.
-      def to_id(obj)
-        (obj.nil? ? nil : _put(obj)) || super
-      end
+    def initialize
+      @id2ref = {}
+    end
 
-      def _clean
-        dead = []
-        @id2ref.each {|id,weakref| dead << id unless weakref.weakref_alive?}
-        dead.each {|id| @id2ref.delete(id)}
-      end
+    # Convert an object reference id to an object.
+    #
+    # This implementation looks up the reference id in the local object
+    # space and returns the object it refers to.
+    def to_obj(ref)
+      _get(ref) || super
+    end
 
-      def _put(obj)
-        _clean
-        @id2ref[obj.__id__] = WeakRef.new(obj)
-        obj.__id__
-      end
+    # Convert an object into a reference id.
+    #
+    # This implementation returns the object's __id__ in the local
+    # object space.
+    def to_id(obj)
+      (obj.nil? ? nil : _put(obj)) || super
+    end
 
-      def _get(id)
-        weakref = @id2ref[id]
-        if weakref
-          result = weakref.__getobj__ rescue nil
-          if result
-            return result
-          else
-            @id2ref.delete id
-          end
+    def _clean
+      dead = []
+      @id2ref.each {|id,weakref| dead << id unless weakref.weakref_alive?}
+      dead.each {|id| @id2ref.delete(id)}
+    end
+
+    def _put(obj)
+      _clean
+      @id2ref[obj.__id__] = WeakRef.new(obj)
+      obj.__id__
+    end
+
+    def _get(id)
+      weakref = @id2ref[id]
+      if weakref
+        result = weakref.__getobj__ rescue nil
+        if result
+          return result
+        else
+          @id2ref.delete id
         end
-        nil
       end
-      private :_clean, :_put, :_get
-      
+      nil
     end
-    
-    # NOTE: the same default object id converter #DRb::DRbIdConv as in 1.8 mode 
-    # (not relying on ObjectSpace which is what #DRb::DRbIdConv does in 1.9) :
-    DRb::DRbServer.default_id_conv(DRb::WeakRefDRbIdConv.new)
-    
+    private :_clean, :_put, :_get
+
   end
-end
+
+  # NOTE: the same default object id converter #DRb::DRbIdConv as in 1.8 mode
+  # (not relying on ObjectSpace which is what #DRb::DRbIdConv does in 1.9) :
+  DRb::DRbServer.default_id_conv(DRb::WeakRefDRbIdConv.new)
+
+end

spec/sample_bundler/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem 'rake'

spec/sample_bundler/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    rake (0.8.7)
+    rake (10.4.2)
 
 PLATFORMS
   java