jefe 1.0.1 → 1.1.0

data/bin/jefe

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
+require 'jefe'
 require 'jefe/cli'
 Jefe::CLI.start

data/lib/jefe/cli.rb

@@ -1,4 +1,8 @@
-require 'jefe'
+require 'thor'
+
+require 'jefe/color_printer'
+require 'jefe/em'
+require 'jefe/loader'
 require 'jefe/version'
 
 class Jefe::CLI < Thor
@@ -8,23 +12,25 @@ class Jefe::CLI < Thor
 	desc "start [COMMAND...]", "Start the application"
 	
 	method_option :env, :type => :string, :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
-  method_option :port,        :type => :numeric, :aliases => "-p"
-  method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3"'
+	method_option :port,        :type => :numeric, :aliases => "-p"
+	method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3"'
 
 	def start(*args)
 		error("#{procfile} does not exist") unless File.exists? procfile
 		
-		engine = Jefe.new
-		engine.load File.read(procfile)
-		engine.printer = Jefe::ColorPrinter.new
-		engine.backend = Jefe::EM.new(engine.printer)
+		loader = Jefe::Loader.new File.read procfile
+		engine = Jefe::EM.new(Jefe::ColorPrinter.new)
 		
-		names = args.empty? ? engine.process_types.keys : args
 		trap("INT") do
 			puts
 			engine.stop
 		end
-		engine.start concurrency(names), port
+		names = args.empty? ? loader.process_types.keys : args
+		engine.start do
+			loader.tasks(concurrency(names), port).each do |(name, command)|
+				engine.add name, command
+			end
+		end
 	end
 	
 	def help(*args)
@@ -40,18 +46,18 @@ private
 	end
 	
 	def concurrency names
+		ret = {}
 		if options[:concurrency]
-			options[:concurrency].split(",").reduce({}) do |tot, kv|
+			options[:concurrency].split(",").each do |kv|
 				k, v = kv.split "="
-				tot[k] = v.to_i
-				tot
+				ret[k] = v.to_i
 			end
 		else
-			names.reduce({}) do |tot, name|
-				tot[name] = 1
-				tot
+			names.each do |name|
+				ret[name] = 1
 			end
 		end
+		ret
 	end
 	
 	def procfile

data/lib/jefe/color_printer.rb

@@ -0,0 +1,29 @@
+require 'thor/shell/color'
+
+class Jefe::ColorPrinter
+	Color = Thor::Shell::Color
+	COLORS = %w{CYAN YELLOW GREEN MAGENTA RED}
+	def initialize
+		@colors = {"system" => "WHITE"}
+		@longest_seen = 0
+	end
+	def colored color, string
+		color = Color.const_get color
+		"#{color}#{string}#{Color::CLEAR}"
+	end
+	def color_for type
+		@colors[type] ||= COLORS.shift.tap {|c| COLORS.push c}
+	end
+	def padded name
+		@longest_seen = name.size if name.size > @longest_seen
+		name.ljust(@longest_seen)
+	end
+	def datetime
+		Time.now.strftime '%H:%M:%S'
+	end
+	def out name, msg
+		type = name.match(/^([A-Za-z0-9_]+).\d+$/) ? $1 : name
+		color = color_for type
+		puts colored(color, "#{datetime} #{padded name} | ")  + msg.chomp
+	end
+end

data/lib/jefe/em.rb

@@ -0,0 +1,70 @@
+require 'eventmachine'
+require 'jefe/emitter'
+require 'micromachine'
+require 'pty'
+
+class Jefe::EM
+	include Jefe::Emitter
+
+	def initialize(printer)
+		@printer = printer
+		@fsm = MicroMachine.new(:started).tap do |m|
+			m.when(:stop, :started => :stopped)
+		end
+	end
+	
+	def start
+		@printer.out "system", "starting"
+		EM.run do
+			yield self
+		end
+	end
+
+	def stop
+		if @fsm.trigger(:stop)
+			@printer.out "system", "stopping"
+			emit(:stop)
+			EM.stop
+		end
+	end
+	
+	def add name, command
+		@printer.out name, "starting #{command}"
+
+		PTY.spawn(command) do |output, input, pid|
+			input.close
+			
+			@printer.out(name, "started with pid #{pid}")
+
+			c = EM.attach output, ProcessHandler
+			m = MicroMachine.new(:started).tap do |m|
+				m.when(:stop, :started => :stopped)
+			end
+
+			c.on(:data) do |data|
+				@printer.out(name, data)
+			end
+
+			c.on(:unbind) do
+				@printer.out(name, "process terminated")
+				m.trigger(:stop)
+				self.stop
+			end
+			
+			self.on(:stop) do
+				if m.trigger(:stop)
+					@printer.out("system", "killing #{name} in #{pid}")
+					Process.kill("INT", pid)
+				end
+			end
+		end
+	end
+
+	class ProcessHandler < EM::Connection
+		include EM::Protocols::LineText2
+		include Jefe::Emitter
+		
+		emits(:data, :from => :receive_line)
+		emits(:unbind)
+	end
+end

data/lib/jefe/emitter.rb

@@ -0,0 +1,24 @@
+module Jefe::Emitter
+	def self.included(klass)
+		klass.extend(ClassMethods)
+	end
+	def callbacks
+		@callbacks ||= {}
+	end
+	def on(name, &cb)
+		callbacks[name] ||= []
+		callbacks[name] << cb
+	end
+	def emit(name, *args)
+		callbacks[name] ||= []
+		callbacks[name].each { |cb| cb.call(*args) }
+	end
+	module ClassMethods
+		def emits(name, opts={})
+			from = opts[:from] || name
+			define_method(from) do |*args|
+				emit(name, *args)
+			end
+		end
+	end
+end

data/lib/jefe/loader.rb

@@ -0,0 +1,25 @@
+class Jefe::Loader
+	attr_reader :process_types
+	def initialize(file)
+		@process_types = {}
+		file.split("\n").each do |line|
+			if line =~ /^([A-Za-z0-9_]+):\s*(.+)$/
+				@process_types[$1] = $2
+			else
+				raise ArgumentError
+			end
+		end
+	end
+	def tasks(concurrency, port)
+		tasks = []
+		concurrency.each do |(name, num)|
+			num.times do |i|
+				env = { "PORT" => (port + i) }
+				command = @process_types[name].gsub(/\$(\w+)/) { env[$1] || ENV[$1] }
+				tasks.push ["#{name}.#{i}", command]
+			end
+			port += 100
+		end
+		tasks
+	end
+end

data/lib/jefe/version.rb

@@ -1 +1 @@
-Jefe::VERSION = "1.0.1"
+Jefe::VERSION = "1.1.0"

data/lib/jefe.rb

@@ -1,149 +1,2 @@
-require 'eventmachine'
-require 'pty'
-require 'thor'
-require 'thor/shell/color'
-
-class Jefe
-	def initialize
-		@process_types = {}
-	end
-	attr_accessor :backend, :printer, :process_types
-	def load file
-		file.split("\n").each do |line|
-			if line =~ /^([A-Za-z0-9_]+):\s*(.+)$/
-				add_process_type $1, $2
-			end
-		end
-	end
-	def add_process_type name, command
-		@process_types[name] = command
-	end
-	
-	def start concurrency, port		
-		processes = []
-		concurrency.each do |(name, num)|
-			num.times do |i|
-				env = { "PORT" => (port + i) }
-				command = self.process_types[name].gsub(/\$(\w+)/) { env[$1] || ENV[$1] }
-				processes.push ["#{name}.#{i}", command]
-			end
-			port += 100
-		end
-		
-		self.printer.out "system", "starting"
-		self.backend.start do |b|
-			processes.each do |(name, command)|
-				self.printer.out name, "starting #{command}"
-				b.add name, command
-			end
-		end
-		
-	end
-	
-	def stop
-		self.printer.out "system", "stopping"
-		self.backend.stop
-	end
-end
-
-class Jefe::ColorPrinter
-	Color = Thor::Shell::Color
-	COLORS = [:cyan, :yellow, :green, :magenta, :red]
-	def initialize
-		@colors ||= {"system" => :white}
-		@longest_seen = 0
-	end
-	def set_color color, string
-		color = Color.const_get color.to_s.upcase
-		"#{color}#{string}#{Color::CLEAR}"
-	end
-	def color_for type
-		@colors[type] ||= COLORS.shift.tap {|c| COLORS.push c}
-	end
-	def padding_for name
-		@longest_seen = name.size if name.size > @longest_seen
-		" " * (@longest_seen - name.length)
-	end
-	def datetime
-		Time.now.strftime '%H:%M:%S'
-	end
-	def out name, command
-		type = name.match(/^([A-Za-z0-9_]+).\d+$/) ? $1 : name
-		color = color_for type
-		puts set_color(color, "#{datetime} #{name}#{padding_for name} | ")  + command.chomp
-	end
-end
-
-class Jefe::EM
-	def initialize(printer)
-		@printer = printer
-		@connections = []
-	end
-	
-	def start
-		EM.run do
-			yield self
-		end
-	end
-	
-	def add name, command
-		PTY.spawn(command) do |output, input, pid|
-			input.close
-			
-			EM.attach output, ProcessHandler do |c|
-				c.init name, pid, @printer
-				bind(c)
-			end
-		end
-	end
-	
-	def stop
-		@connections.each &:stop
-		EM.stop
-	end
-	
-	def bind c
-		@connections.push c
-		c.engine = self
-	end
-	
-	def unbind c
-		@connections.delete c
-		stop if @connections.empty?
-	end
-	
-	class ProcessHandler < EM::Connection
-		include EM::Protocols::LineText2
-		attr_accessor :engine, :name, :pid, :printer
-		
-		def init name, pid, printer
-			self.name = name
-			self.pid = pid
-			self.printer = printer
-			
-			out "started with pid #{self.pid}"
-		end
-		
-		def receive_line data
-			out data
-		end
-		
-		def unbind
-			out "process terminated"
-			self.engine.unbind self
-		end
-		
-		def out msg
-			self.printer.out self.name, msg
-		end
-		
-		def to_s
-			"#{self.name} in pid #{self.pid}"
-		end
-		
-		def stop
-			self.printer.out "system", "killing #{self}"
-			Process.kill("INT", self.pid)
-		end
-	end
+module Jefe
 end

metadata

@@ -1,73 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jefe
-version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Michael Maltese
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-01 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &70096979689180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: micromachine
   prerelease: false
-  version_requirements: *70096979689180
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70096979688760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
-  version_requirements: *70096979688760
-description: Through the magic of Thor and EventMachine, we give you the equivalent
-  to Foreman in just 200 lines of sweet unadulterated Ruby.
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+description: Through the magic of Thor and EventMachine, we give you a Foreman substitute in just 200 lines of sweet unadulterated Ruby.
 email: michael.maltese@pomona.edu
-executables:
+executables: 
 - jefe
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/jefe/cli.rb
+- lib/jefe/color_printer.rb
+- lib/jefe/em.rb
+- lib/jefe/emitter.rb
+- lib/jefe/loader.rb
 - lib/jefe/version.rb
 - lib/jefe.rb
 - bin/jefe
 - README.md
+has_rdoc: true
 homepage: http://github.com/mikemaltese/jefe
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The featherweight Procfile manager
 test_files: []
+