visionmedia-release 0.1.2 → 0.1.3

data/History.rdoc

@@ -1,4 +1,12 @@
 
+=== 0.1.3 / 2009-03-06
+
+* Added progress-bar
+* Added -n, --commits switch
+* Changed log format
+* Changed dependency, now requires visionmedia-commander >= 2.5.6
+* Changed #sh, now using sub-shell now to prevent cluttering stdout
+
 === 0.1.2 / 2009-03-06
 
 * Added #log, using it replacing #say calls

data/Rakefile

@@ -10,7 +10,7 @@ Echoe.new("release", program(:version)) do |p|
   p.summary = "Github release management system"
   p.url = "http://github.com/visionmedia/release"
   p.runtime_dependencies = []
-  p.runtime_dependencies << "visionmedia-commander >=2.4.6"
+  p.runtime_dependencies << "visionmedia-commander >=2.5.6"
 end
 
 Dir['tasks/**/*.rake'].sort.each { |f| load f }

data/Todo.rdoc

@@ -1,11 +1,13 @@
 
 == Major:
 
-* Ability to abort
-* Get git log working
-* Refactor
+* Add .re-log file with commit SHAs
+* Add ability to do a graceful abort
+* Add option to prevent -a in commit command
+* Get git log working better
 * Better specs
 * When exception is raised revert all alterations made to that point
+* Refactor
 
 == Minor:
 

data/bin/re

@@ -5,7 +5,7 @@ require 'commander'
 require 'yaml'
 
 program :name, 'release'
-program :version, '0.1.2'
+program :version, '0.1.3'
 program :description, 'Github release management'
 
 CONFIG_FILE = File.expand_path('~/.re-config')
@@ -15,7 +15,7 @@ trap 'INT' do
 end
 
 def sh command
-  system command
+  exec command
 end
 
 def extract_version_from file
@@ -59,6 +59,7 @@ def bump_options c
   c.option '-r', '--rake TASKS', Array, 'Defaults to manifest,gemspec to build manifest / gemspec before releasing'
   c.option '-R', '--no-rake', 'Disable all rake tasks'
   c.option '-H', '--history', 'Edit history in EDITOR before releasing'
+  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 '-M', '--verify-master', 'Verify that master is the current branch before releasing'
@@ -75,7 +76,6 @@ def remove_config name
 end
 
 def load_config name = nil
-  raise "configuration file cannot be found, run `re help config` for usage" unless File.exists? CONFIG_FILE
   config = YAML.load_file CONFIG_FILE
   return config unless name 
   raise "configuration '#{name}' cannot be found" unless config.include? name
@@ -96,6 +96,14 @@ def log message
   say "... #{message}"
 end
 
+def action title, &block
+  (@__actions ||= []) << [title, block]
+end
+
+def actions
+  @__actions
+end
+
 command :bump do |c|
   bump_options c
   c.syntax = 're bump [level] [options]'
@@ -106,26 +114,26 @@ command :bump do |c|
   c.option '-c', '--config NAME', 'Load configuration options'
   c.when_called do |args, o|
     begin
-      # Defaults
-      level = args.shift || 'patch'
-      o.rake = o.rake || %w( manifest gemspec )
-      o.file = o.file || locate_version_file
+
+      level = args.shift    || 'patch'
       o.message = o.message || '- Release VERSION'
-      
-      # Master verification
-      if o.verify_master and !master_branch?
-        raise 'master branch verification failed'
+      o.rake = o.rake       || %w( manifest gemspec )
+      o.file = o.file       || locate_version_file
+      o.commits = o.commits || 20
+
+      if o.verify_master      
+        action 'verifying master branch' do
+          raise 'master branch verification failed' unless master_branch?
+        end
       end
-      
-      # Configurations
+
       if o.config
-        log "using '#{o.config}' configuration"
-        merge_options o, load_config(o.config) 
+        action "loading #{o.config} configuration" do
+            merge_options o, load_config(o.config) 
+        end
       end
       
-      # Dry-run
       if o.dry_run
-        log 'performing dry-run'
         def sh command
           log "`#{command}`"
         end
@@ -133,20 +141,42 @@ command :bump do |c|
       else
         version = replace_version o.file, level
       end
-    
-      # History
-      log "releasing #{version}"
+            
       if o.history
-        sh "git log --pretty=oneline"
+        sh "git log --pretty=format:'%ar | %an | %s' -#{o.commits} | $EDITOR"
         sh "$EDITOR #{locate_history_file} --wait" 
       end
       
-      # Release
-      log "bumping #{level} level in #{o.file}"
-      o.rake.each { |task| sh "rake #{task}" } unless o.no_rake == false
-      sh "git commit -a -m '#{ o.message.sub('VERSION', version) }'"
-      sh "git tag #{version} && git push && git push --tags"
-      log "release #{version} complete"
+      unless o.no_rake == false
+        action 'running rake tasks' do
+          o.rake.each { |task| sh "rake #{task}" } 
+        end
+      end
+      
+      action 'committing' do
+        sh "git commit -a -m '#{ o.message.sub('VERSION', version) }'"
+      end
+      
+      action 'tag / push' do
+        sh "git tag #{version} && git push && git push --tags"
+      end
+
+      unless o.dry_run
+        options = {
+          :complete_message => "Release #{version} complete",
+          :format => '(:progress_bar) :title ',
+          :width => actions.length * 4,
+        }
+        progress actions, options  do |title, proc|
+          proc.call
+          { :title => title }
+        end
+      else
+        actions.each do |title, proc|
+          proc.call
+        end
+      end
+      
     rescue Exception => e
       o.trace ? raise : log("release failed: #{e}\n")
     end

data/release.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{release}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
@@ -26,11 +26,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<visionmedia-commander>, [">= 2.4.6"])
+      s.add_runtime_dependency(%q<visionmedia-commander>, [">= 2.5.6"])
     else
-      s.add_dependency(%q<visionmedia-commander>, [">= 2.4.6"])
+      s.add_dependency(%q<visionmedia-commander>, [">= 2.5.6"])
     end
   else
-    s.add_dependency(%q<visionmedia-commander>, [">= 2.4.6"])
+    s.add_dependency(%q<visionmedia-commander>, [">= 2.5.6"])
   end
 end

data/spec/fixtures/bar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-release
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.6
+        version: 2.5.6
     version: 
 description: Github release management system
 email: tj@vision-media.ca