guard 2.8.2 → 2.9.0

data/lib/guard/plugin/base.rb

@@ -1,3 +1,5 @@
+require "guard/metadata"
+
 module Guard
   class Plugin
     # Colection of shared methods between `Guard::Guard` (deprecated)

data/lib/guard/plugin_util.rb

@@ -22,27 +22,11 @@ module Guard
     # @return [Array<String>] a list of Guard plugin gem names
     #
     def self.plugin_names
-      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create("1.8.0")
-        Gem::Specification.find_all.select do |x|
-          if x.name =~ /^guard-/
-            true
-          elsif x.name != "guard"
-
-            guard_plugin_path = File.join(
-              x.full_gem_path,
-              "lib/guard/#{ x.name }.rb"
-            )
-
-            File.exist?(guard_plugin_path)
-          end
-        end
-      else
-        ::Guard::UI.deprecation \
-          "Rubygems version prior to 1.8.0 are no longer supported"\
-          " and may not work"
+      valid = Gem::Specification.find_all.select do |gem|
+        _gem_valid?(gem)
+      end
 
-        Gem.source_index.find_name(/^guard-/)
-      end.map { |x| x.name.sub(/^guard-/, "") }.uniq
+      valid.map { |x| x.name.sub(/^guard-/, "") }.uniq
     end
 
     # Initializes a new `Guard::PluginUtil` object.
@@ -87,14 +71,8 @@ module Guard
     # @return [String] the full path to the plugin gem
     #
     def plugin_location
-      @plugin_location ||= begin
-        if Gem::Version.create(Gem::VERSION) >= Gem::Version.create("1.8.0")
-          Gem::Specification.find_by_name("guard-#{ name }").full_gem_path
-        else
-          Gem.source_index.find_name("guard-#{ name }").last.full_gem_path
-        end
-      end
-    rescue
+      @plugin_location ||= _full_gem_path("guard-#{name}")
+    rescue Gem::LoadError
       ::Guard::UI.error "Could not find 'guard-#{ name }' gem path."
     end
 
@@ -120,7 +98,9 @@ module Guard
 
       try_require = false
       begin
-        require "guard/#{ name.downcase }" if try_require
+        if try_require
+          require "guard/#{name.downcase}"
+        end
 
         @plugin_class ||= ::Guard.const_get(_plugin_constant)
       rescue TypeError => error
@@ -134,6 +114,7 @@ module Guard
       rescue LoadError => error
         unless options[:fail_gracefully]
           UI.error ERROR_NO_GUARD_OR_CLASS % [name.downcase, _constant_name]
+          UI.error "Error is: #{error}"
           UI.error error.backtrace.join("\n")
         end
       end
@@ -142,9 +123,11 @@ module Guard
     # Adds a plugin's template to the Guardfile.
     #
     def add_to_guardfile
-      msg = "Guard.evaluator not initialized"
-      fail msg if ::Guard.evaluator.nil?
-      if ::Guard.evaluator.guardfile_include?(name)
+      require "guard/guardfile/evaluator"
+      # TODO: move this method to Generator?
+      evaluator = Guard::Guardfile::Evaluator.new
+      evaluator.evaluate_guardfile
+      if evaluator.guardfile_include?(name)
         ::Guard::UI.info "Guardfile already includes #{ name } guard"
       else
         content = File.read("Guardfile")
@@ -182,5 +165,16 @@ module Guard
       @_constant_name ||= name.gsub(/\/(.?)/) { "::#{ $1.upcase }" }.
         gsub(/(?:^|[_-])(.)/) { $1.upcase }
     end
+
+    def self._gem_valid?(gem)
+      return true if gem.name =~ /^guard-/
+      full_path = gem.full_gem_path
+      file = File.join(full_path, "lib", "guard", "#{gem.name}.rb")
+      File.exist?(file)
+    end
+
+    def _full_gem_path(name)
+      Gem::Specification.find_by_name(name).full_gem_path
+    end
   end
 end

data/lib/guard/reevaluator.rb

@@ -1,12 +1,12 @@
-require "guard"
 require "guard/plugin"
+require "guard/guardfile/evaluator"
 
 module Guard
-  class Reevaluator < Guard::Plugin
+  class Reevaluator < Plugin
     def run_on_modifications(files)
       return unless ::Guard::Watcher.match_guardfile?(files)
       ::Guard.save_scope
-      ::Guard.evaluator.reevaluate_guardfile
+      Guard::Guardfile::Evaluator.new(Guard.options).reevaluate_guardfile
     rescue ScriptError, StandardError => e
       ::Guard::UI.warning("Failed to reevaluate file: #{e}")
 

data/lib/guard/reevaluator.rb.orig

@@ -0,0 +1,22 @@
+require "guard/plugin"
+require "guard/guardfile/evaluator"
+
+module Guard
+  class Reevaluator < Plugin
+    def run_on_modifications(files)
+      STDERR.puts files.inspect
+      return unless ::Guard::Watcher.match_guardfile?(files)
+      ::Guard.save_scope
+      Guard::Guardfile::Evaluator.new.reevaluate_guardfile
+    rescue ScriptError, StandardError => e
+      ::Guard::UI.warning("Failed to reevaluate file: #{e}")
+
+      options = { watchers: [::Guard::Watcher.new("Guardfile")] }
+      ::Guard.add_plugin(:reevaluator, options)
+
+      throw :task_has_failed
+    ensure
+      ::Guard.restore_scope
+    end
+  end
+end

data/lib/guard/runner.rb

@@ -1,5 +1,6 @@
 require "lumberjack"
 
+require "guard/metadata"
 require "guard/ui"
 require "guard/watcher"
 

data/lib/guard/session.rb

@@ -0,0 +1,5 @@
+module Guard
+  class << self
+    attr_reader :options
+  end
+end

data/lib/guard/sheller.rb

@@ -1,3 +1,5 @@
+require "open3"
+
 module Guard
   # The Guard sheller abstract the actual subshell
   # calls and allow easier stubbing.
@@ -108,8 +110,6 @@ module Guard
     def self._system_with_capture(*args)
       # We use popen3, because it started working on recent versions
       # of JRuby, while JRuby doesn't handle options to Kernel.system
-      require "open3"
-
       args = _shellize_if_needed(args)
 
       stdout, stderr, status = nil

data/lib/guard/templates/Guardfile

@@ -1,2 +1,6 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
+
+# Uncomment and set this to only include directories you want to watch
+#
+# directories %(app lib config test spec feature)

data/lib/guard/templates/Guardfile.orig

@@ -0,0 +1,2 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme

data/lib/guard/terminal.rb

@@ -1,3 +1,4 @@
+require "guard/sheller"
 module Guard
   class Terminal
     class << self

data/lib/guard/ui.rb

@@ -1,6 +1,9 @@
 require "lumberjack"
 
 require "guard/options"
+require "guard/session"
+require "guard/metadata"
+
 require "guard/ui/colors"
 
 require "guard/terminal"
@@ -104,7 +107,7 @@ module Guard
         msg = "neither ::Guard.setup nor ::Guard.reset_options was called"
         fail msg if ::Guard.options.nil?
         unless ENV["GUARD_GEM_SILENCE_DEPRECATIONS"] == "1"
-          backtrace = Thread.current.backtrace[1..3].join("\n\t >")
+          backtrace = Thread.current.backtrace[1..5].join("\n\t >")
           msg = format("%s\nDeprecation backtrace: %s", message, backtrace)
           warning(msg, options)
         end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.8.2"
+  VERSION = "2.9.0"
 end

data/lib/guard/version.rb.orig

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.7.1"
+  VERSION = "2.8.2"
 end

data/lib/guard/watcher.rb

@@ -83,7 +83,9 @@ module Guard
     # @return [Boolean] whether one of these files is the Guardfile
     #
     def self.match_guardfile?(files)
-      path = ::Guard.evaluator.guardfile_path
+      # TODO: move this method elsewhere
+      require "guard/guardfile/evaluator"
+      path = Guard.options[:guardfile]
       files.any? { |file| File.expand_path(file) == path }
     end
 

data/lib/guard/watcher.rb.orig

@@ -0,0 +1,122 @@
+require "guard/ui"
+
+module Guard
+  # The watcher defines a RegExp that will be matched against file system
+  # modifications.
+  # When a watcher matches a change, an optional action block is executed to
+  # enable processing the file system change result.
+  #
+  class Watcher
+    attr_accessor :pattern, :action
+
+    # Initializes a file watcher.
+    #
+    # @param [String, Regexp] pattern the pattern to be watched by the Guard
+    #   plugin
+    # @param [Block] action the action to execute before passing the result to
+    #   the Guard plugin
+    #
+    def initialize(pattern, action = nil)
+      @pattern, @action = pattern, action
+      @@warning_printed ||= false
+
+      # deprecation warning
+      regexp = /(^(\^))|(>?(\\\.)|(\.\*))|(\(.*\))|(\[.*\])|(\$$)/
+      return unless @pattern.is_a?(String) && @pattern =~ regexp
+
+      unless @@warning_printed
+        ::Guard::UI.info "*" * 20 + "\nDEPRECATION WARNING!\n" + "*" * 20
+        ::Guard::UI.info <<-MSG
+            You have a string in your Guardfile watch patterns that seem to
+            represent a Regexp.
+
+            Guard matches String with == and Regexp with Regexp#match.
+
+            You should either use plain String (without Regexp special
+            characters) or real Regexp.
+        MSG
+        @@warning_printed = true
+      end
+
+      new_regexp = Regexp.new(@pattern).inspect
+      ::Guard::UI.info "\"#{@pattern}\" has been converted to #{ new_regexp }\n"
+      @pattern = Regexp.new(@pattern)
+    end
+
+    # Finds the files that matches a Guard plugin.
+    #
+    # @param [Guard::Plugin] guard the Guard plugin which watchers are used
+    # @param [Array<String>] files the changed files
+    # @return [Array<Object>] the matched watcher response
+    #
+    def self.match_files(guard, files)
+      return [] if files.empty?
+
+      files.inject([]) do |paths, file|
+        guard.watchers.each do |watcher|
+          matches = watcher.match(file)
+          next unless matches
+
+          if watcher.action
+            result = watcher.call_action(matches)
+            if guard.options[:any_return]
+              paths << result
+            elsif result.respond_to?(:empty?) && !result.empty?
+              paths << Array(result)
+            else
+              next
+            end
+          else
+            paths << matches[0]
+          end
+
+          break if guard.options[:first_match]
+        end
+
+        guard.options[:any_return] ? paths : paths.flatten.map(&:to_s)
+      end
+    end
+
+    # Tests if any of the files is the Guardfile.
+    #
+    # @param [Array<String>] files the files to test
+    # @return [Boolean] whether one of these files is the Guardfile
+    #
+    def self.match_guardfile?(files)
+      # TODO: move this method elsewhere
+      require "guard/guardfile/evaluator"
+      path = ::Guard::Guardfile::Evaluator.new(::Guard.options).guardfile_path
+      STDERR.puts "PATH: #{path.inspect}"
+      files.any? { |file| File.expand_path(file) == path }
+    end
+
+    # Test the watchers pattern against a file.
+    #
+    # @param [String] file the file to test
+    # @return [Array<String>] an array of matches (or containing a single path
+    #   if the pattern is a string)
+    #
+    def match(string_or_pathname)
+      # TODO: use only match() - and show fnmatch example
+      file = string_or_pathname.to_s
+      return (file == @pattern ? [file] : nil) unless @pattern.is_a?(Regexp)
+      return unless (m = @pattern.match(file))
+      m = m.to_a
+      m[0] = file
+      m
+    end
+
+    # Executes a watcher action.
+    #
+    # @param [String, MatchData] matches the matched path or the match from the
+    #   Regex
+    # @return [String] the final paths
+    #
+    def call_action(matches)
+      @action.arity > 0 ? @action.call(matches) : @action.call
+    rescue => ex
+      ::Guard::UI.error "Problem with watch action!\n#{ ex.message }"
+      ::Guard::UI.error ex.backtrace.join("\n")
+    end
+  end
+end

data/man/guard.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GUARD" "1" "January 2014" "" ""
+.TH "GUARD" "1" "November 2014" "" ""
 .
 .SH "NAME"
 \fBguard\fR \- Guard keeps an eye on your file modifications\.
@@ -48,9 +48,6 @@ The following options are available:
 \fB\-B\fR, \fB\-\-no\-bundler\-warning\fR Turn off warning when Bundler is not present\.
 .
 .P
-\fB\-\-show\-deprecations\fR Turn on deprecation warnings\.
-.
-.P
 \fB\-l\fR, \fB\-\-latency\fR Overwrite Listen\'s default latency\.
 .
 .P

data/man/guard.1.html

@@ -122,9 +122,6 @@
 <p><code>-B</code>, <code>--no-bundler-warning</code>
   Turn off warning when Bundler is not present.</p>
 
-<p><code>--show-deprecations</code>
-  Turn on deprecation warnings.</p>
-
 <p><code>-l</code>, <code>--latency</code>
   Overwrite Listen's default latency.</p>
 
@@ -190,7 +187,7 @@ https://github.com/guard/guard/contributors</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>January 2014</li>
+    <li class='tc'>November 2014</li>
     <li class='tr'>guard(1)</li>
   </ol>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.9.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,45 +102,39 @@ files:
 - lib/guard/cli.rb
 - lib/guard/cli.rb.orig
 - lib/guard/commander.rb
-- lib/guard/commander.rb.orig
 - lib/guard/commands/all.rb
-- lib/guard/commands/all.rb.orig
 - lib/guard/commands/change.rb
 - lib/guard/commands/notification.rb
 - lib/guard/commands/pause.rb
 - lib/guard/commands/reload.rb
-- lib/guard/commands/reload.rb.orig
 - lib/guard/commands/scope.rb
-- lib/guard/commands/scope.rb.orig
 - lib/guard/commands/show.rb
-- lib/guard/deprecated_methods.rb
-- lib/guard/deprecated_methods.rb.orig
-- lib/guard/deprecator.rb
-- lib/guard/deprecator.rb.orig
+- lib/guard/config.rb
+- lib/guard/deprecated/dsl.rb
+- lib/guard/deprecated/guard.rb
+- lib/guard/deprecated/guardfile.rb
 - lib/guard/dsl.rb
+- lib/guard/dsl.rb.orig
 - lib/guard/dsl_describer.rb
 - lib/guard/dsl_describer.rb.orig
 - lib/guard/group.rb
-- lib/guard/guard.rb
-- lib/guard/guard.rb.orig
 - lib/guard/guardfile.rb
-- lib/guard/guardfile.rb.orig
 - lib/guard/guardfile/evaluator.rb
-- lib/guard/guardfile/evaluator.rb.orig
 - lib/guard/guardfile/generator.rb
 - lib/guard/interactor.rb
 - lib/guard/internals/debugging.rb
-- lib/guard/internals/debugging.rb.orig
-- lib/guard/internals/environment.rb.orig
+- lib/guard/internals/environment.rb
+- lib/guard/internals/helpers.rb
 - lib/guard/internals/tracing.rb
-- lib/guard/internals/tracing.rb.orig
+- lib/guard/internals/traps.rb
 - lib/guard/jobs/base.rb
 - lib/guard/jobs/pry_wrapper.rb
 - lib/guard/jobs/sleep.rb
+- lib/guard/metadata.rb
 - lib/guard/notifier.rb
 - lib/guard/notifier.rb.orig
+- lib/guard/notifier/detected.rb
 - lib/guard/notifiers/base.rb
-- lib/guard/notifiers/base.rb.orig
 - lib/guard/notifiers/emacs.rb
 - lib/guard/notifiers/file_notifier.rb
 - lib/guard/notifiers/gntp.rb
@@ -151,28 +145,26 @@ files:
 - lib/guard/notifiers/terminal_notifier.rb
 - lib/guard/notifiers/terminal_title.rb
 - lib/guard/notifiers/tmux.rb
-- lib/guard/notifiers/tmux.rb.orig
 - lib/guard/options.rb
 - lib/guard/plugin.rb
 - lib/guard/plugin/base.rb
 - lib/guard/plugin/hooker.rb
 - lib/guard/plugin_util.rb
-- lib/guard/plugin_util.rb.orig
 - lib/guard/rake_task.rb
 - lib/guard/reevaluator.rb
+- lib/guard/reevaluator.rb.orig
 - lib/guard/runner.rb
-- lib/guard/runner.rb.orig
-- lib/guard/setuper.rb
-- lib/guard/setuper.rb.orig
+- lib/guard/session.rb
 - lib/guard/sheller.rb
 - lib/guard/templates/Guardfile
+- lib/guard/templates/Guardfile.orig
 - lib/guard/terminal.rb
 - lib/guard/ui.rb
-- lib/guard/ui.rb.orig
 - lib/guard/ui/colors.rb
 - lib/guard/version.rb
 - lib/guard/version.rb.orig
 - lib/guard/watcher.rb
+- lib/guard/watcher.rb.orig
 - man/guard.1
 - man/guard.1.html
 homepage: http://guardgem.org
@@ -195,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications