gem-release 0.0.17 → 0.0.19

data/lib/gem_release/helpers.rb

@@ -57,5 +57,16 @@ module GemRelease
       name ||= Dir['*.gemspec'].first
       name || raise("No gemspec found or given.")
     end
+
+    def in_gemspec_dirs
+      gemspec_dirs.each do |dir|
+        @version = nil # UGH.
+        Dir.chdir(dir) { yield }
+      end
+    end
+
+    def gemspec_dirs
+      Dir.glob('**/*.gemspec').map { |spec| File.dirname(spec) }
+    end
   end
 end

data/lib/gem_release/template.rb

@@ -26,11 +26,11 @@ module GemRelease
       File.open(filename, 'w+') { |f| f.write(render) }
     end
 
-    protected
+    def filename
+      template
+    end
 
-      def filename
-        template
-      end
+    protected
 
       def render
         ERB.new(read_template, nil, "%").result(binding)

data/lib/gem_release/templates/README.md

@@ -0,0 +1 @@
+# <%= gem_name %>

data/lib/gem_release/templates/Rakefile

@@ -0,0 +1,10 @@
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task :default => :test

data/lib/gem_release/version.rb

@@ -1,5 +1,5 @@
 module GemRelease
-  VERSION = '0.0.17'
+  VERSION = '0.0.19'
 
   class Version < Template
     attr_reader :version

data/lib/rubygems/commands/bootstrap_command.rb

@@ -37,63 +37,25 @@ class Gem::Commands::BootstrapCommand < Gem::Command
 
   def write_scaffold
     say 'scaffolding ...' unless quiet?
-    create_lib
-    create_readme
-    create_license
-    create_gemfile
-    create_test_helper
-    create_version
-    create_rakefile
+
+    create_file Template.new('README.md')
+    create_file Template.new('LICENSE', :year => Time.now.year, :author => user_name, :email => user_email)
+    create_file Template.new('Gemfile')
+    create_file Template.new('Rakefile')
+    create_file Template.new('test/test_helper.rb')
+    create_file Version.new(options)
   end
 
   def create_lib
     `mkdir -p lib test`
   end
 
-  def create_readme
-    `echo "# #{gem_name}" > README.md`
-  end
-
-  def create_license
-    Template.new('LICENSE', :year => Time.now.year, :author => user_name, :email => user_email).write
-  end
-
-  def create_gemfile
-    Template.new('Gemfile').write
-  end
-
-  def create_test_helper
-    Template.new('test/test_helper.rb').write
-  end
-
-  def create_version
-    version = Version.new(options)
-    if File.exists?("#{version.filename}")
-      say "Skipping #{version.filename}: already exists" unless quiet?
+  def create_file(template)
+    if File.exists?(template.filename)
+      say "Skipping #{template.filename}: already exists" unless quiet?
     else
-      say "Creating #{version.filename}" unless quiet?
-      version.write
-    end
-  end
-
-  def create_rakefile
-    if File.exists?('Rakefile')
-      say "Skipping Rakefile: already exists" unless quiet?
-    else
-      say "Creating Rakefile" unless quiet?
-      rakefile = <<RAKEFILE
-require 'rake'
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-task :default => :test
-RAKEFILE
-      File.open('Rakefile', 'w').write(rakefile)
+      say "Creating #{template.filename}" unless quiet?
+      template.write
     end
   end
 

data/lib/rubygems/commands/bump_command.rb

@@ -29,8 +29,11 @@ class Gem::Commands::BumpCommand < Gem::Command
   end
 
   def execute
-    in_spec_dirs { bump }
+    in_gemspec_dirs do
+      bump
+    end
 
+    @version = nil # UGH
     commit  if options[:commit]
     push    if options[:push] || options[:tag]
     release if options[:release]
@@ -39,21 +42,18 @@ class Gem::Commands::BumpCommand < Gem::Command
 
   protected
 
-    def in_spec_dirs
-      spec_dirs.each do |dir|
-        @version = nil
-        Dir.chdir(dir) { yield }
-      end
-    end
-
     def bump
-      say "Bumping #{gem_name} from #{version.old_number} to version #{version.new_number}" unless quiet?
-      version.bump!
+      if File.exist?(version.filename)
+        say "Bumping #{gem_name} from #{version.old_number} to version #{version.new_number}" unless quiet?
+        version.bump!
+        `git add #{version.filename}` if options[:commit]
+      else
+        say "Ignoring #{gem_name}. Version file #{version.filename} not found" unless quiet?
+      end
     end
 
     def commit
       say "Creating commit" unless quiet?
-      `git add #{version.filename}`
       `git commit -m "Bump to #{version.new_number}"`
     end
 
@@ -73,8 +73,4 @@ class Gem::Commands::BumpCommand < Gem::Command
     def version
       @version ||= VersionFile.new(:target => options[:version])
     end
-
-    def spec_dirs
-      Dir.glob('**/*.gemspec').map { |spec| File.dirname(spec) }
-    end
 end

data/lib/rubygems/commands/release_command.rb

@@ -24,9 +24,12 @@ class Gem::Commands::ReleaseCommand < Gem::Command
   end
 
   def execute
-    build
-    push
-    remove
+    in_gemspec_dirs do
+      build
+      push
+      remove
+    end
+
     tag if options[:tag]
     say "All is good, thanks buddy.\n"
   end

metadata

@@ -1,64 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gem-release
-version: !ruby/object:Gem::Version 
-  hash: 61
+version: !ruby/object:Gem::Version
+  version: 0.0.19
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 17
-  version: 0.0.17
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-29 00:00:00 +02:00
+date: 2011-07-29 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: test_declarative
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2167590280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2167590280
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2167589760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id002
-description: Release your ruby gems with ease. (What a bold statement for such a tiny plugin ...)
+  prerelease: false
+  version_requirements: *2167589760
+description: Release your ruby gems with ease. (What a bold statement for such a tiny
+  plugin ...)
 email: svenfuchs@artweb-design.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/core_ext/kernel/silence.rb
 - lib/core_ext/string/camelize.rb
 - lib/gem_release.rb
@@ -69,6 +51,8 @@ files:
 - lib/gem_release/template.rb
 - lib/gem_release/templates/Gemfile
 - lib/gem_release/templates/LICENSE
+- lib/gem_release/templates/README.md
+- lib/gem_release/templates/Rakefile
 - lib/gem_release/templates/gemspec
 - lib/gem_release/templates/test/test_helper.rb
 - lib/gem_release/templates/version.rb
@@ -83,38 +67,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/svenfuchs/gem-release
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
-rubyforge_project: "[none]"
+rubyforge_project: ! '[none]'
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Release your ruby gems with ease
 test_files: []
-