bundler_local_development 0.2.0 → 0.3.0

data/README.md

@@ -26,7 +26,7 @@ And then execute:
 * Call `Bundler.development_gems = [...]` in your Gemfile, to configure
   your default set of local gems.
   You can provide regular expressions or strings to match gem names.
-* Set the `$DEV_GEMS` environment variable to add extra gems to this list (comma separated list of gem names).
+* Set the `$DEV_GEMS` environment variable to add extra gems to this list (semicolon separated list of gem names).
 
 If the `$GEM_DEV` environment variable is unset, this gem will have no effect.
 
@@ -34,9 +34,12 @@ If the `$GEM_DEV` environment variable is set:
 
 * Bundler will search for local gems in the
 path specified by `$GEM_DEV_DIR`. (The default search path is `$HOME/code/gems`, if `$GEM_DEV_DIR` is unset.)
+You can specify multiple directories by separating paths with a semicolon, e.g.
+`$HOME/code/gems;$HOME/code/more_gems`
 
 * If a local copy of the gem is found, it will add the `:path => <path>`
 option to the `gem` command.
+It will also scan the local gem's gemspec and process any runtime dependencies.
 
 * `Gemfile.lock` will **NOT** be updated if this gem is activated.
 

data/lib/bundler/local_development.rb

@@ -11,25 +11,34 @@
 module Bundler
   class << self
     def development_gems=(search_strings)
-      @@development_gems = search_strings
+      @@development_gems = [search_strings].flatten
     end
     def development_gems
-      (@@development_gems ||= []) +
-      ENV['DEV_GEMS'].to_s.split(',').map(&:strip).select{|s| s != "" }
+      # If $DEV_GEMS is provided, append to @@development_gems
+      if ENV['DEV_GEMS']
+        (@@development_gems ||= []) +
+        ENV['DEV_GEMS'].to_s.split(';').map(&:strip).select{|s| s != "" }
+      # Otherwise, default is to make all gems local
+      else
+        @@development_gems ||= [:all]
+      end
     end
   end
 
   class Dsl
     alias :gem_without_development :gem
     def gem_with_development(name, *args)
-      if ENV['GEM_DEV'] && Bundler.development_gems.any?{ |s| name[s] }
-        gem_dev_dir = ENV['GEM_DEV_DIR'] || "#{`echo $HOME`.strip}/code/gems"
-        path = File.join(gem_dev_dir, name)
-        if File.exist?(path)
-          # Check each local gem's gemspec to see if any dependencies need to be made local
-          gemspec_path = File.join(gem_dev_dir, name, "#{name}.gemspec")
-          process_gemspec_dependencies(gemspec_path, gem_dev_dir) if File.exist?(gemspec_path)
-          return gem_without_development name, :path => path
+      if ENV['GEM_DEV']
+        if Bundler.development_gems == [:all] || Bundler.development_gems.any?{ |s| name[s] }
+          gem_development_dirs.each do |dir|
+            path = File.join(dir, name)
+            if File.exist?(path)
+              # Check each local gem's gemspec to see if any dependencies need to be made local
+              gemspec_path = File.join(dir, name, "#{name}.gemspec")
+              process_gemspec_dependencies(gemspec_path) if File.exist?(gemspec_path)
+              return gem_without_development name, :path => path
+            end
+          end
         end
       end
       gem_without_development(name, *args)
@@ -37,11 +46,25 @@ module Bundler
     alias :gem :gem_with_development
 
     private
-    def process_gemspec_dependencies(gemspec_path, gem_dev_dir)
+    # Returns local gem dirs from ENV or default
+    def gem_development_dirs
+      @gem_development_dirs ||= if ENV['GEM_DEV_DIR']
+        ENV['GEM_DEV_DIR'].split(';')
+      else
+        ["#{`echo $HOME`.strip}/code/gems"]
+      end
+    end
+
+    def process_gemspec_dependencies(gemspec_path)
       spec = Bundler.load_gemspec(gemspec_path)
       spec.runtime_dependencies.each do |dep|
-        path = File.join(gem_dev_dir, dep.name)
-        gem_without_development(dep.name, :path => path) if File.exist?(path)
+        gem_development_dirs.each do |dir|
+          path = File.join(dir, dep.name)
+          if File.exist?(path)
+            gem_without_development(dep.name, :path => path)
+            break  # Process next dependency
+          end
+        end
       end
     end
   end

data/lib/bundler_local_development/version.rb

@@ -1,3 +1,3 @@
 module BundlerLocalDevelopment
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler_local_development
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -577521741
+      hash: 986860397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -577521741
+      hash: 986860397
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24