guard-bundler 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c9c5fc2381cc2a3b980bc0b5418e2f1da50d60
-  data.tar.gz: f0cefc476c0549a53f303e98aff50911a375a05d
+  metadata.gz: 374242e51e101d39f466f2304e42db3bb9e3327f
+  data.tar.gz: a915124e35854bb879515c332309d7107cfa3fa6
 SHA512:
-  metadata.gz: aa20ac664ef4d9b9c282c43275b3e4ca41ab513ed6ce196c93b6ea0323e1542e13d7d0c81507a11a88ceb4c89cce237116b6008cee33a461ae26d0448c003ea1
-  data.tar.gz: 09b3dcbf73326a7841c238ac8199b793dcc8069feda7f2b14386156127e3a873444180847352df033acb506897feccb66028640def0a705978e9f9b054bab483
+  metadata.gz: 48fd0897ccd12f95e134e646758a2ba0cf0c03ef4857a019acba3c09b6746fc46e14fc863cf5dcdf18dd767aeee1783d75cf6d1ff843284400c06fc6388b09cd
+  data.tar.gz: 027e90d2a3b52932db54a83e69de9fc55262c1227ca2c9cbaed8137da4b8d89baf7e647c2cd96403e00268f0dad6c0631c31a656d2ae9fb9d210c6a658f432c5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Yann Lugrin
+Copyright (c) 2010-2014 Yann Lugrin, Rémy Coutable
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -5,27 +5,19 @@
 Bundler guard allows to automatically & intelligently install/update bundle when needed.
 
 * Compatible with Bundler 1.0.x
-* Tested against Ruby 1.9.3, 2.0.0, Rubinius & JRuby (1.9 mode only).
+* Tested against Ruby 1.9.3, 2.0.0, 2.1.0, JRuby & Rubinius.
 
 ## Install
 
-Please be sure to have [Guard](https://github.com/guard/guard) installed before continue.
-
-Install the gem:
-
-```bash
-$ gem install guard-bundler
-```
-
-Add it to your `Gemfile`:
+Add the gem to your `Gemfile`:
 
 ```ruby
 group :development do
-  gem 'guard-bundler'
+  gem 'guard-bundler', require: false
 end
 ```
 
-Add guard definition to your Guardfile by running this command:
+Add the plugin definition to your Guardfile by running this command:
 
 ```bash
 $ guard init bundler
@@ -33,11 +25,11 @@ $ guard init bundler
 
 ## Usage
 
-Please read [Guard usage doc](https://github.com/guard/guard#readme)
+Please read the [Guard usage doc](https://github.com/guard/guard#readme)
 
 ## Guardfile
 
-Bundler guard can be really adapted to all kind of projects.
+Guard::Bundler plugin can be really adapted to all kind of projects.
 
 ### Standard RubyGem project
 
@@ -49,20 +41,30 @@ guard :bundler do
 end
 ```
 
-Please read [Guard doc](https://github.com/guard/guard#readme) for more information about the Guardfile DSL.
+Please read the [Guard usage doc](https://github.com/guard/guard#readme) for more information about the Guardfile DSL.
 
 ## 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)
+* Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard-bundler/master/frames).
+* Source hosted at [GitHub](https://github.com/guard/guard-bundler).
 
-Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
-you make.
+Pull requests are very welcome! Please try to follow these simple rules if applicable:
+
+* Please create a topic branch for every separate change you make.
+* Update the [README](https://github.com/guard/guard-bundler/blob/master/README.md).
+* Please **do not change** the version number.
+
+For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
+`#guard` (irc.freenode.net).
 
 ## Author
 
 [Yann Lugrin](https://github.com/yannlugrin)
 
+## Maintainer
+
+[Rémy Coutable](https://github.com/rymai) ([@rymai](https://twitter.com/rymai))
+
 ## Contributors
 
 [https://github.com/guard/guard-bundler/graphs/contributors](https://github.com/guard/guard-bundler/graphs/contributors)

data/lib/guard/bundler.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-require 'guard'
-require 'guard/plugin'
 require 'bundler'
 
+require "guard/compat/plugin"
+
 module Guard
   class Bundler < Plugin
     autoload :Notifier, 'guard/bundler/notifier'
@@ -39,15 +39,15 @@ module Guard
       duration = Time.now - start_at
       case result
       when :bundle_already_up_to_date
-        ::Guard::UI.info 'Bundle already up-to-date', reset: true
+        Guard::Compat::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
+        Guard::Compat::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
+        Guard::Compat::UI.info 'Bundle installed', reset: true
         Notifier.notify true, duration
       else
-        ::Guard::UI.info "Bundle can't be installed -- Please check manually", reset: true
+        Guard::Compat::UI.info "Bundle can't be installed -- Please check manually", reset: true
         Notifier.notify false, nil
       end
       result
@@ -67,6 +67,7 @@ module Guard
     end
 
     def bundle_install
+      Guard::Compat::UI.info 'Bundling...', reset: true
       ::Bundler.with_clean_env do
         system("bundle install#{" #{options[:cli]}" if options[:cli]}")
       end

data/lib/guard/bundler/notifier.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Guard
-  class Bundler
+  class Bundler < Plugin
     class Notifier
 
       def self.guard_message(result, duration)
@@ -18,18 +18,14 @@ module Guard
 
       # failed | success
       def self.guard_image(result)
-        icon = if result
-          :success
-        else
-          :failed
-        end
+        result ?  :success : :failed
       end
 
       def self.notify(result, duration)
         message = guard_message(result, duration)
         image   = guard_image(result)
 
-        ::Guard::Notifier.notify(message, title: 'bundle install', image: image)
+        Guard::Compat::UI.notify(message, title: 'bundle install', image: image)
       end
 
     end

data/lib/guard/bundler/templates/Guardfile

@@ -1,5 +1,11 @@
 guard :bundler do
-  watch('Gemfile')
-  # Uncomment next line if your Gemfile contains the `gemspec' command.
-  # watch(/^.+\.gemspec/)
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
+
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
 end

data/lib/guard/bundler/verify.rb

@@ -0,0 +1,54 @@
+require 'pathname'
+
+module Guard
+  class Bundler < Plugin
+    class Verify
+      if Gem.win_platform?
+        SYMLINK_NEEDED = <<-EOS
+  Error: Guard will not detect changes to your Gemfile!
+
+  Solution: move the Gemfile to a watched directory and symlink it, so that
+  'Gemfile' is symlinked e.g. to config/Gemfile.
+
+  (See: https://github.com/guard/guard/wiki/Optimizing-for-large-projects)
+
+        EOS
+      else
+        SYMLINK_NEEDED = <<-EOS
+  Error: Guard will not detect changes to your Gemfile!
+
+  Solution: move the Gemfile to a watched directory and symlink it back.
+
+  Example:
+
+    $ mkdir config
+    $ git mv Gemfile config # use just 'mv' if this doesn't work
+    $ ln -s config/Gemfile .
+
+  and add config to the `directories` statement in your Guardfile.
+
+  (See: https://github.com/guard/guard/wiki/Optimizing-for-large-projects)
+        EOS
+      end
+
+      def verify!(file)
+        watchdirs = Guard::Compat.watched_directories
+
+        gemfile = Pathname.new(file)
+        config_dir = gemfile.realpath.dirname
+        return if watchdirs.include?(config_dir)
+
+        Compat::UI.error SYMLINK_NEEDED
+      end
+
+      def real_path(file)
+        verify!(file)
+        Pathname.new(file).realpath.relative_path_from(Pathname.pwd).to_s
+      end
+
+      def uses_gemspec?(file)
+        IO.read(file).lines.map(&:strip).grep(/^gemspec$/).any?
+      end
+    end
+  end
+end

data/lib/guard/bundler/version.rb

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

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: guard-bundler
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Yann Lugrin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-compat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Guard::Bundler automatically install/update your gem bundle when needed
 email:
 - yann.lugrin@sans-savoir.net
@@ -59,12 +59,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/guard/bundler.rb
 - lib/guard/bundler/notifier.rb
 - lib/guard/bundler/templates/Guardfile
+- lib/guard/bundler/verify.rb
 - lib/guard/bundler/version.rb
-- lib/guard/bundler.rb
-- LICENSE
-- README.md
 homepage: https://rubygems.org/gems/guard-bundler
 licenses:
 - MIT
@@ -75,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Guard gem for Bundler