alt-foreman 0.0.1 → 0.0.2

data/bin/alt-foreman

@@ -1,9 +1,25 @@
 #!/usr/bin/ruby
 
 require 'alt-foreman'
+require 'alt-foreman/version'
 require 'alt-foreman/process'
 
-Dir.chdir(File.dirname(ARGV[0]))
+
+pf = ARGV[0] || "Procfile"
+is_fail = !File.exist?(pf)
+is_help = ARGV.include?('-h') or ARGV.include?("--help")
+
+if is_help or is_fail
+  unless is_help
+    puts "No such file `#{ARGV[0]}'"
+  end
+  puts "alt-foreman #{Alt::Foreman::VERSION}"
+  puts "Crude alternative to foreman for local development"
+  puts "Usage: alt-foreman [/path/to/Procfile]"
+  exit(is_help ? 0 : 1)
+end
+
+Dir.chdir(File.dirname(ARGV[0] || 'Procfile'))
 
 if File.exist?('Gemfile')
   ENV["BUNDLE_GEMFILE"]= File.expand_path("Gemfile")
@@ -11,14 +27,21 @@ end
 
 processes = IO.readlines(ARGV[0]).map do |line|
   line = line.chomp.gsub(/#.*$/, '')
-  if line =~ /:/
-    Alt::Foreman::Process.new(*line.split(/:/,2))
+  if line =~ /:\s+/
+    Alt::Foreman::Process.new(*line.split(/:\s+/,2))
   else
     nil
   end
 end.compact
 
 threads = processes.map do |process|
-  Thread.new { process.run }
+  Thread.new do
+    loop do
+      process.run
+      process.log("Process #{$?.pid} `#{process.cmd}' died (#{$?.status})", :red)
+      sleep 2
+      process.log("`#{process.cmd}' re-spawning", :red)
+    end
+  end
 end.each { |t| t.join }
 

data/lib/alt-foreman/process.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Alt
   module Foreman
     class Process
@@ -5,12 +7,55 @@ module Alt
       def initialize(name, cmd)
         @name, @cmd = name, cmd
       end
+      def log(info, col = nil)
+        Alt::Foreman.log(@name, info, col)
+      end
       def run
+        args = Shellwords.split(@cmd)
+        args.each_with_index do |arg, index|
+          if arg =~ /-p(\d+)/
+            Foreman.kill_tcp_server!($1, @name)
+          elsif arg == '-p' && args[index+1] =~ /\d+/
+            Foreman.kill_tcp_server!(args[index+1], @name)
+          end
+        end
+
         IO.popen(@cmd, 'rb') do |io|
           while line = io.gets
-            Alt::Foreman.log(@name, line)
+            log(line)
+          end
+        end
+      end
+    end
+
+
+    module_function
+    def kill_tcp_server!(need_port, name)
+      tries = 0
+      loop do
+        found = false
+
+        `netstat -nWlp 2>/dev/null|grep '^tcp '`.each_line do |line|
+          _, _, _, addr, _, what, program = line.strip.split(/\s+/)
+          ip, port = addr.split(%r/:/)
+          pid, process = program.split(%r:/:)
+
+          if (port.to_i == need_port.to_i) && (pid.to_i > 0)
+            found = true
+            sig = (tries <= 5 ? 'TERM' : 'KILL')
+            Alt::Foreman.log(name, "Found conflicting server process - sending #{sig} to #{pid} & sleeping for 2s", :red)
+            ::Process.kill(sig, pid.to_i)
+            sleep 2
+            tries += 1
           end
         end
+
+        return unless found
+
+        if found && tries > 15
+          STDERR.puts "Failed to kill existing process - continuing anyway."
+          return
+        end
       end
     end
   end

data/lib/alt-foreman/version.rb

@@ -1,5 +1,5 @@
 module Alt
   module Foreman
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/alt-foreman.rb

@@ -7,13 +7,17 @@ module Alt
     @mutex = Mutex.new
     @senders = {}
     @colours = [:blue, :red, :yellow, :cyan, :green]
-    def self.log(sender, line)
+    def self.log(sender, line, line_colour = nil)
       @mutex.synchronize do
         colour = @senders[sender]
         unless colour
           colour = @senders[sender] = @colours[@senders.size % @colours.size]
         end
-        puts Term::ANSIColor.send(colour, Term::ANSIColor.bold(sprintf '%s %15s | ', Time.now.strftime('%H:%M:%S'), sender) + line.chomp)
+        line = line.chomp
+        if line_colour
+          line = Term::ANSIColor.send(line_colour, line)
+        end
+        puts Term::ANSIColor.send(colour, Term::ANSIColor.bold(sprintf '%s %15s | ', Time.now.strftime('%H:%M:%S'), sender) + line)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alt-foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -70,4 +70,3 @@ signing_key:
 specification_version: 3
 summary: rubbish dev version of foreman
 test_files: []
-has_rdoc: