guard 0.7.0.rc1 → 0.7.0

data/lib/guard/dsl.rb

@@ -1,148 +1,148 @@
-module Guard
-  class Dsl
-    class << self
-      @@options = nil
-
-      def evaluate_guardfile(options = {})
-        options.is_a?(Hash) or raise ArgumentError.new("evaluate_guardfile not passed a Hash!")
-
-        @@options = options.dup
-        fetch_guardfile_contents
-        instance_eval_guardfile(guardfile_contents_with_user_config)
-
-        UI.error "No guards found in Guardfile, please add at least one." if !::Guard.guards.nil? && ::Guard.guards.empty?
-      end
-
-      def reevaluate_guardfile
-        ::Guard.guards.clear
-        @@options.delete(:guardfile_contents)
-        Dsl.evaluate_guardfile(@@options)
-        msg = "Guardfile has been re-evaluated."
-        UI.info(msg)
-        Notifier.notify(msg)
-      end
-
-      def instance_eval_guardfile(contents)
-        begin
-          new.instance_eval(contents, @@options[:guardfile_path], 1)
-        rescue
-          UI.error "Invalid Guardfile, original error is:\n#{$!}"
-          exit 1
-        end
-      end
-
-      def guardfile_include?(guard_name)
-        guardfile_contents.match(/^guard\s*\(?\s*['":]#{guard_name}['"]?/)
-      end
-
-      def read_guardfile(guardfile_path)
-        begin
-          @@options[:guardfile_path]     = guardfile_path
-          @@options[:guardfile_contents] = File.read(guardfile_path)
-        rescue
-          UI.error("Error reading file #{guardfile_path}")
-          exit 1
-        end
-      end
-
-      def fetch_guardfile_contents
-        # TODO: do we need .rc file interaction?
-        if @@options[:guardfile_contents]
-          UI.info "Using inline Guardfile."
-          @@options[:guardfile_path] = 'Inline Guardfile'
-
-        elsif @@options[:guardfile]
-          if File.exist?(@@options[:guardfile])
-            read_guardfile(@@options[:guardfile])
-            UI.info "Using Guardfile at #{@@options[:guardfile]}."
-          else
-            UI.error "No Guardfile exists at #{@@options[:guardfile]}."
-            exit 1
-          end
-
-        else
-          if File.exist?(guardfile_default_path)
-            read_guardfile(guardfile_default_path)
-          else
-            UI.error "No Guardfile found, please create one with `guard init`."
-            exit 1
-          end
-        end
-
-        unless guardfile_contents_usable?
-          UI.error "The command file(#{@@options[:guardfile]}) seems to be empty."
-          exit 1
-        end
-      end
-
-      def guardfile_contents
-        @@options ? @@options[:guardfile_contents] : ""
-      end
-
-      def guardfile_contents_with_user_config
-        config = File.read(user_config_path) if File.exist?(user_config_path)
-        [guardfile_contents, config].join("\n")
-      end
-
-      def guardfile_path
-        @@options ? @@options[:guardfile_path] : ""
-      end
-
-      def guardfile_contents_usable?
-        guardfile_contents && guardfile_contents.size >= 'guard :a'.size # smallest guard-definition
-      end
-
-      def guardfile_default_path
-        File.exist?(local_guardfile_path) ? local_guardfile_path : home_guardfile_path
-      end
-
-    private
-
-      def local_guardfile_path
-        File.join(Dir.pwd, "Guardfile")
-      end
-
-      def home_guardfile_path
-        File.expand_path(File.join("~", ".Guardfile"))
-      end
-
-      def user_config_path
-        File.expand_path(File.join("~", ".guard.rb"))
-      end
-
-    end
-
-    def group(name, &guard_definition)
-      @groups = @@options[:group] || []
-      name = name.to_sym
-
-      if guard_definition && (@groups.empty? || @groups.map(&:to_sym).include?(name))
-        @current_group = name
-        guard_definition.call
-        @current_group = nil
-      end
-    end
-
-    def guard(name, options = {}, &watch_and_callback_definition)
-      @watchers  = []
-      @callbacks = []
-      watch_and_callback_definition.call if watch_and_callback_definition
-      options.update(:group => (@current_group || :default))
-      ::Guard.add_guard(name.to_s.downcase.to_sym, @watchers, @callbacks, options)
-    end
-
-    def watch(pattern, &action)
-      @watchers << ::Guard::Watcher.new(pattern, action)
-    end
-
-    def callback(*args, &listener)
-      listener, events = args.size > 1 ? args : [listener, args[0]]
-      @callbacks << { :events => events, :listener => listener }
-    end
-
-    def ignore_paths(*paths)
-      UI.info "Ignoring paths: #{paths.join(', ')}"
-      ::Guard.listener.ignore_paths.push(*paths)
-    end
-  end
-end
+module Guard
+  class Dsl
+    class << self
+      @@options = nil
+
+      def evaluate_guardfile(options = {})
+        options.is_a?(Hash) or raise ArgumentError.new("evaluate_guardfile not passed a Hash!")
+
+        @@options = options.dup
+        fetch_guardfile_contents
+        instance_eval_guardfile(guardfile_contents_with_user_config)
+
+        UI.error "No guards found in Guardfile, please add at least one." if !::Guard.guards.nil? && ::Guard.guards.empty?
+      end
+
+      def reevaluate_guardfile
+        ::Guard.guards.clear
+        @@options.delete(:guardfile_contents)
+        Dsl.evaluate_guardfile(@@options)
+        msg = "Guardfile has been re-evaluated."
+        UI.info(msg)
+        Notifier.notify(msg)
+      end
+
+      def instance_eval_guardfile(contents)
+        begin
+          new.instance_eval(contents, @@options[:guardfile_path], 1)
+        rescue
+          UI.error "Invalid Guardfile, original error is:\n#{$!}"
+          exit 1
+        end
+      end
+
+      def guardfile_include?(guard_name)
+        guardfile_contents.match(/^guard\s*\(?\s*['":]#{guard_name}['"]?/)
+      end
+
+      def read_guardfile(guardfile_path)
+        begin
+          @@options[:guardfile_path]     = guardfile_path
+          @@options[:guardfile_contents] = File.read(guardfile_path)
+        rescue
+          UI.error("Error reading file #{guardfile_path}")
+          exit 1
+        end
+      end
+
+      def fetch_guardfile_contents
+        # TODO: do we need .rc file interaction?
+        if @@options[:guardfile_contents]
+          UI.info "Using inline Guardfile."
+          @@options[:guardfile_path] = 'Inline Guardfile'
+
+        elsif @@options[:guardfile]
+          if File.exist?(@@options[:guardfile])
+            read_guardfile(@@options[:guardfile])
+            UI.info "Using Guardfile at #{@@options[:guardfile]}."
+          else
+            UI.error "No Guardfile exists at #{@@options[:guardfile]}."
+            exit 1
+          end
+
+        else
+          if File.exist?(guardfile_default_path)
+            read_guardfile(guardfile_default_path)
+          else
+            UI.error "No Guardfile found, please create one with `guard init`."
+            exit 1
+          end
+        end
+
+        unless guardfile_contents_usable?
+          UI.error "The command file(#{@@options[:guardfile]}) seems to be empty."
+          exit 1
+        end
+      end
+
+      def guardfile_contents
+        @@options ? @@options[:guardfile_contents] : ""
+      end
+
+      def guardfile_contents_with_user_config
+        config = File.read(user_config_path) if File.exist?(user_config_path)
+        [guardfile_contents, config].join("\n")
+      end
+
+      def guardfile_path
+        @@options ? @@options[:guardfile_path] : ""
+      end
+
+      def guardfile_contents_usable?
+        guardfile_contents && guardfile_contents.size >= 'guard :a'.size # smallest guard-definition
+      end
+
+      def guardfile_default_path
+        File.exist?(local_guardfile_path) ? local_guardfile_path : home_guardfile_path
+      end
+
+    private
+
+      def local_guardfile_path
+        File.join(Dir.pwd, "Guardfile")
+      end
+
+      def home_guardfile_path
+        File.expand_path(File.join("~", ".Guardfile"))
+      end
+
+      def user_config_path
+        File.expand_path(File.join("~", ".guard.rb"))
+      end
+
+    end
+
+    def group(name, &guard_definition)
+      @groups = @@options[:group] || []
+      name = name.to_sym
+
+      if guard_definition && (@groups.empty? || @groups.map(&:to_sym).include?(name))
+        @current_group = name
+        guard_definition.call
+        @current_group = nil
+      end
+    end
+
+    def guard(name, options = {}, &watch_and_callback_definition)
+      @watchers  = []
+      @callbacks = []
+      watch_and_callback_definition.call if watch_and_callback_definition
+      options.update(:group => (@current_group || :default))
+      ::Guard.add_guard(name.to_s.downcase.to_sym, @watchers, @callbacks, options)
+    end
+
+    def watch(pattern, &action)
+      @watchers << ::Guard::Watcher.new(pattern, action)
+    end
+
+    def callback(*args, &listener)
+      listener, events = args.size > 1 ? args : [listener, args[0]]
+      @callbacks << { :events => events, :listener => listener }
+    end
+
+    def ignore_paths(*paths)
+      UI.info "Ignoring paths: #{paths.join(', ')}"
+      ::Guard.listener.ignore_paths.push(*paths)
+    end
+  end
+end

data/lib/guard/dsl_describer.rb

@@ -1,28 +1,28 @@
-require 'guard/dsl'
-
-module Guard
-  class DslDescriber < Dsl
-    @@guardfile_structure = [ { :guards => [] } ]
-
-    class << self
-      def guardfile_structure
-        @@guardfile_structure
-      end
-    end
-
-    private
-    def group(name, &guard_definition)
-      @@guardfile_structure << { :group => name.to_sym, :guards => [] }
-
-      @group = true
-      guard_definition.call
-      @group = false
-    end
-
-    def guard(name, options = {}, &watch_definition)
-      node = (@group ? @@guardfile_structure.last : @@guardfile_structure.first)
-
-      node[:guards] << { :name => name, :options => options }
-    end
-  end
-end
+require 'guard/dsl'
+
+module Guard
+  class DslDescriber < Dsl
+    @@guardfile_structure = [ { :guards => [] } ]
+
+    class << self
+      def guardfile_structure
+        @@guardfile_structure
+      end
+    end
+
+    private
+    def group(name, &guard_definition)
+      @@guardfile_structure << { :group => name.to_sym, :guards => [] }
+
+      @group = true
+      guard_definition.call
+      @group = false
+    end
+
+    def guard(name, options = {}, &watch_definition)
+      node = (@group ? @@guardfile_structure.last : @@guardfile_structure.first)
+
+      node[:guards] << { :name => name, :options => options }
+    end
+  end
+end

data/lib/guard/guard.rb

@@ -1,58 +1,58 @@
-module Guard
-  class Guard
-    include Hook
-
-    attr_accessor :watchers, :options, :group
-
-    def initialize(watchers = [], options = {})
-      @group = options.delete(:group) || :default
-      @watchers, @options = watchers, options
-    end
-
-    # Guardfile template needed inside guard gem
-    def self.init(name)
-      if ::Guard::Dsl.guardfile_include?(name)
-        ::Guard::UI.info "Guardfile already includes #{name} guard"
-      else
-        content = File.read('Guardfile')
-        guard   = File.read("#{::Guard.locate_guard(name)}/lib/guard/#{name}/templates/Guardfile")
-        File.open('Guardfile', 'wb') do |f|
-          f.puts(content)
-          f.puts("")
-          f.puts(guard)
-        end
-        ::Guard::UI.info "#{name} guard added to Guardfile, feel free to edit it"
-      end
-    end
-
-    # ================
-    # = Guard method =
-    # ================
-
-    # Call once when guard starts
-    # Please override initialize method to init stuff
-    def start
-      true
-    end
-
-    # Call once when guard quit
-    def stop
-      true
-    end
-
-    # Should be mainly used for "reload" (really!) actions like reloading passenger/spork/bundler/...
-    def reload
-      true
-    end
-
-    # Should be principally used for long action like running all specs/tests/...
-    def run_all
-      true
-    end
-
-    def run_on_change(paths)
-      true
-    end
-
-  end
-end
+module Guard
+  class Guard
+    include Hook
+
+    attr_accessor :watchers, :options, :group
+
+    def initialize(watchers = [], options = {})
+      @group = options.delete(:group) || :default
+      @watchers, @options = watchers, options
+    end
+
+    # Guardfile template needed inside guard gem
+    def self.init(name)
+      if ::Guard::Dsl.guardfile_include?(name)
+        ::Guard::UI.info "Guardfile already includes #{name} guard"
+      else
+        content = File.read('Guardfile')
+        guard   = File.read("#{::Guard.locate_guard(name)}/lib/guard/#{name}/templates/Guardfile")
+        File.open('Guardfile', 'wb') do |f|
+          f.puts(content)
+          f.puts("")
+          f.puts(guard)
+        end
+        ::Guard::UI.info "#{name} guard added to Guardfile, feel free to edit it"
+      end
+    end
+
+    # ================
+    # = Guard method =
+    # ================
+
+    # Call once when guard starts
+    # Please override initialize method to init stuff
+    def start
+      true
+    end
+
+    # Call once when guard quit
+    def stop
+      true
+    end
+
+    # Should be mainly used for "reload" (really!) actions like reloading passenger/spork/bundler/...
+    def reload
+      true
+    end
+
+    # Should be principally used for long action like running all specs/tests/...
+    def run_all
+      true
+    end
+
+    def run_on_change(paths)
+      true
+    end
+
+  end
+end