guard 0.7.0.rc1 → 0.7.0

data/bin/guard

@@ -1,6 +1,6 @@
-#!/usr/bin/env ruby
-
-require 'guard'
-require 'guard/cli'
-
+#!/usr/bin/env ruby
+
+require 'guard'
+require 'guard/cli'
+
 Guard::CLI.start

data/lib/guard.rb

@@ -1,186 +1,186 @@
-module Guard
-
-  autoload :UI,           'guard/ui'
-  autoload :Dsl,          'guard/dsl'
-  autoload :DslDescriber, 'guard/dsl_describer'
-  autoload :Interactor,   'guard/interactor'
-  autoload :Listener,     'guard/listener'
-  autoload :Watcher,      'guard/watcher'
-  autoload :Notifier,     'guard/notifier'
-  autoload :Hook,         'guard/hook'
-
-  class << self
-    attr_accessor :options, :guards, :groups, :interactor, :listener
-
-    # initialize this singleton
-    def setup(options = {})
-      @options    = options
-      @guards     = []
-      @groups     = [:default]
-      @interactor = Interactor.new
-      @listener   = Listener.select_and_init(@options[:watchdir] ? File.expand_path(@options[:watchdir]) : Dir.pwd)
-
-      @options[:notify] && ENV["GUARD_NOTIFY"] != 'false' ? Notifier.turn_on : Notifier.turn_off
-
-      UI.clear if @options[:clear]
-      debug_command_execution if @options[:debug]
-
-      self
-    end
-
-    def start(options = {})
-      setup(options)
-
-      Dsl.evaluate_guardfile(options)
-
-      listener.on_change do |files|
-        Dsl.reevaluate_guardfile        if Watcher.match_guardfile?(files)
-        listener.changed_files += files if Watcher.match_files?(guards, files)
-      end
-
-      UI.info "Guard is now watching at '#{listener.directory}'"
-      guards.each { |guard| supervised_task(guard, :start) }
-
-      interactor.start
-      listener.start
-    end
-
-    def stop
-      UI.info "Bye bye...", :reset => true
-      listener.stop
-      guards.each { |guard| supervised_task(guard, :stop) }
-      abort
-    end
-
-    def reload
-      run do
-        guards.each { |guard| supervised_task(guard, :reload) }
-      end
-    end
-
-    def run_all
-      run do
-        guards.each { |guard| supervised_task(guard, :run_all) }
-      end
-    end
-
-    def pause
-      if listener.locked
-        UI.info "Un-paused files modification listening", :reset => true
-        listener.clear_changed_files
-        listener.unlock
-      else
-        UI.info "Paused files modification listening", :reset => true
-        listener.lock
-      end
-    end
-
-    def run_on_change(files)
-      run do
-        guards.each do |guard|
-          paths = Watcher.match_files(guard, files)
-          unless paths.empty?
-            UI.debug "#{guard.class.name}#run_on_change with #{paths.inspect}"
-            supervised_task(guard, :run_on_change, paths)
-          end
-        end
-      end
-    end
-
-    def run
-      listener.lock
-      interactor.lock
-      UI.clear if options[:clear]
-      begin
-        yield
-      rescue Interrupt
-      end
-      interactor.unlock
-      listener.unlock
-    end
-
-    # Let a guard execute its task but
-    # fire it if his work leads to a system failure
-    def supervised_task(guard, task_to_supervise, *args)
-      guard.hook("#{task_to_supervise}_begin", *args)
-      result = guard.send(task_to_supervise, *args)
-      guard.hook("#{task_to_supervise}_end", result)
-      result
-    rescue Exception => ex
-      UI.error("#{guard.class.name} failed to achieve its <#{task_to_supervise.to_s}>, exception was:" +
-      "\n#{ex.class}: #{ex.message}\n#{ex.backtrace.join("\n")}")
-      guards.delete guard
-      UI.info("\n#{guard.class.name} has just been fired")
-      return ex
-    end
-
-    def add_guard(name, watchers = [], callbacks = [], options = {})
-      if name.to_sym == :ego
-        UI.deprecation("Guard::Ego is now part of Guard. You can remove it from your Guardfile.")
-      else
-        guard_class = get_guard_class(name)
-        callbacks.each { |callback| Hook.add_callback(callback[:listener], guard_class, callback[:events]) }
-        @guards << guard_class.new(watchers, options)
-      end
-    end
-
-    def add_group(name)
-      @groups << name.to_sym unless name.nil?
-    end
-
-    def get_guard_class(name)
-      name        = name.to_s
-      try_require = false
-      const_name  = name.downcase.gsub('-', '')
-      begin
-        require "guard/#{name.downcase}" if try_require
-        self.const_get(self.constants.find { |c| c.to_s.downcase == const_name })
-      rescue TypeError
-        unless try_require
-          try_require = true
-          retry
-        else
-          UI.error "Could not find class Guard::#{const_name.capitalize}"
-        end
-      rescue LoadError => loadError
-        UI.error "Could not load 'guard/#{name.downcase}' or find class Guard::#{const_name.capitalize}"
-        UI.error loadError.to_s
-      end
-    end
-
-    def locate_guard(name)
-      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
-    rescue
-      UI.error "Could not find 'guard-#{name}' gem path."
-    end
-
-    ##
-    # Returns a list of guard Gem names installed locally.
-    def guard_gem_names
-      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create('1.8.0')
-        Gem::Specification.find_all.select { |x| x.name =~ /^guard-/ }
-      else
-        Gem.source_index.find_name(/^guard-/)
-      end.map { |x| x.name.sub /^guard-/, '' }
-    end
-
-    def debug_command_execution
-      Kernel.send(:alias_method, :original_system, :system)
-      Kernel.send(:define_method, :system) do |command, *args|
-        ::Guard::UI.debug "Command execution: #{command} #{args.join(' ')}"
-        original_system command, *args
-      end
-
-      Kernel.send(:alias_method, :original_backtick, :"`")
-      Kernel.send(:define_method, :"`") do |command|
-        ::Guard::UI.debug "Command execution: #{command}"
-        original_backtick command
-      end
-    end
-
-  end
-end
+module Guard
+
+  autoload :UI,           'guard/ui'
+  autoload :Dsl,          'guard/dsl'
+  autoload :DslDescriber, 'guard/dsl_describer'
+  autoload :Interactor,   'guard/interactor'
+  autoload :Listener,     'guard/listener'
+  autoload :Watcher,      'guard/watcher'
+  autoload :Notifier,     'guard/notifier'
+  autoload :Hook,         'guard/hook'
+
+  class << self
+    attr_accessor :options, :guards, :groups, :interactor, :listener
+
+    # initialize this singleton
+    def setup(options = {})
+      @options    = options
+      @guards     = []
+      @groups     = [:default]
+      @interactor = Interactor.new
+      @listener   = Listener.select_and_init(@options[:watchdir] ? File.expand_path(@options[:watchdir]) : Dir.pwd)
+
+      @options[:notify] && ENV["GUARD_NOTIFY"] != 'false' ? Notifier.turn_on : Notifier.turn_off
+
+      UI.clear if @options[:clear]
+      debug_command_execution if @options[:debug]
+
+      self
+    end
+
+    def start(options = {})
+      setup(options)
+
+      Dsl.evaluate_guardfile(options)
+
+      listener.on_change do |files|
+        Dsl.reevaluate_guardfile        if Watcher.match_guardfile?(files)
+        listener.changed_files += files if Watcher.match_files?(guards, files)
+      end
+
+      UI.info "Guard is now watching at '#{listener.directory}'"
+      guards.each { |guard| supervised_task(guard, :start) }
+
+      interactor.start
+      listener.start
+    end
+
+    def stop
+      UI.info "Bye bye...", :reset => true
+      listener.stop
+      guards.each { |guard| supervised_task(guard, :stop) }
+      abort
+    end
+
+    def reload
+      run do
+        guards.each { |guard| supervised_task(guard, :reload) }
+      end
+    end
+
+    def run_all
+      run do
+        guards.each { |guard| supervised_task(guard, :run_all) }
+      end
+    end
+
+    def pause
+      if listener.locked
+        UI.info "Un-paused files modification listening", :reset => true
+        listener.clear_changed_files
+        listener.unlock
+      else
+        UI.info "Paused files modification listening", :reset => true
+        listener.lock
+      end
+    end
+
+    def run_on_change(files)
+      run do
+        guards.each do |guard|
+          paths = Watcher.match_files(guard, files)
+          unless paths.empty?
+            UI.debug "#{guard.class.name}#run_on_change with #{paths.inspect}"
+            supervised_task(guard, :run_on_change, paths)
+          end
+        end
+      end
+    end
+
+    def run
+      listener.lock
+      interactor.lock
+      UI.clear if options[:clear]
+      begin
+        yield
+      rescue Interrupt
+      end
+      interactor.unlock
+      listener.unlock
+    end
+
+    # Let a guard execute its task but
+    # fire it if his work leads to a system failure
+    def supervised_task(guard, task_to_supervise, *args)
+      guard.hook("#{task_to_supervise}_begin", *args)
+      result = guard.send(task_to_supervise, *args)
+      guard.hook("#{task_to_supervise}_end", result)
+      result
+    rescue Exception => ex
+      UI.error("#{guard.class.name} failed to achieve its <#{task_to_supervise.to_s}>, exception was:" +
+      "\n#{ex.class}: #{ex.message}\n#{ex.backtrace.join("\n")}")
+      guards.delete guard
+      UI.info("\n#{guard.class.name} has just been fired")
+      return ex
+    end
+
+    def add_guard(name, watchers = [], callbacks = [], options = {})
+      if name.to_sym == :ego
+        UI.deprecation("Guard::Ego is now part of Guard. You can remove it from your Guardfile.")
+      else
+        guard_class = get_guard_class(name)
+        callbacks.each { |callback| Hook.add_callback(callback[:listener], guard_class, callback[:events]) }
+        @guards << guard_class.new(watchers, options)
+      end
+    end
+
+    def add_group(name)
+      @groups << name.to_sym unless name.nil?
+    end
+
+    def get_guard_class(name)
+      name        = name.to_s
+      try_require = false
+      const_name  = name.downcase.gsub('-', '')
+      begin
+        require "guard/#{name.downcase}" if try_require
+        self.const_get(self.constants.find { |c| c.to_s.downcase == const_name })
+      rescue TypeError
+        unless try_require
+          try_require = true
+          retry
+        else
+          UI.error "Could not find class Guard::#{const_name.capitalize}"
+        end
+      rescue LoadError => loadError
+        UI.error "Could not load 'guard/#{name.downcase}' or find class Guard::#{const_name.capitalize}"
+        UI.error loadError.to_s
+      end
+    end
+
+    def locate_guard(name)
+      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
+    rescue
+      UI.error "Could not find 'guard-#{name}' gem path."
+    end
+
+    ##
+    # Returns a list of guard Gem names installed locally.
+    def guard_gem_names
+      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create('1.8.0')
+        Gem::Specification.find_all.select { |x| x.name =~ /^guard-/ }
+      else
+        Gem.source_index.find_name(/^guard-/)
+      end.map { |x| x.name.sub /^guard-/, '' }
+    end
+
+    def debug_command_execution
+      Kernel.send(:alias_method, :original_system, :system)
+      Kernel.send(:define_method, :system) do |command, *args|
+        ::Guard::UI.debug "Command execution: #{command} #{args.join(' ')}"
+        original_system command, *args
+      end
+
+      Kernel.send(:alias_method, :original_backtick, :"`")
+      Kernel.send(:define_method, :"`") do |command|
+        ::Guard::UI.debug "Command execution: #{command}"
+        original_backtick command
+      end
+    end
+
+  end
+end

data/lib/guard/cli.rb

@@ -1,90 +1,90 @@
-require 'thor'
-require 'guard/version'
-
-module Guard
-  class CLI < Thor
-    default_task :start
-
-    method_option :clear,     :type => :boolean, :default => false, :aliases => '-c', :banner => "Auto clear shell before each change/run_all/reload"
-    method_option :notify,    :type => :boolean, :default => true,  :aliases => '-n', :banner => "Notifications feature (growl/libnotify)"
-    method_option :debug,     :type => :boolean, :default => false, :aliases => '-d', :banner => "Print debug messages"
-    method_option :group,     :type => :array,   :default => [],    :aliases => '-g', :banner => "Run only the passed groups"
-    method_option :watchdir,  :type => :string,                     :aliases => '-w', :banner => "Specify the directory to watch"
-    method_option :guardfile, :type => :string,                     :aliases => '-G', :banner => "Specify a Guardfile"
-
-    desc "start", "Starts Guard"
-    def start
-      ::Guard.start(options)
-    end
-
-    desc "list", "Lists guards that can be used with init"
-    def list
-      ::Guard::DslDescriber.evaluate_guardfile(options)
-      installed = []
-      ::Guard::DslDescriber.guardfile_structure.each do |group|
-        group[:guards].each {|x| installed << x[:name]} if group[:guards]
-      end
-
-      ::Guard::UI.info "Available guards:"
-      ::Guard::guard_gem_names.sort.each do |name|
-        if installed.include? name
-          ::Guard::UI.info "   #{name} *"
-        else
-          ::Guard::UI.info "   #{name}"
-        end
-      end
-      ::Guard::UI.info ' '
-      ::Guard::UI.info "See also https://github.com/guard/guard/wiki/List-of-available-Guards"
-      ::Guard::UI.info "* denotes ones already in your Guardfile"
-    end
-
-    desc "version", "Prints Guard's version"
-    def version
-      ::Guard::UI.info "Guard version #{Guard::VERSION}"
-    end
-    map %w(-v --version) => :version
-
-    desc "init [GUARD]", "Generates a Guardfile into the current working directory, or insert the given GUARD in an existing Guardfile"
-    def init(guard_name = nil)
-      if !File.exist?("Guardfile")
-        puts "Writing new Guardfile to #{Dir.pwd}/Guardfile"
-        FileUtils.cp(File.expand_path('../templates/Guardfile', __FILE__), 'Guardfile')
-      elsif guard_name.nil?
-        ::Guard::UI.error "Guardfile already exists at #{Dir.pwd}/Guardfile"
-        exit 1
-      end
-
-      if guard_name
-        guard_class = ::Guard.get_guard_class(guard_name)
-        guard_class.init(guard_name)
-      end
-    end
-
-    desc "show", "Show all defined Guards and their options"
-    def show
-      ::Guard::DslDescriber.evaluate_guardfile(options)
-
-      ::Guard::DslDescriber.guardfile_structure.each do |group|
-        if !group[:guards].empty?
-          if group[:group]
-            ::Guard::UI.info "Group #{group[:group]}:"
-          else
-            ::Guard::UI.info "(global):"
-          end
-
-          group[:guards].each do |guard|
-            line = "  #{guard[:name]}"
-
-            if !guard[:options].empty?
-              line += ": #{guard[:options].collect { |k, v| "#{k} => #{v.inspect}" }.join(", ")}"
-            end
-            ::Guard::UI.info line
-          end
-        end
-      end
-
-      ::Guard::UI.info ''
-    end
-    map %w(-T) => :show
-  end
-end
+require 'thor'
+require 'guard/version'
+
+module Guard
+  class CLI < Thor
+    default_task :start
+
+    method_option :clear,     :type => :boolean, :default => false, :aliases => '-c', :banner => "Auto clear shell before each change/run_all/reload"
+    method_option :notify,    :type => :boolean, :default => true,  :aliases => '-n', :banner => "Notifications feature (growl/libnotify)"
+    method_option :debug,     :type => :boolean, :default => false, :aliases => '-d', :banner => "Print debug messages"
+    method_option :group,     :type => :array,   :default => [],    :aliases => '-g', :banner => "Run only the passed groups"
+    method_option :watchdir,  :type => :string,                     :aliases => '-w', :banner => "Specify the directory to watch"
+    method_option :guardfile, :type => :string,                     :aliases => '-G', :banner => "Specify a Guardfile"
+
+    desc "start", "Starts Guard"
+    def start
+      ::Guard.start(options)
+    end
+
+    desc "list", "Lists guards that can be used with init"
+    def list
+      ::Guard::DslDescriber.evaluate_guardfile(options)
+      installed = []
+      ::Guard::DslDescriber.guardfile_structure.each do |group|
+        group[:guards].each {|x| installed << x[:name]} if group[:guards]
+      end
+
+      ::Guard::UI.info "Available guards:"
+      ::Guard::guard_gem_names.sort.each do |name|
+        if installed.include? name
+          ::Guard::UI.info "   #{name} *"
+        else
+          ::Guard::UI.info "   #{name}"
+        end
+      end
+      ::Guard::UI.info ' '
+      ::Guard::UI.info "See also https://github.com/guard/guard/wiki/List-of-available-Guards"
+      ::Guard::UI.info "* denotes ones already in your Guardfile"
+    end
+
+    desc "version", "Prints Guard's version"
+    def version
+      ::Guard::UI.info "Guard version #{Guard::VERSION}"
+    end
+    map %w(-v --version) => :version
+
+    desc "init [GUARD]", "Generates a Guardfile into the current working directory, or insert the given GUARD in an existing Guardfile"
+    def init(guard_name = nil)
+      if !File.exist?("Guardfile")
+        puts "Writing new Guardfile to #{Dir.pwd}/Guardfile"
+        FileUtils.cp(File.expand_path('../templates/Guardfile', __FILE__), 'Guardfile')
+      elsif guard_name.nil?
+        ::Guard::UI.error "Guardfile already exists at #{Dir.pwd}/Guardfile"
+        exit 1
+      end
+
+      if guard_name
+        guard_class = ::Guard.get_guard_class(guard_name)
+        guard_class.init(guard_name)
+      end
+    end
+
+    desc "show", "Show all defined Guards and their options"
+    def show
+      ::Guard::DslDescriber.evaluate_guardfile(options)
+
+      ::Guard::DslDescriber.guardfile_structure.each do |group|
+        if !group[:guards].empty?
+          if group[:group]
+            ::Guard::UI.info "Group #{group[:group]}:"
+          else
+            ::Guard::UI.info "(global):"
+          end
+
+          group[:guards].each do |guard|
+            line = "  #{guard[:name]}"
+
+            if !guard[:options].empty?
+              line += ": #{guard[:options].collect { |k, v| "#{k} => #{v.inspect}" }.join(", ")}"
+            end
+            ::Guard::UI.info line
+          end
+        end
+      end
+
+      ::Guard::UI.info ''
+    end
+    map %w(-T) => :show
+  end
+end