foreman 0.40.0-java → 0.41.0-java

data/data/export/supervisord/app.conf.erb

@@ -0,0 +1,21 @@
+<%
+engine.procfile.entries.each do |process|
+  next if (conc = self.concurrency[process.name]) < 1
+  1.upto(self.concurrency[process.name]) do |num|
+    port = engine.port_for(process, num, self.port)
+    name = if (conc > 1); "#{process.name}-#{num}" else process.name; end
+    environment = (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a << "PORT=#{port}")
+%>
+[program:<%= app %>-<%= name %>]
+command=<%= process.command %>
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>-out.log
+stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>-err.log
+user=<%= user %>
+directory=<%= engine.directory %>
+environment=<%= environment.join(',') %><%
+  end
+end
+%>

data/lib/foreman/color.rb

@@ -0,0 +1,40 @@
+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/engine.rb

@@ -1,10 +1,10 @@
 require "foreman"
+require "foreman/color"
 require "foreman/process"
 require "foreman/procfile"
 require "foreman/utils"
 require "tempfile"
 require "timeout"
-require "term/ansicolor"
 require "fileutils"
 require "thread"
 
@@ -15,11 +15,10 @@ class Foreman::Engine
   attr_reader :directory
   attr_reader :options
 
-  extend Term::ANSIColor
+  COLORS = %w( cyan yellow green magenta red blue intense_cyan intense_yellow
+               intense_green intense_magenta intense_red, intense_blue )
 
-  COLORS = [ cyan, yellow, green, magenta, red, blue,
-             intense_cyan, intense_yellow, intense_green, intense_magenta,
-             intense_red, intense_blue ]
+  Foreman::Color.enable($stdout)
 
   def initialize(procfile, options={})
     @procfile  = Foreman::Procfile.new(procfile)
@@ -128,11 +127,11 @@ private ######################################################################
   rescue Errno::ECHILD
   end
 
-  def info(message, name="system", color=Term::ANSIColor.white)
+  def info(message, name="system", color=:white)
     output  = ""
-    output += color
+    output += $stdout.color(color)
     output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "
-    output += Term::ANSIColor.reset
+    output += $stdout.color(:reset)
     output += message.chomp
     puts output
   end
@@ -182,8 +181,8 @@ private ######################################################################
   end
 
   def assign_colors
-    procfile.entries.each do |entry|
-      colors[entry.name] = next_color
+    procfile.entries.each_with_index do |entry, idx|
+      colors[entry.name] = COLORS[idx % COLORS.length]
     end
   end
 
@@ -191,13 +190,6 @@ private ######################################################################
     readers.invert[reader]
   end
 
-  def next_color
-    @current_color ||= -1
-    @current_color  +=  1
-    @current_color = 0 if COLORS.length < @current_color
-    COLORS[@current_color]
-  end
-
   def read_environment_files(filenames)
     environment = {}
 

data/lib/foreman/export.rb

@@ -30,3 +30,5 @@ require "foreman/export/inittab"
 require "foreman/export/upstart"
 require "foreman/export/bluepill"
 require "foreman/export/runit"
+require "foreman/export/supervisord"
+

data/lib/foreman/export/supervisord.rb

@@ -0,0 +1,26 @@
+require "erb"
+require "foreman/export"
+
+class Foreman::Export::Supervisord < Foreman::Export::Base
+
+  def export
+    error("Must specify a location") unless location
+
+    FileUtils.mkdir_p location
+
+    app = self.app || File.basename(engine.directory)
+    user = self.user || app
+    log_root = self.log || "/var/log/#{app}"
+    template_root = self.template
+
+    Dir["#{location}/#{app}*.conf"].each do |file|
+      say "cleaning up: #{file}"
+      FileUtils.rm(file)
+    end
+
+    app_template = export_template("supervisord", "app.conf.erb", template_root)
+    app_config   = ERB.new(app_template, 0, '<').result(binding)
+    write_file "#{location}/#{app}.conf", app_config
+  end
+
+end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.40.0"
+  VERSION = "0.41.0"
 
 end

data/spec/foreman/color_spec.rb

@@ -0,0 +1,31 @@
+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/export/supervisord_spec.rb

@@ -0,0 +1,75 @@
+require "spec_helper"
+require "foreman/engine"
+require "foreman/export/supervisord"
+require "tmpdir"
+
+describe Foreman::Export::Supervisord, :fakefs do
+  let(:procfile) { FileUtils.mkdir_p("/tmp/app"); write_procfile("/tmp/app/Procfile") }
+  let(:engine)   { Foreman::Engine.new(procfile) }
+  let(:options)  { Hash.new }
+  let(:supervisord)  { Foreman::Export::Supervisord.new("/tmp/init", engine, options) }
+
+  before(:each) { load_export_templates_into_fakefs("supervisord") }
+  before(:each) { stub(supervisord).say }
+
+  it "exports to the filesystem" do
+    supervisord.export
+
+    File.read("/tmp/init/app.conf").should         == example_export_file("supervisord/app.conf")
+  end
+
+  it "cleans up if exporting into an existing dir" do
+    mock(FileUtils).rm("/tmp/init/app.conf")
+
+    supervisord.export
+    supervisord.export
+  end
+
+  context "with concurrency" do
+    let(:options) { Hash[:concurrency => "alpha=2"] }
+
+    it "exports to the filesystem with concurrency" do
+      supervisord.export
+      
+      File.read("/tmp/init/app.conf").should            == example_export_file("supervisord/app-alpha-2.conf")
+    end
+  end
+
+  context "with alternate templates" do
+    let(:template_root) { "/tmp/alternate" }
+    let(:supervisord) { Foreman::Export::Supervisord.new("/tmp/init", engine, :template => template_root) }
+
+    before do
+      FileUtils.mkdir_p template_root
+      File.open("#{template_root}/app.conf.erb", "w") { |f| f.puts "alternate_template" }
+    end
+
+    it "can export with alternate template files" do
+      supervisord.export
+      
+      File.read("/tmp/init/app.conf").should == "alternate_template\n"
+    end
+  end
+
+  context "with alternate templates from home dir" do
+    let(:default_template_root) {File.expand_path("#{ENV['HOME']}/.foreman/templates")}
+
+    before do
+      ENV['_FOREMAN_SPEC_HOME'] = ENV['HOME']
+      ENV['HOME'] = "/home/appuser"
+      FileUtils.mkdir_p default_template_root
+      File.open("#{default_template_root}/app.conf.erb", "w") { |f| f.puts "default_alternate_template" }
+    end
+
+    after do
+      ENV['HOME'] = ENV.delete('_FOREMAN_SPEC_HOME')
+    end
+
+    it "can export with alternate template files" do
+      supervisord.export
+
+      File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
+    end
+  end
+
+end

data/spec/resources/export/supervisord/app-alpha-2.conf

@@ -0,0 +1,21 @@
+
+[program:app-alpha-1]
+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-alpha-2]
+command=./alpha
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/alpha-2-out.log
+stderr_logfile=/var/log/app/alpha-2-err.log
+user=app
+directory=/tmp/app
+environment=PORT=5001

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

@@ -0,0 +1,21 @@
+
+[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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0
   prerelease: 
 platform: java
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
-  requirement: &70341062669220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: *70341062669220
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70341062667880 !ruby/object:Gem::Requirement
+  requirement: &70231553195660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70341062667880
+  version_requirements: *70231553195660
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &70341062666480 !ruby/object:Gem::Requirement
+  requirement: &70231553194960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +32,7 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70341062666480
+  version_requirements: *70231553194960
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -62,16 +51,19 @@ files:
 - data/export/bluepill/master.pill.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.rb
 - lib/foreman/export/base.rb
 - lib/foreman/export/bluepill.rb
 - lib/foreman/export/inittab.rb
 - lib/foreman/export/runit.rb
+- lib/foreman/export/supervisord.rb
 - lib/foreman/export/upstart.rb
 - lib/foreman/export.rb
 - lib/foreman/helpers.rb
@@ -83,11 +75,13 @@ files:
 - 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
 - spec/foreman/export/inittab_spec.rb
 - spec/foreman/export/runit_spec.rb
+- spec/foreman/export/supervisord_spec.rb
 - spec/foreman/export/upstart_spec.rb
 - spec/foreman/export_spec.rb
 - spec/foreman/helpers_spec.rb
@@ -105,6 +99,8 @@ files:
 - 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-2.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