visionmedia-release 0.3.2 → 0.3.5

data/History.rdoc

@@ -1,4 +1,18 @@
 
+=== 0.3.5 / 2009-04-08
+
+* Added support for multiple version files
+
+=== 0.3.4 / 2009-03-24
+
+* Github build me?
+
+=== 0.3.3 / 2009-03-24
+
+* Updated compatibility with latest commander
+* Removed need for .re directory
+* Fixed config help doc typo
+
 === 0.3.2 / 2009-03-14
 
 * Github, build me!

data/Manifest

@@ -3,7 +3,6 @@ History.rdoc
 Manifest
 Rakefile
 README.rdoc
-release.gemspec
 spec/fixtures/bar/version.rb
 spec/fixtures/foo.rb
 spec/release_spec.rb

data/Rakefile

@@ -4,13 +4,13 @@ require 'rake'
 require 'echoe'
 load './bin/re'
 
-Echoe.new("release", program(:version)) do |p|
+Echoe.new "release", program(:version) do |p|
   p.author = "TJ Holowaychuk"
   p.email = "tj@vision-media.ca"
   p.summary = "Github release management system"
   p.url = "http://github.com/visionmedia/release"
   p.runtime_dependencies = []
-  p.runtime_dependencies << "visionmedia-commander >=3.1.1"
+  p.runtime_dependencies << "visionmedia-commander >=3.1.7"
 end
 
 Dir['tasks/**/*.rake'].sort.each { |f| load f }

data/Todo.rdoc

@@ -7,7 +7,6 @@
 * Better specs
 * When exception is raised revert all alterations made to that point
 * Support init of first tag
-* Dont use .re 
 * Refactor
 
 == Minor:

data/bin/re

@@ -5,7 +5,7 @@ require 'commander'
 require 'yaml'
 
 program :name, 'release'
-program :version, '0.3.2'
+program :version, '0.3.5'
 program :description, 'Github release management'
 
 default_command :bump
@@ -21,7 +21,7 @@ def sh command, nullify = true
 end
 
 def extract_version_from file
-  raise 'faild to locate version file. Use --file' unless file
+  raise 'failed to locate version file. Use --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
@@ -56,7 +56,7 @@ def locate_history_file
 end
 
 def bump_options c
-  c.option '-f', '--file FILE', 'File containing the version, otherwise searches lib/ for version.rb'
+  c.option '-f', '--file FILE', Array, 'File(s) 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'
   c.option '-R', '--no-rake', 'Disable all rake tasks'
@@ -67,27 +67,22 @@ def bump_options c
   c.option '-M', '--verify-master', 'Verify that master is the current branch before releasing'
 end
 
-def save_config config
-  File.open(CONFIG_FILE, 'w+') { |f| YAML.dump config, f } 
+def save_config hash
+  File.open(CONFIG_FILE, 'w+') { |f| YAML.dump hash, f } 
 end
 
 def remove_config name
-  config = load_config
-  config.delete name
-  save_config config
+  if hash = load_config
+    hash.delete name
+    save_config hash
+  end
 end
 
 def load_config name = nil
-  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
+  hash = YAML.load_file CONFIG_FILE rescue false
+  return hash unless name and hash
+  raise "configuration '#{name}' cannot be found" unless hash.include? name
+  hash[name]
 end
 
 def master_branch?
@@ -106,16 +101,8 @@ def actions
   @__actions
 end
 
-def save_last_version
-  `mkdir .re` unless File.directory? '.re'
-  File.open('.re/last_version', 'w+') do |file|
-    file.write `git tag`.split.last
-  end
-end
-
 def last_version
-  save_last_version
-  File.read '.re/last_version'
+  `git tag`.split.last
 end
 
 command :bump do |c|
@@ -132,10 +119,9 @@ command :bump do |c|
       level = args.shift    || 'patch'
       o.message = o.message || 'Release VERSION'
       o.rake = o.rake       || %w( manifest gemspec )
-      o.file = o.file       || locate_version_file
+      o.file = o.file       || [locate_version_file]
       o.format = o.format   || "format:'* %s'"
-      
-      merge_options o, load_config(o.config) if o.config
+      o.__hash__.merge! load_config(o.config)
       
       if o.verify_master      
         action 'verifying master branch' do
@@ -147,9 +133,14 @@ command :bump do |c|
         def sh command, nullify = true
           log "`#{command}`"
         end
-        version = bump_version(o.file, level).join '.'
+        log "version file(s) #{o.file.join(', ')}"
+        version = o.file.inject false do |version, file|
+          version = bump_version(file, level).join '.'
+        end
       else
-        version = replace_version o.file, level
+        version = o.file.inject false do |version, file|
+          version = replace_version file, level
+        end
       end
       
       if o.history
@@ -217,32 +208,32 @@ command :config do |c|
   '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.example 'Show all configurations', 're config 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  
+      abort 'invalid configuration name' unless name
+      if config = load_config
+        config[name] = options.__hash__
       else
-        config = { name => options }
+        config = { name => options.__hash__ }
       end
       save_config config
       log "configuration '#{name}' saved"
     when 'remove'
-      raise 'invalid configuration name' unless name
+      abort 'invalid configuration name' unless name
       remove_config name
       log "configuration '#{name}' removed"
     when 'show'
+      abort 'no configurations' unless load_config
       load_config.each do |name, config|
-        say '%14s: %s' % [name, config.inspect.sub('#<Commander::Command::Options ', '').sub('>', '')]
+        say '%14s: %s' % [name, config.inspect]
       end
     else
-      raise 'invalid operation'
+      abort 'invalid operation'
     end
     
   end

data/release.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{release}
-  s.version = "0.3.2"
+  s.version = "0.3.5"
 
   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-14}
+  s.date = %q{2009-04-08}
   s.default_executable = %q{re}
   s.description = %q{Github release management system}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["re"]
   s.extra_rdoc_files = ["bin/re", "README.rdoc", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "tasks/update.rake"]
-  s.files = ["bin/re", "History.rdoc", "Manifest", "Rakefile", "README.rdoc", "release.gemspec", "spec/fixtures/bar/version.rb", "spec/fixtures/foo.rb", "spec/release_spec.rb", "spec/spec_helper.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "tasks/update.rake", "Todo.rdoc"]
+  s.files = ["bin/re", "History.rdoc", "Manifest", "Rakefile", "README.rdoc", "spec/fixtures/bar/version.rb", "spec/fixtures/foo.rb", "spec/release_spec.rb", "spec/spec_helper.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "tasks/update.rake", "Todo.rdoc", "release.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/visionmedia/release}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Release", "--main", "README.rdoc"]
@@ -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>, [">= 3.1.1"])
+      s.add_runtime_dependency(%q<visionmedia-commander>, [">= 3.1.7"])
     else
-      s.add_dependency(%q<visionmedia-commander>, [">= 3.1.1"])
+      s.add_dependency(%q<visionmedia-commander>, [">= 3.1.7"])
     end
   else
-    s.add_dependency(%q<visionmedia-commander>, [">= 3.1.1"])
+    s.add_dependency(%q<visionmedia-commander>, [">= 3.1.7"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-release
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-14 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: re
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.1
+        version: 3.1.7
     version: 
 description: Github release management system
 email: tj@vision-media.ca
@@ -41,7 +41,6 @@ files:
 - Manifest
 - Rakefile
 - README.rdoc
-- release.gemspec
 - spec/fixtures/bar/version.rb
 - spec/fixtures/foo.rb
 - spec/release_spec.rb
@@ -51,6 +50,7 @@ files:
 - tasks/spec.rake
 - tasks/update.rake
 - Todo.rdoc
+- release.gemspec
 has_rdoc: true
 homepage: http://github.com/visionmedia/release
 post_install_message: