bump 0.3.0 → 0.3.1

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -0,0 +1,35 @@
+# Installation
+
+    gem install bump
+
+# Usage
+
+Current version of your gem:
+
+    bump current
+
+Current version: 0.1.2
+
+Bump your gemfile (major, minor, patch):
+
+    bump patch
+
+Bump version 0.1.2 to 0.1.3
+
+# Supported locations
+ - VERSION file with "1.2.3"
+ - gemspec with `gem.version = "1.2.3"`
+ - lib/**/version.rb file with `VERSION = "1.2.3"`
+
+# Todo
+
+ - Handle options properly
+ - `VERSION = "1.2.3"` in lib/*.rb
+ - gemspec with `Gem::Specification.new "gem-name", "1.2.3" do`
+
+# Author
+Gregory<br/>
+License: MIT<br/>
+[![Build Status](https://travis-ci.org/gregorym/bump.png)](https://travis-ci.org/gregorym/bump)
+
+

data/bin/bump

@@ -2,7 +2,8 @@
 require 'optparse'
 
 options = {
-  :commit => true
+  :commit => true,
+  :bundle => File.exist?("Gemfile")
 }
 OptionParser.new do |opts|
   opts.banner = <<BANNER
@@ -17,6 +18,7 @@ Usage:
 Options:
 BANNER
   opts.on("--no-commit", "Do not make a commit.") { options[:commit] = false }
+  opts.on("--no-bundle", "Do not bundle.") { options[:bundle] = false }
   opts.on("-h", "--help","Show this.") { puts opts; exit }
 end.parse!
 

data/bump.gemspec

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

data/lib/bump.rb

@@ -36,13 +36,15 @@ module Bump
       current, file = current_version
       next_version = next_version(current, part)
       replace(file, current, next_version)
-      commit(next_version, file) if options[:commit]
+      system("bundle") if options[:bundle]
+      commit(next_version, file, options) if options[:commit]
       ["Bump version #{current} to #{next_version}", 0]
     end
 
-    def self.commit(version, file)
+    def self.commit(version, file, options)
       return unless File.directory?(".git")
-      raise unless system("git add #{file} && git commit -m 'v#{version}'")
+      system("git add --update Gemfile.lock") if options[:bundle]
+      system("git add --update #{file} && git commit -m 'v#{version}'")
     end
 
     def self.replace(file, old, new)

data/spec/bump_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + "/../lib/bump.rb"
+require 'bundler'
 
 describe Bump do
   let(:gemspec){ "fixture.gemspec" }
@@ -45,17 +46,32 @@ describe Bump do
   context "git" do
     it "should commit the new version" do
       write_gemspec
+      `git add #{gemspec}`
+
       bump("patch")
+
       `git log -1 --pretty=format:'%s'`.should == "v4.2.4"
       `git status`.should include "nothing to commit"
     end
 
     it "should not commit if --no-commit flag was given" do
       write_gemspec
+      `git add #{gemspec}`
+
       bump("patch --no-commit")
+
       `git log -1 --pretty=format:'%s'`.should == "initial"
       `git status`.should_not include "nothing to commit"
     end
+
+    it "should not add untracked gemspec" do
+      write_gemspec
+
+      bump("patch")
+
+      `git log -1 --pretty=format:'%s'`.should == "initial"
+      `git status`.should include "Untracked files:"
+    end
   end
 
   context ".version in gemspec" do
@@ -153,6 +169,36 @@ describe Bump do
     end
   end
 
+  context "with a Gemfile" do
+    before do
+      write_gemspec('"1.0.0"')
+      write "Gemfile", <<-RUBY
+        gemspec
+      RUBY
+      `git add Gemfile #{gemspec}`
+      Bundler.with_clean_env { run("bundle") }
+    end
+
+    it "bundle to keep version up to date and commit changed Gemfile.lock" do
+      `git add Gemfile.lock`
+      Bundler.with_clean_env { bump("patch") }
+      read("Gemfile.lock").should include "1.0.1"
+      `git status`.should include "nothing to commit"
+    end
+
+    it "does not bundle with --no-bundle" do
+      Bundler.with_clean_env { bump("patch --no-bundle") }
+      read(gemspec).should include "1.0.1"
+      read("Gemfile.lock").should include "1.0.0"
+    end
+
+    it "does not 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:"
+    end
+  end
+
   private
 
   def write(file, content)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: g.marcilhacy@gmail.com
@@ -19,9 +19,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
-- README.textile
+- README.md
 - Rakefile
 - bin/bump
 - bump.gemspec

data/README.textile

@@ -1,27 +0,0 @@
-h1. Installation
-
-bc. gem install bump
-
-h1. Usage
-
-Current version of your gem:
-
-bc. bump current
-Current version: 0.1.2
-
-Bump your gemfile (major, minor, patch):
-
-bc. bump patch
-Bump version 0.1.2 to 0.1.3
-
-h1. Supported locations
-* VERSION file with "1.2.3"
-* gemspec with `gem.version = "1.2.3"`
-* lib/**/version.rb file with `VERSION = "1.2.3"`
-
-h1. Todo
-
-* Handle options properly
-* `VERSION = "1.2.3"` in lib/*.rb
-* gemspec with `Gem::Specification.new "gem-name", "1.2.3" do`
-