foreman 0.47.0 → 0.48.0.pre1

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.47.0
-  prerelease: 
+  version: 0.48.0.pre1
+  prerelease: 7
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70170917701380 !ruby/object:Gem::Requirement
+  requirement: &70346306226760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70170917701380
+  version_requirements: *70346306226760
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -31,24 +31,28 @@ extra_rdoc_files: []
 files:
 - bin/foreman
 - bin/foreman-runner
+- bin/taskman
 - data/example/error
 - data/example/log/neverdie.log
 - data/example/Procfile
 - data/example/Procfile.without_colon
+- data/example/spawnee
+- data/example/spawner
 - data/example/ticker
 - data/example/utf8
 - data/export/bluepill/master.pill.erb
 - data/export/launchd/launchd.plist.erb
-- data/export/runit/log_run.erb
+- data/export/runit/log/run.erb
 - data/export/runit/run.erb
 - data/export/supervisord/app.conf.erb
 - data/export/upstart/master.conf.erb
 - data/export/upstart/process.conf.erb
 - data/export/upstart/process_master.conf.erb
 - lib/foreman/cli.rb
-- lib/foreman/color.rb
 - lib/foreman/distribution.rb
+- lib/foreman/engine/cli.rb
 - lib/foreman/engine.rb
+- lib/foreman/env.rb
 - lib/foreman/export/base.rb
 - lib/foreman/export/bluepill.rb
 - lib/foreman/export/inittab.rb
@@ -60,13 +64,10 @@ files:
 - lib/foreman/helpers.rb
 - lib/foreman/process.rb
 - lib/foreman/procfile.rb
-- lib/foreman/procfile_entry.rb
-- lib/foreman/utils.rb
 - lib/foreman/version.rb
 - lib/foreman.rb
 - README.md
 - spec/foreman/cli_spec.rb
-- spec/foreman/color_spec.rb
 - spec/foreman/engine_spec.rb
 - spec/foreman/export/base_spec.rb
 - spec/foreman/export/bluepill_spec.rb
@@ -78,10 +79,12 @@ files:
 - spec/foreman/export_spec.rb
 - spec/foreman/helpers_spec.rb
 - spec/foreman/process_spec.rb
-- spec/foreman/procfile_entry_spec.rb
 - spec/foreman/procfile_spec.rb
 - spec/foreman_spec.rb
 - spec/helper_spec.rb
+- spec/resources/bin/echo
+- spec/resources/bin/env
+- spec/resources/bin/test
 - spec/resources/bin/utf8
 - spec/resources/export/bluepill/app-concurrency.pill
 - spec/resources/export/bluepill/app.pill
@@ -89,22 +92,21 @@ files:
 - spec/resources/export/inittab/inittab.default
 - spec/resources/export/launchd/launchd-a.default
 - spec/resources/export/launchd/launchd-b.default
-- spec/resources/export/runit/app-alpha-1-log-run
-- spec/resources/export/runit/app-alpha-1-run
-- spec/resources/export/runit/app-alpha-2-log-run
-- spec/resources/export/runit/app-alpha-2-run
-- spec/resources/export/runit/app-bravo-1-log-run
-- spec/resources/export/runit/app-bravo-1-run
+- spec/resources/export/runit/app-alpha-1/log/run
+- spec/resources/export/runit/app-alpha-1/run
+- spec/resources/export/runit/app-alpha-2/log/run
+- spec/resources/export/runit/app-alpha-2/run
+- spec/resources/export/runit/app-bravo-1/log/run
+- spec/resources/export/runit/app-bravo-1/run
+- spec/resources/export/supervisord/app-alpha-1.conf
 - spec/resources/export/supervisord/app-alpha-2.conf
-- spec/resources/export/supervisord/app-env-with-comma.conf
-- spec/resources/export/supervisord/app-env.conf
-- spec/resources/export/supervisord/app.conf
 - spec/resources/export/upstart/app-alpha-1.conf
 - spec/resources/export/upstart/app-alpha-2.conf
 - spec/resources/export/upstart/app-alpha.conf
 - spec/resources/export/upstart/app-bravo-1.conf
 - spec/resources/export/upstart/app-bravo.conf
 - spec/resources/export/upstart/app.conf
+- spec/resources/Procfile
 - spec/spec_helper.rb
 - man/foreman.1
 homepage: http://github.com/ddollar/foreman
@@ -122,9 +124,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11

data/data/export/runit/log_run.erb

@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-LOG=<%= log_root %>/<%= process.name %>-<%= num %>
-
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown <%= user %> "$LOG"
-exec chpst -u <%= user %> svlogd "$LOG"

data/lib/foreman/color.rb

@@ -1,40 +0,0 @@
-require "foreman"
-
-module Foreman::Color
-
-  ANSI = {
-    :reset          => 0,
-    :black          => 30,
-    :red            => 31,
-    :green          => 32,
-    :yellow         => 33,
-    :blue           => 34,
-    :magenta        => 35,
-    :cyan           => 36,
-    :white          => 37,
-    :bright_black   => 30,
-    :bright_red     => 31,
-    :bright_green   => 32,
-    :bright_yellow  => 33,
-    :bright_blue    => 34,
-    :bright_magenta => 35,
-    :bright_cyan    => 36,
-    :bright_white   => 37,
-  }
-
-  def self.enable(io)
-    io.extend(self)
-  end
-
-  def color?
-    return false unless self.respond_to?(:isatty)
-    self.isatty && ENV["TERM"]
-  end
-
-  def color(name)
-    return "" unless color?
-    return "" unless ansi = ANSI[name.to_sym]
-    "\e[#{ansi}m"
-  end
-
-end

data/lib/foreman/procfile_entry.rb

@@ -1,26 +0,0 @@
-require "foreman"
-
-class Foreman::ProcfileEntry
-
-  attr_reader :name
-  attr_reader :command
-  attr_accessor :color
-
-  def initialize(name, command)
-    @name = name
-    @command = command
-  end
-
-  def spawn(num, pipe, basedir, environment, base_port)
-    (1..num).to_a.map do |n|
-      process = Foreman::Process.new(self, n, base_port + (n-1))
-      process.run(pipe, basedir, environment)
-      process
-    end
-  end
-
-  def to_s
-    "#{name}: #{command}"
-  end
-
-end

data/lib/foreman/utils.rb

@@ -1,18 +0,0 @@
-require "foreman"
-
-class Foreman::Utils
-
-  def self.parse_concurrency(concurrency)
-    begin
-      pairs = concurrency.to_s.gsub(/\s/, "").split(",")
-      
-      default = concurrency.nil? ? 1 : 0
-      
-      pairs.inject(Hash.new(default)) do |hash, pair|
-        process, amount = pair.split("=")
-        hash.update(process => amount.to_i)        
-      end
-    end
-  end
-
-end

data/spec/foreman/color_spec.rb

@@ -1,31 +0,0 @@
-require "spec_helper"
-require "foreman/color"
-
-describe Foreman::Color do
-
-  let(:io) { Object.new }
-
-  it "should extend an object with colorization" do
-    Foreman::Color.enable(io)
-    io.should respond_to(:color)
-  end
-
-  it "should not colorize if the object does not respond to isatty" do
-    mock(io).respond_to?(:isatty) { false }
-    Foreman::Color.enable(io)
-    io.color(:white).should == ""
-  end
-
-  it "should not colorize if the object is not a tty" do
-    mock(io).isatty { false }
-    Foreman::Color.enable(io)
-    io.color(:white).should == ""
-  end
-
-  it "should colorize if the object is a tty" do
-    mock(io).isatty { true }
-    Foreman::Color.enable(io)
-    io.color(:white).should == "\e[37m"
-  end
-
-end

data/spec/foreman/procfile_entry_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-require 'foreman/procfile_entry'
-require 'pathname'
-require 'tmpdir'
-
-describe Foreman::ProcfileEntry do
-  subject { described_class.new('alpha', './alpha') }
-
-  it "stringifies as a Procfile line" do
-    subject.to_s.should == 'alpha: ./alpha'
-  end
-
-end

data/spec/resources/export/supervisord/app-env-with-comma.conf

@@ -1,24 +0,0 @@
-
-[program:app-alpha]
-command=./alpha
-autostart=true
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/var/log/app/alpha-1-out.log
-stderr_logfile=/var/log/app/alpha-1-err.log
-user=app
-directory=/tmp/app
-environment=QUEUE="fastqueue,slowqueue",VERBOSE="1",PORT="5000"
-[program:app-bravo]
-command=./bravo
-autostart=true
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/var/log/app/bravo-1-out.log
-stderr_logfile=/var/log/app/bravo-1-err.log
-user=app
-directory=/tmp/app
-environment=QUEUE="fastqueue,slowqueue",VERBOSE="1",PORT="5100"
-
-[group:app]
-programs=app-alpha,app-bravo

data/spec/resources/export/supervisord/app-env.conf

@@ -1,21 +0,0 @@
-
-[program:app-alpha]
-command=./alpha
-autostart=true
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/var/log/app/alpha-1-out.log
-stderr_logfile=/var/log/app/alpha-1-err.log
-user=app
-directory=/tmp/app
-environment=FOO="bar",PORT="5000"
-[program:app-bravo]
-command=./bravo
-autostart=true
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/var/log/app/bravo-1-out.log
-stderr_logfile=/var/log/app/bravo-1-err.log
-user=app
-directory=/tmp/app
-environment=FOO="bar",PORT="5100"

data/spec/resources/export/supervisord/app.conf

@@ -1,24 +0,0 @@
-
-[program:app-alpha]
-command=./alpha
-autostart=true
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/var/log/app/alpha-1-out.log
-stderr_logfile=/var/log/app/alpha-1-err.log
-user=app
-directory=/tmp/app
-environment=PORT="5000"
-[program:app-bravo]
-command=./bravo
-autostart=true
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/var/log/app/bravo-1-out.log
-stderr_logfile=/var/log/app/bravo-1-err.log
-user=app
-directory=/tmp/app
-environment=PORT="5100"
-
-[group:app]
-programs=app-alpha,app-bravo