guard 0.10.0 → 1.0.0

data/CHANGELOG.md

@@ -1,6 +1,22 @@
+## 1.0.0 - 19 January, 2012
+
+### Improvements
+
+- Add Gemnasium dependency status image to README. ([@laserlemon][])
+- Update vendor/darwin. ([@thibaudgg][])
+- [#223](https://github.com/guard/guard/issues/223): Warn if Guard isn't launched with `bundle exec`. (Proposed by [@thibaudgg][], done by [@netzpirat][])
+
+### Bug fixes
+
+- [#226](https://github.com/guard/guard/issues/226): Use a direct file descriptor with stty. ([@netzpirat][])
+- [#218](https://github.com/guard/guard/issues/174): Watching directory with `-A` option only reports a deleted file the first time around. ([@rymai][])
+- [#174](https://github.com/guard/guard/issues/174): Not creating timestamps for new files with `-A` option. ([@rymai][])
+- [#216](https://github.com/guard/guard/issues/216): Fix exit-status codes for Guard. ([@Maher4Ever][])
+- [#213 & 214](https://github.com/guard/guard/issues/214): Fixes the "ERROR: No guards found in Guardfile" message wrongly displayed when running `guard list`. ([@pirukire][])
+
 ## 0.10.0 - 1 January, 2012
 
-### Improvement
+### Improvements
 
 - Improved Readline constraints. ([@netzpirat][])
 - Stop & start all guards on Guardfile reevaluation. ([@thibaudgg][])
@@ -397,6 +413,7 @@
 [@johnbintz]: https://github.com/johnbintz
 [@jrsacks]: https://github.com/jrsacks
 [@koshigoe]: https://github.com/koshigoe
+[@laserlemon]: https://github.com/laserlemon
 [@limeyd]: https://github.com/limeyd
 [@madtrick]: https://github.com/madtrick
 [@Maher4Ever]: https://github.com/Maher4Ever
@@ -410,6 +427,7 @@
 [@niklas]: https://github.com/niklas
 [@oliamb]: https://github.com/oliamb
 [@pcreux]: https://github.com/pcreux
+[@pirukire]: https://github.com/pirukire
 [@rmm5t]: https://github.com/rmm5t
 [@rymai]: https://github.com/rymai
 [@scottdavis]: https://github.com/scottdavis

data/README.md

@@ -832,7 +832,7 @@ When you file an issue, please try to follow to these simple rules if applicable
 * Add your `Guardfile` and `Gemfile` to the issue.
 * Make sure that the issue is reproducible with your description.
 
-Development
+Development [![Dependency Status](https://gemnasium.com/guard/guard.png?branch=master)](https://gemnasium.com/guard/guard) 
 -----------
 
 * Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard/master/frames).

data/lib/guard.rb

@@ -46,13 +46,13 @@ module Guard
         elsif File.exist?(File.join(HOME_TEMPLATES, guard_name))
           content  = File.read('Guardfile')
           template = File.read(File.join(HOME_TEMPLATES, guard_name))
-          
+
           File.open('Guardfile', 'wb') do |f|
             f.puts(content)
             f.puts("")
             f.puts(template)
           end
-          
+
           ::Guard::UI.info "#{ guard_name } template added to Guardfile, feel free to edit it"
         else
           const_name  = guard_name.downcase.gsub('-', '')
@@ -180,6 +180,7 @@ module Guard
       setup(options)
 
       Dsl.evaluate_guardfile(options)
+      UI.error 'No guards found in Guardfile, please add at least one.' if ::Guard.guards.empty?
 
       options[:notify] && ENV['GUARD_NOTIFY'] != 'false' ? Notifier.turn_on : Notifier.turn_off
 
@@ -213,7 +214,6 @@ module Guard
 
       interactor.stop if interactor
       listener.stop
-      abort
     end
 
     # Reload all Guards currently enabled.

data/lib/guard/cli.rb

@@ -71,9 +71,11 @@ module Guard
     # @see Guard.start
     #
     def start
+      verify_bundler_presence
       ::Guard.start(options)
     rescue Interrupt
       ::Guard.stop
+      abort
     end
 
     desc 'list', 'Lists guards that can be used with init'
@@ -84,6 +86,7 @@ module Guard
     # @see Guard::DslDescriber.list
     #
     def list
+      verify_bundler_presence
       ::Guard::DslDescriber.list(options)
     end
 
@@ -95,7 +98,8 @@ module Guard
     # @see Guard::VERSION
     #
     def version
-      ::Guard::UI.info "Guard version #{ Guard::VERSION }"
+      verify_bundler_presence
+      ::Guard::UI.info "Guard version #{ ::Guard::VERSION }"
     end
 
     desc 'init [GUARD]', 'Generates a Guardfile at the current working directory, or insert the given GUARD to an existing Guardfile'
@@ -108,6 +112,7 @@ module Guard
     # @param [String] guard_name the name of the Guard to initialize
     #
     def init(guard_name = nil)
+      verify_bundler_presence
       ::Guard.initialize_template(guard_name)
     end
 
@@ -115,13 +120,23 @@ module Guard
     map %w(-T) => :show
 
     # Shows all Guards and their options that are defined in
-    # the `Guardfile`.
+    # the `Guardfile`
     #
     # @see Guard::DslDescriber.show
     #
     def show
+      verify_bundler_presence
       ::Guard::DslDescriber.show(options)
     end
 
+    private
+
+    # Verifies if Guard is run with `bundle exec` and
+    # shows a hint to do so if not.
+    #
+    def verify_bundler_presence
+      ::Guard::UI.warning "You are using Guard outside of Bundler, this is dangerous and could not work. Using `bundle exec guard` is safer." unless ENV['BUNDLE_GEMFILE']
+    end
+
   end
 end

data/lib/guard/dsl.rb

@@ -100,8 +100,6 @@ module Guard
 
         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
 
       # Re-evaluate the `Guardfile` to update the current Guard configuration.
@@ -117,6 +115,7 @@ module Guard
           ::Guard::Notifier.clear_notifications
           @@options.delete(:guardfile_contents)
           Dsl.evaluate_guardfile(@@options)
+          UI.error 'No guards found in Guardfile, please add at least one.' if ::Guard.guards.empty?
           msg = 'Guardfile has been re-evaluated.'
           UI.info(msg)
           Notifier.notify(msg)

data/lib/guard/dsl_describer.rb

@@ -48,7 +48,7 @@ module Guard
         evaluate_guardfile(options)
 
         installed_guards = guardfile_structure.inject([]) do |installed, group|
-          group[:guards].each { |guard| installed << guard[:name] } if group[:guards]
+          group[:guards].each { |guard| installed << guard[:name].to_s } if group[:guards]
           installed
         end
 

data/lib/guard/interactor.rb

@@ -96,6 +96,7 @@ module Guard
     # Kill interactor thread if not current
     #
     def stop
+      return if ENV['GUARD_ENV'] == 'test'
       unless Thread.current == @thread
         @thread.kill
       end
@@ -122,6 +123,7 @@ module Guard
         help
       when :stop
         ::Guard.stop
+        exit
       when :pause
         ::Guard.pause
       when :reload

data/lib/guard/interactors/readline.rb

@@ -98,13 +98,13 @@ module Guard
     # when stopping.
     #
     def store_terminal_settings
-      @stty_save = `stty -g`.chomp
+      @stty_save = `stty -g 2>/dev/null`.chomp
     end
 
     # Restore terminal settings
     #
     def restore_terminal_settings
-      system('stty', @stty_save)
+      system('stty', @stty_save, '2>/dev/null')
     end
   end
 end

data/lib/guard/listener.rb

@@ -98,7 +98,7 @@ module Guard
     #
     def start
       watch(@directory)
-      timestamp_files
+      timestamp_files if watch_all_modifications?
     end
 
     # Stop listening for events.
@@ -154,6 +154,7 @@ module Guard
     def modified_files(dirs, options = {})
       last_event = @last_event
       files = []
+
       if watch_all_modifications?
         deleted_files = @file_timestamp_hash.collect do |path, ts|
           unless File.exists?(path)
@@ -165,7 +166,10 @@ module Guard
         files.concat(deleted_files.compact)
       end
       update_last_event
-      files.concat(potentially_modified_files(dirs, options).select { |path| file_modified?(path, last_event) })
+      updated_files = potentially_modified_files(dirs, options).select do |path|
+        file_modified?(path, last_event)
+      end
+      files.concat(updated_files)
 
       relativize_paths(files)
     end
@@ -195,7 +199,7 @@ module Guard
     def relativize_paths(paths)
       return paths unless relativize_paths?
       paths.map do |path|
-      path.gsub(%r{^(!)?#{ @directory }/},'\1')
+        path.gsub(%r{^(!)?#{ @directory }/},'\1')
       end
     end
 
@@ -219,7 +223,7 @@ module Guard
     # Populate initial timestamp file hash to watch for deleted or moved files.
     #
     def timestamp_files
-      all_files.each {|path| set_file_timestamp_hash(path, file_timestamp(path)) } if watch_all_modifications?
+      all_files.each { |path| set_file_timestamp_hash(path) }
     end
 
     # Removes the ignored paths from the directory list.
@@ -273,10 +277,12 @@ module Guard
     def file_modified?(path, last_event)
       ctime = File.ctime(path).to_i
       mtime = File.mtime(path).to_i
+
       if [mtime, ctime].max == last_event.to_i
-        file_content_modified?(path, sha1_checksum(path))
+        file_content_modified?(path)
       elsif mtime > last_event.to_i
-        set_sha1_checksums_hash(path, sha1_checksum(path))
+        set_sha1_checksums_hash(path)
+        set_file_timestamp_hash(path) if watch_all_modifications?
         true
       elsif watch_all_modifications?
         ts = file_timestamp(path)
@@ -295,11 +301,11 @@ module Guard
     # comparing the SHA1 checksum.
     #
     # @param [String] path the file path
-    # @param [String] sha1_checksum the checksum of the file
     #
-    def file_content_modified?(path, sha1_checksum)
-      if @sha1_checksums_hash[path] != sha1_checksum
-        set_sha1_checksums_hash(path, sha1_checksum)
+    def file_content_modified?(path)
+      checksum = sha1_checksum(path)
+      if @sha1_checksums_hash[path] != checksum
+        set_sha1_checksums_hash(path, checksum)
         true
       else
         false
@@ -311,8 +317,8 @@ module Guard
     # @param [String] path the file path
     # @param [Integer] file_timestamp the files modified timestamp
     #
-    def set_file_timestamp_hash(path, file_timestamp)
-        @file_timestamp_hash[path] = file_timestamp
+    def set_file_timestamp_hash(path, timestamp = nil)
+      @file_timestamp_hash[path] = timestamp ? timestamp : file_timestamp(path)
     end
 
     # Set the current checksum of a file.
@@ -320,8 +326,8 @@ module Guard
     # @param [String] path the file path
     # @param [String] sha1_checksum the checksum of the file
     #
-    def set_sha1_checksums_hash(path, sha1_checksum)
-      @sha1_checksums_hash[path] = sha1_checksum
+    def set_sha1_checksums_hash(path, checksum = nil)
+      @sha1_checksums_hash[path] = checksum ? checksum : sha1_checksum(path)
     end
 
     # Gets a files modified timestamp

data/lib/guard/ui.rb

@@ -24,6 +24,18 @@ module Guard
         end
       end
 
+      # Show a yellow warning message that is prefixed with WARNING.
+      #
+      # @param [String] message the message to show
+      # @option options [Boolean] reset whether to clean the output before
+      #
+      def warning(message, options = { })
+        unless ENV['GUARD_ENV'] == 'test'
+          reset_line if options[:reset]
+          STDERR.puts color('WARNING: ', :yellow) + message
+        end
+      end
+
       # Show a red error message that is prefixed with ERROR.
       #
       # @param [String] message the message to show

data/lib/guard/version.rb

@@ -1,6 +1,6 @@
 module Guard
   unless defined? Guard::VERSION
     # The current gem version of Guard
-    VERSION = '0.10.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/guard/watcher.rb

@@ -43,11 +43,11 @@ module Guard
     def self.match_files(guard, files)
       guard.watchers.inject([]) do |paths, watcher|
         files.each do |file|
-          if matches = watcher.match_file?(file)
+          if matches = watcher.match(file)
             if watcher.action
               result = watcher.call_action(matches)
               if guard.options[:any_return]
-                paths << result 
+                paths << result
               elsif result.respond_to?(:empty?) && !result.empty?
                 paths << Array(result)
               end
@@ -56,7 +56,7 @@ module Guard
             end
           end
         end
-        
+
         guard.options[:any_return] ? paths : paths.flatten.map { |p| p.to_s }
       end
     end
@@ -70,21 +70,35 @@ module Guard
     def self.match_files?(guards, files)
       guards.any? do |guard|
         guard.watchers.any? do |watcher|
-          files.any? { |file| watcher.match_file?(file) }
+          files.any? { |file| watcher.match(file) }
         end
       end
     end
 
+    # @deprecated Use .match instead
+    #
+    def match_file?(file)
+      UI.info "Guard::Watcher.match_file? is deprecated, please use Guard::Watcher.match instead."
+      match(file)
+    end
+
     # Test the watchers pattern against a file.
     #
     # @param [String] file the file to test
-    # @return [Boolean] whether the given file is matched
+    # @return [Array<String>] an array of matches (or containing a single path if the pattern is a string)
     #
-    def match_file?(file)
+    def match(file)
+      f = file
+      deleted = file.start_with?('!')
+      f = deleted ? f[1..-1] : f
       if @pattern.is_a?(Regexp)
-        file.match(@pattern)
+        if m = f.match(@pattern)
+          m = m.to_a
+          m[0] = file
+          m
+        end
       else
-        file == @pattern ? [file] : nil
+        f == @pattern ? [file] : nil
       end
     end
 

data/lib/vendor/darwin/ext/extconf.rb

@@ -21,12 +21,15 @@ else
   raise "Only Darwin systems greater than 8 (Mac OS X 10.5+) are supported" unless sdk_version
 
   core_flags = %W{
-    -isysroot #{xcode_path}/SDKs/MacOSX#{sdk_version}.sdk
+    -isysroot "#{xcode_path}/SDKs/MacOSX#{sdk_version}.sdk"
     -mmacosx-version-min=#{sdk_version} -mdynamic-no-pic -std=gnu99
   }
 
   cflags = core_flags + %w{-Os -pipe}
 
+  arch_sig = `uname -m`
+  cflags << '-arch i386'  if arch_sig =~ /i386$/i
+
   wflags = %w{
     -Wmissing-prototypes -Wreturn-type -Wmissing-braces -Wparentheses -Wswitch
     -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-01 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70103690365860 !ruby/object:Gem::Requirement
+  requirement: &70098870288860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70103690365860
+  version_requirements: *70098870288860
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70103690365180 !ruby/object:Gem::Requirement
+  requirement: &70098870331220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70103690365180
+  version_requirements: *70098870331220
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70103690358380 !ruby/object:Gem::Requirement
+  requirement: &70098870377140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,62 +43,62 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103690358380
+  version_requirements: *70098870377140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70103690357140 !ruby/object:Gem::Requirement
+  requirement: &70098870399680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70103690357140
+  version_requirements: *70098870399680
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70103690356380 !ruby/object:Gem::Requirement
+  requirement: &70098870396740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70103690356380
+  version_requirements: *70098870396740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70103690355840 !ruby/object:Gem::Requirement
+  requirement: &70098870407720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103690355840
+  version_requirements: *70098870407720
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70103690355140 !ruby/object:Gem::Requirement
+  requirement: &70098870444360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.17.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103690355140
+  version_requirements: *70098870444360
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70103690354660 !ruby/object:Gem::Requirement
+  requirement: &70098870442760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.6.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103690354660
+  version_requirements: *70098870442760
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -195,6 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3509592351307849355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: