HeSYINUvSBZfxqA-foreman 0.20.0.3 → 0.20.0.4

data/lib/foreman/cli.rb

@@ -1,6 +1,5 @@
 require "foreman"
 require "foreman/engine"
-require "foreman/export"
 require "thor"
 require "yaml"
 
@@ -13,7 +12,8 @@ class Foreman::CLI < Thor
   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 :min,         :type => :numeric, :aliases => "-m"
-  method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3"'
+  method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3,feh,meh"'
+  method_option :args,        :type => :array,   :aliases => "-a", :banner => 'alpha bar feh meh'
 
   def start(process=nil)
     check_procfile!
@@ -25,31 +25,6 @@ class Foreman::CLI < Thor
     end
   end
 
-  desc "export FORMAT LOCATION", "Export the application to another process management format"
-
-  method_option :app,         :type => :string,  :aliases => "-a"
-  method_option :log,         :type => :string,  :aliases => "-l"
-  method_option :port,        :type => :numeric, :aliases => "-p"
-  method_option :user,        :type => :string,  :aliases => "-u"
-  method_option :template,    :type => :string,  :aliases => "-t"
-  method_option :concurrency, :type => :string,  :aliases => "-c",
-    :banner => '"alpha=5,bar=3"'
-
-  def export(format, location=nil)
-    check_procfile!
-
-    formatter = case format
-      when "inittab" then Foreman::Export::Inittab
-      when "upstart" then Foreman::Export::Upstart
-      else error "Unknown export format: #{format}."
-    end
-
-    formatter.new(engine).export(location, options)
-
-  rescue Foreman::Export::Exception => ex
-    error ex.message
-  end
-
   desc "check", "Validate your application's Procfile"
 
   def check
@@ -65,7 +40,7 @@ private ######################################################################
   end
 
   def engine
-    @engine ||= Foreman::Engine.new(procfile)
+    @engine ||= Foreman::Engine.new(procfile, options)
   end
 
   def procfile

data/lib/foreman/engine.rb

@@ -16,10 +16,10 @@ class Foreman::Engine
 
   COLORS = [ cyan, yellow, green, magenta, red ]
 
-  def initialize(procfile)
+  def initialize(procfile, options={})
     @procfile =
     if procfile.end_with? ".rb"
-      eval_procfile(procfile)
+      eval_procfile(procfile, options)
     else
       read_procfile(procfile)
     end
@@ -175,8 +175,8 @@ private ######################################################################
     $0 = title
   end
 
-  def eval_procfile(procfile)
-    eval(read_procfile(procfile))
+  def eval_procfile(procfile, options)
+    eval(read_procfile(procfile), binding)
   end
 
   def read_procfile(procfile)

data/lib/foreman/utils.rb

@@ -7,7 +7,7 @@ class Foreman::Utils
       pairs = concurrency.to_s.gsub(/\s/, "").split(",")
       pairs.inject(Hash.new(min)) do |hash, pair|
         process, amount = pair.split("=")
-        hash.update(process => amount.to_i)
+        hash.update(process => (amount || 1).to_i)
       end
     end
   end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.20.0.3"
+  VERSION = "0.20.0.4"
 
 end

data/spec/foreman/cli_spec.rb

@@ -25,39 +25,6 @@ describe "Foreman::CLI" do
     end
   end
 
-  describe "export" do
-    describe "with a non-existent Procfile" do
-      it "prints an error" do
-        mock_error(subject, "Procfile does not exist.") do
-          dont_allow.instance_of(Foreman::Engine).export
-          subject.export("testapp")
-        end
-      end
-    end
-
-    describe "with a Procfile" do
-      before(:each) { write_procfile }
-
-      describe "with an invalid formatter" do
-        it "prints an error" do
-          mock_error(subject, "Unknown export format: invalidformatter.") do
-            subject.export("invalidformatter")
-          end
-        end
-      end
-
-      describe "with a valid config" do
-        before(:each) { write_foreman_config("testapp") }
-
-        it "runs successfully" do
-          dont_allow(subject).error
-          mock.instance_of(Foreman::Export::Upstart).export("/tmp/foo", {})
-          subject.export("upstart", "/tmp/foo")
-        end
-      end
-    end
-  end
-
   describe "check" do
     describe "with a valid Procfile" do
       before { write_procfile }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: HeSYINUvSBZfxqA-foreman
 version: !ruby/object:Gem::Version 
-  hash: 233
+  hash: 231
   prerelease: 
   segments: 
   - 0
   - 20
   - 0
-  - 3
-  version: 0.20.0.3
+  - 4
+  version: 0.20.0.4
 platform: ruby
 authors: 
 - David Dollar
@@ -178,10 +178,6 @@ files:
 - data/export/upstart/process_master.conf.erb
 - lib/foreman/cli.rb
 - lib/foreman/engine.rb
-- lib/foreman/export/base.rb
-- lib/foreman/export/inittab.rb
-- lib/foreman/export/upstart.rb
-- lib/foreman/export.rb
 - lib/foreman/process.rb
 - lib/foreman/utils.rb
 - lib/foreman/version.rb
@@ -189,8 +185,6 @@ files:
 - README.markdown
 - spec/foreman/cli_spec.rb
 - spec/foreman/engine_spec.rb
-- spec/foreman/export/upstart_spec.rb
-- spec/foreman/export_spec.rb
 - spec/foreman/process_spec.rb
 - spec/foreman_spec.rb
 - spec/resources/export/upstart/app-alpha-1.conf

data/lib/foreman/export.rb

@@ -1,9 +0,0 @@
-require "foreman"
-
-module Foreman::Export
-  class Exception < ::Exception; end
-end
-
-require "foreman/export/base"
-require "foreman/export/inittab"
-require "foreman/export/upstart"

data/lib/foreman/export/base.rb

@@ -1,44 +0,0 @@
-require "foreman/export"
-require "foreman/utils"
-
-class Foreman::Export::Base
-
-  attr_reader :engine
-
-  def initialize(engine)
-    @engine = engine
-  end
-
-  def export
-    raise "export method must be overridden"
-  end
-
-private ######################################################################
-
-  def error(message)
-    raise Foreman::Export::Exception.new(message)
-  end
-
-  def say(message)
-    puts "[foreman export] %s" % message
-  end
-
-  def export_template(exporter, file, template_root)
-    if template_root && File.exist?(file_path = File.join(template_root, file))
-      File.read(file_path)
-    elsif File.exist?(file_path = File.join("~/.foreman/templates", file))
-      File.read(file_path)
-    else
-      File.read(File.expand_path("../../../../data/export/#{exporter}/#{file}", __FILE__))
-    end
-  end
-
-  def write_file(filename, contents)
-    say "writing: #{filename}"
-
-    File.open(filename, "w") do |file|
-      file.puts contents
-    end
-  end
-
-end

data/lib/foreman/export/inittab.rb

@@ -1,38 +0,0 @@
-require "foreman/export"
-
-class Foreman::Export::Inittab < Foreman::Export::Base
-
-  def export(fname=nil, options={})
-    app = options[:app] || File.basename(engine.directory)
-    user = options[:user] || app
-    log_root = options[:log] || "/var/log/#{app}"
-
-    concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
-
-    inittab = []
-    inittab << "# ----- foreman #{app} processes -----"
-
-    engine.processes.values.inject(1) do |index, process|
-      1.upto(concurrency[process.name]) do |num|
-        id = app.slice(0, 2).upcase + sprintf("%02d", index)
-        port = engine.port_for(process, num, options[:port])
-        inittab << "#{id}:4:respawn:/bin/su - #{user} -c 'PORT=#{port} #{process.command} >> #{log_root}/#{process.name}-#{num}.log 2>&1'"
-        index += 1
-      end
-      index
-    end
-
-    inittab << "# ----- end foreman #{app} processes -----"
-
-    inittab = inittab.join("\n") + "\n"
-
-    if fname
-      FileUtils.mkdir_p(log_root) rescue error "could not create #{log_root}"
-      FileUtils.chown(user, nil, log_root) rescue error "could not chown #{log_root} to #{user}"
-      write_file(fname, inittab)
-    else
-      puts inittab
-    end
-  end
-
-end

data/lib/foreman/export/upstart.rb

@@ -1,42 +0,0 @@
-require "erb"
-require "foreman/export"
-
-class Foreman::Export::Upstart < Foreman::Export::Base
-
-  def export(location, options={})
-    error("Must specify a location") unless location
-
-    FileUtils.mkdir_p location
-
-    app = options[:app] || File.basename(engine.directory)
-    user = options[:user] || app
-    log_root = options[:log] || "/var/log/#{app}"
-    template_root = options[:template]
-
-    Dir["#{location}/#{app}*.conf"].each do |file|
-      say "cleaning up: #{file}"
-      FileUtils.rm(file)
-    end
-
-    concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
-
-    master_template = export_template("upstart", "master.conf.erb", template_root)
-    master_config   = ERB.new(master_template).result(binding)
-    write_file "#{location}/#{app}.conf", master_config
-
-    process_template = export_template("upstart", "process.conf.erb", template_root)
-
-    engine.processes.values.each do |process|
-      process_master_template = export_template("upstart", "process_master.conf.erb", template_root)
-      process_master_config   = ERB.new(process_master_template).result(binding)
-      write_file "#{location}/#{app}-#{process.name}.conf", process_master_config
-
-      1.upto(concurrency[process.name]) do |num|
-        port = engine.port_for(process, num, options[:port])
-        process_config = ERB.new(process_template).result(binding)
-        write_file "#{location}/#{app}-#{process.name}-#{num}.conf", process_config
-      end
-    end
-  end
-
-end

data/spec/foreman/export/upstart_spec.rb

@@ -1,55 +0,0 @@
-require "spec_helper"
-require "foreman/engine"
-require "foreman/export/upstart"
-require "tmpdir"
-
-describe Foreman::Export::Upstart do
-  let(:procfile) { FileUtils.mkdir_p("/tmp/app"); write_procfile("/tmp/app/Procfile") }
-  let(:engine) { Foreman::Engine.new(procfile) }
-  let(:upstart) { Foreman::Export::Upstart.new(engine) }
-
-  before(:each) { load_export_templates_into_fakefs("upstart") }
-  before(:each) { stub(upstart).say }
-
-  it "exports to the filesystem" do
-    upstart.export("/tmp/init")
-
-    File.read("/tmp/init/app.conf").should         == example_export_file("upstart/app.conf")
-    File.read("/tmp/init/app-alpha.conf").should   == example_export_file("upstart/app-alpha.conf")
-    File.read("/tmp/init/app-alpha-1.conf").should == example_export_file("upstart/app-alpha-1.conf")
-    File.read("/tmp/init/app-alpha-2.conf").should == example_export_file("upstart/app-alpha-2.conf")
-    File.read("/tmp/init/app-bravo.conf").should   == example_export_file("upstart/app-bravo.conf")
-    File.read("/tmp/init/app-bravo-1.conf").should == example_export_file("upstart/app-bravo-1.conf")
-  end
-
-  context "with alternate templates" do
-    let(:template_root) { "/tmp/alternate" }
-
-    before do
-      FileUtils.mkdir_p template_root
-      File.open("#{template_root}/master.conf.erb", "w") { |f| f.puts "alternate_template" }
-    end
-
-    it "can export with alternate template files" do
-      upstart.export("/tmp/init", :template => template_root)
-
-      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("~/.foreman/templates")}
-
-    before do
-      FileUtils.mkdir_p default_template_root
-      File.open("#{default_template_root}/master.conf.erb", "w") { |f| f.puts "default_alternate_template" }
-    end
-
-    it "can export with alternate template files" do
-      upstart.export("/tmp/init")
-
-      File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
-    end
-  end
-
-end

data/spec/foreman/export_spec.rb

@@ -1,2 +0,0 @@
-require "spec_helper"
-require "foreman/export"