visionmedia-release 0.1.3 → 0.1.4

data/History.rdoc

@@ -1,4 +1,11 @@
 
+=== 0.1.4 / 2009-03-06
+
+* Added -F, --format switch for chaning the git log --pretty format
+* Changed back to #system in #sh
+* Changed log format to "* %s" since most people use the RDoc syntax for history
+* Fixed issue with --config not merging
+
 === 0.1.3 / 2009-03-06
 
 * Added progress-bar

data/bin/re

@@ -5,7 +5,7 @@ require 'commander'
 require 'yaml'
 
 program :name, 'release'
-program :version, '0.1.3'
+program :version, '0.1.4'
 program :description, 'Github release management'
 
 CONFIG_FILE = File.expand_path('~/.re-config')
@@ -15,11 +15,10 @@ trap 'INT' do
 end
 
 def sh command
-  exec command
+  system command
 end
 
 def extract_version_from file
-  raise "version cannot find version file #{file}" unless file 
   contents = File.read file
   version = $~.captures if contents =~ /(\d+)\.(\d+)\.(\d+)/
   raise "failed to locate version within #{file}. Must be format 'n.n.n'." unless version.length == 3
@@ -62,6 +61,7 @@ def bump_options c
   c.option '-n', '--commits NUMBER', Integer, 'Number of commits to display when using --history'
   c.option '-d', '--dry-run', 'Performs a dry run, without releasing'
   c.option '-t', '--trace', 'Output callstack when an exception is raised'
+  c.option '-F', '--format FORMAT', 'Valid git log --pretty format. Defaults to \'%s\''
   c.option '-M', '--verify-master', 'Verify that master is the current branch before releasing'
 end
 
@@ -119,20 +119,17 @@ command :bump do |c|
       o.message = o.message || '- Release VERSION'
       o.rake = o.rake       || %w( manifest gemspec )
       o.file = o.file       || locate_version_file
+      o.format = o.format   || "format:'* %s'"
       o.commits = o.commits || 20
-
+      
+      merge_options o, load_config(o.config) if o.config
+      
       if o.verify_master      
         action 'verifying master branch' do
           raise 'master branch verification failed' unless master_branch?
         end
       end
 
-      if o.config
-        action "loading #{o.config} configuration" do
-            merge_options o, load_config(o.config) 
-        end
-      end
-      
       if o.dry_run
         def sh command
           log "`#{command}`"
@@ -143,7 +140,7 @@ command :bump do |c|
       end
             
       if o.history
-        sh "git log --pretty=format:'%ar | %an | %s' -#{o.commits} | $EDITOR"
+        sh "git log --pretty=#{o.format} -#{o.commits} | $EDITOR"
         sh "$EDITOR #{locate_history_file} --wait" 
       end
       

data/release.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{release}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-release
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - TJ Holowaychuk