bump 0.3.7 → 0.3.8

data/.gitignore

@@ -1 +1,3 @@
 *.gem
+.bundle/
+.rspec

data/Gemfile

@@ -1,5 +1,2 @@
 source :rubygems
 gemspec
-
-gem 'rake'
-gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    bump (0.3.7)
+    bump (0.3.8)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -22,5 +22,5 @@ PLATFORMS
 
 DEPENDENCIES
   bump!
-  rake
-  rspec (~> 2)
+  rake (~> 10.0.0)
+  rspec (~> 2.0)

data/bump.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new "bump" do |s|
-  s.version = "0.3.7"
+  s.version = "0.3.8"
   s.author = "Gregory Marcilhacy"
   s.email = "g.marcilhacy@gmail.com"
   s.homepage = "https://github.com/gregorym/bump"
@@ -9,6 +9,9 @@ Gem::Specification.new "bump" do |s|
   s.license = "MIT"
   s.require_path = "lib"
   s.executables = ["bump"]
+
+  s.add_development_dependency 'rake', '~> 10.0.0'
+  s.add_development_dependency 'rspec', '~> 2.0'
 end
 
 

data/lib/bump.rb

@@ -71,6 +71,7 @@ module Bump
         version_from_version_rb ||
         version_from_gemspec ||
         version_from_version ||
+        version_from_lib_rb  ||
         raise(UnfoundVersionFileError)
       )
       raise UnfoundVersionError unless version
@@ -85,7 +86,7 @@ module Bump
     end
 
     def self.version_from_version_rb
-      return unless file = find_version_file("*/**/version.rb")
+      return unless file = find_version_file("lib/**/version.rb")
       extract_version_from_file(file)
     end
 
@@ -94,6 +95,12 @@ module Bump
       extract_version_from_file(file)
     end
 
+    def self.version_from_lib_rb
+      file = find_version_file('lib/*.rb')
+      return unless file && File.open(file).lines.grep(/^VERSION = (['"])#{VERSION_REGEX}['"]/i)
+      extract_version_from_file(file)
+    end
+
     def self.extract_version_from_file(file)
       return unless version = File.read(file)[VERSION_REGEX]
       [version, file]

data/spec/bump_spec.rb

@@ -1,8 +1,7 @@
 require "spec_helper"
 
 describe Bump do
-  let(:gemspec){ "fixture.gemspec" }
-  let(:version_rb_file){ "lib/foo/version.rb" }
+  let(:gemspec) { "fixture.gemspec" }
 
   inside_of_folder("spec/fixture")
 
@@ -119,28 +118,30 @@ describe Bump do
   end
 
   context "VERSION in version.rb" do
+    let(:version_file) { "lib/foo/version.rb" }
+
     before do
-      write_version_rb
+      write_version_file
     end
 
     it "show current" do
       bump("current").should include("1.2.3")
-      read(version_rb_file).should include('  VERSION = "1.2.3"')
+      read(version_file).should include('  VERSION = "1.2.3"')
     end
 
     it "should bump VERSION" do
       bump("minor").should include("1.3.0")
-      read(version_rb_file).should include('  VERSION = "1.3.0"')
+      read(version_file).should include('  VERSION = "1.3.0"')
     end
 
     it "should bump Version" do
-      write version_rb_file, <<-RUBY.sub(" "*8, "")
+      write version_file, <<-RUBY.sub(" "*8, "")
         module Foo
           Version = "1.2.3"
         end
       RUBY
       bump("minor").should include("1.3.0")
-      read(version_rb_file).should include('  Version = "1.3.0"')
+      read(version_file).should include('  Version = "1.3.0"')
     end
 
     it "should bump if a gemspec exists and leave it alone" do
@@ -152,6 +153,7 @@ describe Bump do
 
   context "version in VERSION" do
     let(:version) { "1.2.3" }
+    let(:version_file) { "lib/foo/version.rb" }
 
     before do
       write "VERSION", "#{version}\n"
@@ -169,10 +171,10 @@ describe Bump do
 
     it "should bump if a gemspec & version.rb exists and leave it alone" do
       write_gemspec "File.read('VERSION')"
-      write_version_rb "File.read('VERSION')"
+      write_version_file "File.read('VERSION')"
       bump("minor").should include("1.3.0")
       read("VERSION").should include("1.3.0")
-      read(version_rb_file).should include("VERSION = File.read('VERSION')")
+      read(version_file).should include("VERSION = File.read('VERSION')")
       read(gemspec).should include("version = File.read('VERSION')")
     end
 
@@ -238,6 +240,7 @@ describe Bump do
     before do
       write_gemspec('"1.0.0"')
       write "Gemfile", <<-RUBY
+        source :rubygems
         gemspec
       RUBY
       `git add Gemfile #{gemspec}`
@@ -272,6 +275,40 @@ describe Bump do
     end
   end
 
+  context "VERSION in lib file" do
+    let(:version_file) { "lib/foo.rb" }
+
+    before do
+      write_version_file
+    end
+
+    it "show current" do
+      bump("current").should include("1.2.3")
+      read(version_file).should include('  VERSION = "1.2.3"')
+    end
+
+    it "should bump VERSION" do
+      bump("minor").should include("1.3.0")
+      read(version_file).should include('  VERSION = "1.3.0"')
+    end
+
+    it "should bump Version" do
+      write version_file, <<-RUBY.sub(" "*8, "")
+        module Foo
+          Version = "1.2.3"
+        end
+      RUBY
+      bump("minor").should include("1.3.0")
+      read(version_file).should include('  Version = "1.3.0"')
+    end
+
+    it "should bump if a gemspec exists and leave it alone" do
+      write_gemspec "'1.'+'2.3'"
+      bump("minor").should include("1.3.0")
+      read(gemspec).should include("version = '1.'+'2.3'")
+    end
+  end
+
   private
 
   def bump(command="", options={})
@@ -285,14 +322,14 @@ describe Bump do
         s.version = #{version}
         s.summary = 'Fixture gem'
       end
-    RUBY
+        RUBY
   end
 
-  def write_version_rb(version = '"1.2.3"')
-    write version_rb_file, <<-RUBY.sub(" "*6, "")
+  def write_version_file(version = '"1.2.3"')
+    write version_file, <<-RUBY.sub(" "*6, "")
       module Foo
         VERSION = #{version}
       end
-    RUBY
+        RUBY
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
-dependencies: []
+date: 2012-12-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: 
 email: g.marcilhacy@gmail.com
 executables: