0.48.0.pre3

added command for displaying foreman version

.travis.yml

@@ -1,8 +1,11 @@
 script: bundle exec rake spec
 
-rvm:
-  - 1.9.2
-  - 1.9.3
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+    - rvm: jruby
+    - rvm: rbx
+    - rvm: ree
 
 notifications:
   email: false
@@ -11,3 +14,11 @@ notifications:
     on_failure: always
     urls:
       - http://dx-helper.herokuapp.com/travis
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - rbx
+  - ree

Changelog.md

@@ -1,3 +1,20 @@
+## 0.48.0.pre1 (2012-06-11)
+
+* Massive refactoring for programmatic control and stability  [David Dollar]
+* Procfile commands with shell interpolations now work again  [David Dollar]
+* Stop trying to test on Ruby 1.8  [David Dollar]
+
+## 0.47.0 (2012-06-07)
+
+* Fix multi-word argument handling in `foreman run`.  [Daniel Brockman]
+* Make 'PORT=5000 foreman start' work  [Koen Van der Auwera]
+* Terminate gracefully upon SIGHUP  [Stefan Schüßler]
+* Set port from .env if specified  [Koen Van der Auwera]
+* Updated bluepill exporter to use environment variables from .env  [Aneeth]
+* Added launchd exporter  [Maxwell Swadling]
+* Quote and escape environment variables in upstart templates  [Matt Griffin]
+* Added list of ports to other languages to README  [elf Pavlik]
+
 ## 0.46.0 (2012-05-02)
 
 * Add Profile load/write/append API  [Michael Granger]

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foreman (0.47.0)
+    foreman (0.48.0.pre3)
       thor (>= 0.13.6)
 
 GEM
@@ -39,7 +39,7 @@ GEM
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    thor (0.14.6)
+    thor (0.15.2)
     timecop (0.3.5)
     win32console (1.3.0-x86-mingw32)
     xml-simple (1.0.15)

lib/foreman/cli.rb

@@ -3,18 +3,23 @@ require "foreman/helpers"
 require "foreman/engine"
 require "foreman/engine/cli"
 require "foreman/export"
+require "foreman/version"
 require "shellwords"
+require "yaml"
 require "thor"
 
 class Foreman::CLI < Thor
 
   include Foreman::Helpers
 
+  map ["-v", "--version"] => :version
+
   class_option :procfile, :type => :string, :aliases => "-f", :desc => "Default: Procfile"
   class_option :root,     :type => :string, :aliases => "-d", :desc => "Default: Procfile directory"
 
   desc "start [PROCESS]", "Start the application (or a specific PROCESS)"
 
+  method_option :color,     :type => :boolean, :aliases => "-c", :desc => "Force color to be enabled"
   method_option :env,       :type => :string,  :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
   method_option :formation, :type => :string,  :aliases => "-m", :banner => '"alpha=5,bar=3"'
   method_option :port,      :type => :numeric, :aliases => "-p"
@@ -79,15 +84,17 @@ class Foreman::CLI < Thor
     end
   end
 
+  desc "version", "Display Foreman gem version"
+
+  def version
+    puts Foreman::VERSION
+  end
+
   no_tasks do
     def engine
       @engine ||= begin
         engine_class = Foreman::Engine::CLI
-        engine = engine_class.new(
-          :formation => options[:formation],
-          :port      => options[:port],
-          :root      => options[:root]
-        )
+        engine = engine_class.new(options)
         engine
       end
     end
@@ -126,7 +133,7 @@ private ######################################################################
   def options
     original_options = super
     return original_options unless File.exists?(".foreman")
-    defaults = YAML::load_file(".foreman") || {}
+    defaults = ::YAML::load_file(".foreman") || {}
     Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
   end
 

lib/foreman/engine/cli.rb

@@ -24,11 +24,13 @@ class Foreman::Engine::CLI < Foreman::Engine
       :bright_white   => 37,
     }
 
-    def self.enable(io)
+    def self.enable(io, force=false)
       io.extend(self)
+      @@color_force = force
     end
 
     def color?
+      return true if @@color_force
       return false unless self.respond_to?(:isatty)
       self.isatty && ENV["TERM"]
     end
@@ -51,14 +53,17 @@ class Foreman::Engine::CLI < Foreman::Engine
 
   def output(name, data)
     data.to_s.chomp.split("\n").each do |message|
-      Color.enable($stdout) unless $stdout.respond_to?(:color?)
+      Color.enable($stdout, options[:color]) unless $stdout.respond_to?(:color?)
       output  = ""
       output += $stdout.color(@colors[name.split(".").first].to_sym)
       output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "
       output += $stdout.color(:reset)
       output += message
       $stdout.puts output
+      $stdout.flush
     end
+  rescue Errno::EPIPE
+    terminate_gracefully
   end
 
   def shutdown

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.47.0"
+  VERSION = "0.48.0.pre3"
 
 end

spec/foreman/cli_spec.rb

@@ -74,4 +74,14 @@ describe "Foreman::CLI", :fakefs do
     end
   end
 
+  describe "version" do
+    it "displays gem version" do
+      foreman("version").chomp.should == Foreman::VERSION
+    end
+
+    it "displays gem version on shortcut command" do
+      foreman("-v").chomp.should == Foreman::VERSION
+    end
+  end
+
 end

tasks/release.rake

@@ -35,7 +35,7 @@ def newer_release
   tags = %x{ git tag --contains v#{latest_release} }.split("\n").sort_by do |tag|
     Gem::Version.new(tag[1..-1])
   end
-  tags.reject { |tag| Gem::Version.new(tag[1..-1]).prerelease? }[1]
+  tags[1]
 end
 
 desc "Generate a Changelog"