bump 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bump (0.3.2)
+    bump (0.3.3)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -16,6 +16,16 @@ Bump your gemfile (major, minor, patch):
 
 Bump version 0.1.2 to 0.1.3
 
+### Rake
+
+```Ruby
+# Rakefile
+require "bump/tasks"
+```
+
+    rake bump:patch
+    rake bump:current
+
 # Supported locations
  - VERSION file with "1.2.3"
  - gemspec with `gem.version = "1.2.3"`

data/bin/bump

@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
 require 'optparse'
 
-options = {
-  :commit => true,
-  :bundle => File.exist?("Gemfile")
-}
+options = {}
 OptionParser.new do |opts|
   opts.banner = <<BANNER
 Bump your gem version.

data/bump.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new "bump" do |s|
-  s.version = "0.3.2"
+  s.version = "0.3.3"
   s.author = "Gregory Marcilhacy"
   s.email = "g.marcilhacy@gmail.com"
   s.homepage = "https://github.com/gregorym/bump"

data/lib/bump.rb

@@ -10,7 +10,16 @@ module Bump
     OPTIONS = BUMPS | ["current"]
     VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:#{PRERELEASE.compact.join('|')}))?)/
 
-    def self.run(bump, options)
+    def self.defaults
+      {
+        :commit => true,
+        :bundle => File.exist?("Gemfile")
+      }
+    end
+
+    def self.run(bump, options={})
+      options = defaults.merge(options)
+
       case bump
       when *BUMPS
         bump(bump, options)
@@ -37,7 +46,7 @@ module Bump
       current, file = current_version
       next_version = next_version(current, part)
       replace(file, current, next_version)
-      system("bundle") if options[:bundle]
+      system("bundle") if options[:bundle] and under_version_control?("Gemfile.lock")
       commit(next_version, file, options) if options[:commit]
       ["Bump version #{current} to #{next_version}", 0]
     end
@@ -115,5 +124,10 @@ module Bump
       version = [major, minor, patch, *other].compact.join('.')
       [version, prerelease].compact.join('-')
     end
+
+    def self.under_version_control?(file)
+      @all_files ||= `git ls-files`.split(/\r?\n/)
+      @all_files.include?(file)
+    end
   end
 end

data/lib/bump/tasks.rb

@@ -0,0 +1,11 @@
+require "bump"
+
+namespace :bump do
+  (Bump::Bump::BUMPS + ["current"]).each do |bump|
+    task bump do
+      output, status = Bump::Bump.run(bump)
+      puts output
+      abort unless status == 0
+    end
+  end
+end

data/spec/bump/tasks_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe "rake bump" do
+  inside_of_folder("spec/fixture")
+
+  before do
+    write "VERSION", "1.2.3\n"
+    write "Rakefile", "require File.expand_path('../../../lib/bump/tasks', __FILE__)"
+    raise unless system("git add VERSION")
+  end
+
+  it "bumps a version" do
+    output = run "rake bump:minor"
+    output.should include("1.3.0")
+    read("VERSION").should == "1.3.0\n"
+    `git log -1 --pretty=format:'%s'`.should == "v1.3.0"
+  end
+
+  it "fails when it cannot bump" do
+    write "VERSION", "AAA"
+    run "rake bump:minor", :fail => true
+  end
+
+  it "shows the version" do
+    result = run "rake bump:current"
+    result.should include("1.2.3")
+  end
+end

data/spec/bump_spec.rb

@@ -1,18 +1,10 @@
-require File.dirname(__FILE__) + "/../lib/bump.rb"
-require 'bundler'
+require "spec_helper"
 
 describe Bump do
   let(:gemspec){ "fixture.gemspec" }
   let(:version_rb_file){ "lib/foo/version.rb" }
 
-  around do |example|
-    run "rm -rf fixture && mkdir fixture"
-    Dir.chdir "fixture" do
-      `git init && git commit --allow-empty -am 'initial'` # so we never accidentally do commit to the current repo
-      example.call
-    end
-    run "rm -rf fixture"
-  end
+  inside_of_folder("spec/fixture")
 
   it "should fail if it cannot find anything to bump" do
     bump("current", :fail => true).should include "Unable to find"
@@ -249,33 +241,18 @@ describe Bump do
       Bundler.with_clean_env { bump("patch --no-bundle") }
       read(gemspec).should include "1.0.1"
       read("Gemfile.lock").should include "1.0.0"
+      `git status --porcelain`.should include "?? Gemfile.lock"
     end
 
-    it "does not commit an untracked Gemfile.lock" do
+    it "does not bundle or commit an untracked Gemfile.lock" do
       Bundler.with_clean_env { bump("patch") }
-      read("Gemfile.lock").should include "1.0.1"
-      `git status`.should include "Untracked files:"
+      read("Gemfile.lock").should include "1.0.0"
+      `git status --porcelain`.should include "?? Gemfile.lock"
     end
   end
 
   private
 
-  def write(file, content)
-    folder = File.dirname(file)
-    run "mkdir -p #{folder}" unless File.exist?(folder)
-    File.open(file, 'w'){|f| f.write content }
-  end
-
-  def read(file)
-    File.read(file)
-  end
-
-  def run(cmd, options={})
-    result = `#{cmd} 2>&1`
-    raise "FAILED #{cmd} --> #{result}" if $?.success? != !options[:fail]
-    result
-  end
-
   def bump(command="", options={})
     run "#{File.expand_path("../../bin/bump", __FILE__)} #{command}", options
   end

data/spec/spec_helper.rb

@@ -0,0 +1,41 @@
+require "bundler"
+require "bump"
+
+module SpecHelpers
+  module InstanceMethods
+    def write(file, content)
+      folder = File.dirname(file)
+      run "mkdir -p #{folder}" unless File.exist?(folder)
+      File.open(file, 'w'){|f| f.write content }
+    end
+
+    def read(file)
+      File.read(file)
+    end
+
+    def run(cmd, options={})
+      result = `#{cmd} 2>&1`
+      raise "FAILED #{cmd} --> #{result}" if $?.success? != !options[:fail]
+      result
+    end
+  end
+
+  module ClassMethods
+    def inside_of_folder(folder)
+      folder = File.expand_path(folder, File.dirname(File.dirname(__FILE__)))
+      around do |example|
+        run "rm -rf #{folder} && mkdir #{folder}"
+        Dir.chdir folder do
+          `git init && git commit --allow-empty -am 'initial'` # so we never accidentally do commit to the current repo
+          example.call
+        end
+        run "rm -rf #{folder}"
+      end
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.include SpecHelpers::InstanceMethods
+  c.extend SpecHelpers::ClassMethods
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: g.marcilhacy@gmail.com
@@ -27,7 +27,10 @@ files:
 - bin/bump
 - bump.gemspec
 - lib/bump.rb
+- lib/bump/tasks.rb
+- spec/bump/tasks_spec.rb
 - spec/bump_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/gregorym/bump
 licenses:
 - MIT