Merge pull request #364 from ruby-concurrency/build-updates

Build updates

Author: jdantonio

Gemfile

@@ -6,22 +6,22 @@ gemspec name: 'concurrent-ruby-edge'
 group :development do
   gem 'rake', '~> 10.4.2'
   gem 'rake-compiler', '~> 0.9.5'
-  gem 'rake-compiler-dock', '~> 0.4.0'
+  gem 'rake-compiler-dock', '~> 0.4.2'
   gem 'gem-compiler', '~> 0.3.0'
   gem 'benchmark-ips', '~> 2.2.0'
 
   # documentation
   gem 'countloc', '~> 0.4.0', :platforms => :mri, :require => false
   gem 'yard', '~> 0.8.7.6', :require => false
-  gem 'inch', '~> 0.6.2', :platforms => :mri, :require => false
-  gem 'redcarpet', '~> 3.2.3', platforms: :mri # understands github markdown
+  gem 'inch', '~> 0.6.3', :platforms => :mri, :require => false
+  gem 'redcarpet', '~> 3.3.2', platforms: :mri # understands github markdown
 end
 
 group :testing do
-  gem 'rspec', '~> 3.2.0'
-  gem 'timecop', '~> 0.7.3'
+  gem 'rspec', '~> 3.3.0'
+  gem 'timecop', '~> 0.7.4'
 
   # Coverage
   gem 'simplecov', '~> 0.10.0', :require => false
-  gem 'coveralls', '~> 0.8.1', :require => false
+  gem 'coveralls', '~> 0.8.2', :require => false
 end

README.md

@@ -249,10 +249,16 @@ bundle exec rake build              # Build JRuby-specific core gem (alias for `
 bundle exec rake build:core         # Build concurrent-ruby-<version>-java.gem into the pkg directory
 
 *All except JRuby*
-bundle exec rake build              # Build core and extension gems
 bundle exec rake build:core         # Build concurrent-ruby-<version>.gem into the pkg directory
 bundle exec rake build:ext          # Build concurrent-ruby-ext-<version>.gem into the pkg directory
 
+*When Docker IS installed*
+bundle exec rake build:windows      # Build the windows binary <version> gems per rake-compiler-dock
+bundle exec rake build              # Build core, extension, and edge gems, including Windows binaries
+
+*When Docker is NOT installed*
+bundle exec rake build              # Build core, extension, and edge gems (excluding Windows binaries)
+
 *All*
 bundle exec rake clean              # Remove any temporary products
 bundle exec rake clobber            # Remove any generated file
@@ -261,7 +267,7 @@ bundle exec rake compile            # Compile all the extensions
 
 ## Maintainers
 
-* [Jerry D'Antonio](https://github.com/jdantonio)
+* [Jerry D'Antonio](https://github.com/jdantonio) (creator)
 * [Michele Della Torre](https://github.com/mighe)
 * [Chris Seaton](https://github.com/chrisseaton)
 * [Lucas Allan](https://github.com/lucasallan)

Rakefile

@@ -7,23 +7,23 @@ require 'concurrent/utility/native_extension_loader'
 
 ## load the two gemspec files
 CORE_GEMSPEC = Gem::Specification.load('concurrent-ruby.gemspec')
-EXT_GEMSPEC = Gem::Specification.load('concurrent-ruby-ext.gemspec')
+EXT_GEMSPEC  = Gem::Specification.load('concurrent-ruby-ext.gemspec')
 EDGE_GEMSPEC = Gem::Specification.load('concurrent-ruby-edge.gemspec')
 
 ## constants used for compile/build tasks
 
-GEM_NAME = 'concurrent-ruby'
-EXT_NAME = 'extension'
-EDGE_NAME = 'edge'
+GEM_NAME      = 'concurrent-ruby'
+EXT_NAME      = 'extension'
+EDGE_NAME     = 'edge'
 JAVA_EXT_NAME = 'concurrent_ruby_ext'
 
 if Concurrent.on_jruby?
-  CORE_GEM = "#{GEM_NAME}-#{Concurrent::VERSION}-java.gem"
+  CORE_GEM   = "#{GEM_NAME}-#{Concurrent::VERSION}-java.gem"
 else
-  CORE_GEM = "#{GEM_NAME}-#{Concurrent::VERSION}.gem"
-  EXT_GEM = "#{GEM_NAME}-ext-#{Concurrent::VERSION}.gem"
+  CORE_GEM   = "#{GEM_NAME}-#{Concurrent::VERSION}.gem"
+  EXT_GEM    = "#{GEM_NAME}-ext-#{Concurrent::VERSION}.gem"
   NATIVE_GEM = "#{GEM_NAME}-ext-#{Concurrent::VERSION}-#{Gem::Platform.new(RUBY_PLATFORM)}.gem"
-  EDGE_GEM = "#{GEM_NAME}-edge-#{Concurrent::EDGE_VERSION}.gem"
+  EDGE_GEM   = "#{GEM_NAME}-edge-#{Concurrent::EDGE_VERSION}.gem"
 end
 
 ## safely load all the rake tasks in the `tasks` directory
@@ -41,6 +41,10 @@ Dir.glob('tasks/**/*.rake').each do |rakefile|
   safe_load rakefile
 end
 
+def has_docker?
+  system("docker version > /dev/null 2>&1 || boot2docker version > /dev/null 2>&1")
+end
+
 if Concurrent.on_jruby?
 
   ## create the compile task for the JRuby-specific gem
@@ -135,21 +139,27 @@ namespace :build do
     end
   end
 
-  desc "Build the windows binary gems per rake-compiler-dock"
-  task :windows do
-    require 'rake_compiler_dock'
-    RakeCompilerDock.sh <<-EOT
+  if has_docker?
+    desc "Build the windows binary #{Concurrent::VERSION} gems per rake-compiler-dock"
+    task :windows do
+      require 'rake_compiler_dock'
+      RakeCompilerDock.sh <<-EOT
       bundle --without="development testing" &&
       rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.6:2.2.2
-    EOT
+      rm -rf .bundle
+      EOT
+    end
   end
 end
 
 if Concurrent.on_jruby?
   desc 'Build JRuby-specific core gem (alias for `build:core`)'
   task :build => ['build:core']
+elsif has_docker?
+  desc 'Build core, extension, and edge gems, including Windows binaries'
+  task :build => ['build:core', 'build:ext', 'build:edge', 'build:windows']
 else
-  desc 'Build core, extension, and edge gems'
+  desc 'Build core, extension, and edge gems (excluding Windows binaries)'
   task :build => ['build:core', 'build:ext', 'build:edge']
 end
 
@@ -170,7 +180,20 @@ begin
                    '--tag ~notravis'
   end
 
-  task :ci => [:clean, :compile, :travis]
+  RSpec::Core::RakeTask.new(:appveyor) do |t|
+    t.rspec_opts = '--backtrace ' \
+                   '--tag ~unfinished ' \
+                   '--seed 1 ' \
+                   '--format documentation ' \
+                   '--tag ~notravis'
+  end
+
+  if Concurrent.on_windows?
+    task :ci => [:clean, :compile, :appveyor]
+  else
+    task :ci => [:clean, :compile, :travis]
+  end
+
   task :default => [:clean, :compile, :spec]
 rescue LoadError
   puts 'Error loading Rspec rake tasks, probably building the gem...'

lib/concurrent/utility/engine.rb

@@ -19,6 +19,10 @@ def on_rbx?
         ruby_engine == 'rbx'
       end
 
+      def on_windows?
+        !(RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/).nil?
+      end
+
       def ruby_engine
         defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
       end

spec/spec_helper.rb

@@ -8,10 +8,14 @@
   require 'simplecov'
   require 'coveralls'
 
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  if ENV['TRAVIS']
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
       SimpleCov::Formatter::HTMLFormatter,
       Coveralls::SimpleCov::Formatter
-  ]
+    ]
+  else
+    SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+  end
 
   SimpleCov.start do
     project_name 'concurrent-ruby'