fswatch 0.0.1 → 0.0.2

data/README.md

@@ -1,5 +1,5 @@
 # fswatch
-A super trivial Ruby script for triggering a command on file system change in OS X.
+A trivial Ruby script for triggering a command on file system change in OS X.
 
 ## Installation
 
@@ -11,4 +11,32 @@ The point was mainly to shove this into gemcutter so it's easy to deploy:
 
 On file system change execute `ls -l`:
 
-    $ fswatch ls -l
+    $ fswatch ls -l
+
+Watch a specific path:
+
+	$ fswatch -d / ls -l
+
+Wait at least 5 seconds before refreshing using deferral:
+
+	$ fswatch -t5 ls -l
+
+If the command is long running and you want to forcibly restart it on file system change:
+
+	$ fswatch -x ls -l
+
+If you want to pass the paths which have changed as a parameter to the command:
+
+	$ fswatch -p echo
+
+If you want to place the paths somewhere other than at the end, use the `@fspaths` token:
+
+	$ fswatch -p "echo @fspaths | wc -l"
+
+You can also use `@fspathscolon` for colon-separated paths and `@fspatchcomma` for comma-separated paths.
+
+## Examples
+
+Automatically rsync on changes:
+
+	$ fswatch -t 5 "rsync -av . devbox:/devfolder-on-devbox/"

data/fswatch.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency 'rb-fsevent'
+  s.add_runtime_dependency 'trollop'
   s.add_runtime_dependency 'term-ansicolor'
 end

data/lib/fswatch.rb

@@ -1,16 +1,55 @@
 require 'fswatch/version'
 
+require 'rubygems'
+require 'trollop'
 require 'rb-fsevent'
 require 'term/ansicolor'
 
 include Term::ANSIColor
 
 module FSWatch
-  
-  fsevent = FSEvent.new
-  fsevent.watch Dir.pwd do |directories|
+
+	opts = Trollop::options do
+		version "fswatch - #{VERSION} (c) 2012 w.k.macura - Released under BSD license"
+		banner <<-EOS
+A utility for triggering a command on file system change.
+		EOS
+
+		opt :dir, "the directory to watch", :default => '.'
+		opt :throttle, "only allow one fsevent in the given amount of seconds", :default => 1
+		opt :kill, "forcibly restart the command if it's still running during an fs trigger", :short => :x
+		opt :paths, "append the changed paths when calling the command"
+	end
+	  
+	if opts[:dir] == '.'
+		dir = Dir.pwd
+	else
+		dir = opts[:dir]
+	end
+
+  fsevent = FSEvent.new 
+  fsevent.watch dir, { :latency => opts[:throttle], :no_defer => true } do |directories|
     print red, "\n\n--- Changed: ", bold, blue, directories.inspect, reset, "\n"
-    system(ARGV.join(' '))
+    if @processPid 
+      status = Process.wait(@processPid, Process::WNOHANG)
+      if status == nil
+      	print red, "!!! Killing #{@processPid}", reset, "\n"
+    		Process.kill("KILL", @processPid)
+      end
+  	end
+
+    command = ARGV.join(' ')
+    command.sub!("@fspathscolon", directories.join(':'))
+    command.sub!("@fspathscomma", directories.join(','))
+    command.sub!("@fspaths", directories.join(' '))
+
+    if opts[:paths]
+    	command << ' ' << directories.join(' ')
+    end
+     
+    @processPid = fork {
+      system(command)
+    }
   end
   
   fsevent.run

data/lib/fswatch/version.rb

@@ -1,3 +1,3 @@
 module Fswatch
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fswatch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70326022078700 !ruby/object:Gem::Requirement
+  requirement: &70115501893640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326022078700
+  version_requirements: *70115501893640
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &70115501893220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70115501893220
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70326022078160 !ruby/object:Gem::Requirement
+  requirement: &70115501892800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326022078160
+  version_requirements: *70115501892800
 description: ''
 email:
 - wiktor@tumblr.com