visionmedia-release 0.1.1 → 0.1.2

data/History.rdoc

@@ -1,5 +1,13 @@
 
-=== 0.1.1 / date
+=== 0.1.2 / 2009-03-06
+
+* Added #log, using it replacing #say calls
+* Changed -h to -H for history, -h collides with --help from commander gem 
+* Fixed bump levels.
+  Previously 0.1.2 bumped at the minor level would bump to 0.2.2, this is 
+  incorrect. It now bumps to 0.2.0, as expected.
+
+=== 0.1.1 / 2009-03-06
 
 * Added --verify-master switch
 

data/bin/re

@@ -5,7 +5,7 @@ require 'commander'
 require 'yaml'
 
 program :name, 'release'
-program :version, '0.1.1'
+program :version, '0.1.2'
 program :description, 'Github release management'
 
 CONFIG_FILE = File.expand_path('~/.re-config')
@@ -28,8 +28,12 @@ end
 
 def bump_version file, level
   version = extract_version_from file 
-  levels = { :major => 0, :minor => 1, :patch => 2, :tiny => 2 }
-  version[levels[level.to_sym]] += 1
+  case level.to_sym
+  when :tiny, :patch ;                              version[2] += 1 
+  when :minor ;                   version[1] += 1 ; version[2]  = 0 
+  when :major ; version[0] += 1 ; version[1]  = 0 ; version[2]  = 0
+  else raise "invalid bump level '#{level}'"
+  end
   version
 end
 
@@ -54,7 +58,7 @@ def bump_options c
   c.option '-m', '--message MESSAGE', String, 'Message defaults to \'- Release VERSION\''
   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 '-H', '--history', 'Edit history in EDITOR before releasing'
   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'
@@ -88,6 +92,10 @@ def master_branch?
   `git branch | grep '*' | awk '{print $2}'`.strip == 'master'
 end
 
+def log message
+  say "... #{message}"
+end
+
 command :bump do |c|
   bump_options c
   c.syntax = 're bump [level] [options]'
@@ -111,15 +119,15 @@ command :bump do |c|
       
       # Configurations
       if o.config
-        say "... using '#{o.config}' configuration"
+        log "using '#{o.config}' configuration"
         merge_options o, load_config(o.config) 
       end
       
       # Dry-run
       if o.dry_run
-        puts "... performing dry-run"
+        log 'performing dry-run'
         def sh command
-          say "... `#{command}`"
+          log "`#{command}`"
         end
         version = bump_version(o.file, level).join '.'
       else
@@ -127,19 +135,20 @@ command :bump do |c|
       end
     
       # History
+      log "releasing #{version}"
       if o.history
         sh "git log --pretty=oneline"
         sh "$EDITOR #{locate_history_file} --wait" 
       end
       
       # Release
-      say "... bumping #{level} level in #{o.file}"
+      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"
-      say "... release #{version} complete"
+      log "release #{version} complete"
     rescue Exception => e
-      o.trace ? raise : say("... release failed: #{e}\n")
+      o.trace ? raise : log("release failed: #{e}\n")
     end
   end
 end
@@ -168,11 +177,11 @@ command :config do |c|
         config = { name => options }
       end
       save_config config
-      say "... configuration '#{name}' saved"
+      log "configuration '#{name}' saved"
     when 'remove'
       raise 'invalid configuration name' unless name
       remove_config name
-      say "... configuration '#{name}' removed"
+      log "configuration '#{name}' removed"
     when 'show'
       load_config.each do |name, config|
         say '%14s: %s' % [name, config.inspect.sub('#<OpenStruct ', '').sub('>', '')]

data/release.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{release}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-03-05}
+  s.date = %q{2009-03-06}
   s.default_executable = %q{re}
   s.description = %q{Github release management system}
   s.email = %q{tj@vision-media.ca}

data/spec/fixtures/bar/version.rb

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

data/spec/release_spec.rb

@@ -53,17 +53,20 @@ describe "bin/re" do
     it "should bump minor level" do
       @bump.call ['minor']
       extract_version_from(locate_version_file)[1].should == @previous_version[1] + 1      
+      extract_version_from(locate_version_file)[2].should == 0      
     end
     
     it "should bump major level" do
       @bump.call ['major']
-      extract_version_from(locate_version_file)[0].should == @previous_version[0] + 1      
+      extract_version_from(locate_version_file)[0].should == @previous_version[0] + 1
+      extract_version_from(locate_version_file)[1].should == 0  
+      extract_version_from(locate_version_file)[2].should == 0  
     end
     
-    it "should allow altering of commit message with --message" do
-      run 'bump', '--message', 'New release of VERSION'
-      @output.string.should include('New release of')
-    end
+    # it "should allow altering of commit message with --message" do
+    #   run 'bump', '--message', 'New release of VERSION'
+    #   @output.string.should include('New release of')
+    # end
     
     # it "should allow altering rake tasks with --rake" do
     #   run 'bump', '--rake', 'foo,bar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-release
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 -08:00
+date: 2009-03-06 00:00:00 -08:00
 default_executable: re
 dependencies: 
 - !ruby/object:Gem::Dependency