concurrent-ruby 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8d042c846e692138ba0eea6efbabb53794abbaae207477dc5e549abac9fab266
4
- data.tar.gz: 34678c0ec6d519d5beac0b12a8c6116d4eb1ff29dd620ba03df851d086b04adc
3
+ metadata.gz: b989ff504545fbd515aa9623e18515993f30d758768702fd48775efbf1eb68da
4
+ data.tar.gz: 6de4e1598114ce722b56eb2ca567d75dd8828afb998252bdb46906e2578f943d
5
5
  SHA512:
6
- metadata.gz: 9b75559855ce216316a81bb68a9fcb1e74dceed4baa8e816d2e02cd12af50745e88f9afba7470681a8f47297a297fe9fd79e82ace4b5f63410197469eab45523
7
- data.tar.gz: 79e63eb2ef9ab15e9fd5d1d777ae027e68b399ec885d85bc8156f9edad741ecf4eb20fc063357068018ef932c18e7263466ef64cee7592bf50b39433e83b94a7
6
+ metadata.gz: b81c2d2d16e02a03ef0e77c8d633280c02946472e7a762de733da0ee7203c2227ccb09ce5f03835446db42f0bef78df55a2158a787eea3620b1c228a234836df
7
+ data.tar.gz: f5ca5bacf3edbc0cf9894d94b8a3c3bc4aef173e4122c6a9cae84d257a3d3df5ada3280431c14f8e33b328348ce039af9a278975954daccb5aea916bad18a1fa
data/Rakefile CHANGED
@@ -2,7 +2,15 @@
2
2
 
3
3
  require_relative 'lib/concurrent/version'
4
4
  require_relative 'lib/concurrent/utility/engine'
5
- require_relative 'lib/concurrent/utility/193'
5
+
6
+ if Concurrent.ruby_version :<, 2, 0, 0
7
+ # @!visibility private
8
+ module Kernel
9
+ def __dir__
10
+ File.dirname __FILE__
11
+ end
12
+ end
13
+ end
6
14
 
7
15
  core_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby.gemspec')
8
16
  ext_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-ext.gemspec')
@@ -155,7 +163,6 @@ begin
155
163
  "{Concurrent::#{$1} #{$1}}"
156
164
  end
157
165
  end
158
- FileUtils.mkpath 'tmp'
159
166
  File.write 'tmp/README.md', content
160
167
  end
161
168
  end
@@ -276,20 +283,28 @@ namespace :release do
276
283
  task :publish => ['publish:ask', 'publish:tag', 'publish:rubygems', 'publish:post_steps']
277
284
 
278
285
  namespace :publish do
286
+ publish_edge = false
287
+
279
288
  task :ask do
280
289
  begin
281
- STDOUT.puts 'Do you want to publish? (y/n)'
290
+ STDOUT.puts 'Do you want to publish anything? (y/n)'
282
291
  input = STDIN.gets.strip.downcase
283
292
  end until %w(y n).include?(input)
284
293
  exit 1 if input == 'n'
294
+ begin
295
+ STDOUT.puts 'Do you want to publish edge? (y/n)'
296
+ input = STDIN.gets.strip.downcase
297
+ end until %w(y n).include?(input)
298
+ publish_edge = input == 'y'
285
299
  end
286
300
 
287
301
  desc '** tag HEAD with current version and push to github'
288
302
  task :tag do
289
303
  Dir.chdir(__dir__) do
290
304
  sh "git tag v#{Concurrent::VERSION}"
291
- sh "git tag edge-v#{Concurrent::EDGE_VERSION}"
292
- sh "git push origin v#{Concurrent::VERSION} edge-v#{Concurrent::EDGE_VERSION}"
305
+ sh "git push origin v#{Concurrent::VERSION}"
306
+ sh "git tag edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
307
+ sh "git push origin edge-v#{Concurrent::EDGE_VERSION}" if publish_edge
293
308
  end
294
309
  end
295
310
 
@@ -297,7 +312,7 @@ namespace :release do
297
312
  task :rubygems do
298
313
  Dir.chdir(__dir__) do
299
314
  sh "gem push pkg/concurrent-ruby-#{Concurrent::VERSION}.gem"
300
- sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem"
315
+ sh "gem push pkg/concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem" if publish_edge
301
316
  sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}.gem"
302
317
  sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x64-mingw32.gem"
303
318
  sh "gem push pkg/concurrent-ruby-ext-#{Concurrent::VERSION}-x86-mingw32.gem"
@@ -1,5 +1,3 @@
1
- require 'concurrent/utility/193'
2
-
3
1
  require 'concurrent/version'
4
2
  require 'concurrent/constants'
5
3
  require 'concurrent/errors'
@@ -42,6 +42,14 @@ module Concurrent
42
42
 
43
43
  private
44
44
 
45
+ def load_error_path(error)
46
+ if error.respond_to? :path
47
+ error.path
48
+ else
49
+ error.message.split(' -- ').last
50
+ end
51
+ end
52
+
45
53
  def set_c_extensions_loaded
46
54
  @c_extensions_loaded = true
47
55
  end
@@ -54,7 +62,7 @@ module Concurrent
54
62
  require path
55
63
  set_c_extensions_loaded
56
64
  rescue LoadError => e
57
- if e.path == path
65
+ if load_error_path(e) == path
58
66
  # move on with pure-Ruby implementations
59
67
  # TODO (pitr-ch 12-Jul-2018): warning on verbose?
60
68
  else
@@ -1,4 +1,4 @@
1
1
  module Concurrent
2
- VERSION = '1.1.1'
2
+ VERSION = '1.1.2'
3
3
  EDGE_VERSION = '0.4.1'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: concurrent-ruby
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jerry D'Antonio
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2018-11-05 00:00:00.000000000 Z
13
+ date: 2018-11-06 00:00:00.000000000 Z
14
14
  dependencies: []
15
15
  description: |
16
16
  Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
@@ -157,7 +157,6 @@ files:
157
157
  - lib/concurrent/timer_task.rb
158
158
  - lib/concurrent/tuple.rb
159
159
  - lib/concurrent/tvar.rb
160
- - lib/concurrent/utility/193.rb
161
160
  - lib/concurrent/utility/at_exit.rb
162
161
  - lib/concurrent/utility/engine.rb
163
162
  - lib/concurrent/utility/monotonic_time.rb
@@ -1,17 +0,0 @@
1
- require_relative 'engine'
2
-
3
- if Concurrent.ruby_version :<, 2, 0, 0
4
- # @!visibility private
5
- module Kernel
6
- def __dir__
7
- File.dirname __FILE__
8
- end
9
- end
10
-
11
- # @!visibility private
12
- class LoadError < ScriptError
13
- def path
14
- message.split(' -- ').last
15
- end
16
- end
17
- end