First successful gem build using custom rake-compiler-dev-box.

Removed superflouous lines from gemsepc and Rakefile.

Fixed CAtomic load error for Windows cross-compiled extensions.

Author: jdantonio

.gitignore

@@ -1,5 +1,8 @@
 Gemfile.lock
 *.gem
+lib/1.8
+lib/1.9
+lib/2.0
 .rvmrc
 .ruby-version
 .ruby-gemset

Rakefile

@@ -2,21 +2,18 @@ require 'rake'
 require 'bundler/gem_tasks'
 require 'rake/extensiontask'
 require 'rake/javaextensiontask'
-#require 'rspec'
-#require 'rspec/core/rake_task'
 
 GEMSPEC = Gem::Specification.load(File.expand_path('../concurrent-ruby.gemspec', __FILE__))
 
 $:.push File.join(File.dirname(__FILE__), 'lib')
 require 'extension_helper'
 
-Bundler::GemHelper.install_tasks
+$:.unshift 'tasks'
+Dir.glob('tasks/**/*.rake').each do|rakefile|
+  load rakefile
+end
 
-#RSpec::Core::RakeTask.new(:spec)
-#$:.unshift 'tasks'
-#Dir.glob('tasks/**/*.rake').each do|rakefile|
-  #load rakefile
-#end
+Bundler::GemHelper.install_tasks
 
 desc 'Run benchmarks'
 task :bench do
@@ -60,17 +57,29 @@ elsif Concurrent.use_c_extensions?
 end
 
 Rake::Task[:clean].enhance do
-  rm_rf 'pkg'
+  rm_rf 'pkg/classes'
+  rm_rf 'tmp'
+  rm_rf 'lib/1.9'
+  rm_rf 'lib/2.0'
   rm_f Dir.glob('./lib/*.jar')
-  rm_f Dir.glob('./lib/*.bundle')
+  rm_f Dir.glob('./**/*.bundle')
 end
 
-#RSpec::Core::RakeTask.new(:travis_spec) do |t|
-  #t.rspec_opts = '--tag ~@not_on_travis'
-#end
+begin
+  require 'rspec'
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
 
-#if defined?(EXTENSION_NAME)
-  #task :default => [:clean, "compile:#{EXTENSION_NAME}", :travis_spec]
-#else
-  #task :default => [:clean, :travis_spec]
-#end
+  RSpec::Core::RakeTask.new(:travis_spec) do |t|
+    t.rspec_opts = '--tag ~@not_on_travis'
+  end
+
+  if defined?(EXTENSION_NAME)
+    task :default => [:clean, "compile:#{EXTENSION_NAME}", :travis_spec]
+  else
+    task :default => [:clean, :travis_spec]
+  end
+rescue LoadError
+  puts 'Error loading Rspec rake tasks, probably building the gem...'
+end

concurrent-ruby.gemspec

@@ -18,10 +18,7 @@ Gem::Specification.new do |s|
     Inspired by Erlang, Clojure, Go, JavaScript, actors, and classic concurrency patterns.
   EOF
 
-  s.files            = Dir['README*', 'LICENSE*', 'CHANGELOG*']
-  s.files           += Dir['{lib,md,spec}/**/*']
-  s.test_files       = Dir['{spec}/**/*']
-  s.extra_rdoc_files = ['README.md']
+  s.files            = Dir['lib/**/*']
   s.extra_rdoc_files = Dir['README*', 'LICENSE*', 'CHANGELOG*']
   s.require_paths    = ['lib']
 
@@ -33,8 +30,4 @@ Gem::Specification.new do |s|
   end
 
   s.required_ruby_version = '>= 1.9.3'
-
-  s.add_development_dependency 'bundler', '~> 1.6.2'
-  s.add_development_dependency 'rake', '~> 10.3.2'
-  s.add_development_dependency 'rake-compiler', '~> 0.9.2'
 end

lib/concurrent/atomic.rb

@@ -14,7 +14,7 @@
   warn "#{__FILE__}:#{__LINE__}: unsupported Ruby engine `#{RUBY_ENGINE}', using less-efficient Atomic impl"
 end
 
-if RUBY_PLATFORM == 'java'
+if defined? Concurrent::JavaAtomic
 
   class Concurrent::Atomic < Concurrent::JavaAtomic
   end

lib/concurrent/atomic_reference/ruby.rb

@@ -1,4 +1,10 @@
-require 'concurrent_cruby'
+begin
+  require 'concurrent_cruby'
+rescue LoadError
+  # may be a Windows cross-compiled native gem
+  require "#{RUBY_VERSION[0..2]}/concurrent_cruby"
+end
+
 require 'concurrent/atomic_reference/direct_update'
 require 'concurrent/atomic_reference/numeric_cas_wrapper'
 

lib/extension_helper.rb

@@ -4,6 +4,6 @@ module Concurrent
   def self.use_c_extensions?
     host_os = RbConfig::CONFIG['host_os']
     ruby_name = RbConfig::CONFIG['ruby_install_name']
-    (ruby_name =~ /^ruby$/i || host_os =~ /mswin32/i || host_os =~ /mingw32/i) #&& RUBY_VERSION >= '2.0'
+    (ruby_name =~ /^ruby$/i || host_os =~ /mswin32/i || host_os =~ /mingw32/i)
   end
 end