guard 0.1.0.beta.1 → 0.1.0.beta.2

data/lib/guard.rb

@@ -1,3 +1,5 @@
+require 'bundler'
+
 module Guard
   
   autoload :UI,         'guard/ui'
@@ -16,26 +18,42 @@ module Guard
       @guards   = []
       
       Dsl.evaluate_guardfile
-      Interactor.init_signal_traps
-      
-      listener.on_change do |files|
-        run do
-          guards.each do |guard|
-            paths = Watcher.match_files(guard, files)
-            guard.run_on_change(paths) unless paths.empty?
+      if guards.empty?
+        UI.error "No guards found in Guardfile, too bad."
+      else
+        Interactor.init_signal_traps
+        
+        listener.on_change do |files|
+          run do
+            guards.each do |guard|
+              paths = Watcher.match_files(guard, files)
+              guard.run_on_change(paths) unless paths.empty?
+            end
           end
         end
+        
+        UI.info "Guard is now watching at '#{Dir.pwd}'"
+        guards.each(&:start)
+        listener.start
       end
-      
-      UI.info "Guard is now watching at '#{Dir.pwd}'"
-      guards.each(&:start)
-      listener.start
     end
     
     def add_guard(name, watchers = [], options = {})
+      guard_class = get_guard_class(name)
+      @guards << guard_class.new(watchers, options)
+    end
+    
+    def get_guard_class(name)
       require "guard/#{name.downcase}"
       guard_class = ObjectSpace.each_object(Class).detect { |c| c.to_s.downcase.match "^guard::#{name.downcase}" }
-      @guards << guard_class.new(watchers, options)
+    rescue LoadError
+      UI.error "#{name} guard gem not found, try to add it to your Gemfile."
+    end
+    
+    def locate_guard(name)
+      spec = Bundler.load.specs.find{|s| s.name == "guard-#{name}" }
+      UI.error "Could not find gem '#{name}' in the current Gemfile." unless spec
+      spec.full_gem_path
     end
     
     def run
@@ -45,5 +63,4 @@ module Guard
     end
     
   end
-  
 end

data/lib/guard/cli.rb

@@ -16,5 +16,22 @@ module Guard
       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 add it given guard"
+    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
+    
   end
 end

data/lib/guard/dsl.rb

@@ -10,14 +10,18 @@ module Guard
       exit 1
     end
     
+    def self.guardfile_included?(guard_name)
+      File.read('Guardfile').include?("guard '#{guard_name}'")
+    end
+    
     def guard(name, options = {}, &definition)
       @watchers = []
-      definition.call
-      Guard.add_guard(name, @watchers, options)
+      definition.call if definition
+      ::Guard.add_guard(name, @watchers, options)
     end
     
     def watch(pattern, &action)
-      @watchers << Guard::Watcher.new(pattern, action)
+      @watchers << ::Guard::Watcher.new(pattern, action)
     end
     
   end

data/lib/guard/guard.rb

@@ -6,6 +6,22 @@ module Guard
       @watchers, @options = watchers, options
     end
     
+    # Guardfile template needed inside guard gem
+    def self.init(name)
+      if ::Guard::Dsl.guardfile_included?(name)
+        ::Guard::UI.info "Guardfile already include #{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 =
     # ================

data/lib/guard/listener.rb

@@ -50,6 +50,8 @@ module Guard
     
     def recent_file?(file)
       File.mtime(file) >= last_event
+    rescue
+      false
     end
     
     def update_last_event

data/lib/guard/templates/Guardfile

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

data/lib/guard/ui.rb

@@ -5,7 +5,7 @@ module Guard
       def info(message, options = {})
         unless ENV["GUARD_ENV"] == "test"
           reset_line if options[:reset]
-          clear      if options.key?(:clear) ? options[:clear] : ::Guard.options[:clear]
+          clear      if options.key?(:clear) ? options[:clear] : (::Guard.options && ::Guard.options[:clear])
           puts reset_color(message) if message != ''
         end
       end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "0.1.0.beta.1"
+  VERSION = "0.1.0.beta.2"
 end

data/lib/guard/watcher.rb

@@ -12,11 +12,10 @@ module Guard
           if matches = file.match(watcher.pattern)
             if watcher.action
               begin 
-                case watcher.action.arity
-                when -1
-                  result = watcher.action.call
-                when 1
+                if watcher.action.arity == 1
                   result = watcher.action.call(matches)
+                else
+                  result = watcher.action.call
                 end
               rescue
                 UI.info "Problem with watch action"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: guard
 version: !ruby/object:Gem::Version 
-  hash: 62196401
+  hash: 62196407
   prerelease: true
   segments: 
   - 0
   - 1
   - 0
   - beta
-  - 1
-  version: 0.1.0.beta.1
+  - 2
+  version: 0.1.0.beta.2
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -17,63 +17,80 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 +02:00
+date: 2010-10-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 7712058
         segments: 
-        - 1
+        - 2
         - 0
-        - 1
-        version: 1.0.1
+        - 0
+        - rc
+        version: 2.0.0.rc
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: guard-rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196431
+        hash: 62196407
         segments: 
-        - 2
         - 0
+        - 1
         - 0
         - beta
-        - 22
-        version: 2.0.0.beta.22
+        - 2
+        version: 0.1.0.beta.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 19
         segments: 
+        - 1
         - 0
-        - 14
         - 2
-        version: 0.14.2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sys-uname
+  name: thor
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 0
+        - 14
+        - 3
+        version: 0.14.3
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sys-uname
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -85,11 +102,11 @@ dependencies:
         - 4
         version: 0.8.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: growl
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,25 +118,27 @@ dependencies:
         - 3
         version: 1.0.3
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rb-inotify
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 61
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: libnotify
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -131,7 +150,7 @@ dependencies:
         - 3
         version: 0.1.3
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 description: Guard is a command line tool to easly manage script launch when your files change
 email: 
 - thibaud@thibaud.me
@@ -153,6 +172,7 @@ files:
 - lib/guard/interactor.rb
 - lib/guard/listener.rb
 - lib/guard/notifier.rb
+- lib/guard/templates/Guardfile
 - lib/guard/ui.rb
 - lib/guard/version.rb
 - lib/guard/watcher.rb
@@ -182,14 +202,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 23
       segments: 
       - 1
       - 3
-      - 1
-      version: 1.3.1
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: guard