guard-bundler 0.1.2 → 0.1.3

data/lib/guard/bundler.rb

@@ -1,27 +1,20 @@
 # encoding: utf-8
 require 'guard'
 require 'guard/guard'
+require 'bundler'
 
 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
 
-      @original_env = {}
       options[:notify] = true if options[:notify].nil?
     end
- 
-    def start
-      return refresh_bundle if bundle_need_refresh?
-      true
-    end
 
-    def stop
-      true
+    def start
+      refresh_bundle
     end
 
     def reload
@@ -29,8 +22,7 @@ module Guard
     end
 
     def run_on_change(paths = [])
-      return refresh_bundle if bundle_need_refresh?
-      true
+      refresh_bundle
     end
 
     private
@@ -39,41 +31,27 @@ module Guard
       !!options[:notify]
     end
 
-    def bundle_need_refresh?
-      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
+    def refresh_bundle
+      if bundle_need_refresh?
+        UI.info 'Refresh bundle', :reset => true
+        start_at = Time.now
+        ::Bundler.with_clean_env do
+          @result = system('bundle install')
+        end
+        Notifier::notify(@result, Time.now - start_at) if notify?
+        @result
+      else
+        UI.info 'Bundle already up-to-date', :reset => true
+        Notifier::notify('up-to-date', nil) if notify?
+        true
       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 = ''
-      with_clean_env do
-        result = system('bundle install')
+    def bundle_need_refresh?
+      ::Bundler.with_clean_env do
+        `bundle check`
       end
-      Notifier::notify(true, Time.now - start_at) if notify?
-      result
+      $? == 0 ? false : true
     end
 
   end

data/lib/guard/bundler/notifier.rb

@@ -4,13 +4,14 @@ module Guard
     class Notifier
 
       def self.guard_message(result, duration)
-        message = ''
-        if result
-          message << "Bundle has been updated\nin %.1f seconds." % [duration]
+        case result
+        when 'up-to-date'
+          "Bundle already up-to-date"
+        when true
+          "Bundle has been updated\nin %.1f seconds." % [duration]
         else
-          message << "Bundle can't be updated,\nplease check manually."
+          "Bundle can't be updated,\nplease check manually."
         end
-        message
       end
 
       # failed | success
@@ -31,4 +32,4 @@ module Guard
 
     end
   end
-end
+end

data/lib/guard/bundler/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: guard-bundler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Yann Lugrin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +01:00
+date: 2011-05-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,10 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
-  type: :development
+        version: 1.0.0
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -43,9 +43,20 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.6.0
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.3.1
+  type: :development
+  version_requirements: *id004
 description: Guard::Bundler automatically install/update your gem bundle when needed
 email: 
 - yann.lugrin@sans-savoir.net
@@ -88,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard-bundler
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Guard gem for Bundler