ak47 0.2.3 → 0.2.4

data/bin/ak47

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'ak47'
-Ak47.run(*$*)
+Ak47::CLI.run(*$*)

data/lib/ak47.rb

@@ -5,57 +5,10 @@ require 'optparse'
 
 require "ak47/version"
 require "ak47/runner"
+require 'ak47/cli'
 
 module Ak47
   Reload = Class.new(RuntimeError)
-
-  class << self
-    def run(*argv)
-      argv_opts, commands = if argv == ['--help'] or argv == ['-help']
-        [argv, []]
-      elsif divider_index = argv.index('--')
-        [argv[0...divider_index], argv[divider_index.succ...argv.size]]
-      else
-        [[], argv]
-      end
-
-      interval, maximum, error_time = nil, nil, 5
-      optparse = OptionParser.new do |opts|
-        opts.banner = "Usage: ak47 [cmd] / ak47 [options] -- [cmd]"
-        opts.on( '-i', '--interval [FLOAT]', 'Interval before restarting' ) do |i|
-          interval = Float(i) rescue raise("Interval must be a valid floating point number (e.g. -i0.5)")
-          raise("Interval must be a positive number") unless interval >= 0
-        end
-        opts.on( '-m', '--maximum [FLOAT]', 'Maximum time to wait before restarting' ) do |m|
-          maximum = Float(m) rescue raise("Maximum must be a valid floating point number (e.g. -m60)")
-          raise("Maximum must be a positive number") unless maximum >= 0
-        end
-        opts.on( '-e', '--error-time [FLOAT]', 'Maximum time to wait before restarting if there was an abnormal status code' ) do |e|
-          error_time = Float(e) rescue raise("Error time must be a valid floating point number (e.g. -e10)")
-          raise("Maximum must be a positive number") unless error_time >= 0
-        end
-        opts.on( '-h', '--help', 'Display this screen' ) do
-          puts opts
-          exit
-        end
-      end
-      optparse.parse!(argv_opts)
-      watch_dirs = argv_opts
-      watch_dirs << Dir.pwd if watch_dirs.empty?
-      watch_dirs.map! { |wd| File.expand_path(wd, Dir.pwd) }
-
-      command = ShellTools.escape(commands).strip
-      if command.empty?
-        puts optparse
-        puts
-        raise "No command supplied"
-      end
-      Runner.new(:watch_dirs => watch_dirs, :maximum => maximum, :interval => interval, :error_time => error_time, :command => command) { exec(command) }.start
-    rescue
-      puts $!.message.red
-      exit 1
-    end
-  end
 end
 
 def Ak47(opts = nil, &blk)

data/lib/ak47/cli.rb

@@ -0,0 +1,54 @@
+module Ak47
+  module CLI
+    def self.run(*argv)
+      argv_opts, commands = if argv == ['--help'] or argv == ['-help']
+        [argv, []]
+      elsif divider_index = argv.index('--')
+        [argv[0...divider_index], argv[divider_index.succ...argv.size]]
+      else
+        [[], argv]
+      end
+
+      interval, maximum, error_time, interrupt = nil, nil, 5, true
+      optparse = OptionParser.new do |opts|
+        opts.banner = "Usage: ak47 [cmd] / ak47 [options] -- [cmd]"
+        opts.on( '-i', '--interval [FLOAT]', 'Interval before restarting' ) do |i|
+          interval = Float(i) rescue raise("Interval must be a valid floating point number (e.g. -i0.5)")
+          raise("Interval must be a positive number") unless interval >= 0
+        end
+        opts.on( '-m', '--maximum [FLOAT]', 'Maximum time to wait before restarting' ) do |m|
+          maximum = Float(m) rescue raise("Maximum must be a valid floating point number (e.g. -m60)")
+          raise("Maximum must be a positive number") unless maximum >= 0
+        end
+        opts.on( '-e', '--error-time [FLOAT]', 'Maximum time to wait before restarting if there was an abnormal status code' ) do |e|
+          error_time = Float(e) rescue raise("Error time must be a valid floating point number (e.g. -e10)")
+          raise("Maximum must be a positive number") unless error_time >= 0
+        end
+        opts.on( '-d', '--dont-interrupt', 'Don\'t interrupt a running process, wait for it to finish before reloading' ) do
+          interrupt = false
+        end
+        opts.on( '-h', '--help', 'Display this screen' ) do
+          puts opts
+          exit
+        end
+      end
+      optparse.parse!(argv_opts)
+      watch_dirs = argv_opts
+      watch_dirs << Dir.pwd if watch_dirs.empty?
+      watch_dirs.map! { |wd| File.expand_path(wd, Dir.pwd) }
+
+      command = ShellTools.escape(commands).strip
+      if command.empty?
+        puts optparse
+        puts
+        raise "No command supplied"
+      end
+      Runner.new(:watch_dirs => watch_dirs, :maximum => maximum, :interval => interval, :error_time => error_time, :command => command, :interrupt => interrupt) {
+        exec(command)
+      }.start
+    rescue
+      puts $!.message.red
+      exit 1
+    end
+  end
+end

data/lib/ak47/runner.rb

@@ -1,6 +1,6 @@
 module Ak47
   class Runner
-    attr_reader :watch_dirs, :maximum, :interval, :error_time, :command
+    attr_reader :watch_dirs, :maximum, :interval, :error_time, :command, :interrupt
 
     def initialize(opts = nil, &blk)
       @watch_dirs = Array(opts && opts[:watch_dirs] || Dir.pwd)
@@ -8,17 +8,27 @@ module Ak47
       @interval   = opts && opts[:interval] || 0.01
       @error_time = opts && opts[:error_time] || 5
       @command    = opts && opts[:command]
+      @interrupt  = opts && opts.key?(:interrupt) ? opts[:interrupt] : true
       @blk        = blk
     end
 
     def start
       listeners = watch_dirs.map {|wd| Guard::Listener.select_and_init(:watchdir => wd, :watch_all_modifications => true) }
+      change_detected = false
+      running = false
       listeners.each do |l|
-        l.on_change { |f| Thread.main.raise Reload, "File system changed" }
+        l.on_change { |f|
+          if @interrupt
+            Thread.main.raise Reload, "File system changed"
+          else
+            change_detected = true
+            Thread.main.raise Reload, "File system changed" unless running
+          end
+        }
         Thread.new { l.start }
       end
 
-      at_exit { Process.kill("INT", @pid) rescue nil if @pid }
+      at_exit { kill_pid }
 
       puts "[Starting ak47 #{VERSION} in #{watch_dirs.join(', ')}]".green
       loop do
@@ -28,17 +38,30 @@ module Ak47
           if maximum 
             @thread = Thread.new { sleep maximum; Thread.main.raise Reload, "Cancelled due to maximum time" }
           end
-          @pid = fork(&@blk)
-          _, status = Process.waitpid2(@pid)
+          running = true
+          change_detected = false
+          begin
+            @pid = fork(&@blk)
+            Process.detach(@pid)
+            _, status = Process.waitpid2(@pid)
+          ensure
+            running = false
+          end
           @thread.kill if @thread
           if status.success?
-            puts "[Terminated, waiting for file system change]".green
-            maximum ? sleep(interval) : sleep
+            if change_detected
+              puts "[Change detected while previously running]".green
+              change_detected = false
+            else
+              puts "[Terminated, waiting for file system change]".green
+              maximum ? sleep(interval) : sleep
+            end
           else
             puts "[Terminated abnormally (#{status.inspect}), retrying in 5s]".red
             sleep error_time
           end
         rescue Reload => e
+          kill_pid
           sleep interval
           puts "[Reloading (#{e.message}) #{Time.new.to_s}]".yellow
         rescue Interrupt
@@ -47,5 +70,33 @@ module Ak47
         end
       end
     end
+
+    def kill_pid
+      if @pid
+        begin
+          unless wait_pid('INT')
+            unless wait_pid('KILL')
+              raise "[Unable to kill #{@pid}]"
+            end
+          end
+        rescue Errno::ESRCH
+        end
+      end
+    end
+
+    def wait_pid(sig)
+      count = 0
+      while count < 5
+        begin
+          Process.kill(sig, @pid)
+          count += 1
+          sleep 1
+        rescue Errno::ESRCH
+          @pid = nil
+          return true
+        end
+      end
+      false
+    end
   end
 end

data/lib/ak47/version.rb

@@ -1,3 +1,3 @@
 module Ak47
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ak47
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Josh Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-08 00:00:00 Z
+date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: guard
@@ -80,6 +80,7 @@ files:
 - ak47.gemspec
 - bin/ak47
 - lib/ak47.rb
+- lib/ak47/cli.rb
 - lib/ak47/runner.rb
 - lib/ak47/version.rb
 homepage: ""