tumbler 0.0.9 → 0.0.10

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.0.10
+
+* Added preflight task for easy injection of arbitrary code before tumbler runs. (Joshua Hull, bdb7ed7)
+* More explicit instructions for releasing in two steps (Joshua Hull, a836489)
+* Cleaned up spec, removed debug output (Joshua Hull, 75e2b2d)
+* Removed whitespace (Joshua Hull, 6a66d7d)
+* Gem#push on successful bumps (Joshua Hull, c359a1d)
+
 == 0.0.9
 
 * Allow custom binding to be passed when rendering erb (Nathan Esquenazi, 4ccc567)

data/Gemfile

@@ -9,4 +9,5 @@ group :development do
   gem 'rake'
   gem 'rspec'
   gem 'fakeweb'
+  gem 'mocha'
 end

data/Gemfile.lock

@@ -16,15 +16,19 @@ dependencies:
     group: 
     - :default
     version: ">= 0"
+  mocha: 
+    group: 
+    - :development
+    version: ">= 0"
   json: 
     group: 
     - :default
     version: ">= 0"
-  bundler: 
+  callsite: 
     group: 
     - :default
     version: ">= 0"
-  callsite: 
+  bundler: 
     group: 
     - :default
     version: ">= 0"
@@ -41,11 +45,13 @@ specs:
     version: 1.2.8
 - json: 
     version: 1.4.3
+- mocha: 
+    version: 0.9.8
 - rspec: 
     version: 1.3.0
 - versionomy: 
     version: 0.4.0
-hash: 607cf6d6ac15a00ffd67cd35247ddf8b124dc5a8
+hash: 85f3afef38338d73c791177045f3c5d9b77a14b4
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/README.rdoc

@@ -74,13 +74,21 @@ Once you've got Tumbler up and running in your gem, you will have access to the
   rake version:push           # Push current version into git
   rake version:tag            # Tag current version into git
 
-==== Releasing your Gem
+There is a special rake task you can override, <tt>'tumbler:preflight'</tt>, if you'd like to run specs or do some other task before any of the tumbler tasks get invoked. For instance, to invoke +spec+ before you run your main tasks, you could add:
 
-You can either do
+  task 'tumbler:preflight' do
+    Rake::Task["spec"].invoke
+  end
+
+==== Releasing Your Gem
+
+If you do the following,
 
   rake version:(tiny|minor|major):release
   
-which will bump the version, tag it in git, regenerate the changelog from your git commits and push the whole thing to rubygems and your remote or you can do it in two separate steps:
+you will bump the version, tag it in git, regenerate the changelog from your git commits and push the whole thing to rubygems and your remote.
+
+If you prefer you can do it in two steps (which give you a chance to edit the generated changelog)
 
   rake version:(tiny|minor|major):bump
   rake version:push

data/Rakefile

@@ -2,6 +2,10 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'tumbler'
 Tumbler.use_rake_tasks
 
+task 'tumbler:preflight' do
+  Rake::Task["spec"].invoke
+end
+
 require 'spec'
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |t|

data/lib/template/Gemfile.erb

@@ -14,4 +14,3 @@ group :development do
   gem <%=dep.name.inspect%>, <%=dep.requirement.to_s.inspect%>
 <% end %>
 end
-

data/lib/tumbler/manager.rb

@@ -81,6 +81,7 @@ module Tumbler
       guard_already_tagged
       tag
       push
+      @gem.push
     end
 
     def bump_and_push(field)

data/lib/tumbler/rake_tasks.rb

@@ -16,47 +16,52 @@ module Tumbler
 
     def activate_project_tasks(protect_namespace)
       tasks = proc do
+        namespace :tumbler do
+          task :preflight do
+          end
+        end
+
         namespace :gem do
           desc "Build the gem"
-          task :build do
+          task :build => 'tumbler:preflight' do
             @manager.gem.build
           end
 
           desc "Push the gem"
-          task :push do
+          task :push => 'tumbler:preflight' do
             @manager.gem.push
           end
 
           desc "Install the gem"
-          task :install do
+          task :install => 'tumbler:preflight' do
             @manager.gem.install
           end
         end
 
         namespace :version do
           desc "Tag current version into git"
-          task :tag do
+          task :tag => 'tumbler:preflight' do
             @manager.tag
           end
         
           desc "Push current version into git"
-          task :push do
+          task :push => 'tumbler:preflight' do
             @manager.tag_and_push
           end
         
           @manager.version.field_names.each do |field|
             namespace field do 
               desc "Bump version from #{@manager.version.to_s} ->  #{@manager.version.value.bump(field).to_s}"
-              task :bump do
+              task :bump => 'tumbler:preflight' do
                 @manager.bump_and_commit(field)
               end
 
-              task :push do
+              task :push => 'tumbler:preflight' do
                 @manager.tag_and_push(field)
               end
 
               desc "Bump version from #{@manager.version.to_s} ->  #{@manager.version.value.bump(field).to_s} and push"
-              task :release do
+              task :release => 'tumbler:preflight' do
                 @manager.bump_and_push(field)
               end
             end

data/lib/tumbler/version.rb

@@ -1,3 +1,3 @@
 module Tumbler
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/changelog_spec.rb

@@ -14,6 +14,7 @@ describe Tumbler::Manager::Changelog do
       tumbler.sh 'touch file2'
       tumbler.sh 'git add file2'
       tumbler.sh 'git commit file2 -m"added file2"'
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
       tumbler.bump_and_push(:tiny)
       tumbler.version.to_s.should == '0.0.1'
       changelog = File.read(tumbler.changelog.file)
@@ -29,6 +30,7 @@ describe Tumbler::Manager::Changelog do
       tumbler.sh 'touch file2'
       tumbler.sh 'git add file2'
       tumbler.sh 'git commit file2 -m"added file2"'
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
       tumbler.bump_and_push(:tiny)
       tumbler.version.to_s.should == '0.0.1'
       File.exist?(File.join(tumbler.base, 'CHANGELOG')).should be_false

data/spec/spec_helper.rb

@@ -1,11 +1,15 @@
 require 'tempfile'
 require 'fileutils'
+require 'mocha'
 
 $LOAD_PATH << File.basename(__FILE__)
 $LOAD_PATH << File.join(File.basename(__FILE__), '..', 'lib')
 
 require 'tumbler'
 
+Tumbler::Gem.any_instance.stubs(:install).raises
+Tumbler::Gem.any_instance.stubs(:push).raises
+
 def create_app(name = 'test', opts = {})
   temp_dir(name) do |dir|
     temp_dir("remote-#{name}.git") do |remote_dir|

data/spec/tasks_spec.rb

@@ -30,6 +30,7 @@ describe Tumbler do
   
     it "should successfully push after a bump" do
       create_app do |app|
+        Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
         app.bump_and_commit(:minor)
         app.tag_and_push
         app.reload
@@ -42,6 +43,7 @@ describe Tumbler do
   context "version bumping & pushing" do
     it "should create a nice changelog" do
       create_app do |app|
+        Tumbler::Gem.any_instance.stubs(:push).times(4).returns(true)
         app.sh 'touch test1; git add test1; git commit test1 -m"Added test1"'
         app.bump_and_push(:minor)
         app.sh 'touch test2; git add test2; git commit test2 -m"Added test2"'

data/spec/version_spec.rb

@@ -2,46 +2,50 @@ require 'spec/spec_helper'
 
 describe 'Tumbler#version' do
   it "should read the current version" do
-    create_app('test', :version => '0.1.2') { |tumbler|
-      tumbler.version.to_s.should == '0.1.2'
+    create_app('test', :version => '0.1.2') { |app|
+      app.version.to_s.should == '0.1.2'
     }
   end
 
   it "should bump the current version by minor" do
-    create_app('test', :version => '0.1.2') { |tumbler|
-      puts "File.read(tumbler.version.file) #{File.read(tumbler.version.file)}"
-      tumbler.bump_and_push(:minor)
-      tumbler.version.to_s.should == '0.2.0'
-      tumbler.tags.should include('0.2.0')
+    create_app('test', :version => '0.1.2') { |app|
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+      app.bump_and_push(:minor)
+      app.version.to_s.should == '0.2.0'
+      app.tags.should include('0.2.0')
     }
   end
 
   it "should bump the current version by tiny" do
-    create_app('test', :version => '0.1.2') { |tumbler|
-      tumbler.bump_and_push(:tiny)
-      tumbler.version.to_s.should == '0.1.3'
+    create_app('test', :version => '0.1.2') { |app|
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+      app.bump_and_push(:tiny)
+      app.version.to_s.should == '0.1.3'
     }
   end
 
   it "should bump the current version by major" do
-    create_app('test', :version => '0.1.2') { |tumbler|
-      tumbler.bump_and_push(:major)
-      tumbler.version.to_s.should == '1.0.0'
+    create_app('test', :version => '0.1.2') { |app|
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+      app.bump_and_push(:major)
+      app.version.to_s.should == '1.0.0'
     }
   end
 
   it "should bump the current version by major" do
-    create_app('test', :version => '0.1.2') { |tumbler|
-      tumbler.bump_and_push(:major)
-      tumbler.version.to_s.should == '1.0.0'
+    create_app('test', :version => '0.1.2') { |app|
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+      app.bump_and_push(:major)
+      app.version.to_s.should == '1.0.0'
     }
   end
 
   it "should not let you tag the same version twice" do
-    create_app('test', :version => '0.1.2') { |tumbler|
-      tumbler.bump_and_push(:major)
-      tumbler.version.to_s.should == '1.0.0'
-      proc {tumbler.tag_and_push(:major)}.should raise_error
+    create_app('test', :version => '0.1.2') { |app|
+      Tumbler::Gem.any_instance.stubs(:push).once.returns(true)
+      app.bump_and_push(:major)
+      app.version.to_s.should == '1.0.0'
+      proc {app.tag_and_push(:major)}.should raise_error
       
     }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tumbler
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Joshua Hull
@@ -116,6 +116,20 @@ dependencies:
   requirement: *id007
   type: :development
   name: fakeweb
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+  type: :development
+  name: mocha
 description: Description
 email: joshbuddy@gmail.com
 executables: