atomic 1.1.0-java → 1.1.1-java

data/.travis.yml

@@ -3,7 +3,8 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.8.7
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
+# Because we need JDK8 to build, these are disabled temporarily
+#  - jruby-18mode # JRuby in 1.8 mode
+#  - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode
   - rbx-19mode

data/atomic.gemspec

@@ -1,12 +1,21 @@
 # -*- encoding: utf-8 -*-
 
+# Update these to get proper version and commit history
+new_version = "1.1.1"
+old_version = "1.1.0"
+
 Gem::Specification.new do |s|
   s.name = %q{atomic}
-  s.version = "1.1.0"
-  s.authors = ["Charles Oliver Nutter", "MenTaLguY"]
+  s.version = new_version
+  s.authors = ["Charles Oliver Nutter", "MenTaLguY", "Sokolov Yura"]
   s.date = Time.now.strftime('%Y-%m-%d')
-  s.description = "An atomic reference implementation for JRuby, Rubinius, and MRI"
-  s.email = ["headius@headius.com", "mental@rydia.net"]
+  s.description = <<EOS
+Changes in version #{new_version}:
+
+#{`git log --oneline #{old_version}...#{new_version}`}
+#{File.read('README.md')}
+EOS
+  s.email = ["headius@headius.com", "mental@rydia.net", "funny.falcon@gmail.com"]
   s.homepage = "http://github.com/headius/ruby-atomic"
   s.require_paths = ["lib"]
   s.summary = "An atomic reference implementation for JRuby, Rubinius, and MRI"

data/ext/org/jruby/ext/atomic/AtomicReferenceLibrary.java

@@ -54,7 +54,7 @@ public class AtomicReferenceLibrary implements Library {
     
     private static final ObjectAllocator JRUBYREFERENCE8_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new JRubyReference(runtime, klazz);
+            return new JRubyReference8(runtime, klazz);
         }
     };
 

metadata

@@ -1,21 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: atomic
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease:
 platform: java
 authors:
 - Charles Oliver Nutter
 - MenTaLguY
+- Sokolov Yura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies: []
-description: An atomic reference implementation for JRuby, Rubinius, and MRI
+description: |
+  Changes in version 1.1.1:
+
+  2c5ab6c Include README and oneline logs in gem description.
+  6aeb053 Add @funny-falcon to authors.
+  aa24d4d Bump version to 1.1.1.
+  dc327eb Merge pull request #16 from funny-falcon/patch-1
+  1b68767 Fix JRUBYREFERENCE8_ALLOCATOR
+
+  atomic: An atomic reference implementation for JRuby, Rubinius, and MRI.
+
+  Summary
+  =======
+
+  This library provides:
+
+  * an Atomic class that guarantees atomic updates to its contained value
+
+  The Atomic class provides accessors for the contained "value" plus two update
+  methods:
+
+  * update will run the provided block, passing the current value and replacing
+    it with the block result iff the value has not been changed in the mean time.
+    It may run the block repeatedly if there are other concurrent updates in
+    progress.
+  * try_update will run the provided block, passing the current value and
+    replacing it with the block result. If the value changes before the update
+    can happen, it will throw Atomic::ConcurrentUpdateError.
+
+  The atomic repository is at http://github.com/headius/ruby-atomic.
+
+  Usage
+  =====
+
+  The simplest way to use "atomic" is to call the "update" or "try_update"
+  methods.
+
+  "try_update" and "update" both call the given block, passing the current
+  value and using the block's result as the new value. If the value is updated
+  by another thread before the block completes, "try update" raises a
+  ConcurrentUpdateError and "update" retries the block. Because "update" may call
+  the block several times when multiple threads are all updating the same value,
+  the block's logic should be kept as simple as possible.
+
+  ````ruby
+  require 'atomic'
+
+  my_atomic = Atomic.new(0)
+  my_atomic.update {|v| v + 1}
+  begin
+    my_atomic.try_update {|v| v + 1}
+  rescue Atomic::ConcurrentUpdateError => cue
+    # deal with it (retry, propagate, etc)
+  end
+  ````
+
+  It's also possible to use the regular get/set operations on the Atomic, if you
+  want to avoid the exception and respond to contended changes in some other way.
+
+  ````ruby
+  my_atomic = Atomic.new(0)
+  my_atomic.value # => 0
+  my_atomic.value = 1
+  my_atomic.swap(2) # => 1
+  my_atomic.compare_and_swap(2, 3) # => true, updated to 3
+  my_atomic.compare_and_swap(2, 3) # => false, current is not 2
+  ````
+
+  Building
+  ========
+
+  As of 1.1.0, JDK8 is required to build the atomic gem, since it attempts to use
+  the new atomic Unsafe.getAndSetObject method only in JDK8. The resulting code
+  should still work fine as far back as Java 5.
 email:
 - headius@headius.com
 - mental@rydia.net
+- funny.falcon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -51,17 +126,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24