guard-bundler 0.1.1 → 0.1.2

data/README.rdoc

@@ -7,7 +7,7 @@ Bundler guard allows to automatically & intelligently install/update bundle when
 
 == Install
 
-Please be sure to have {guard}[http://github.com/guard/guard] installed before continue.
+Please be sure to have {Guard}[https://github.com/guard/guard] installed before continue.
 
 Install the gem:
 
@@ -23,21 +23,19 @@ Add guard definition to your Guardfile by running this command:
 
 == Usage
 
-Please read {guard usage doc}[http://github.com/guard/guard#readme]
+Please read {Guard usage doc}[https://github.com/guard/guard#readme]
 
 == Guardfile
 
-Bundler guard can be really be adapated to all kind of projects.
-Please read {guard doc}[http://github.com/guard/guard#readme] for more info about Guardfile DSL.
-
-Attention place bundler guard before other is recommended.
+Bundler guard can be really be adapted to all kind of projects.
+Advice: place Bundler guard before other is recommended.
 
 === Standard ruby gems
 
     guard 'bundler' do
-      watch('^Gemfile')
+      watch('Gemfile')
       # Uncomment next line if Gemfile contain `gemspec' command
-      # watch('^.+\.gemspec')
+      # watch(/^.+\.gemspec/)
     end
 
 == Options
@@ -48,14 +46,16 @@ You can disable desktop notification with:
       ...
     end
 
+Please read {Guard doc}[https://github.com/guard/guard#readme] for more info about Guardfile DSL.
+
 == Development
 
-- Source hosted at {GitHub}[http://github.com/guard/guard-bundler]
-- Report issues/Questions/Feature requests on {GitHub Issues}[http://github.com/guard/guard-bundler/issues]
+- Source hosted at {GitHub}[https://github.com/guard/guard-bundler]
+- Report issues/Questions/Feature requests on {GitHub Issues}[https://github.com/guard/guard-bundler/issues]
 
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
 you make.
 
 == Authors
 
-{Yann Lugrin}[http://github.com/yannlugrin]
+{Yann Lugrin}[https://github.com/yannlugrin]

data/lib/guard/bundler.rb

@@ -4,13 +4,15 @@ require 'guard/guard'
 
 module Guard
   class Bundler < Guard
+    BUNDLER_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE).freeze
 
     autoload :Notifier, 'guard/bundler/notifier'
 
     def initialize(watchers = [], options = {})
       super
 
-      @notify = options[:notify].nil? ? true : options[:notify]
+      @original_env = {}
+      options[:notify] = true if options[:notify].nil?
     end
  
     def start
@@ -18,6 +20,10 @@ module Guard
       true
     end
 
+    def stop
+      true
+    end
+
     def reload
       refresh_bundle
     end
@@ -27,21 +33,45 @@ module Guard
       true
     end
 
+    private
+
     def notify?
-      !!@notify
+      !!options[:notify]
     end
 
-    private
-
     def bundle_need_refresh?
-      `bundle check`
+      with_clean_env do
+        `bundle check`
+      end
       $? == 0 ? false : true
     end
 
+    def with_clean_env
+      unset_bundler_env_vars
+      ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, "Gemfile")
+      yield
+    ensure
+      restore_env
+    end
+
+    def unset_bundler_env_vars
+      BUNDLER_ENV_VARS.each do |key|
+        @original_env[key] = ENV[key]
+        ENV[key] = nil
+      end
+    end
+
+    def restore_env
+      @original_env.each { |key, value| ENV[key] = value }
+    end
+
     def refresh_bundle
       UI.info 'Refresh bundle', :reset => true
       start_at = Time.now
-      result = system('bundle install')
+      result = ''
+      with_clean_env do
+        result = system('bundle install')
+      end
       Notifier::notify(true, Time.now - start_at) if notify?
       result
     end

data/lib/guard/bundler/templates/Guardfile

@@ -1,5 +1,5 @@
 guard 'bundler' do
-  watch('^Gemfile')
+  watch('Gemfile')
   # Uncomment next line if Gemfile contain `gemspec' command
-  # watch('^.+\.gemspec')
+  # watch(/^.+\.gemspec/)
 end

data/lib/guard/bundler/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Guard
   module BundlerVersion
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: guard-bundler
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Yann Lugrin
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
         version: 0.2.2
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
   type: :development
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
         version: 2.0.1
   type: :development
   version_requirements: *id003
@@ -98,25 +78,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: guard-bundler
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Guard gem for Bundler