visionmedia-release 0.1.7 → 0.1.8

data/History.rdoc

@@ -1,4 +1,11 @@
 
+=== 0.1.8 / 2009-03-06
+
+* Added auto-generation / saving of history 
+* Refactored locate_version_file
+* Seperated actions 
+* Removed hyphen from default commit message
+
 === 0.1.7 / 2009-03-06
 	
 * Changed #sh (again), /dev/null-ifying stdout
@@ -65,4 +72,4 @@
 
 === 0.0.1 / 2009-03-05
 
-* Initial release
+* Initial release

data/README.rdoc

@@ -33,6 +33,9 @@ View help for the bump sub-command
 Bump patch (tiny), auto-locates version.rb
   $ re bump
 
+It is recommended that you do a dry-run to verify that release will work
+  $ re bump --dry-run
+
 Bump major with custom commit message (VERSION is replaced with release version)
   $ re bump major -m 'Release VERSION, check it out!'
 
@@ -42,14 +45,16 @@ Run rake tasks before releasing (defaults to manifest,gemspec)
 Specific version file
   $ re bump --file bin/re
 
-Edit changelog or history (auto-locates file within the current directory) before releasing
+Edit changelog or history (auto-locates file within the current directory) before releasing.
+This switch currently grabs the last -n commits from git log and places them in your history
+file, which then opens for adjustments. Alter -n, --commits to change the number of commits added.
   $ re bump major --history
 
 == Limitations
 
 * Currently supports 'n.n.n' format only
 * The --history switch has been tested with textmate only
-* Auto-locates version.rb (specify a specific file with --file switch)
+* Auto-locates version.rb using glob lib/**/version.rb (specify a specific file with --file switch)
 
 == License:
 

data/Todo.rdoc

@@ -1,7 +1,7 @@
 
 == Major:
 
-* Add .re-log file with commit SHAs
+* Add .re-log file with release SHAs
 * Add ability to do a graceful abort
 * Add option to prevent -a in commit command
 * Get git log working better

data/bin/re

@@ -5,7 +5,7 @@ require 'commander'
 require 'yaml'
 
 program :name, 'release'
-program :version, '0.1.7'
+program :version, '0.1.8'
 program :description, 'Github release management'
 
 CONFIG_FILE = File.expand_path('~/.re-config')
@@ -45,7 +45,7 @@ def replace_version file, level
 end
 
 def locate_version_file
-  Dir['lib/*/**/*.rb'].grep(/version/).first
+  Dir['lib/**/version.rb'].first
 end
 
 def locate_history_file
@@ -116,7 +116,7 @@ command :bump do |c|
     begin
 
       level = args.shift    || 'patch'
-      o.message = o.message || '- Release VERSION'
+      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'"
@@ -140,7 +140,12 @@ command :bump do |c|
       end
             
       if o.history
-        sh "git log --pretty=#{o.format} -#{o.commits} | $EDITOR"
+        banner = "\n=== #{version} / #{ Time.now.strftime('%Y-%m-%d') }\n"
+        changes = sh "git log --pretty=#{o.format} -#{o.commits}", false
+        previous = File.read locate_history_file 
+        File.open(locate_history_file, 'w') do |file|
+          file.write [banner, changes, previous].join("\n") 
+        end
         sh "$EDITOR #{locate_history_file} --wait" 
       end
       
@@ -154,14 +159,22 @@ command :bump do |c|
         sh "git commit -a -m '#{ o.message.sub('VERSION', version) }'"
       end
       
-      action 'tag / push' do
-        sh "git tag #{version} && git push && git push --tags"
+      action 'tagging' do
+        sh "git tag #{version}"
       end
-
+      
+      action 'pushing branch' do
+        sh "git push"
+      end
+                  
+      action 'pushing tags' do
+        sh "git push --tags"
+      end
+      
       unless o.dry_run
         options = {
           :complete_message => "Release #{version} complete",
-          :format => '(:progress_bar) :title ',
+          :format => "Releasing #{version} (:progress_bar) :title ",
           :width => actions.length * 4,
         }
         progress actions, options  do |title, proc|

data/release.gemspec

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

data/spec/fixtures/bar/version.rb

@@ -1,6 +1,6 @@
 
 module Bar
   def version
-    '30.0.0'
+    '31.0.0'
   end
 end

metadata

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