guard-bundler 1.0.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 86c9c5fc2381cc2a3b980bc0b5418e2f1da50d60
+  data.tar.gz: f0cefc476c0549a53f303e98aff50911a375a05d
+SHA512:
+  metadata.gz: aa20ac664ef4d9b9c282c43275b3e4ca41ab513ed6ce196c93b6ea0323e1542e13d7d0c81507a11a88ceb4c89cce237116b6008cee33a461ae26d0448c003ea1
+  data.tar.gz: 09b3dcbf73326a7841c238ac8199b793dcc8069feda7f2b14386156127e3a873444180847352df033acb506897feccb66028640def0a705978e9f9b054bab483

data/README.md

@@ -1,9 +1,11 @@
 # Guard::Bundler
 
+[![Gem Version](https://badge.fury.io/rb/guard-bundler.png)](http://badge.fury.io/rb/guard-bundler) [![Build Status](https://travis-ci.org/guard/guard-bundler.png?branch=master)](https://travis-ci.org/guard/guard-bundler) [![Dependency Status](https://gemnasium.com/guard/guard-bundler.png)](https://gemnasium.com/guard/guard-bundler) [![Code Climate](https://codeclimate.com/github/guard/guard-bundler.png)](https://codeclimate.com/github/guard/guard-bundler) [![Coverage Status](https://coveralls.io/repos/guard/guard-bundler/badge.png?branch=master)](https://coveralls.io/r/guard/guard-bundler)
+
 Bundler guard allows to automatically & intelligently install/update bundle when needed.
 
 * Compatible with Bundler 1.0.x
-* Tested against Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest versions of Rubinius.
+* Tested against Ruby 1.9.3, 2.0.0, Rubinius & JRuby (1.9 mode only).
 
 ## Install
 
@@ -11,13 +13,13 @@ Please be sure to have [Guard](https://github.com/guard/guard) installed before
 
 Install the gem:
 
-```
+```bash
 $ gem install guard-bundler
 ```
 
-Add it to your Gemfile (inside development group):
+Add it to your `Gemfile`:
 
-``` ruby
+```ruby
 group :development do
   gem 'guard-bundler'
 end
@@ -25,7 +27,7 @@ end
 
 Add guard definition to your Guardfile by running this command:
 
-```
+```bash
 $ guard init bundler
 ```
 
@@ -40,7 +42,7 @@ Bundler guard can be really adapted to all kind of projects.
 ### Standard RubyGem project
 
 ```ruby
-guard 'bundler' do
+guard :bundler do
   watch('Gemfile')
   # Uncomment next line if Gemfile contain `gemspec' command
   # watch(/^.+\.gemspec/)
@@ -49,7 +51,7 @@ end
 
 Please read [Guard doc](https://github.com/guard/guard#readme) for more information about the Guardfile DSL.
 
-== Development
+## Development
 
 * 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)
@@ -57,6 +59,10 @@ Please read [Guard doc](https://github.com/guard/guard#readme) for more informat
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
 you make.
 
-== Authors
+## Author
+
+[Yann Lugrin](https://github.com/yannlugrin)
+
+## Contributors
 
-{Yann Lugrin}[https://github.com/yannlugrin]
+[https://github.com/guard/guard-bundler/graphs/contributors](https://github.com/guard/guard-bundler/graphs/contributors)

data/lib/guard/bundler.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 require 'guard'
-require 'guard/guard'
+require 'guard/plugin'
 require 'bundler'
 
 module Guard
-  class Bundler < Guard
+  class Bundler < Plugin
     autoload :Notifier, 'guard/bundler/notifier'
 
     def start
@@ -34,27 +34,43 @@ module Guard
     private
 
     def refresh_bundle
-      if bundle_need_refresh?
-        ::Guard::UI.info 'Refresh bundle', :reset => true
-        start_at = Time.now
-        ::Bundler.with_clean_env do
-          @result = system("bundle install#{" #{options[:cli]}" if options[:cli]}")
-        end
-        Notifier.notify(@result, Time.now - start_at)
-        @result
+      start_at = Time.now
+      result = bundle_check || bundle_install
+      duration = Time.now - start_at
+      case result
+      when :bundle_already_up_to_date
+        ::Guard::UI.info 'Bundle already up-to-date', reset: true
+      when :bundle_installed_using_local_gems
+        ::Guard::UI.info 'Bundle installed using local gems', reset: true
+        Notifier.notify 'bundle_check_install', nil
+      when :bundle_installed
+        ::Guard::UI.info 'Bundle installed', reset: true
+        Notifier.notify true, duration
       else
-        UI.info 'Bundle already up-to-date', :reset => true
-        Notifier.notify('up-to-date', nil)
-        true
+        ::Guard::UI.info "Bundle can't be installed -- Please check manually", reset: true
+        Notifier.notify false, nil
       end
+      result
     end
 
-    def bundle_need_refresh?
+    def bundle_check
+      gemfile_lock_mtime = File.exists?('Gemfile.lock') ? File.mtime('Gemfile.lock') : nil
       ::Bundler.with_clean_env do
         `bundle check`
       end
-      $? == 0 ? false : true
+      return false unless $? == 0
+      if gemfile_lock_mtime && gemfile_lock_mtime == File.mtime('Gemfile.lock')
+        :bundle_already_up_to_date
+      else
+        :bundle_installed_using_local_gems
+      end
     end
 
+    def bundle_install
+      ::Bundler.with_clean_env do
+        system("bundle install#{" #{options[:cli]}" if options[:cli]}")
+      end
+      $? == 0 ? :bundle_installed : false
+    end
   end
 end

data/lib/guard/bundler/notifier.rb

@@ -7,10 +7,12 @@ module Guard
         case result
         when 'up-to-date'
           "Bundle already up-to-date"
+        when 'bundle_check_install'
+          "Bundle installed using local gems"
         when true
-          "Bundle has been updated\nin %.1f seconds." % [duration]
+          "Bundle has been installed\nin %.1f seconds." % [duration]
         else
-          "Bundle can't be updated,\nplease check manually."
+          "Bundle can't be installed,\nplease check manually."
         end
       end
 
@@ -27,7 +29,7 @@ module Guard
         message = guard_message(result, duration)
         image   = guard_image(result)
 
-        ::Guard::Notifier.notify(message, :title => 'Bundle update', :image => image)
+        ::Guard::Notifier.notify(message, title: 'bundle install', image: image)
       end
 
     end

data/lib/guard/bundler/templates/Guardfile

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

data/lib/guard/bundler/version.rb

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

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: guard-bundler
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Yann Lugrin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,35 +41,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: Guard::Bundler automatically install/update your gem bundle when needed
 email:
 - yann.lugrin@sans-savoir.net
@@ -88,32 +65,28 @@ files:
 - lib/guard/bundler.rb
 - LICENSE
 - README.md
-homepage: http://rubygems.org/gems/guard-bundler
-licenses: []
+homepage: https://rubygems.org/gems/guard-bundler
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
-- --main=README.md
-- --exclude='(lib|test|spec)|(Gem|Guard|Rake)file'
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: guard-bundler
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Guard gem for Bundler
 test_files: []
-has_rdoc: