ak47 0.1.0 → 0.2.1

data/README.md

@@ -1,6 +1,7 @@
 # Ak47
 
-Reload anything. Watches the current directory for file changes and restarts your process if anything changes.
+Ak47 is a general purpose reloader. It allows you to reload any command line argument based on either time or
+file system change events. File system change events are only supported on Windows, Mac, and Linux.
 
 ## Installation
 
@@ -8,4 +9,21 @@ Reload anything. Watches the current directory for file changes and restarts you
 
 ## Usage
 
-    ak47 [Your original command]
+To start an application using ak47, just prepend the entire command with ak47. For example:
+
+    ak47 bundle exec thin -R config.ru start
+
+This will run your webserver, but will reload it if there are any changes in your working directory.
+
+There are a few command line options as well:
+
+  * -m / --maximum Maximum time to wait before restarting, if unspecified wait forever.
+  * -i / --interval Interval of time to wait before restarting in the event of a restart. Defaults to 0.01 seconds.
+  * -e / --error-time Amount of time to wait between restarts if there was an error. Defaults to 5 seconds.
+  
+Any remaining arguments passed to the path will be interpretted as directories to watch. To stop parsing command line arguments
+and enter your command, use `--` to seperate options from your command. For example:
+
+    ak47 -i2 test -- rake test
+
+This will watch your `test` directory and wait two seconds between restarts.

data/ak47.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "guard", "~> 0.10.0"
   s.add_dependency "shell_tools", "~> 0.1.0"
+  s.add_dependency "smart_colored"
 end

data/lib/ak47.rb

@@ -1,40 +1,56 @@
 require 'guard'
 require 'shell_tools'
 require "ak47/version"
+require "ak47/runner"
+require "smart_colored/extend"
 
 module Ak47
   Reload = Class.new(RuntimeError)
 
   class << self
     def run(*argv)
-      command = ShellTools.escape(argv)
-      watch_dir = Dir.pwd
-      listener = Guard::Listener.select_and_init(:watchdir => watch_dir, :watch_all_modifications => true)
-      listener.on_change {
-        Thread.main.raise Reload
-      }
-      Thread.new { listener.start }
-
-      at_exit { Process.kill("INT", @pid) rescue nil if @pid }
+      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
 
-      puts "[Starting ak47 #{VERSION} in #{watch_dir.inspect}]"
-      loop do
-        begin
-          puts "[Running... #{Time.new.to_s}]"
-          puts "# #{command}"
-          @pid = fork { exec(command) }
-          _, status = Process.waitpid2(@pid)
-          if status.success?
-            puts "[Terminated, waiting for file system change]"
-            sleep
-          else
-            puts "[Terminated abnormally (#{status.inspect}), retrying in 5s]"
-            sleep 5
-          end
-        rescue Reload
-          puts "[Reloading... #{Time.new.to_s}]"
+      interval, maximum, error_time = 0.01, 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, command, maximum, interval, error_time).start
+    rescue
+      puts $!.message.red
     end
   end
 end

data/lib/ak47/runner.rb

@@ -0,0 +1,48 @@
+module Ak47
+  class Runner
+    attr_reader :watch_dirs, :command, :maximum, :interval, :error_time
+
+    def initialize(watch_dirs, command, maximum, interval, error_time)
+      @watch_dirs, @command, @maximum, @interval, @error_time = watch_dirs, command, maximum, interval, error_time
+    end
+
+    def start
+      listeners = watch_dirs.map {|wd| Guard::Listener.select_and_init(:watchdir => wd, :watch_all_modifications => true) }
+      listeners.each do |l|
+        l.on_change { |f| Thread.main.raise Reload, "File system changed" }
+        Thread.new { l.start }
+      end
+
+      at_exit { Process.kill("INT", @pid) rescue nil if @pid }
+
+      puts "[Starting ak47 #{VERSION} in #{watch_dirs.join(', ')}]".green
+      loop do
+        begin
+          puts "[Running... #{Time.new.to_s}]".yellow
+          puts "# #{command}"
+          if maximum 
+            @thread = Thread.new { sleep maximum; Thread.main.raise Reload, "Cancelled due to maximum time" }
+          end
+          @pid = fork {
+            exec(command)
+          }
+          _, status = Process.waitpid2(@pid)
+          @thread.kill if @thread
+          if status.success?
+            puts "[Terminated, waiting for file system change]".green
+            maximum ? sleep(interval) : sleep
+          else
+            puts "[Terminated abnormally (#{status.inspect}), retrying in 5s]".red
+            sleep error_time
+          end
+        rescue Reload => e
+          sleep interval
+          puts "[Reloading (#{e.message}) #{Time.new.to_s}]".yellow
+        rescue Interrupt
+          puts "[Interrupted, exiting]".yellow
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/ak47/version.rb

@@ -1,3 +1,3 @@
 module Ak47
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ak47
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 21
   prerelease: 
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Josh Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 Z
+date: 2012-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: guard
@@ -49,6 +49,20 @@ dependencies:
         version: 0.1.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: smart_colored
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Reload anything.
 email: 
 - joshbuddy@gmail.com
@@ -66,6 +80,7 @@ files:
 - ak47.gemspec
 - bin/ak47
 - lib/ak47.rb
+- lib/ak47/runner.rb
 - lib/ak47/version.rb
 homepage: ""
 licenses: []