jefe 1.1.0 → 1.2.0

data/README.md

@@ -2,4 +2,13 @@
 
 Through the magic of [Thor](https://github.com/wycats/thor) and [EventMachine](http://rubyeventmachine.com/), we give you the equivalent to [Foreman](https://github.com/ddollar/foreman) in just 200 lines of sweet unadulterated Ruby.
 
-Run `gem install jefe` and you're all set!
+###Installing
+
+Do a `gem install jefe` and you're all set!
+
+### Using
+
+Run `jefe`. Just five keystrokes!
+
+You can also try `jefe start -p 5000` or `jefe start -c web=1,db=1,worker=47`. Run `jefe help` for more options.
+

data/lib/jefe/cli.rb

@@ -10,13 +10,17 @@ class Jefe::CLI < Thor
 	class_option :procfile, :type => :string, :aliases => "-f", :desc => "Default: Procfile"
 	
 	desc "start [COMMAND...]", "Start the application"
+	default_task :start
 	
 	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"'
 
 	def start(*args)
-		error("#{procfile} does not exist") unless File.exists? procfile
+		if ! File.exists? procfile
+			help
+			error("#{procfile} does not exist")
+		end
 		
 		loader = Jefe::Loader.new File.read procfile
 		engine = Jefe::EM.new(Jefe::ColorPrinter.new)
@@ -25,9 +29,8 @@ class Jefe::CLI < Thor
 			puts
 			engine.stop
 		end
-		names = args.empty? ? loader.process_types.keys : args
 		engine.start do
-			loader.tasks(concurrency(names), port).each do |(name, command)|
+			loader.scale(concurrency_options(args), port).each do |(name, command)|
 				engine.add name, command
 			end
 		end
@@ -35,6 +38,7 @@ class Jefe::CLI < Thor
 	
 	def help(*args)
 		puts "Jefe #{Jefe::VERSION}, the featherweight Procfile manager"
+		puts "By default, calling `jefe' acts as `jefe start'. Your other options are:"
 		puts
 		super
 	end
@@ -45,17 +49,11 @@ private
 		options[:port] || 5000
 	end
 	
-	def concurrency names
+	def concurrency_options names
 		ret = {}
-		if options[:concurrency]
-			options[:concurrency].split(",").each do |kv|
-				k, v = kv.split "="
-				ret[k] = v.to_i
-			end
-		else
-			names.each do |name|
-				ret[name] = 1
-			end
+		options[:concurrency].to_s.split(",").each do |kv|
+			k, v = kv.split "="
+			ret[k] = v.to_i
 		end
 		ret
 	end

data/lib/jefe/loader.rb

@@ -1,17 +1,20 @@
 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
+		@process_types = Hash[file.lines.map &method(:decompose_line)]
+	end
+	def decompose_line line
+		if line =~ /^([A-Za-z0-9_]+):\s*(.+)$/
+			[$1, $2]
+		else
+			raise ArgumentError
 		end
 	end
-	def tasks(concurrency, port)
+	def scale(concurrency, port)
 		tasks = []
+		if concurrency.empty?
+			concurrency = Hash[process_types.keys.map { |name| [name, 1] }]
+		end
 		concurrency.each do |(name, num)|
 			num.times do |i|
 				env = { "PORT" => (port + i) }

data/lib/jefe/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jefe
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Michael Maltese
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-01 00:00:00 -07:00
-default_executable: 
+date: 2012-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +35,11 @@ dependencies:
   name: micromachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +49,11 @@ dependencies:
   name: thor
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -71,7 +77,6 @@ files:
 - lib/jefe.rb
 - bin/jefe
 - README.md
-has_rdoc: true
 homepage: http://github.com/mikemaltese/jefe
 licenses: []
 
@@ -81,23 +86,27 @@ rdoc_options: []
 require_paths: 
 - - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: The featherweight Procfile manager