0.37.2

Changelog.md

@@ -1,190 +1,148 @@
-## 0.37.0.pre5 2012-01-24 9632227
-0.37.0.pre5  [David Dollar]
-Merge pull request #142 from apollo13/master  [David Dollar]
-rename readme  [David Dollar]
-Fix the test for an empty string in bin/runner  [Florian Apolloner]
+## 0.37.1 (2012-01-29)
 
-## 0.37.0.pre4 2012-01-24 a040324
-0.37.0.pre4  [David Dollar]
-Merge pull request #130 from clowder/foreman  [David Dollar]
-Don't expose the options hash.  [Chris Lowder]
-Simplify subclassing by adding all arguments to the initializer. Also, clean up the method signatures for existing exporters.  [Chris Lowder]
-Add ZenTest as a development dependency, there is an autotest folder but the gem is missing.  [Chris Lowder]
-Attempt to require the custom export class.  [Chris Lowder]
-Catching more than we need to.  [Chris Lowder]
-Extract commonality into the base class, make life easy for our plugin writers.  [Chris Lowder]
-Removing the hard coding of export formats allowing the user to 'plug-in' their own export format.  [Chris Lowder]
-Update README.markdown  [David Dollar]
-Revert "try on more rubies"  [David Dollar]
-try on more rubies  [David Dollar]
-fix webhook url  [David Dollar]
-Update README.markdown  [David Dollar]
-Update README.markdown  [David Dollar]
-ensure we have non-nil data, fixes #111  [David Dollar]
-make sure error method exists. fixes #104  [David Dollar]
-Merge pull request #136 from fnichol/foreman  [David Dollar]
-remove other from install instructions  [David Dollar]
-cleanup  [David Dollar]
-Revert "tweak authors"  [David Dollar]
-tweak authors  [David Dollar]
-fix authors  [David Dollar]
-readme tweaks  [David Dollar]
-readme tweaks  [David Dollar]
-fix up authors  [David Dollar]
-Update README.markdown  [David Dollar]
-fix up specs  [David Dollar]
-we're not chdiring any more  [David Dollar]
-use strings rather than symbols to better emulate the real thing  [David Dollar]
-Merge pull request #139 from brainopia/foreman  [David Dollar]
-Add specs for Foreman::Process#run  [brainopia]
-Implement Foreman::Process#kill,detach,alive?,dead?  [brainopia]
-- Use explicit fakefs tag in specs - Clean up trailing whitespace  [brainopia]
-Simplify Foreman::Process#with_environment  [brainopia]
-Add specs for options of Foreman::Process#run  [brainopia]
-Add specs for initialization of Foreman::Process  [brainopia]
-runit creates a full path to export directory.  [Fletcher Nichol]
+* use binary pipes to better handle UTF-8 data  [David Dollar]
+* set up example procfile with UTF-8 item  [David Dollar]
+* remove autotest  [David Dollar]
+* fix up authors generation  [David Dollar]
+* fix up packaging after moving tasks  [David Dollar]
+* fix up changelog tasks  [David Dollar]
 
-## 0.37.0.pre3 2012-01-22 51eee01
-0.37.0.pre3  [David Dollar]
-normalize platform names  [David Dollar]
-windows support  [David Dollar]
-add windows support  [David Dollar]
-dont need pty  [David Dollar]
-fix specs  [David Dollar]
+## 0.37.0 (2012-01-29)
 
-## 0.37.0.pre2 2012-01-22 2995a60
-0.37.0.pre2  [David Dollar]
-0.37.0.pre1  [David Dollar]
-remove unnecessary stdout/stderr flattening  [David Dollar]
-use PLATFORM=jruby instead of JRUBY=true  [David Dollar]
+* put an entire line of output inside a single mutex so we don't cross the streams  [David Dollar]
+* fix race condition with process termination  [David Dollar]
+* allow external custom exporters [Chris Lowder]
+* fix the test for an empty string in bin/runner  [Florian Apolloner]
+* ensure we have non-nil data, fixes #111  [David Dollar]
+* make sure error method exists, fixes #104  [David Dollar]
+* clean up chdir usage  [David Dollar]
+* normalize platform names  [David Dollar]
+* add windows support  [David Dollar]
+* add jruby support  [David Dollar]
+* pass basedir along to the runner script  [David Dollar]
+* harden runner script  [David Dollar]
+* add many missing specs  [brainopia]
+* clean up fakefs usage in specs  [brainopia]
+* runit creates a full path to export directory.  [Fletcher Nichol]
 
-## 0.37.0.pre1 2012-01-22 3e98170
-fix java build bug  [David Dollar]
-dont do rubygems/bundler in the Rakefile  [David Dollar]
-switch to posix-spawn for jruby  [David Dollar]
-add jruby build  [David Dollar]
-spork is in the gemspec now  [David Dollar]
-remove debugging  [David Dollar]
-move the spoon require into the jruby branch  [David Dollar]
-pass basedir along to the runner script  [David Dollar]
-beef up the runner script to allow a working directory to be set  [David Dollar]
-Merge pull request #140 from jc00ke/foreman  [David Dollar]
-Move spoon dep to Gemfile  [jc00ke]
-Using spoon for JRuby support  [jc00ke]
-use default bucket for storage  [David Dollar]
-Merge pull request #138 from technomancy/debian  [David Dollar]
-Add Debian packaging.  [Phil Hagelberg]
-Ignore vendor dir.  [Phil Hagelberg]
+## 0.36.1 (2012-01-18)
 
-## 0.36.1 2012-01-18 1485eeb
-0.36.1  [David Dollar]
-bump term-ansicolor in gemspec  [David Dollar]
+* 0.36.1  [David Dollar]
+* bump term-ansicolor in gemspec  [David Dollar]
 
-## 0.36.0 2012-01-17 a73dce5
-0.36.0  [David Dollar]
-sync the writer stream  [David Dollar]
-capture stderr as well  [David Dollar]
+## 0.36.0 (2012-01-17)
 
-## 0.35.0 2012-01-16 2bfc065
-update rake  [David Dollar]
-0.35.0  [David Dollar]
-Merge pull request #132 from Viximo/feature/concurrency  [David Dollar]
-Fix export specs  [Matt Griffin]
-Merge branch 'master' of https://github.com/michaeldwan/foreman into feature/concurrency  [Matt Griffin]
-default process concurrency is 0 when concurrency options specified, otherwise default concurrency is 1  [Michael Dwan]
+* 0.36.0  [David Dollar]
+* sync the writer stream  [David Dollar]
+* capture stderr as well  [David Dollar]
 
-## 0.34.1 2012-01-16 d4c2332
-0.34.1  [David Dollar]
-fix missing start desc  [David Dollar]
+## 0.35.0 (2012-01-16)
 
-## 0.34.0 2012-01-16 a278755
-0.34.0  [David Dollar]
-update man page  [David Dollar]
-update docs for -d  [David Dollar]
-Merge pull request #101 from ndbroadbent/foreman  [David Dollar]
-Wrap around to the first colour when all the colours are used  [Craig R Webster]
-run specs in random order  [David Dollar]
-update rspec  [David Dollar]
-pedantry  [David Dollar]
-Set executable bit on runit run scripts.  [Matthijs Langenberg]
-Merge pull request #114 from gburt/master  [David Dollar]
-add more colors  [Gabriel Burt]
-Added option to specify app_root, if executing a Procfile from a shared location  [Nathan Broadbent]
+* update rake  [David Dollar]
+* 0.35.0  [David Dollar]
+* Merge pull request #132 from Viximo/feature/concurrency  [David Dollar]
+* Fix export specs  [Matt Griffin]
+* Merge branch 'master' of https://github.com/michaeldwan/foreman into feature/concurrency  [Matt Griffin]
+* default process concurrency is 0 when concurrency options specified, otherwise default concurrency is 1  [Michael Dwan]
 
-## 0.33.1 2012-01-16 533139e
-0.33.1  [David Dollar]
-Merge pull request #129 from fnichol/resolve-home-template  [David Dollar]
-Expand template path under user's home directory.  [Fletcher Nichol]
+## 0.34.1 (2012-01-16)
 
-## 0.33.0 2012-01-15 cf269c3
-0.33.0  [David Dollar]
-Revert "Merge pull request #125 from brainopia/master"  [David Dollar]
+* 0.34.1  [David Dollar]
+* fix missing start desc  [David Dollar]
 
-## 0.32.0 2012-01-12 83748cb
-0.32.0  [David Dollar]
-Merge pull request #125 from brainopia/master  [David Dollar]
-Merge pull request #121 from Viximo/feature/run  [David Dollar]
-Return some whitespace that was accidentally removed  [Matt Griffin]
-Steal the run method back from Thor so that it can be used in place for exec for running commands in the foreman environment.  [Matt Griffin]
-Remove old cruft  [brainopia]
-In case someone wants to use bin/runner directly  [brainopia]
-Fix for double fork  [brainopia]
-Use ruby exec which works with escaped cmd and replaces shell  [brainopia]
-Fix foreman to work with cmds containing pipes and redirects  [brainopia]
-Add "exec" action to allow execution of arbitrary commands with the app's environment.  [Matt Griffin]
-tweak readme  [David Dollar]
+## 0.34.0 (2012-01-16)
 
-## 0.31.0 2012-01-04 342d30b
-0.31.0  [David Dollar]
-make fork more robust  [David Dollar]
-remove unnecessary debug  [David Dollar]
-add more information when shutting down  [David Dollar]
-Merge pull request #110 from lstoll/master  [David Dollar]
-Use different port ranges for each process type  [Lincoln Stoll]
+* 0.34.0  [David Dollar]
+* update man page  [David Dollar]
+* update docs for -d  [David Dollar]
+* Merge pull request #101 from ndbroadbent/foreman  [David Dollar]
+* Wrap around to the first colour when all the colours are used  [Craig R Webster]
+* run specs in random order  [David Dollar]
+* update rspec  [David Dollar]
+* pedantry  [David Dollar]
+* Set executable bit on runit run scripts.  [Matthijs Langenberg]
+* Merge pull request #114 from gburt/master  [David Dollar]
+* add more colors  [Gabriel Burt]
+* Added option to specify app_root, if executing a Procfile from a shared location  [Nathan Broadbent]
 
-## 0.30.1 2011-12-23 fcfa913
-0.30.1  [David Dollar]
-require thread for mutex  [David Dollar]
+## 0.33.1 (2012-01-16)
 
-## 0.30.0 2011-12-22 fc95936
-0.30.0  [David Dollar]
-compatibility with ruby 1.8  [David Dollar]
+* 0.33.1  [David Dollar]
+* Merge pull request #129 from fnichol/resolve-home-template  [David Dollar]
+* Expand template path under user's home directory.  [Fletcher Nichol]
 
-## 0.29.0 2011-12-22 356c61f
-0.29.0  [David Dollar]
+## 0.33.0 (2012-01-15)
 
-## 0.28.0.pre2 2011-12-08 dcff4da
-0.28.0.pre2  [David Dollar]
-fix pipe error  [David Dollar]
+* 0.33.0  [David Dollar]
+* Revert "Merge pull request #125 from brainopia/master"  [David Dollar]
 
-## 0.28.0.pre1 2011-12-08 c7b6b33
-0.28.0.pre1  [David Dollar]
-Merge branch 'fork'  [David Dollar]
-wip  [David Dollar]
-wip  [David Dollar]
-wip  [David Dollar]
-wip  [David Dollar]
-wip  [David Dollar]
+## 0.32.0 (2012-01-12)
 
-## 0.27.0 2011-12-05 914a1ee
-0.27.0  [David Dollar]
-add changelog  [David Dollar]
-Merge pull request #103 from csquared/load_env_from_irb  [David Dollar]
-refactor load_env to apply_environment  [Chris Continanza]
-rename load! to load_env!  [Chris Continanza]
-use ./.env as default  [Chris Continanza]
-load contents from env file  [Chris Continanza]
-refactor engine to expose env methods  [Chris Continanza]
-disable email notifications  [David Dollar]
-add travis config  [David Dollar]
+* 0.32.0  [David Dollar]
+* Merge pull request #125 from brainopia/master  [David Dollar]
+* Merge pull request #121 from Viximo/feature/run  [David Dollar]
+* Return some whitespace that was accidentally removed  [Matt Griffin]
+* Steal the run method back from Thor so that it can be used in place for exec for running commands in the foreman environment.  [Matt Griffin]
+* Remove old cruft  [brainopia]
+* In case someone wants to use bin/runner directly  [brainopia]
+* Fix for double fork  [brainopia]
+* Use ruby exec which works with escaped cmd and replaces shell  [brainopia]
+* Fix foreman to work with cmds containing pipes and redirects  [brainopia]
+* Add "exec" action to allow execution of arbitrary commands with the app's environment.  [Matt Griffin]
+* tweak readme  [David Dollar]
 
-## 0.26.1 2011-12-05 a5e0943
+## 0.31.0 (2012-01-04)
 
-Merge pull request #103 from csquared/load_env_from_irb   [David Dollar]
-refactor load_env to apply_environment   [Chris Continanza]
-rename load! to load_env!   [Chris Continanza]
-use ./.env as default   [Chris Continanza]
-load contents from env file   [Chris Continanza]
-refactor engine to expose env methods   [Chris Continanza]
-disable email notifications   [David Dollar]
-add travis config   [David Dollar]
+* 0.31.0  [David Dollar]
+* make fork more robust  [David Dollar]
+* remove unnecessary debug  [David Dollar]
+* add more information when shutting down  [David Dollar]
+* Merge pull request #110 from lstoll/master  [David Dollar]
+* Use different port ranges for each process type  [Lincoln Stoll]
+
+## 0.30.1 (2011-12-23)
+
+* 0.30.1  [David Dollar]
+* require thread for mutex  [David Dollar]
+
+## 0.30.0 (2011-12-22)
+
+* 0.30.0  [David Dollar]
+* compatibility with ruby 1.8  [David Dollar]
+
+## 0.29.0 (2011-12-22)
+
+* 0.29.0  [David Dollar]
+* 0.28.0.pre2  [David Dollar]
+* fix pipe error  [David Dollar]
+* 0.28.0.pre1  [David Dollar]
+* Merge branch 'fork'  [David Dollar]
+* wip  [David Dollar]
+* wip  [David Dollar]
+* wip  [David Dollar]
+* wip  [David Dollar]
+* wip  [David Dollar]
+
+## 0.27.0 (2011-12-05)
+
+* 0.27.0  [David Dollar]
+* add changelog  [David Dollar]
+* Merge pull request #103 from csquared/load_env_from_irb  [David Dollar]
+* refactor load_env to apply_environment  [Chris Continanza]
+* rename load! to load_env!  [Chris Continanza]
+* use ./.env as default  [Chris Continanza]
+* load contents from env file  [Chris Continanza]
+* refactor engine to expose env methods  [Chris Continanza]
+* disable email notifications  [David Dollar]
+* add travis config  [David Dollar]
+
+## 0.26.1 2011-12-05
+
+* Merge pull request #103 from csquared/load_env_from_irb   [David Dollar]
+* refactor load_env to apply_environment   [Chris Continanza]
+* rename load! to load_env!   [Chris Continanza]
+* use ./.env as default   [Chris Continanza]
+* load contents from env file   [Chris Continanza]
+* refactor engine to expose env methods   [Chris Continanza]
+* disable email notifications   [David Dollar]
+* add travis config   [David Dollar]

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foreman (0.37.0)
+    foreman (0.37.2)
       term-ansicolor (~> 1.0.7)
       thor (>= 0.13.6)
 

README.md

@@ -25,6 +25,7 @@ Manage Procfile-based applications
 
 * [man page](http://ddollar.github.com/foreman)
 * [wiki](http://github.com/ddollar/foreman/wiki)
+* [changelog](https://github.com/ddollar/foreman/blob/master/Changelog.md)
 
 ## Authors
 
@@ -32,7 +33,7 @@ Manage Procfile-based applications
 David Dollar
 
 #### Patches contributed by
-Adam Wiggins, Chris Continanza, Chris Lowder, Craig R Webster, Dan Farina, Dan Peterson, David Dollar, Fletcher Nichol, Gabriel Burt, Gamaliel Toro, Greg Reinacker, Hugues Le Gendre, Hunter Nield, Iain Hecker, Jay Zeschin, Keith Rarick, Khaja Minhajuddin, Lincoln Stoll, Marcos Muino Garcia, Mark McGranaghan, Matt Griffin, Matt Haynes, Matthijs Langenberg, Michael Dwan, Michael van Rooijen, Mike Javorski, Nathan Broadbent, Nathan L Smith, Nick Zadrozny, Phil Hagelberg, Ricardo Chimal, Jr, Thom May, Tom Ward, brainopia, clifff, jc00ke
+Adam Wiggins, Chris Continanza, Chris Lowder, Craig R Webster, Dan Farina, Dan Peterson, David Dollar, Fletcher Nichol, Florian Apolloner, Gabriel Burt, Gamaliel Toro, Greg Reinacker, Hugues Le Gendre, Hunter Nield, Iain Hecker, Jay Zeschin, Keith Rarick, Khaja Minhajuddin, Lincoln Stoll, Marcos Muino Garcia, Mark McGranaghan, Matt Griffin, Matt Haynes, Matthijs Langenberg, Michael Dwan, Michael van Rooijen, Mike Javorski, Nathan Broadbent, Nathan L Smith, Nick Zadrozny, Phil Hagelberg, Ricardo Chimal, Jr, Thom May, Tom Ward, brainopia, clifff, jc00ke
 
 ## License
 

autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }

bin/runner

@@ -18,7 +18,7 @@ usage() {
 
 while getopts ":hd:" OPT; do
   case $OPT in
-     d) cd $OPTARG ;;
+     d) cd "$OPTARG" ;;
      h) usage ;;
     \?) error "invalid option: -$OPTARG" ;;
      :) error "option -$OPTARG requires an argument" ;;

data/example/Procfile

@@ -1,2 +1,3 @@
 ticker: ruby ./ticker $PORT
 error:  ruby ./error
+utf8:   ruby ./utf8

data/example/utf8

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# encoding: BINARY
+
+$stdout.sync = true
+
+while true
+  puts "\u65e5\u672c\u8a9e\u6587\u5b57\u5217"
+  puts "\u0915\u0932\u094d\u0907\u0928\u0643\u0637\u0628\u041a\u0430\u043b\u0438\u043d\u0430"
+  puts "\xff\x03"
+  sleep 1
+end

lib/foreman/engine.rb

@@ -58,7 +58,7 @@ private ######################################################################
     concurrency = Foreman::Utils.parse_concurrency(@options[:concurrency])
 
     procfile.entries.each do |entry|
-      reader, writer = IO.pipe
+      reader, writer = (IO.method(:pipe).arity == 0 ? IO.pipe : IO.pipe("BINARY"))
       entry.spawn(concurrency[entry.name], writer, @directory, @environment, port_for(entry, 1, base_port)).each do |process|
         running_processes[process.pid] = process
         readers[process] = reader
@@ -94,19 +94,23 @@ private ######################################################################
     kill_all "SIGKILL"
   end
 
+  def poll_readers
+    rs, ws = IO.select(readers.values, [], [], 1)
+    (rs || []).each do |r|
+      data = r.gets
+      next unless data
+      ps, message = data.split(",", 2)
+      color = colors[ps.split(".").first]
+      info message, ps, color
+    end
+  end
+
   def watch_for_output
     Thread.new do
       require "win32console" if Foreman.windows?
       begin
         loop do
-          rs, ws = IO.select(readers.values, [], [], 1)
-          (rs || []).each do |r|
-            data = r.gets
-            next unless data
-            ps, message = data.split(",", 2)
-            color = colors[ps.split(".").first]
-            info message, ps, color
-          end
+          poll_readers
         end
       rescue Exception => ex
         puts ex.message

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.37.0"
+  VERSION = "0.37.2"
 
 end

man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "January 2012" "Foreman 0.33.1" "Foreman Manual"
+.TH "FOREMAN" "1" "January 2012" "Foreman 0.37.1" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

spec/foreman/engine_spec.rb

@@ -83,4 +83,23 @@ describe "Foreman::Engine", :fakefs do
       engine.start
     end
   end
+
+  describe "utf8" do
+    before(:each) do
+      File.open("Procfile", "w") do |file|
+        file.puts "utf8: #{resource_path("bin/utf8")}"
+      end
+    end
+
+    it "should spawn" do
+      stub(subject).watch_for_output
+      stub(subject).watch_for_termination
+      subject.start
+      sleep 1
+      mock(subject).info(/started with pid \d+/, "utf8.1", anything)
+      mock(subject).info("\xff\x03\n", "utf8.1", anything)
+      subject.send(:poll_readers)
+      subject.send(:poll_readers)
+    end
+  end
 end

spec/foreman/process_spec.rb

@@ -36,6 +36,7 @@ describe Foreman::Process do
     def run_file(executable, code)
       file = File.open("#{basedir}/script", 'w') {|it| it << code }
       run "#{executable} #{file.path}"
+      sleep 1
     end
 
     context 'options' do
@@ -98,7 +99,6 @@ describe Foreman::Process do
           trap "TERM", "IGNORE"
           loop { sleep 1 }
         CODE
-        sleep 1  # wait for ruby to start
         subject.should be_alive
         subject.kill 'TERM'
         subject.should be_alive

spec/resources/bin/utf8

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+puts "\xff\x03"

spec/spec_helper.rb

@@ -68,9 +68,13 @@ def load_export_templates_into_fakefs(type)
   end
 end
 
+def resource_path(filename)
+  File.expand_path("../resources/#{filename}", __FILE__)
+end
+
 def example_export_file(filename)
   FakeFS.deactivate!
-  data = File.read(File.expand_path("../resources/export/#{filename}", __FILE__))
+  data = File.read(File.expand_path(resource_path("export/#{filename}"), __FILE__))
   FakeFS.activate!
   data
 end

tasks/dist.rake

@@ -21,7 +21,7 @@ end
 GEM_BLACKLIST = %w( bundler foreman )
 
 def assemble_gems(target_dir=Dir.pwd)
-  lines = %x{ bundle show }.strip.split("\n")
+  lines = %x{ cd #{project_root} && bundle show }.strip.split("\n")
   raise "error running bundler" unless $?.success?
 
   %x{ env BUNDLE_WITHOUT="development:test" bundle show }.split("\n").each do |line|
@@ -47,8 +47,7 @@ def distribution_files(type=nil)
   require "foreman/distribution"
   base_files = Foreman::Distribution.files
   type_files = type ?
-    Dir[File.expand_path("../dist/resources/#{type}/**/*", __FILE__)] :
-    []
+    Dir[File.expand_path("../../dist/resources/#{type}/**/*", __FILE__)] : []
   base_files.concat(type_files)
 end
 
@@ -60,15 +59,15 @@ def mkchdir(dir)
 end
 
 def pkg(filename)
-  File.expand_path("../pkg/#{filename}", __FILE__)
+  File.expand_path("../../pkg/#{filename}", __FILE__)
 end
 
 def project_root
-  File.dirname(__FILE__)
+  File.expand_path("../..", __FILE__)
 end
 
 def resource(name)
-  File.expand_path("../dist/resources/#{name}", __FILE__)
+  File.expand_path("../../dist/resources/#{name}", __FILE__)
 end
 
 def s3_connect

tasks/release.rake

@@ -9,8 +9,8 @@ end
 
 desc "Commit the manual to git"
 task "man:commit" => :man do
-  sh "git add README.markdown"
-  sh "git commit -m 'update readme' || echo 'nothing to commit'"
+  sh "git add README.md"
+  sh "git commit -am 'update docs' || echo 'nothing to commit'"
 end
 
 desc "Generate the Github docs"
@@ -30,52 +30,45 @@ end
 desc "Generate an authors list"
 task :authors do
   authors = %x{ git log --pretty=format:"%an" | sort -u }.split("\n")
-  puts authors.join(", ")
+  readme = File.read("README.md")
+  readme.gsub!(/#### Patches contributed by\n([^\n]*)\n/m, "#### Patches contributed by\n#{authors.join(", ")}\n")
+  File.open("README.md", "w") { |f| f.print readme }
 end
 
 def latest_release
-  latest = File.read("Changelog.md").split("\n").first.split(" ").last
+  latest = File.read("Changelog.md").split("\n").first.split(" ")[1]
 end
 
 def newer_release
-  release = %x{ git tag --contains #{latest_release} }.split("\n")[1]
+  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]
 end
 
 desc "Generate a Changelog"
 task :changelog do
   while release = newer_release
-    entry = %x{ git show --format="%h %cd" #{release} | head -n 1 }
-    commit, date_raw = entry.split(" ", 2)
-    date = Time.parse(date_raw).strftime("%Y-%m-%d")
+    entry = %x{ git show --format="%cd" #{release} | head -n 1 }
+    date = Time.parse(entry.chomp).strftime("%Y-%m-%d")
 
-    message  = "## #{release[1..-1]} #{date} #{commit}\n"
-    message += %x{ git log --format="%s  [%an]" #{latest_release}..#{release} }
+    message  = "## #{release[1..-1]} (#{date})\n\n"
+    message += %x{ git log --format="* %s  [%an]" v#{latest_release}..#{release} }
 
     changelog = File.read("Changelog.md")
     changelog = message + "\n" + changelog
 
+    puts release
+
     File.open("Changelog.md", "w") do |file|
-      file.puts changelog
+      file.print changelog
     end
   end
-    
-
-  #   date = 
-  #   message = "## #{release[1..-1]} 
-  # timestamp = Time.now.utc.strftime('%m/%d/%Y')
-  # sha = `git log | head -1`.split(' ').last
-  # changelog = ["#{version} #{timestamp} #{sha}"]
-  # changelog << ('=' * changelog[0].length)
-  # changelog << ''
-
-  # last_sha = `cat Changelog | head -1`.split(' ').last
-  # shortlog = `git log #{last_sha}..HEAD --pretty=format:'%s   [%an]'`
-  # changelog << shortlog.split("\n")
-  # changelog.concat ['', '', '']
-
-  # old_changelog = File.read('Changelog')
-  # File.open('Changelog', 'w') do |file|
-  #   file.write(changelog.join("\n"))
-  #   file.write(old_changelog)
-  # end
+end
+
+desc "Cut a release"
+task :release do
+  Rake::Task["authors"].invoke
+  Rake::Task["changelog"].invoke
+  Rake::Task["pages"].invoke
 end