guard 2.7.0 → 2.7.1

data/lib/guard/terminal.rb

@@ -0,0 +1,11 @@
+module Guard
+  class Terminal
+    class << self
+      def clear
+        cmd =  Gem.win_platform? ? "cls" : "clear;"
+        exit_code, _, stderr = ::Guard::Sheller.system(cmd)
+        fail Errno::ENOENT, stderr unless exit_code == 0
+      end
+    end
+  end
+end

data/lib/guard/ui.rb

@@ -3,6 +3,8 @@ require "lumberjack"
 require "guard/options"
 require "guard/ui/colors"
 
+require "guard/terminal"
+
 module Guard
   # The UI class helps to format messages for the user. Everything that is
   # logged through this class is considered either as an error message or a
@@ -25,6 +27,14 @@ module Guard
                     end
       end
 
+      # Since logger is global, for Aruba in-process to properly
+      # separate output between calls, we need to reset
+      #
+      # We don't use logger=() since it's expected to be a Lumberjack instance
+      def reset_logger
+        @logger = nil
+      end
+
       # Get the logger options
       #
       # @return [Hash] the logger options
@@ -109,9 +119,18 @@ module Guard
       # Clear the output if clearable.
       #
       def clear(options = {})
+        fail "UI not set up!" if @clearable.nil?
         return unless ::Guard.options[:clear] && (@clearable || options[:force])
         @clearable = false
-        ::Guard::Sheller.run("clear;")
+        ::Guard::Terminal.clear
+      rescue Errno::ENOENT => e
+        warning("Failed to clear the screen: #{e.inspect}")
+      end
+
+      # TODO: arguments: UI uses Guard::options anyway
+      def setup(_options)
+        @clearable = false
+        clear(force: true)
       end
 
       # Allow the screen to be cleared again.
@@ -206,7 +225,7 @@ module Guard
         @color_enabled = nil unless @color_enabled_initialized
         @color_enabled_initialized = true
         if @color_enabled.nil?
-          if RbConfig::CONFIG["target_os"] =~ /mswin|mingw/i
+          if Gem.win_platform?
             if ENV["ANSICON"]
               @color_enabled = true
             else

data/lib/guard/ui.rb.orig

@@ -25,6 +25,14 @@ module Guard
                     end
       end
 
+      # Since logger is global, for Aruba in-process to properly
+      # separate output between calls, we need to reset
+      #
+      # We don't use logger=() since it's expected to be a Lumberjack instance
+      def reset_logger
+        @logger = nil
+      end
+
       # Get the logger options
       #
       # @return [Hash] the logger options
@@ -85,6 +93,8 @@ module Guard
       # @option options [String] plugin manually define the calling plugin
       #
       def deprecation(message, options = {})
+        msg = "neither ::Guard.setup nor ::Guard.reset_options was called"
+        fail msg if ::Guard.options.nil?
         warning(message, options) if ::Guard.options[:show_deprecations]
       end
 
@@ -204,7 +214,7 @@ module Guard
         @color_enabled = nil unless @color_enabled_initialized
         @color_enabled_initialized = true
         if @color_enabled.nil?
-          if RbConfig::CONFIG["target_os"] =~ /mswin|mingw/i
+          if Gem.win_platform?
             if ENV["ANSICON"]
               @color_enabled = true
             else

data/lib/guard/version.rb

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

data/lib/guard/version.rb.orig

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.6.1"
+  VERSION = "2.7.0"
 end

data/lib/guard/watcher.rb.orig

@@ -0,0 +1,119 @@
+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)
+      path = ::Guard.evaluator.guardfile_path
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -98,8 +98,9 @@ files:
 - images/pending.png
 - images/success.png
 - lib/guard.rb
+- lib/guard.rb.orig
+- lib/guard/aruba_adapter.rb
 - lib/guard/cli.rb
-- lib/guard/cli.rb.orig
 - lib/guard/commander.rb
 - lib/guard/commands/all.rb
 - lib/guard/commands/change.rb
@@ -112,23 +113,21 @@ files:
 - lib/guard/deprecator.rb
 - lib/guard/dsl.rb
 - 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/evaluator.rb
-- lib/guard/guardfile/evaluator.rb.orig
 - lib/guard/guardfile/generator.rb
 - lib/guard/interactor.rb
 - lib/guard/interactor.rb.orig
 - lib/guard/jobs/base.rb
 - lib/guard/jobs/pry_wrapper.rb
-- lib/guard/jobs/pry_wrapper.rb.orig
 - lib/guard/jobs/sleep.rb
+- lib/guard/jobs/stdin.rb.orig
 - lib/guard/notifier.rb
 - lib/guard/notifiers/base.rb
 - lib/guard/notifiers/emacs.rb
+- lib/guard/notifiers/emacs.rb.orig
 - lib/guard/notifiers/file_notifier.rb
 - lib/guard/notifiers/gntp.rb
 - lib/guard/notifiers/growl.rb
@@ -143,22 +142,24 @@ files:
 - 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/runner.rb
-- lib/guard/runner.rb.orig
 - lib/guard/setuper.rb
 - lib/guard/setuper.rb.orig
 - lib/guard/sheller.rb
+- lib/guard/sheller.rb.orig
 - lib/guard/tags
 - lib/guard/templates/Guardfile
+- lib/guard/terminal.rb
+- lib/guard/terminal.rb.orig
 - 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

data/lib/guard/cli.rb.orig

@@ -1,215 +0,0 @@
-require "thor"
-
-require "guard"
-require "guard/version"
-require "guard/dsl_describer"
-require "guard/guardfile"
-
-module Guard
-  # Facade for the Guard command line interface managed by
-  # [Thor](https://github.com/wycats/thor).
-  #
-  # This is the main interface to Guard that is called by the Guard binary
-  # `bin/guard`. Do not put any logic in here, create a class and delegate
-  # instead.
-  #
-  class CLI < Thor
-    default_task :start
-
-    desc "start", "Starts Guard"
-
-    method_option :clear,
-                  type:    :boolean,
-                  default: false,
-                  aliases: "-c",
-                  banner:  "Auto clear shell before each action"
-
-    method_option :notify,
-                  type:    :boolean,
-                  default: true,
-                  aliases: "-n",
-                  banner:  "Notifications feature"
-
-    method_option :debug,
-                  type:    :boolean,
-                  default: false,
-                  aliases: "-d",
-                  banner:  "Show debug information"
-
-    method_option :group,
-                  type:    :array,
-                  default: [],
-                  aliases: "-g",
-                  banner:  "Run only the passed groups"
-
-    method_option :plugin,
-                  type:    :array,
-                  default: [],
-                  aliases: "-P",
-                  banner:  "Run only the passed plugins"
-
-    method_option :watchdir,
-                  type:    :array,
-                  aliases: "-w",
-                  banner:  "Specify the directories to watch"
-
-    method_option :guardfile,
-                  type:    :string,
-                  aliases: "-G",
-                  banner:  "Specify a Guardfile"
-
-    method_option :no_interactions,
-                  type: :boolean,
-                  default: false,
-                  aliases: "-i",
-                  banner: "Turn off completely any Guard terminal interactions"
-
-    method_option :no_bundler_warning,
-                  type: :boolean,
-                  default: false,
-                  aliases: "-B",
-                  banner: "Turn off warning when Bundler is not present"
-
-    method_option :show_deprecations,
-                  type: :boolean,
-                  default: false,
-                  banner: "Turn on deprecation warnings"
-
-    # Listen options
-    method_option :latency,
-                  type:    :numeric,
-                  aliases: "-l",
-                  banner:  'Overwrite Listen\'s default latency'
-
-    method_option :force_polling,
-                  type:    :boolean,
-                  default: false,
-                  aliases: "-p",
-                  banner:  "Force usage of the Listen polling listener"
-
-    method_option :wait_for_delay,
-                  type:    :numeric,
-                  aliases: "-y",
-                  banner:  'Overwrite Listen\'s default wait_for_delay'
-
-    method_option :listen_on,
-                  type:    :string,
-                  aliases: "-o",
-                  default: false,
-                  banner:  "Specify a network address to Listen on for "\
-                  "file change events (e.g. for use in VMs)"
-
-    # Start Guard by initializing the defined Guard plugins and watch the file
-    # system.
-    #
-    # This is the default task, so calling `guard` is the same as calling
-    # `guard start`.
-    #
-    # @see Guard.start
-    #
-    def start
-      _verify_bundler_presence unless options[:no_bundler_warning]
-      ::Guard.start(options)
-    end
-
-    desc "list", "Lists Guard plugins that can be used with init"
-
-    # List the Guard plugins that are available for use in your system and
-    # marks those that are currently used in your `Guardfile`.
-    #
-    # @see Guard::DslDescriber.list
-    #
-    def list
-      ::Guard::DslDescriber.new(options).list
-    end
-
-    desc "notifiers", "Lists notifiers and its options"
-
-    # List the Notifiers for use in your system.
-    #
-    # @see Guard::DslDescriber.notifiers
-    #
-    def notifiers
-      ::Guard::DslDescriber.new(options).notifiers
-    end
-
-    desc "version", "Show the Guard version"
-    map %w(-v --version) => :version
-
-    # Shows the current version of Guard.
-    #
-    # @see Guard::VERSION
-    #
-    def version
-      STDOUT.puts "Guard version #{ ::Guard::VERSION }"
-    end
-
-    desc "init [GUARDS]", "Generates a Guardfile at the current directory"\
-      " (if it is not already there) and adds all installed Guard plugins"\
-      " or the given GUARDS into it"
-
-    method_option :bare,
-                  type: :boolean,
-                  default: false,
-                  aliases: "-b",
-                  banner: "Generate a bare Guardfile without adding any"\
-                  " installed plugin into it"
-
-    # Initializes the templates of all installed Guard plugins and adds them
-    # to the `Guardfile` when no Guard name is passed. When passing
-    # Guard plugin names it does the same but only for those Guard plugins.
-    #
-    # @see Guard::Guardfile.initialize_template
-    # @see Guard::Guardfile.initialize_all_templates
-    #
-    # @param [Array<String>] plugin_names the name of the Guard plugins to
-    # initialize
-    #
-    def init(*plugin_names)
-      _verify_bundler_presence unless options[:no_bundler_warning]
-
-      ::Guard::Guardfile.create_guardfile(abort_on_existence: options[:bare])
-
-      return if options[:bare]
-
-      if plugin_names.empty?
-        ::Guard::Guardfile.initialize_all_templates
-      else
-        plugin_names.each do |plugin_name|
-          ::Guard::Guardfile.initialize_template(plugin_name)
-        end
-      end
-    end
-
-    desc "show", "Show all defined Guard plugins and their options"
-    map %w(-T) => :show
-
-    # Shows all Guard plugins and their options that are defined in
-    # the `Guardfile`
-    #
-    # @see Guard::DslDescriber.show
-    #
-    def show
-      ::Guard::DslDescriber.new(options).show
-    end
-
-    private
-
-    # Verifies if Guard is run with `bundle exec` and
-    # shows a hint to do so if not.
-    #
-    def _verify_bundler_presence
-      return unless File.exist?("Gemfile")
-      return if ENV["BUNDLE_GEMFILE"] || ENV["RUBYGEMS_GEMDEPS"]
-
-      ::Guard::UI.info <<EOF
-
-Guard here! It looks like your project has a Gemfile, yet you are running
-`guard` outside of Bundler. If this is your intent, feel free to ignore this
-message. Otherwise, consider using `bundle exec guard` to ensure your
-dependencies are loaded correctly.
-(You can run `guard` with --no-bundler-warning to get rid of this message.)
-EOF
-    end
-  end
-end