visionmedia-release 0.0.5 → 0.1.0

data/History.rdoc

@@ -1,4 +1,19 @@
 
+=== 0.1.0 / 2009-03-05
+
+* Added dependency of visionmedia-commander gem
+* Trapping INT for better abort message
+
+=== 0.0.8 / 2009-03-05
+
+* Better formatting for `re config show`
+
+=== 0.0.7 / 2009-03-05
+
+* Added config sub-command for storing, removing, and viewing configurations
+* Added --config NAME switch to bump sub-command
+* Fixed git log switch preventing --pretty=oneline from working
+
 === 0.0.5 / 2009-03-05
 
 * Added git log pretty=oneline to take a look at commits while editing history

data/Rakefile

@@ -10,6 +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"
 end
 
 Dir['tasks/**/*.rake'].sort.each { |f| load f }

data/Todo.rdoc

@@ -1,8 +1,10 @@
 
 == Major:
 
+* Ability to abort
+* Get git log working
+* Refactor
 * Better specs
-* Datastore for config at ~/.re/config.yml
 * When exception is raised revert all alterations made to that point
 
 == Minor:

data/bin/re

@@ -2,11 +2,18 @@
 
 require 'rubygems'
 require 'commander'
+require 'yaml'
 
 program :name, 'release'
-program :version, '0.0.5'
+program :version, '0.1.0'
 program :description, 'Github release management'
 
+CONFIG_FILE = File.expand_path('~/.re-config')
+
+trap 'INT' do
+  raise "release interrupted"
+end
+
 def sh command
   system command
 end
@@ -30,9 +37,7 @@ def replace_version file, level
   version = bump_version(file, level).join '.'
   contents = File.read file
   contents.sub! /\d+\.\d+\.\d+/, version
-  File.open(file, 'w+') do |file|
-    file.write contents
-  end
+  File.open(file, 'w+') { |f| f.write contents } 
   version
 end
 
@@ -44,12 +49,7 @@ def locate_history_file
   Dir['*'].grep(/history|change/i).first
 end
 
-command :bump do |c|
-  c.syntax = 're bump [level] [options]'
-  c.summary = 'Bump the version <level>, defaults to patch.'
-  c.description = 'Bump the version by major, minor, or patch (tiny) levels, defaults to patch.'
-  c.example 'Bump patch level, running several rake tasks first', 're bump --rake manifest,gemspec'
-  c.example 'Custom message, VERSION replaced with actual version', 're bump major --message \'Release of App VERSION\''
+def bump_options c
   c.option '-f', '--file FILE', 'File containing the version, otherwise searches lib/ for version.rb'
   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'
@@ -57,6 +57,40 @@ command :bump do |c|
   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'
+end
+
+def save_config config
+  File.open(CONFIG_FILE, 'w+') { |f| YAML.dump config, f } 
+end
+
+def remove_config name
+  config = load_config
+  config.delete name
+  save_config config
+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
+  config[name]
+end
+
+def merge_options options, other_options
+  a = options.instance_variable_get :"@table"
+  b = other_options.instance_variable_get :"@table"
+  a.merge! b
+end
+
+command :bump do |c|
+  bump_options c
+  c.syntax = 're bump [level] [options]'
+  c.summary = 'Bump the version <level>, defaults to patch'
+  c.description = 'Bump the version by major, minor, or patch (tiny) levels, defaults to patch.'
+  c.example 'Bump patch level, running several rake tasks first', 're bump --rake manifest,gemspec'
+  c.example 'Custom message, VERSION replaced with actual version', 're bump major --message \'Release of App VERSION\''
+  c.option '-c', '--config NAME', 'Load configuration options'
   c.when_called do |args, o|
     begin
       # Defaults
@@ -64,7 +98,13 @@ command :bump do |c|
       o.rake = o.rake || %w( manifest gemspec )
       o.file = o.file || locate_version_file
       o.message = o.message || '- Release VERSION'
-    
+      
+      # Configurations
+      if o.config
+        say "... using '#{o.config}' configuration"
+        merge_options o, load_config(o.config) 
+      end
+      
       # Dry-run
       if o.dry_run
         puts "... performing dry-run"
@@ -78,7 +118,7 @@ command :bump do |c|
     
       # History
       if o.history
-        sh "git log pretty=online"
+        sh "git log --pretty=oneline"
         sh "$EDITOR #{locate_history_file} --wait" 
       end
       
@@ -89,7 +129,47 @@ command :bump do |c|
       sh "git tag #{version} && git push && git push --tags"
       say "... release #{version} complete"
     rescue Exception => e
-      o.trace ? raise : say("... release failed: #{e}")
+      o.trace ? raise : say("... release failed: #{e}\n")
     end
   end
-end
+end
+
+command :config do |c|
+  bump_options c
+  c.syntax = 're config <op> <name>'
+  c.summary = 'Manage configurations'
+  c.description = "Add, remove, or show release configurations."
+  c.example 'Create config for myproject. All switches in this command will be stored as the new configuration.', 
+  're config add myproject --message "Release myproject VERSION" --file bin/myproject'
+  c.example 'Use the config created above', 're bump --config myproject'
+  c.example 'Remove myproject config', 're config remove myproject'
+  c.example 'Show all configurations', 're show'
+  c.when_called do |args, options|
+    op = args.shift
+    name = args.shift
+    
+    case op
+    when 'add'
+      raise 'invalid configuration name' unless name
+      if File.exists? CONFIG_FILE
+        config = load_config
+        config[name] = options  
+      else
+        config = { name => options }
+      end
+      save_config config
+      say "... configuration '#{name}' saved"
+    when 'remove'
+      raise 'invalid configuration name' unless name
+      remove_config name
+      say "... configuration '#{name}' removed"
+    when 'show'
+      load_config.each do |name, config|
+        say '%14s: %s' % [name, config.inspect.sub('#<OpenStruct ', '').sub('>', '')]
+      end
+    else
+      raise 'invalid operation'
+    end
+    
+  end
+end

data/release.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{release}
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   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.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - TJ Holowaychuk