concurrent-ruby 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e771744bb5e8ed6f2e29f284b92dc82c86052313e32ca6113ca14866316e888b
-  data.tar.gz: 72f694ab26e04d3d0eba6966d22dc124e6c047bd34d0531c9f7c33ffca0f2962
+  metadata.gz: baa8a50b8b08ea03ec40438bf1e921d86a28c2ccc1292535bf9d72aab66fb659
+  data.tar.gz: cf77c2327c6527a2be4476c2e6464c2b90e86610ecf3543bcee5df5e2c6aa3b0
 SHA512:
-  metadata.gz: 5b351d16a4a900ecefcfddfe282e30ab7c4c022c71aa3d596199cb9a4816adcc8eeedba6a219b8f239bba73ce992403ac40e9d4eb83038713edee9705262677c
-  data.tar.gz: 8a49539c89fe3f073a0a89c1c79453a49132c0ba5ce575172f9592b62be98e35136f0c216c80660f1e0489c5b33ca62a7db5575866794231b0d81d0f0665c03d
+  metadata.gz: e9a34a06cc1efb94d36d986369efefb8df61bfe1bd4b0bf960ab84028bf68e6a60636fcaa453490b38c5ced3d8b628e62f92e2524dd08ac1912ccbb74ba40aeb
+  data.tar.gz: 51790fe6686917f9a11e5e8fc82af16959bdc7ef8111348bfaad010ad1babc97cfde0048407f98cf11002e789a53e5eddff65a58977f87c4825fab06d4a20a11

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Current
 
+## Release v1.1.4 (14 Dec 2018)
+
+* (#780) Remove java_alias of 'submit' method of Runnable to let executor service work on java 11
+* (#776) Fix NameError on defining a struct with a name which is already taken in an ancestor
+
 ## Release v1.1.3 (7 Nov 2018)
 
 * (#775) fix partial require of the gem (although not officially supported)

data/README.md

@@ -43,7 +43,7 @@ appreciate your help. Would you like to contribute? Great! Have a look at
 
 *Concurrent Ruby makes one of the strongest thread safety guarantees of any Ruby concurrency 
 library, providing consistent behavior and guarantees on all three of the main Ruby interpreters 
-(MRI/CRuby, JRuby, and Rubinius).*
+(MRI/CRuby, JRuby, Rubinius, TruffleRuby).*
 
 Every abstraction in this library is thread safe. Specific thread safety guarantees are documented 
 with each abstraction.
@@ -59,7 +59,7 @@ Concurrent Ruby is also the only Ruby library which provides a full suite of thr
 immutable variable types and data structures.
 
 We've also initiated discussion to document [memory model](docs-source/synchronization.md) of Ruby which 
-would provide consistent behaviour and guarantees on all three of the main Ruby interpreters 
+would provide consistent behaviour and guarantees on all four of the main Ruby interpreters 
 (MRI/CRuby, JRuby, Rubinius, TruffleRuby).
 
 ## Features & Documentation

data/Rakefile

@@ -18,11 +18,10 @@ edge_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-edge.
 
 require 'rake/javaextensiontask'
 
-JRUBY_JAR_PATH = '/usr/local/opt/rbenv/versions/jruby-9.1.17.0/lib/jruby.jar'
-
 class ConcurrentRubyJavaExtensionTask < Rake::JavaExtensionTask
   def java_classpath_arg(*args)
     jruby_cpath = nil
+
     if RUBY_PLATFORM =~ /java/
       begin
         cpath       = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
@@ -30,11 +29,26 @@ class ConcurrentRubyJavaExtensionTask < Rake::JavaExtensionTask
         jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
       rescue => e
       end
+
+      unless jruby_cpath
+        libdir = RbConfig::CONFIG['libdir']
+        if libdir.start_with? "classpath:"
+          raise 'Cannot build with jruby-complete'
+        end
+        jruby_cpath = File.join(libdir, "jruby.jar")
+      end
     end
+
     unless jruby_cpath
-      jruby_cpath = JRUBY_JAR_PATH
-      raise "#{jruby_cpath} does not exist" unless File.exist? jruby_cpath
+      jruby_home = ENV['JRUBY_HOME']
+      if jruby_home
+        candidate = File.join(jruby_home, 'lib', 'jruby.jar')
+        jruby_cpath = candidate if File.exist? candidate
+      end
     end
+
+    raise "jruby.jar path not found" unless jruby_cpath
+
     jruby_cpath += File::PATH_SEPARATOR + args.join(File::PATH_SEPARATOR) unless args.empty?
     jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
   end
@@ -63,7 +77,9 @@ namespace :repackage do
   desc '* with Windows fat distributions'
   task :all do
     Dir.chdir(__dir__) do
+      # store gems in vendor cache for docker
       sh 'bundle package'
+
       # needed only if the jar is built outside of docker
       Rake::Task['lib/concurrent/concurrent_ruby.jar'].invoke
       RakeCompilerDock.exec 'support/cross_building.sh'
@@ -119,7 +135,7 @@ rescue LoadError => e
   puts 'RSpec is not installed, skipping test task definitions: ' + e.message
 end
 
-current_yard_version_name = Concurrent::VERSION.split('.')[0..2].join('.')
+current_yard_version_name = [*Concurrent::VERSION.split('.')[0..1], 'x'].join('.')
 
 begin
   require 'yard'

data/lib/concurrent/executor/java_executor_service.rb

@@ -20,13 +20,12 @@ if Concurrent.on_jruby?
 
       def initialize(*args, &block)
         super
-        ns_make_executor_runnable
       end
 
       def post(*args, &task)
         raise ArgumentError.new('no block given') unless block_given?
         return handle_fallback(*args, &task) unless running?
-        @executor.submit_runnable Job.new(args, task)
+        @executor.submit Job.new(args, task)
         true
       rescue Java::JavaUtilConcurrent::RejectedExecutionException
         raise RejectedExecutionError
@@ -75,14 +74,6 @@ if Concurrent.on_jruby?
         @executor.isShutdown || @executor.isTerminated
       end
 
-      def ns_make_executor_runnable
-        if !defined?(@executor.submit_runnable)
-          @executor.class.class_eval do
-            java_alias :submit_runnable, :submit, [java.lang.Runnable.java_class]
-          end
-        end
-      end
-
       class Job
         include Runnable
         def initialize(args, block)

data/lib/concurrent/synchronization/abstract_struct.rb

@@ -138,7 +138,7 @@ module Concurrent
         end
         unless name.nil?
           begin
-            parent.send :remove_const, name if parent.const_defined? name
+            parent.send :remove_const, name if parent.const_defined?(name, false)
             parent.const_set(name, clazz)
             clazz
           rescue NameError

data/lib/concurrent/version.rb

@@ -1,4 +1,4 @@
 module Concurrent
-  VERSION      = '1.1.3'
+  VERSION      = '1.1.4'
   EDGE_VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concurrent-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Jerry D'Antonio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies: []
 description: |
   Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.