Skip to content
This repository was archived by the owner on Mar 15, 2022. It is now read-only.

Commit d77f0d7

Browse files
committed
Updated README, rake tasks, and TravisCI build targets.
1 parent 9e720c8 commit d77f0d7

File tree

7 files changed

+105
-26
lines changed

7 files changed

+105
-26
lines changed

.coveralls.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
repo_token: YHujQy7tqpw5P0TuWjwk6Vd5Vuw8LcGvo

.gitignore

+35-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,37 @@
1-
.*.sw?
2-
lib/atomic_reference.jar
3-
/nbproject
4-
ext/*.bundle
5-
ext/*.so
6-
ext/*.jar
1+
Gemfile.lock
2+
*.gem
3+
lib/1.8
4+
lib/1.9
5+
lib/2.0
6+
.rvmrc
7+
.ruby-version
8+
.ruby-gemset
9+
.bundle/*
10+
.yardoc/*
11+
yardoc/*
12+
tmp/*
13+
man/*
14+
*.tmproj
15+
rdoc/*
16+
*.orig
17+
*.BACKUP.*
18+
*.BASE.*
19+
*.LOCAL.*
20+
*.REMOTE.*
21+
git_pull.txt
22+
coverage
23+
critic
24+
.DS_Store
25+
TAGS
26+
tmtags
27+
*.sw?
28+
.idea
29+
.rbx/*
30+
lib/**/*.bundle
31+
lib/**/*.so
32+
lib/**/*.jar
33+
ext/**/*.bundle
34+
ext/**/*.so
35+
ext/**/*.jar
736
pkg
837
*.gem

.travis.yml

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
language: ruby
2+
23
rvm:
4+
- 2.2.0
5+
- 2.1.5
6+
- 2.1.4
37
- 2.0.0
48
- 1.9.3
5-
- 1.8.7
6-
- jruby-18mode # JRuby in 1.8 mode
7-
- jruby-19mode # JRuby in 1.9 mode
9+
- ruby-head
10+
- jruby-1.7.18
11+
- jruby-head
812
- rbx-2
13+
914
jdk:
1015
- oraclejdk8
16+
17+
sudo: false
18+
19+
branches:
20+
only:
21+
- master
22+
23+
matrix:
24+
allow_failures:
25+
- rvm: ruby-head
26+
- rvm: jruby-head
27+
- rvm: 1.9.3

Gemfile

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
source "https://rubygems.org"
1+
source 'https://rubygems.org'
22

3-
gem 'rake-compiler'
4-
gem 'minitest', '>= 5.0.0', :group => :development
3+
gemspec
4+
5+
group :development do
6+
gem 'rake', '~> 10.3.2'
7+
gem 'rake-compiler', '~> 0.9.2'
8+
end
9+
10+
group :testing do
11+
gem 'minitest', '>= 5.0.0', :group => :development
12+
end

README.md

+33-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1-
atomic: An atomic reference implementation for JRuby, Rubinius, and MRI.
2-
========================================================================
1+
# Ruby Atomic
32

4-
[![Build Status](https://travis-ci.org/headius/ruby-atomic.png?branch=master)](https://travis-ci.org/headius/ruby-atomic)
3+
[![Gem Version](https://badge.fury.io/rb/atomic.svg)](http://badge.fury.io/rb/atomic) [![Build Status](https://travis-ci.org/ruby-concurrency/atomic.svg?branch=master)](https://travis-ci.org/ruby-concurrency/atomic) [![Code Climate](https://codeclimate.com/github/ruby-concurrency/atomic.svg)](https://codeclimate.com/github/ruby-concurrency/atomic) [![Dependency Status](https://gemnasium.com/ruby-concurrency/atomic.svg)](https://gemnasium.com/ruby-concurrency/atomic) [![License](https://img.shields.io/badge/license-Apache-green.svg)](http://opensource.org/licenses/Apache-2.0) [![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/ruby-concurrency/concurrent-ruby)
54

6-
Summary
7-
=======
5+
An atomic reference implementation for JRuby, Rubinius, and MRI.
6+
7+
# Deprecated!
8+
9+
*This gem has been deprecated in lieu of [Concurrent Ruby](http://www.concurrent-ruby.com).
10+
This gem will be retained in GitHUb and Rubygems.org indefinitely but no new development
11+
will occur, including updates to support new versions of Ruby, JRuby, and Java. All users
12+
of this gem are encouraged to update their projects to use `concurrent-ruby` instead.*
13+
14+
All code from this gem has been merged into `concurrent-ruby` and its companion gems.
15+
All abstrations in this library are available in `concurrent-ruby` but have been moved
16+
under the `Concurrent` module to avoid namespace collisions.
17+
18+
```ruby
19+
# old way
20+
require 'atomic'
21+
my_atomic = Atomic.new(0)
22+
23+
# new way
24+
require 'concurrent'
25+
my_atomic = Concurrent::Atomic.new(0)
26+
```
27+
28+
# Old Documentation
29+
30+
*For historic purposes only...*
31+
32+
## Summary
833

934
This library provides:
1035

@@ -15,10 +40,9 @@ The Atomic class provides accessors for the contained "value" plus two update me
1540
* update will run the provided block, passing the current value and replacing it with the block result if the value has not been changed in the meantime. It may run the block repeatedly if there are other concurrent updates in progress.
1641
* 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 an Atomic::ConcurrentUpdateError.
1742

18-
The atomic repository is at http://github.com/headius/ruby-atomic.
43+
The atomic repository is at http://github.com/ruby-concurrency/ruby-atomic.
1944

20-
Usage
21-
=====
45+
## Usage
2246

2347
The simplest way to use "atomic" is to call the "update" or "try_update" methods.
2448

@@ -47,7 +71,6 @@ my_atomic.compare_and_swap(2, 3) # => true, updated to 3
4771
my_atomic.compare_and_swap(2, 3) # => false, current is not 2
4872
```
4973

50-
Building
51-
========
74+
## Building
5275

5376
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.

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
require 'rake'
1414
require 'rake/testtask'
1515

16-
task :default => :test
17-
1816
desc "Run tests"
1917
Rake::TestTask.new :test do |t|
2018
t.libs << "lib"
@@ -61,3 +59,5 @@ end
6159

6260
task :package => :compile
6361
task :test => :compile
62+
63+
task :default => :test

atomic.gemspec

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
Gem::Specification.new do |s|
66
s.name = %q{atomic}
7-
s.version = "1.1.16"
7+
s.version = "1.1.99"
88
s.authors = ["Charles Oliver Nutter", "MenTaLguY", "Sokolov Yura"]
99
s.date = Time.now.strftime('%Y-%m-%d')
1010
s.summary = "An atomic reference implementation for JRuby, Rubinius, and MRI"
1111
s.description = s.summary
1212
13-
s.homepage = "http://github.com/headius/ruby-atomic"
13+
s.homepage = "http://github.com/ruby-concurrency/ruby-atomic"
1414
s.require_paths = ["lib"]
1515
s.licenses = ["Apache-2.0"]
1616
s.test_files = Dir["test/test*.rb"]
@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
2121
s.extensions = 'ext/extconf.rb'
2222
end
2323
s.files += `git ls-files`.lines.map(&:chomp)
24+
s.post_install_message = 'This gem has been deprecated in lieu of Concurrent Ruby (http://concurrent-ruby.com).'
2425
end

0 commit comments

Comments
 (0)