Simplify moving features between gems

Author: pitr-ch

concurrent-ruby-edge.gemspec

@@ -1,38 +1,30 @@
 $:.push File.join(File.dirname(__FILE__), 'lib')
 
 require 'concurrent/version'
-require 'concurrent/edge/version'
+require 'concurrent/file_map'
 
 Gem::Specification.new do |s|
-  s.name        = 'concurrent-ruby-edge'
-  s.version     = Concurrent::Edge::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jerry D'Antonio", 'The Ruby Concurrency Team']
-  s.email       = ['[email protected]', '[email protected]']
-  s.homepage    = 'http://www.concurrent-ruby.com'
-  s.summary     = <<-TXT
-Edge features and additions to the concurrent-ruby gem.
-
+  git_files = `git ls-files`.split("\n")
+
+  s.name             = 'concurrent-ruby-edge'
+  s.version          = Concurrent::EDGE_VERSION
+  s.platform         = Gem::Platform::RUBY
+  s.authors          = ["Jerry D'Antonio", 'The Ruby Concurrency Team']
+  s.email            = ['[email protected]', '[email protected]']
+  s.homepage         = 'http://www.concurrent-ruby.com'
+  s.summary          = 'Edge features and additions to the concurrent-ruby gem.'
+  s.license          = 'MIT'
+  s.date             = Time.now.strftime('%Y-%m-%d')
+  s.files            = Concurrent::FILE_MAP.fetch :edge
+  s.extra_rdoc_files = Dir['README*', 'LICENSE*']
+  s.require_paths    = ['lib']
+  s.description      = <<-TXT
 These features are under active development and may change frequently. They are expected not to
 keep backward compatibility (there may also lack tests and documentation). Semantic versions will
 be obeyed though. Features developed in `concurrent-ruby-edge` are expected to move to `concurrent-ruby` when final.
+Please see http://concurrent-ruby.com for more information.
   TXT
 
-  s.license     = 'MIT'
-  s.date        = Time.now.strftime('%Y-%m-%d')
-
-  s.description = <<-EOF
-    Experimental features and additions to the concurrent-ruby gem.
-    Minimally tested and documented.
-    Please see http://concurrent-ruby.com for more information.
-  EOF
-
-  s.files            = Dir['lib/concurrent/edge.rb', 'lib/concurrent/edge/**/*.rb']
-  s.files           += Dir['lib/concurrent/actor.rb', 'lib/concurrent/actor/**/*.rb']
-  s.files           += Dir['lib/concurrent/channel.rb', 'lib/concurrent/channel/**/*.rb']
-  s.extra_rdoc_files = Dir['README*', 'LICENSE*']
-  s.require_paths    = ['lib']
-
   s.required_ruby_version = '>= 1.9.3'
 
   s.add_runtime_dependency 'concurrent-ruby', "~> #{Concurrent::VERSION}"

concurrent-ruby.gemspec

@@ -1,29 +1,30 @@
 $:.push File.join(File.dirname(__FILE__), 'lib')
 
 require 'concurrent/version'
+require 'concurrent/file_map'
 
 Gem::Specification.new do |s|
-  s.name        = 'concurrent-ruby'
-  s.version     = Concurrent::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.author      = "Jerry D'Antonio"
-  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')
+  git_files = `git ls-files`.split("\n")
 
-  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
-
-  s.files            = Dir['lib/**/*.rb'].delete_if{|path| path =~ /actor|channel|edge/}
+  s.name             = 'concurrent-ruby'
+  s.version          = Concurrent::VERSION
+  s.platform         = Gem::Platform::RUBY
+  s.authors          = ["Jerry D'Antonio", 'The Ruby Concurrency Team']
+  s.email            = ['[email protected]', '[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            = Concurrent::FILE_MAP.fetch :core
   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.files    += Dir['lib/**/*.jar']
     s.platform = 'java'
   else
     s.add_runtime_dependency 'ref', '~> 1.0', '>= 1.0.5'

lib/concurrent-edge.rb

@@ -0,0 +1,7 @@
+require 'concurrent'
+require 'concurrent-edge/version'
+
+require 'concurrent-edge/actor'
+require 'concurrent-edge/channel'
+
+

lib/concurrent/edge/version.rb

@@ -0,0 +1,16 @@
+module Concurrent
+
+  git_files      = `git ls-files`.split("\n")
+  all_lib_files  = Dir['lib/concurrent/**/*.rb'] & git_files
+  edge_lib_files = Dir['lib/concurrent/actor.rb',
+                       'lib/concurrent/actor/**/*.rb',
+                       'lib/concurrent/channel.rb',
+                       'lib/concurrent/channel/**/*.rb'] & git_files
+  core_lib_files = all_lib_files - edge_lib_files
+
+  FILE_MAP = {
+      core: core_lib_files + %w(lib/concurrent.rb lib/concurrent_ruby.rb),
+      edge: edge_lib_files + %w(lib/concurrent-edge.rb)
+  }
+end
+

lib/concurrent/file_map.rb

@@ -1,3 +1,4 @@
 module Concurrent
-  VERSION = '0.8.0'
+  VERSION      = '0.8.0'
+  EDGE_VERSION = '0.1.0'
 end

lib/concurrent/version.rb

@@ -1 +1,2 @@
+warn "'[DEPRECATED] use `require 'concurrent'` instead of `require 'concurrent_ruby'`"
 require 'concurrent'