Update gemspec, gemfile, support files

Author: pitr-ch

Gemfile

@@ -10,8 +10,9 @@ group :development do
   gem 'rake-compiler-dock', '~> 0.6.0'
   gem 'gem-compiler', '~> 0.3.0'
   gem 'benchmark-ips', '~> 2.7'
+end
 
-  # documentation
+group :documentation do
   gem 'countloc', '~> 0.4.0', :platforms => :mri, :require => false
   # TODO (pitr-ch 04-May-2018): update to remove: [DEPRECATION] `last_comment` is deprecated.  Please use `last_description` instead.
   gem 'yard', '~> 0.8.0', :require => false

concurrent-ruby-edge.gemspec

@@ -1,8 +1,5 @@
-$:.push File.join(File.dirname(__FILE__), 'lib')
-$:.push File.join(File.dirname(__FILE__), 'support')
-
-require 'concurrent/version'
-require 'file_map'
+require_relative 'lib/concurrent/version'
+require_relative 'support/file_map'
 
 Gem::Specification.new do |s|
   git_files = `git ls-files`.split("\n")

concurrent-ruby-ext.gemspec

@@ -1,6 +1,4 @@
-$:.push File.join(File.dirname(__FILE__), 'lib')
-
-require 'concurrent/version'
+require_relative 'lib/concurrent/version'
 
 Gem::Specification.new do |s|
   s.name        = 'concurrent-ruby-ext'

concurrent-ruby.gemspec

@@ -1,33 +1,26 @@
-$:.push File.join(File.dirname(__FILE__), 'lib')
-$:.push File.join(File.dirname(__FILE__), 'support')
-
-require 'concurrent/version'
-require 'file_map'
+require_relative 'lib/concurrent/version'
+require_relative 'lib/concurrent/utility/engine'
+require_relative 'support/file_map'
 
 Gem::Specification.new do |s|
-  git_files = `git ls-files`.split("\n")
-
   s.name             = 'concurrent-ruby'
   s.version          = Concurrent::VERSION
-  s.platform         = Gem::Platform::RUBY
+  s.platform         = Concurrent.on_jruby? ? Gem::Platform::JAVA : Gem::Platform::RUBY
   s.authors          = ["Jerry D'Antonio", 'Petr Chalupa', 'The Ruby Concurrency Team']
   s.email            = '[email protected]'
   s.homepage         = 'http://www.concurrent-ruby.com'
   s.summary          = 'Modern concurrency tools for Ruby. Inspired by Erlang, Clojure, Scala, Haskell, F#, C#, Java, and classic concurrency patterns.'
   s.license          = 'MIT'
   s.date             = Time.now.strftime('%Y-%m-%d')
-  s.files            = FileMap::MAP.fetch(:core)
+  s.files            = [*FileMap::MAP.fetch(:core),
+                        *FileMap::MAP.fetch(:spec),
+                        *(Dir['lib/**/*.jar'] if Concurrent.on_jruby?)]
   s.extra_rdoc_files = Dir['README*', 'LICENSE*', 'CHANGELOG*']
   s.require_paths    = ['lib']
-  s.description      = <<-EOF
-Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
-Inspired by Erlang, Clojure, Go, JavaScript, actors, and classic concurrency patterns.
-  EOF
-
-  if defined?(JRUBY_VERSION)
-    s.files    += Dir['lib/**/*.jar']
-    s.platform = 'java'
-  end
+  s.description      = <<-TXT.gsub(/^ +/, '')
+    Modern concurrency tools including agents, futures, promises, thread pools, actors, supervisors, and more.
+    Inspired by Erlang, Clojure, Go, JavaScript, actors, and classic concurrency patterns.
+  TXT
 
   s.required_ruby_version = '>= 1.9.3'
 end

support/file_map.rb

@@ -11,6 +11,7 @@ module FileMap
 
   MAP = {
     core: CORE_LIB_FILES + %w(lib/concurrent.rb),
-    edge: EDGE_LIB_FILES + %w(lib/concurrent-edge.rb)
+    edge: EDGE_LIB_FILES + %w(lib/concurrent-edge.rb),
+    spec: (Dir['spec/**/*'] + ['Gemfile', 'Rakefile']) & GIT_FILES
   }
 end

support/publish-concurrent-ruby.rb

@@ -22,8 +22,8 @@ log "prerelease:           $prerelease"
 
 set -x
 
-mriVersion="2.4.0"
-jrubyVersion="jruby-9.1.7.0"
+mriVersion="2.4.3"
+jrubyVersion="jruby-9.1.17.0"
 
 if [[ "$@" =~ 'build' || $@ =~ 'all' ]]
 then