fswatch 0.0.2 → 0.0.3

data/lib/fswatch.rb

@@ -9,48 +9,58 @@ include Term::ANSIColor
 
 module FSWatch
 
-	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|
+  def FSWatch.run_command(directories)
     print red, "\n\n--- Changed: ", bold, blue, directories.inspect, reset, "\n"
     if @processPid 
       status = Process.wait(@processPid, Process::WNOHANG)
       if status == nil
-      	print red, "!!! Killing #{@processPid}", reset, "\n"
-    		Process.kill("KILL", @processPid)
+        print red, "!!! Killing #{@processPid}", reset, "\n"
+        Process.kill("KILL", @processPid)
       end
-  	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(' ')
+    if @opts[:paths]
+      command << ' ' << directories.join(' ')
     end
      
     @processPid = fork {
       system(command)
     }
   end
+
+
+	@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 :start, "whether the command should be executed immediately on start", :default => true
+		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
+
+  if @opts[:start]
+    run_command([])
+  end
+
+  fsevent = FSEvent.new 
+  fsevent.watch dir, { :latency => @opts[:throttle], :no_defer => true } do |directories|
+    run_command(directories)
+  end
   
   fsevent.run
 end

data/lib/fswatch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fswatch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70115501893640 !ruby/object:Gem::Requirement
+  requirement: &70152326580060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115501893640
+  version_requirements: *70152326580060
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70115501893220 !ruby/object:Gem::Requirement
+  requirement: &70152326579400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115501893220
+  version_requirements: *70152326579400
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70115501892800 !ruby/object:Gem::Requirement
+  requirement: &70152326578160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115501892800
+  version_requirements: *70152326578160
 description: ''
 email:
 - wiktor@tumblr.com