concurrent-ruby 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d042c846e692138ba0eea6efbabb53794abbaae207477dc5e549abac9fab266
-  data.tar.gz: 34678c0ec6d519d5beac0b12a8c6116d4eb1ff29dd620ba03df851d086b04adc
+  metadata.gz: b989ff504545fbd515aa9623e18515993f30d758768702fd48775efbf1eb68da
+  data.tar.gz: 6de4e1598114ce722b56eb2ca567d75dd8828afb998252bdb46906e2578f943d
 SHA512:
-  metadata.gz: 9b75559855ce216316a81bb68a9fcb1e74dceed4baa8e816d2e02cd12af50745e88f9afba7470681a8f47297a297fe9fd79e82ace4b5f63410197469eab45523
-  data.tar.gz: 79e63eb2ef9ab15e9fd5d1d777ae027e68b399ec885d85bc8156f9edad741ecf4eb20fc063357068018ef932c18e7263466ef64cee7592bf50b39433e83b94a7
+  metadata.gz: b81c2d2d16e02a03ef0e77c8d633280c02946472e7a762de733da0ee7203c2227ccb09ce5f03835446db42f0bef78df55a2158a787eea3620b1c228a234836df
+  data.tar.gz: f5ca5bacf3edbc0cf9894d94b8a3c3bc4aef173e4122c6a9cae84d257a3d3df5ada3280431c14f8e33b328348ce039af9a278975954daccb5aea916bad18a1fa

data/Rakefile

@@ -2,7 +2,15 @@
 
 require_relative 'lib/concurrent/version'
 require_relative 'lib/concurrent/utility/engine'
-require_relative 'lib/concurrent/utility/193'
+
+if Concurrent.ruby_version :<, 2, 0, 0
+  # @!visibility private
+  module Kernel
+    def __dir__
+      File.dirname __FILE__
+    end
+  end
+end
 
 core_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby.gemspec')
 ext_gemspec  = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-ext.gemspec')
@@ -155,7 +163,6 @@ begin
             "{Concurrent::#{$1} #{$1}}"
           end
         end
-        FileUtils.mkpath 'tmp'
         File.write 'tmp/README.md', content
       end
     end
@@ -276,20 +283,28 @@ namespace :release do
   task :publish => ['publish:ask', 'publish:tag', 'publish:rubygems', 'publish:post_steps']
 
   namespace :publish do
+    publish_edge = false
+
     task :ask do
       begin
-        STDOUT.puts 'Do you want to publish? (y/n)'
+        STDOUT.puts 'Do you want to publish anything? (y/n)'
         input = STDIN.gets.strip.downcase
       end until %w(y n).include?(input)
       exit 1 if input == 'n'
+      begin
+        STDOUT.puts 'Do you want to publish edge? (y/n)'
+        input = STDIN.gets.strip.downcase
+      end until %w(y n).include?(input)
+      publish_edge = input == 'y'
     end
 
     desc '** tag HEAD with current version and push to github'
     task :tag do
       Dir.chdir(__dir__) do
         sh "git tag v#{Concurrent::VERSION}"
-        sh "git tag edge-v#{Concurrent::EDGE_VERSION}"
-        sh "git push origin v#{Concurrent::VERSION} edge-v#{Concurrent::EDGE_VERSION}"
+        sh "git push origin v#{Concurrent::VERSION}"
+        sh "git tag edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
+        sh "git push origin edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
       end
     end
 
@@ -297,7 +312,7 @@ namespace :release do
     task :rubygems do
       Dir.chdir(__dir__) do
         sh "gem push pkg/concurrent-ruby-#{Concurrent::VERSION}.gem"
-        sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem"
+        sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem" if publish_edge
         sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}.gem"
         sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x64-mingw32.gem"
         sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x86-mingw32.gem"

data/lib/concurrent.rb

@@ -1,5 +1,3 @@
-require 'concurrent/utility/193'
-
 require 'concurrent/version'
 require 'concurrent/constants'
 require 'concurrent/errors'

data/lib/concurrent/utility/native_extension_loader.rb

@@ -42,6 +42,14 @@ module Concurrent
 
       private
 
+      def load_error_path(error)
+        if error.respond_to? :path
+          error.path
+        else
+          error.message.split(' -- ').last
+        end
+      end
+
       def set_c_extensions_loaded
         @c_extensions_loaded = true
       end
@@ -54,7 +62,7 @@ module Concurrent
         require path
         set_c_extensions_loaded
       rescue LoadError => e
-        if e.path == path
+        if load_error_path(e) == path
           # move on with pure-Ruby implementations
           # TODO (pitr-ch 12-Jul-2018): warning on verbose?
         else

data/lib/concurrent/version.rb

@@ -1,4 +1,4 @@
 module Concurrent
-  VERSION      = '1.1.1'
+  VERSION      = '1.1.2'
   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.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jerry D'Antonio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies: []
 description: |
   Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
@@ -157,7 +157,6 @@ files:
 - lib/concurrent/timer_task.rb
 - lib/concurrent/tuple.rb
 - lib/concurrent/tvar.rb
-- lib/concurrent/utility/193.rb
 - lib/concurrent/utility/at_exit.rb
 - lib/concurrent/utility/engine.rb
 - lib/concurrent/utility/monotonic_time.rb

data/lib/concurrent/utility/193.rb

@@ -1,17 +0,0 @@
-require_relative 'engine'
-
-if Concurrent.ruby_version :<, 2, 0, 0
-  # @!visibility private
-  module Kernel
-    def __dir__
-      File.dirname __FILE__
-    end
-  end
-
-  # @!visibility private
-  class LoadError < ScriptError
-    def path
-      message.split(' -- ').last
-    end
-  end
-end