bundler_ext 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 097abed54c3df5db6f7ede0b5ba90cf50d408372
-  data.tar.gz: 24bc257459c0291672f1a96238dbb4fbb340bbf1
+  metadata.gz: 18929e0e577a996fe29aab583a44ff3dc47f70ee
+  data.tar.gz: 8b5fc498ef3304ec5370c3a79226e764514a6f9c
 SHA512:
-  metadata.gz: 6188048e54d881ebe49b43bbbe63f87e4678164462f2f422224038d9f811654f84e0d7fcc0e6eda7e851ac9b3147ca75543bcb23071733ec2c66f57208221161
-  data.tar.gz: ad2a52003629007b609b80aec899733b2b58de7a5c3f470331297299a8c3d75d87e58106c4c6d2fc1430fc62876558f0d2d91d1aff0ca1d31fd1aa4a6431ba04
+  metadata.gz: 6947df0c40f5c52fe75e5fc194b40278449485255205e6961a1d09026693c166b7d88e3ac877d7ac9cf276287c78d0e0279600439909db26b868da7d261d23d8
+  data.tar.gz: 171b367e5382260a075546f96ce30cf600fa67b6981013a21dff99a7e1326fd173e5dcc62db343b901eff484eef12fdfe355e115c438300efb362613c423b239

data/CHANGELOG

@@ -1,3 +1,10 @@
+====== version 0.3.2 =========
+
+Mo Morsi (2013-11-19) 
+ - 12b79e0 Shorten default ENV variable names to 'BEXT'
+Mo Morsi (2013-11-12) 
+ - ad57f28 Lookup and activate versions of system installed gems
+
 ====== version 0.3.1 =========
 
 Jason Guiditta (2013-07-22) 

data/README.md

@@ -59,21 +59,21 @@ case, this is not the desired behavior, we explicitly want to say
 There are special environment variables you can use. You may need to 
 insert additional groups to be required, e.g. when developing and you
 want to restart the system in development mode once. Use 
-BUNDLER_EXT_GROUPS variable (separate with whitespace):
+BEXT_GROUPS variable (separate with whitespace):
 
-    BUNDLER_EXT_GROUPS="group1 group2 group3" rails server ...
+    BEXT_GROUPS="group1 group2 group3" rails server ...
 
 Also, by default bundler_ext raises an error when dependency cannot
 be loaded. You can turn off this behavior (e.g. for installers when
-you want to do rake db:migrate) with setting BUNDLER_EXT_NOSTRICT:
+you want to do rake db:migrate) with setting BEXT_NOSTRICT:
 
-    BUNDLER_EXT_NOSTRICT=1 rake db:migrate ...
+    BEXT_NOSTRICT=1 rake db:migrate ...
 
 In this mode bundler_ext prints out error messages on the stdout, 
 but does not terminate the process.
 
 Some rubygems require HOME environment variable to be set, threfore
-not running daemonized. For this purposes there is BUNDLER_EXT_HOME
+not running daemonized. For this purposes there is BEXT_HOME
 variable which can be used to set HOME environment variable before
 any rubygem gets loaded. The variable is not exported for
 subprocesses.

data/lib/bundler_ext/bundler_ext.rb

@@ -1,30 +1,43 @@
 require "bundler"
 
 # some rubygems does not play well with daemonized processes ($HOME is empty)
+ENV['HOME'] = ENV['BEXT_HOME']        if ENV['BEXT_HOME']
 ENV['HOME'] = ENV['BUNDLER_EXT_HOME'] if ENV['BUNDLER_EXT_HOME']
 
 class BundlerExt
   def self.parse_from_gemfile(gemfile,*groups)
     ENV['BUNDLE_GEMFILE'] = gemfile
     extra_groups = ENV['BUNDLER_EXT_GROUPS']
+    extra_groups = ENV['BEXT_GROUPS'] || ENV['BUNDLER_EXT_GROUPS']
     extra_groups.split(/\s/).each {|g| groups << g.to_sym} if extra_groups
     all_groups = false
     all_groups = true if groups.size == 1 and groups.include?(:all) and not extra_groups
     groups.map! { |g| g.to_sym }
     g = Bundler::Dsl.evaluate(gemfile,'foo',true)
-    list = []
+    deps = {}
     g.dependencies.each do |dep|
       if ((groups & dep.groups).any? || all_groups) && dep.current_platform?
+        files = []
         Array(dep.autorequire || dep.name).each do |file|
-          list << file
+          files << file
         end
+        deps[dep.name] = {:dep => dep, :files => files}
       end
     end
-    list
+    deps
+  end
+
+  def self.system_gem_name_for(name)
+    ENV['BEXT_PKG_PREFIX'] ||= ''
+    "#{ENV['BEXT_PKG_PREFIX']}#{name}"
+  end
+
+  def self.system_gem_version_for(name)
+    LinuxAdmin::Package.get_info(name)['version']
   end
 
   def self.strict_error(msg)
-    if ENV['BUNDLER_EXT_NOSTRICT']
+    if ENV['BEXT_NOSTRICT'] || ENV['BUNDLER_EXT_NOSTRICT']
       puts msg
     else
       raise msg
@@ -32,28 +45,50 @@ class BundlerExt
   end
 
   def self.system_require(gemfile,*groups)
-    BundlerExt.parse_from_gemfile(gemfile,*groups).each do |dep|
-      #This part ripped wholesale from lib/bundler/runtime.rb (github/master)
+    activate_versions = ENV['BEXT_ACTIVATE_VERSIONS']
+    if activate_versions
       begin
-        #puts "Attempting to require #{dep}"
-        require dep
-      rescue LoadError => e
-        #puts "Caught error: #{e.message}"
-        if dep.include?('-')
-          begin
-            if dep.respond_to? :name
-              namespaced_file = dep.name.gsub('-', '/')
-            else
-              # try to load unresolved deps
-              namespaced_file = dep.gsub('-', '/')
+        require "linux_admin"
+      rescue LoadError
+        puts "linux_admin not installed, cannot retrieve versions to activate"
+        activate_versions = false
+      end
+    end
+
+    BundlerExt.parse_from_gemfile(gemfile,*groups).each do |name,gdep|
+      # activate the dependency
+      if activate_versions
+        begin
+          sys_name = BundlerExt.system_gem_name_for(name)
+          version  = BundlerExt.system_gem_version_for(sys_name)
+          gem name, "=#{version}"
+        rescue LoadError, CommandResultError
+        end
+      end
+
+      gdep[:files].each do |dep|
+        #This part ripped wholesale from lib/bundler/runtime.rb (github/master)
+        begin
+          #puts "Attempting to require #{dep}"
+          require dep
+        rescue LoadError => e
+          #puts "Caught error: #{e.message}"
+          if dep.include?('-')
+            begin
+              if dep.respond_to? :name
+                namespaced_file = dep.name.gsub('-', '/')
+              else
+                # try to load unresolved deps
+                namespaced_file = dep.gsub('-', '/')
+              end
+              #puts "Munged the name, now trying to require as #{namespaced_file}"
+              require namespaced_file
+            rescue LoadError => e2
+              strict_error "Gem loading error: #{e2.message}"
             end
-            #puts "Munged the name, now trying to require as #{namespaced_file}"
-            require namespaced_file
-          rescue LoadError => e2
-            strict_error "Gem loading error: #{e2.message}"
+          else
+            strict_error "Gem loading error: #{e.message}"
           end
-        else
-          strict_error "Gem loading error: #{e.message}"
         end
       end
     end

data/lib/bundler_ext/version.rb

@@ -1,3 +1,3 @@
 module BundlerExt
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/bundler_ext/bundler_ext_spec.rb

@@ -1,57 +1,69 @@
 require 'spec_helper'
 
+# skip system specs unless we can load linux_admin
+skip_system = false
+begin
+  require 'linux_admin'
+rescue LoadError
+  skip_system = true
+end
+
   describe BundlerExt do
     before(:each) do
       @gemfile = 'spec/fixtures/Gemfile.in'
     end
     after(:each) do
-      ENV['BUNDLER_EXT_NOSTRICT'] = nil
-      ENV['BUNDLER_EXT_GROUPS'] = nil
+      ENV['BUNDLER_PKG_PREFIX'] = nil
+      ENV['BEXT_ACTIVATE_VERSIONS'] = nil
+      ENV['BEXT_PKG_PREFIX'] = nil
+      ENV['BEXT_NOSTRICT'] = nil
+      ENV['BEXT_GROUPS'] = nil
     end
 
     describe "#parse_from_gemfile" do
       describe "with no group passed in" do
         it "should return nothing to require" do
           libs = BundlerExt.parse_from_gemfile(@gemfile)
-          libs.should be_an(Array)
-          libs.should_not include('deltacloud')
-          libs.should_not include('vcr')
+          libs.should be_an(Hash)
+          libs.keys.should_not include('deltacloud-client')
+          libs.keys.should_not include('vcr')
         end
       end
       describe "with :all passed in" do
         it "should return the list of system libraries in all groups to require" do
           libs = BundlerExt.parse_from_gemfile(@gemfile, :all)
-          libs.should be_an(Array)
-          libs.should include('deltacloud')
-          libs.should include('vcr')
+          libs.should be_an(Hash)
+          libs.keys.should include('deltacloud-client')
+          libs['deltacloud-client'][:files].should == ['deltacloud']
+          libs.keys.should include('vcr')
         end
       end
       describe "with group passed in" do
         it "should not return any deps that are not in the 'development' group" do
           libs = BundlerExt.parse_from_gemfile(@gemfile,'development')
-          libs.should be_an(Array)
-          libs.should_not include('deltacloud')
+          libs.should be_an(Hash)
+          libs.keys.should_not include('deltacloud-client')
         end
         it "should return only deps that are in the :test group" do
           libs = BundlerExt.parse_from_gemfile(@gemfile, :test)
-          libs.should be_an(Array)
-          libs.should_not include('deltacloud')
-          libs.should include('vcr')
+          libs.should be_an(Hash)
+          libs.keys.should_not include('deltacloud-client')
+          libs.keys.should include('vcr')
         end
         it "should return deps from both the :default and :test groups" do
           libs = BundlerExt.parse_from_gemfile(@gemfile, :default, :test)
-          libs.should be_an(Array)
-          libs.should include('deltacloud')
-          libs.should include('vcr')
+          libs.should be_an(Hash)
+          libs.keys.should include('deltacloud-client')
+          libs.keys.should include('vcr')
         end
       end
       it "should only return deps for the current platform" do
         libs = BundlerExt.parse_from_gemfile(@gemfile)
-        libs.should be_an(Array)
+        libs.should be_an(Hash)
         if RUBY_VERSION < "1.9"
-          libs.should_not include('cinch')
+          libs.keys.should_not include('cinch')
         else
-          libs.should_not include('fastercsv')
+          libs.keys.should_not include('fastercsv')
         end
       end
     end
@@ -59,21 +71,76 @@ require 'spec_helper'
       it "strict mode should fail loading non existing gem" do
         expect { BundlerExt.system_require(@gemfile, :fail) }.to raise_error
       end
+
+      it "non-strict mode should load the libraries in the gemfile" do
+        ENV['BEXT_NOSTRICT'] = 'true'
+        BundlerExt.system_require(@gemfile)
+        defined?(Gem).should be_true
+      end
+
       it "non-strict mode should load the libraries in the gemfile" do
         ENV['BUNDLER_EXT_NOSTRICT'] = 'true'
         BundlerExt.system_require(@gemfile)
         defined?(Gem).should be_true
       end
+
+      it "non-strict mode should load the libraries in the gemfile" do
+        ENV['BEXT_NOSTRICT'] = 'true'
+        BundlerExt.system_require(@gemfile, :fail)
+        defined?(Gem).should be_true
+      end
+
       it "non-strict mode should load the libraries in the gemfile" do
         ENV['BUNDLER_EXT_NOSTRICT'] = 'true'
         BundlerExt.system_require(@gemfile, :fail)
         defined?(Gem).should be_true
       end
       it "non-strict mode should load the libraries using env var list" do
-        ENV['BUNDLER_EXT_GROUPS'] = 'test development blah'
-        ENV['BUNDLER_EXT_NOSTRICT'] = 'true'
+        ENV['BEXT_GROUPS'] = 'test development blah'
+        ENV['BEXT_NOSTRICT'] = 'true'
+        BundlerExt.system_require(@gemfile)
+        defined?(Gem::Command).should be_true
+      end
+
+      it "non-strict mode should load the libraries using env var list" do
+        ENV['BUNLDER_EXT_GROUPS'] = 'test development blah'
+        ENV['BEXT_NOSTRICT'] = 'true'
         BundlerExt.system_require(@gemfile)
         defined?(Gem::Command).should be_true
       end
+
+      unless skip_system
+        context "ENV['BEXT_ACTIVATE_VERSIONS'] is true" do
+          before(:each) do
+            ENV['BUNDLER_EXT_NOSTRICT'] = 'true'
+            ENV['BEXT_ACTIVATE_VERSIONS'] = 'true'
+          end
+
+          it "activates the version of the system installed package" do
+            gems = BundlerExt.parse_from_gemfile(@gemfile, :all)
+            gems.each { |gem,gdep|
+              version = rand(100)
+              BundlerExt.should_receive(:system_gem_name_for).with(gem).
+                         and_return(gem)
+              BundlerExt.should_receive(:system_gem_version_for).with(gem).
+                         and_return(version)
+              BundlerExt.should_receive(:gem).with(gem, "=#{version}")
+            }
+            BundlerExt.system_require(@gemfile, :all)
+          end
+
+          context "ENV['BEXT_PKG_PREFIX'] is specified" do
+            it "prepends bundler pkg prefix onto system package name to load" do
+              ENV['BEXT_PKG_PREFIX'] = 'rubygem-'
+              gems = BundlerExt.parse_from_gemfile(@gemfile, :all)
+              gems.each { |gem,gdep|
+                BundlerExt.should_receive(:system_gem_version_for).with("rubygem-#{gem}").
+                           and_return('0')
+              }
+              BundlerExt.system_require(@gemfile, :all)
+            end
+          end
+        end
+      end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler_ext
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jason Guiditta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,9 +75,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- Install the linux_admin gem and set BEXT_ACTIVATE_VERSIONS to true to activate rpm/deb
+  installed gems
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.13
 signing_key: 
 specification_version: 4
 summary: Load system gems via Bundler DSL