tripwire 1.1.0 → 1.2.1

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/tripwire.rb
 lib/tripwire/cli.rb
 lib/tripwire/runner.rb
 lib/tripwire/scanner.rb
+ext/fsevent/fsevent_sleep.c
 spec/scanner_spec.rb
 spec/spec.opts
 spec/spec_helper.rb

data/README.txt

@@ -28,7 +28,15 @@ Tripwire uses very simple Dir.glob-ing
 
 == INSTALL:
 
-  sudo gem install brendan-tripwire
+The gem is hosted on gemcutter.org, so you should only have to type:
+
+  sudo gem install tripwire
+
+== CONTRIBUTORS:
+
+Brendan Baldwin (author), Matthew Fallshaw (integrate Sven Schwyn's fsevent
+magic, default FILESPEC, interrupt once to trip), Sven Schwyn (silently had his
+code pinched)
 
 == LICENSE:
 

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.description = "Similar to rstakeout and autotest except more options"
     gem.email = "brendan@usergenic.com"
     gem.homepage = "http://github.com/brendan/tripwire"
-    gem.authors = ["Brendan Baldwin"]
+    gem.authors = ["Brendan Baldwin", "Matthew Fallshaw", "Sven Schwyn"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.1

data/ext/fsevent/extconf.rb

@@ -0,0 +1,31 @@
+# Workaround to make Rubygems believe it builds a native gem
+# from http://github.com/svoop/autotest-fsevent/tree/master/ext/fsevent/
+
+def emulate_extension_install(extension_name)
+  File.open('Makefile', 'w') { |f| f.write "all:\n\ninstall:\n\n" }
+  File.open('make', 'w') do |f|
+    f.write '#!/bin/sh'
+    f.chmod f.stat.mode | 0111
+  end
+  File.open(extension_name + '.so', 'w') {}
+  File.open(extension_name + '.dll', 'w') {}
+  File.open('nmake.bat', 'w') { |f| }
+end
+
+emulate_extension_install('fsevent')
+
+
+# Compile the actual fsevent_sleep binary
+
+raise "Only Darwin (Mac OS X) systems are supported" unless `uname -s`.chomp == 'Darwin'
+
+GEM_ROOT       = File.expand_path(File.join('..', '..'))
+DARWIN_VERSION = `uname -r`.to_i
+SDK_VERSION    = { 9 => '10.5', 10 => '10.6', 11 => '10.7' }[DARWIN_VERSION]
+
+raise "Darwin #{DARWIN_VERSION} is not (yet) supported" unless SDK_VERSION
+
+`mkdir -p #{File.join(GEM_ROOT, 'bin')}`
+`CFLAGS='-isysroot /Developer/SDKs/MacOSX#{SDK_VERSION}.sdk -mmacosx-version-min=#{SDK_VERSION}' /usr/bin/gcc -framework CoreServices -o "#{GEM_ROOT}/bin/fsevent_sleep" fsevent_sleep.c`
+
+raise "Compilation of fsevent_sleep failed (see README)" unless File.executable?("#{GEM_ROOT}/bin/fsevent_sleep")

data/ext/fsevent/fsevent_sleep.c

@@ -0,0 +1,43 @@
+#include <CoreServices/CoreServices.h>
+
+static void callback(ConstFSEventStreamRef streamRef,
+					 void *clientCallBackInfo,
+					 size_t numEvents,
+					 void *eventPaths,
+					 const FSEventStreamEventFlags eventFlags[],
+					 const FSEventStreamEventId eventIds[]) {
+	exit(0);
+}
+
+int main (int argc, const char * argv[]) {
+	// Show help
+	if (argc != 2 || strncmp(argv[1], "-h", 2) == 0) {
+		printf("Sleep until a file in or below the watchdir is modified.\n");
+		printf("Usage: fsevent_sleep /path/to/watchdir\n");
+		exit(1);
+	}
+	
+	// Create event stream
+	CFStringRef pathToWatch = CFStringCreateWithCString(kCFAllocatorDefault, argv[1], kCFStringEncodingUTF8);
+    CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void **)&pathToWatch, 1, NULL);	
+    void *callbackInfo = NULL;
+    FSEventStreamRef stream;
+    CFAbsoluteTime latency = 1.0;
+    stream = FSEventStreamCreate(
+								 kCFAllocatorDefault,
+								 callback,
+								 callbackInfo,
+								 pathsToWatch,
+								 kFSEventStreamEventIdSinceNow,
+								 latency,
+								 kFSEventStreamCreateFlagNone
+								 );
+	
+	// Add stream to run loop
+    FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+	FSEventStreamStart(stream);
+	CFRunLoopRun();
+	
+	// Exit
+	return 2;
+}

data/lib/tripwire/cli.rb

@@ -8,26 +8,25 @@ module Tripwire
     
     def initialize(args)
       
-      trap('INT') do
-        puts "\nQuitting..."
-        exit
-      end
-      
       scanner = Tripwire::Scanner.new
       recursive = true
       delay = 1
       option_parser = OptionParser.new do |opt|
-        opt.banner = "Usage: tripwire [options] <command> <filespec>+"
-        opt.on("-e","--exclude <pattern>", String, "a pattern defining files/folders to ignore") do |e|
+        opt.banner = "Usage: tripwire [options] COMMAND [FILESPEC]+"
+        opt.on("-e","--exclude PATTERN", String,
+               "a pattern defining files/folders to ignore") do |e|
           scanner.exclude_patterns << e
         end
-        opt.on("-d","--delay <seconds>", Integer, "number of seconds between each scan (defaults to 1)") do |d|
+        opt.on("-d","--delay SECONDS", Integer,
+               "number of seconds between each scan (defaults to 1)") do |d|
           delay = d
         end
-        opt.on("-q","--quiet", "suppresses output") do
+        opt.on("-q","--quiet",
+               "suppresses output") do
           scanner.quiet = true
         end
-        opt.on("-n","--non-recursive", "tells tripwire *not* to scan folders recursively") do
+        opt.on("-n","--non-recursive",
+               "tells tripwire *not* to scan folders recursively") do
           recursive = false
         end
       end
@@ -35,12 +34,33 @@ module Tripwire
       option_parser.parse!(args)
             
       command = args.shift
-      args.map!{|arg| File.directory?(arg) ? "#{arg}/**/*" : arg} if recursive
+      nothing_to_watch = true
+      args.map! do |arg|
+        if File.exist?(arg)
+          nothing_to_watch = false
+        else
+          STDERR.puts "'#{arg}' doesn't exist."
+        end
+        File.directory?(arg) ? "#{arg}/**/*" : arg
+      end if recursive
+
+      # Enough to run?
+      if command.nil?
+        raise "No command specified.  Please specify a command to run."
+      elsif args.empty?
+        args = ["."]
+        puts "Watching default path '.'"
+      elsif nothing_to_watch
+        STDERR.puts "WARNING: Nothing to watch in '#{args.join(", ")}'"
+      # else good to run
+      end
+
       scanner.scan_patterns.concat(args)
       runner = Tripwire::Runner.new(scanner, command, :delay => delay)
-      runner.run! rescue puts "#{$!}\n(type tripwire -h for help)"
-      
+      runner.run!
+    rescue
+      STDERR.puts "#{$!}\n\n#{option_parser}"
     end
     
   end
-end
+end

data/lib/tripwire/runner.rb

@@ -1,10 +1,14 @@
 module Tripwire
   class Runner
+
+	GEM_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
     
     attr_accessor :scanner
     attr_accessor :command
     attr_accessor :delay
 
+    attr_accessor :interrupted
+
     def run!
       raise "No command specified.  Please specify a command to run." if !command
       raise "No files/folders specified.  Please specify files/patterns to scan." if scanner.scan_patterns.empty?
@@ -12,8 +16,15 @@ module Tripwire
       scanner.quiet = true
       scanner.scan # do this because we don't care about the initial updates collection
       scanner.quiet = original_quiet
+
+      add_sigint_handler
+
       loop do
-        sleep delay
+        begin
+          `cd '#{Dir.pwd}'; #{File.join(GEM_PATH, 'bin', 'fsevent_sleep')} . 2>&1`
+        rescue
+          sleep delay
+        end
         system(command) unless scanner.scan.empty?
       end  
     end
@@ -25,6 +36,21 @@ module Tripwire
       self.command = command
       self.delay = options[:delay] || 1
     end
-    
+
+    def add_sigint_handler
+      trap('INT') do
+        if interrupted then
+          puts "\nQuitting..."
+          exit 0
+        else
+          puts "Interrupt a second time to quit"
+          self.interrupted = true
+          Kernel.sleep 1.5
+          system(command)
+          self.interrupted = false
+        end
+      end
+    end
+
   end
-end
+end

data/tripwire.gemspec

@@ -5,15 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tripwire}
-  s.version = "1.1.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brendan Baldwin"]
-  s.date = %q{2010-01-09}
+  s.authors = ["Brendan Baldwin", "Matthew Fallshaw", "Sven Schwyn"]
+  s.date = %q{2010-11-02}
   s.default_executable = %q{tripwire}
   s.description = %q{Similar to rstakeout and autotest except more options}
   s.email = %q{brendan@usergenic.com}
   s.executables = ["tripwire"]
+  s.extensions = ["ext/fsevent/extconf.rb"]
   s.extra_rdoc_files = [
     "README.txt"
   ]
@@ -25,6 +26,8 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/tripwire",
+     "ext/fsevent/extconf.rb",
+     "ext/fsevent/fsevent_sleep.c",
      "lib/tripwire.rb",
      "lib/tripwire/cli.rb",
      "lib/tripwire/runner.rb",
@@ -32,12 +35,13 @@ Gem::Specification.new do |s|
      "spec/scanner_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "temp/.keep",
      "tripwire.gemspec"
   ]
   s.homepage = %q{http://github.com/brendan/tripwire}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Executes a shell command every time file/folder changes}
   s.test_files = [
     "spec/scanner_spec.rb",
@@ -48,7 +52,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

metadata

@@ -1,33 +1,47 @@
 --- !ruby/object:Gem::Specification 
 name: tripwire
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  hash: 29
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Brendan Baldwin
+- Matthew Fallshaw
+- Sven Schwyn
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 -08:00
+date: 2010-11-02 00:00:00 -07:00
 default_executable: tripwire
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Similar to rstakeout and autotest except more options
 email: brendan@usergenic.com
 executables: 
 - tripwire
-extensions: []
-
+extensions: 
+- ext/fsevent/extconf.rb
 extra_rdoc_files: 
 - README.txt
 files: 
@@ -38,6 +52,8 @@ files:
 - Rakefile
 - VERSION
 - bin/tripwire
+- ext/fsevent/extconf.rb
+- ext/fsevent/fsevent_sleep.c
 - lib/tripwire.rb
 - lib/tripwire/cli.rb
 - lib/tripwire/runner.rb
@@ -45,6 +61,7 @@ files:
 - spec/scanner_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- temp/.keep
 - tripwire.gemspec
 has_rdoc: true
 homepage: http://github.com/brendan/tripwire
@@ -56,21 +73,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Executes a shell command every time file/folder changes