bundler_ext 0.1.0 → 0.2.0

data/README.md

@@ -18,9 +18,21 @@ However, this is the use case for many linux systems, and this library
 is an initial attempt to get the two approaches to not step on each
 other.
 
-### Example usage: ###
+### Example usage ###
 
-    Aeolus::Ext::BundlerExt.system_require(File.expand_path('../../Gemfile.in', __FILE__),:default, Rails.env)
+If you want to load ALL Gemfile groups, use the following statement:
+
+    Aeolus::Ext::BundlerExt.system_require(File.expand_path('../../Gemfile.in', __FILE__), :all)
+
+When you want to load only the default one, use:
+
+    Aeolus::Ext::BundlerExt.system_require(File.expand_path('../../Gemfile.in', __FILE__), :default)
+
+You can provide multiple parameters to the system_require function
+of course. Finally, you will be likely requiring default group and
+group named as the current Rails environment; use this:
+    
+    Aeolus::Ext::BundlerExt.system_require(File.expand_path('../../Gemfile.in', __FILE__), :default, Rails.env)
 
 You may also want to wrap your call in some kind of check, to allow
 non-platform users (ie, mac, or any developer not installing as a
@@ -41,3 +53,27 @@ all, so for now at least, it is safer to just look for a different
 file (and this is easily scripted as well) In the linux deployment
 case, this is not the desired behavior, we explicitly want to say
 'just use what the package manager has installed'.
+
+### Additional configuration ###
+
+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):
+
+    BUNDLER_EXT_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:
+
+    BUNDLER_EXT_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
+variable which can be used to set HOME environment variable before
+any rubygem gets loaded. The variable is not exported for
+subprocesses.

data/lib/aeolus/ext/bundler_ext.rb

@@ -15,41 +15,63 @@
 #
 
 require "bundler"
+
+# some rubygems does not play well with daemonized processes ($HOME is empty)
+ENV['HOME'] = ENV['BUNDLER_EXT_HOME'] if ENV['BUNDLER_EXT_HOME']
+
 module  Aeolus
   module Ext
     class BundlerExt
       def self.parse_from_gemfile(gemfile,*groups)
         ENV['BUNDLE_GEMFILE'] = gemfile
+        extra_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 }
-        groups = [:default] if groups.empty?
         g = Bundler::Dsl.evaluate(gemfile,'foo',true)
         list = []
-        g.dependencies.each { |dep|
-	  next unless ((groups & dep.groups).any? && dep.current_platform?)
-	  Array(dep.autorequire || dep.name).each do |file|
-            list << file
+        g.dependencies.each do |dep|
+          if ((groups & dep.groups).any? || all_groups) && dep.current_platform?
+            Array(dep.autorequire || dep.name).each do |file|
+              list << file
+            end
           end
-        }
+        end
         list
       end
+
+      def self.strict_error(msg)
+        if ENV['BUNDLER_EXT_NOSTRICT']
+          puts msg
+        else
+          raise msg
+        end
+      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)
-	  begin
+          #This part ripped wholesale from lib/bundler/runtime.rb (github/master)
+          begin
             #puts "Attempting to require #{dep}"
-	    require dep
+            require dep
           rescue LoadError => e
             #puts "Caught error: #{e.message}"
             if dep.include?('-')
               begin
-                namespaced_file = dep.name.gsub('-', '/')
+                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
-                raise if $1.gsub('-', '/') != namespaced_file
+              rescue LoadError => e2
+                strict_error "Gem loading error: #{e2.message}"
               end
             else
-              puts($1) if $1 != dep
+              strict_error "Gem loading error: #{e.message}"
             end
           end
         end

data/lib/aeolus/ext/version.rb

@@ -16,6 +16,6 @@
 
 module Aeolus
   module Ext
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/aeolus/ext/bundler_ext_spec.rb

@@ -19,55 +19,77 @@ module Aeolus
   module Ext
     describe BundlerExt do
       before(:each) do
-	@gemfile = 'spec/fixtures/Gemfile.in'
+        @gemfile = 'spec/fixtures/Gemfile.in'
+      end
+      after(:each) do
+        ENV['BUNDLER_EXT_NOSTRICT'] = nil
+        ENV['BUNDLER_EXT_GROUPS'] = nil
       end
 
       describe "#parse_from_gemfile" do
         describe "with no group passed in" do
-          it "should return the list of system libraries in the :default group to require" do
+          it "should return nothing to require" do
             libs = BundlerExt.parse_from_gemfile(@gemfile)
-	    libs.should be_an(Array)
-	    libs.should include('deltacloud')
-	    libs.should_not include('vcr')
+            libs.should be_an(Array)
+            libs.should_not include('deltacloud')
+            libs.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')
           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_not include('deltacloud')
           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')
-	  end
+            libs.should_not include('deltacloud')
+            libs.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')
-	  end
+            libs.should include('deltacloud')
+            libs.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)
-	  if RUBY_VERSION < "1.9"
-	    libs.should_not include('cinch')
-	  else
-	    libs.should_not include('fastercsv')
+          if RUBY_VERSION < "1.9"
+            libs.should_not include('cinch')
+          else
+            libs.should_not include('fastercsv')
           end
         end
       end
       describe "#system_require" do
-        it "should load the libraries in the gemfile" do
+        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['BUNDLER_EXT_NOSTRICT'] = 'true'
           BundlerExt.system_require(@gemfile)
-          Object.const_defined?(:DeltaCloud).should be_true
+          defined?(Gem).should be_true
         end
-        it "should load the libraries in the gemfile" do
+        it "non-strict mode should load the libraries in the gemfile" do
+          ENV['BUNDLER_EXT_NOSTRICT'] = 'true'
           BundlerExt.system_require(@gemfile, :fail)
-	  Object.const_defined?(:DeltaCloud).should be_true
+          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'
+          defined?(Gem::Command).should be_true
         end
       end
     end

data/spec/fixtures/Gemfile.in

@@ -1,12 +1,19 @@
 source :rubygems
 
+# only this really need to be present on the system
+gem 'rubygems'
+
+# non exising gem must be ordered as second gem
+gem 'not_existing_gem', :group => :fail
+
+# all the others are not required to have passing tests
 gem 'deltacloud-client', :require => 'deltacloud'
 gem 'will_paginate', '>= 3.0.pre1'
 gem 'fastercsv' , :platforms => :mri_18
 gem 'cinch' , :platforms => :mri_19
-gem 'foo', :group => :fail
+
 group :development, :test do
-  gem 'rspec-rails'
+  gem 'rubygems-command'
   gem 'vcr'
   gem 'webmock'
   gem 'launchy'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler_ext
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jason Guiditta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -47,20 +47,6 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: deltacloud-client
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
 description: Simple library leveraging the Bundler Gemfile DSL to load gems already on the system and managed by the systems package manager (like yum/apt)
 email: 
 - aeolus-devel@lists.fedorahosted.org, jguiditt@redhat.com
@@ -110,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Load system gems via Bundler DSL