guard 1.1.0.alpha → 1.1.0.alpha.2

data/lib/guard.rb

@@ -160,19 +160,20 @@ module Guard
     # Stop Guard listening to file changes
     #
     def stop
+      UI.info 'Bye bye...', :reset => true
       interactor.stop if interactor
       listener.stop
       runner.run(:stop)
-
-      UI.info 'Bye bye...', :reset => true
     end
 
-    # Reload all Guards currently enabled.
+    # Reload Guardfile and all Guards currently enabled.
     #
     # @param [Hash] scopes an hash with a guard or a group scope
     #
     def reload(scopes)
       UI.clear
+      UI.action_with_scopes('Reload', scopes)
+      Dsl.reevaluate_guardfile if scopes.empty?
       runner.run(:reload, scopes)
     end
 
@@ -182,6 +183,7 @@ module Guard
     #
     def run_all(scopes)
       UI.clear
+      UI.action_with_scopes('Run', scopes)
       runner.run(:run_all, scopes)
     end
 

data/lib/guard/group.rb

@@ -32,6 +32,10 @@ module Guard
       @options = options
     end
 
+    def to_s
+      "#{@name} group"
+    end
+
   end
 
 end

data/lib/guard/guard.rb

@@ -72,6 +72,10 @@ module Guard
       end
     end
 
+    def to_s
+      self.class.to_s
+    end
+
     # Call once when Guard starts. Please override initialize method to init stuff.
     #
     # @raise [:task_has_failed] when start has failed

data/lib/guard/interactor.rb

@@ -127,7 +127,7 @@ module Guard
       when :pause
         ::Guard.pause
       when :reload
-        reload(scopes)
+        ::Guard.reload(scopes)
       when :run_all
         ::Guard.run_all(scopes)
       when :notification
@@ -137,16 +137,6 @@ module Guard
       end
     end
 
-    # Execute the reload action.
-    #
-    # @param [Hash] scopes the reload scopes
-    #
-    def reload(scopes)
-      ::Guard::UI.info 'Reload'
-      ::Guard::Dsl.reevaluate_guardfile if scopes.empty?
-      ::Guard.reload(scopes)
-    end
-
     # Toggle the system notifications on/off
     #
     def toggle_notification

data/lib/guard/ui.rb

@@ -83,6 +83,19 @@ module Guard
       def clear
         system('clear;') if ::Guard.options[:clear]
       end
+      
+      # Show a scoped action message.
+      #
+      # @param [String] action the action to show
+      # @param [Hash] scopes an hash with a guard or a group scope
+      #
+      def action_with_scopes(action, scopes)
+        scope_message ||= scopes[:guard]
+        scope_message ||= scopes[:group]
+        scope_message ||= 'all'
+        
+        info "#{action} #{scope_message}"
+      end
 
       private
 

data/lib/guard/version.rb

@@ -1,4 +1,4 @@
 module Guard
   # The current gem version of Guard
-  VERSION = '1.1.0.alpha'
+  VERSION = '1.1.0.alpha.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha
+  version: 1.1.0.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement