diff --git a/CHANGELOG.md b/CHANGELOG.md index e41ca1b33..002eab474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### Upcoming Release v1.0.0.pre2 (TBD) +## Current Release v1.0.0.pre2 (19 September 2015) * Simplification of `RubySingleThreadExecutor` * `Async` improvements @@ -10,8 +10,9 @@ - Now `Observable` - Added a `#reset` method * Brand new `Agent` API and implementation. Now functionally equivalent to Clojure. +* Continued improvements to the synchronization layer -## Current Release v1.0.0.pre1 (19 Aug 2015) +### Release v1.0.0.pre1 (19 August 2015) * Merged in the `thread_safe` gem - `Concurrent::Array` diff --git a/build-tests/atomic_boolean_builds_spec.rb b/build-tests/atomic_boolean_builds_spec.rb index 9d754fba4..206e85689 100644 --- a/build-tests/atomic_boolean_builds_spec.rb +++ b/build-tests/atomic_boolean_builds_spec.rb @@ -28,15 +28,17 @@ def atomic_boolean_test(clazz, opts = {}) let!(:threads) { 10 } let!(:tests) { 1000 } - describe Concurrent::MutexAtomicBoolean do + unless jruby? + describe Concurrent::MutexAtomicBoolean do - specify 'is defined' do - expect(defined?(Concurrent::MutexAtomicBoolean)).to be_truthy - end + specify 'is defined' do + expect(defined?(Concurrent::MutexAtomicBoolean)).to be_truthy + end - specify 'runs the benchmarks' do - stats = atomic_boolean_test('MutexAtomicBoolean', threads: threads, tests: tests) - expect(stats).to be_benchmark_results + specify 'runs the benchmarks' do + stats = atomic_boolean_test('MutexAtomicBoolean', threads: threads, tests: tests) + expect(stats).to be_benchmark_results + end end end diff --git a/build-tests/atomic_fixnum_builds_spec.rb b/build-tests/atomic_fixnum_builds_spec.rb index d35071637..f68f9553b 100644 --- a/build-tests/atomic_fixnum_builds_spec.rb +++ b/build-tests/atomic_fixnum_builds_spec.rb @@ -28,15 +28,17 @@ def atomic_fixnum_test(clazz, opts = {}) let!(:threads) { 10 } let!(:tests) { 1000 } - describe Concurrent::MutexAtomicFixnum do + unless jruby? + describe Concurrent::MutexAtomicFixnum do - specify 'is defined' do - expect(defined?(Concurrent::MutexAtomicFixnum)).to be_truthy - end + specify 'is defined' do + expect(defined?(Concurrent::MutexAtomicFixnum)).to be_truthy + end - specify 'runs the benchmarks' do - stats = atomic_fixnum_test('MutexAtomicFixnum', threads: threads, tests: tests) - expect(stats).to be_benchmark_results + specify 'runs the benchmarks' do + stats = atomic_fixnum_test('MutexAtomicFixnum', threads: threads, tests: tests) + expect(stats).to be_benchmark_results + end end end diff --git a/build-tests/atomic_reference_builds_spec.rb b/build-tests/atomic_reference_builds_spec.rb index 59bb7e4dc..32dee8928 100644 --- a/build-tests/atomic_reference_builds_spec.rb +++ b/build-tests/atomic_reference_builds_spec.rb @@ -28,15 +28,17 @@ def atomic_reference_test(clazz, opts = {}) let!(:threads) { 10 } let!(:tests) { 1000 } - describe Concurrent::MutexAtomicReference do + unless jruby? + describe Concurrent::MutexAtomicReference do - specify 'is defined' do - expect(defined?(Concurrent::MutexAtomicReference)).to be_truthy - end + specify 'is defined' do + expect(defined?(Concurrent::MutexAtomicReference)).to be_truthy + end - specify 'runs the benchmarks' do - stats = atomic_reference_test('MutexAtomicReference', threads: threads, tests: tests) - expect(stats).to be_benchmark_results + specify 'runs the benchmarks' do + stats = atomic_reference_test('MutexAtomicReference', threads: threads, tests: tests) + expect(stats).to be_benchmark_results + end end end diff --git a/build-tests/runner.rb b/build-tests/runner.rb index 521919d08..460c7944c 100755 --- a/build-tests/runner.rb +++ b/build-tests/runner.rb @@ -102,13 +102,13 @@ def run_test_suite(files, ext, platform = '') puts SUITE_BREAK run_test_suite(TEST_FILES, false) -if mri? - if ! windows? - puts SUITE_BREAK - run_test_suite(TEST_FILES, true) - end - if platform_specific_extensions?(RUBY_PLATFORM) - puts SUITE_BREAK - run_test_suite(TEST_FILES, true, RUBY_PLATFORM) - end -end +#if mri? + #if ! windows? + #puts SUITE_BREAK + #run_test_suite(TEST_FILES, true) + #end + #if platform_specific_extensions?(RUBY_PLATFORM) + #puts SUITE_BREAK + #run_test_suite(TEST_FILES, true, RUBY_PLATFORM) + #end +#end diff --git a/lib/concurrent/version.rb b/lib/concurrent/version.rb index 76dc97177..0f8518002 100644 --- a/lib/concurrent/version.rb +++ b/lib/concurrent/version.rb @@ -1,4 +1,4 @@ module Concurrent - VERSION = '1.0.0.pre1' - EDGE_VERSION = '0.2.0.pre1' + VERSION = '1.0.0.pre2' + EDGE_VERSION = '0.2.0.pre2' end diff --git a/publish-concurrent-ruby.rb b/publish-concurrent-ruby.rb new file mode 100755 index 000000000..d21a40925 --- /dev/null +++ b/publish-concurrent-ruby.rb @@ -0,0 +1,20 @@ +#!/usr/bin/env ruby + +# get the current gem version +require_relative './lib/concurrent/version' + +GEMS = [ + "concurrent-ruby-#{Concurrent::VERSION}.gem", + "concurrent-ruby-#{Concurrent::VERSION}-java.gem", + "concurrent-ruby-ext-#{Concurrent::VERSION}.gem", + "concurrent-ruby-ext-#{Concurrent::VERSION}-x86-mingw32.gem", + "concurrent-ruby-ext-#{Concurrent::VERSION}-x64-mingw32.gem", + "concurrent-ruby-edge-#{Concurrent::EDGE_VERSION}.gem", +] + +GEMS.each do |gem| + file = File.join("pkg", gem) + basename = File.basename(file) + puts "Publishing #{basename}..." + `gem push #{file}` +end