bump 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ef186ccfe40cf26219fa1c75d15efc1d8dafdfc
-  data.tar.gz: 7da83bfd2c56ea4f0c4afced03ab7d09a8ce3bab
+  metadata.gz: 1175cf2868e448afaf993f17409112483889ed04
+  data.tar.gz: 29be419ef76fed2ca063e1eea18f6fbc922a019e
 SHA512:
-  metadata.gz: e1e6e0b617ef415e82dacd1607b69a16af17e692e9a0127bc0b8ecaa35945730b2c0ee3dc7b5e7dbd83e8e7216ba06e142443632082e09fcfcde2fdfb15f8caa
-  data.tar.gz: 021358ba88e682754d6907280dce1b69e1ff791cc93d62c3dc8fc1d5ce1e2b61c3715d42b55edb6ed117710aed96e7b81d943842e6100d116036af074e9f9c0f
+  metadata.gz: a31e2f7327abba449c4144807c2f20471a3d67566800fe77326507be5d4d22fc93b2885e67f87f3d9fa9530d8cad6fa0d4e9223d5761efde0894efe31335b2e0
+  data.tar.gz: ccca570ac125a618f0524664a975838c1e5e3673dfd2e4ccb110300367360f8880c47e8d07fdc0cf422d690f9e9042304716c97b9d53caa2b26b7daee533d303

data/lib/bump.rb

@@ -42,9 +42,7 @@ module Bump
     rescue UnfoundVersionFileError
       ["Unable to find a file with the gem version", 1]
     rescue TooManyVersionFilesError
-      ["More than one gemspec file", 1]
-    rescue Exception => e
-      ["Something wrong happened: #{e.message}\n#{e.backtrace.join("\n")}", 1]
+      ["More than one version file found (#{$!.message})", 1]
     end
 
     def self.current
@@ -120,8 +118,12 @@ module Bump
     end
 
     def self.version_from_version_rb
-      return unless file = find_version_file("lib/**/version.rb")
-      extract_version_from_file(file)
+      files = Dir.glob("lib/**/version.rb")
+      files.detect do |file|
+        if version_and_file = extract_version_from_file(file)
+          return version_and_file
+        end
+      end
     end
 
     def self.version_from_version
@@ -154,7 +156,7 @@ module Bump
       when 0 then nil
       when 1 then files.first
       else
-        raise TooManyVersionFilesError
+        raise TooManyVersionFilesError, files.join(", ")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Gregory Marcilhacy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,19 +45,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- Gemfile.lock
 - README.md
-- Rakefile
 - 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
@@ -70,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitignore

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

data/.travis.yml

@@ -1,19 +0,0 @@
-rvm:
-  - ree
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-2.1.1
-matrix:
-  allow_failures:
-    - rvm: 2.1.0
-before_script:
-  - git config --global user.email "you@example.com"
-  - git config --global user.name "Your Name"
-before_install:
-  - gem update --system 2.1.11
-  - gem --version

data/Gemfile

@@ -1,2 +0,0 @@
-source "https://rubygems.org"
-gemspec

data/Gemfile.lock

@@ -1,26 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bump (0.5.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    rake (10.0.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump!
-  rake (~> 10.0.0)
-  rspec (~> 2.0)

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-
-task :default do
-  sh "rspec spec/"
-end
-

data/bump.gemspec

@@ -1,17 +0,0 @@
-Gem::Specification.new "bump" do |s|
-  s.version = "0.5.2"
-  s.author = "Gregory Marcilhacy"
-  s.email = "g.marcilhacy@gmail.com"
-  s.homepage = "https://github.com/gregorym/bump"
-  s.summary = "Bump your gem version file"
-
-  s.files = `git ls-files`.split("\n")
-  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/spec/bump/tasks_spec.rb

@@ -1,45 +0,0 @@
-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 "bumps a version and can optionally tag it" do
-    run "rake bump:patch[true]"
-    `git tag`.split("\n").last.should == "v1.2.4"
-  end
-
-  it "does not tag by default" do
-    run "rake bump:patch"
-    `git tag`.split("\n").last.should be_nil
-  end
-
-  it "sets a version" do
-    output = run "VERSION=1.3.0 rake bump:set"
-    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,443 +0,0 @@
-require "spec_helper"
-
-describe Bump do
-  let(:gemspec) { "fixture.gemspec" }
-
-  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"
-  end
-
-  it "should fail without command" do
-    write_gemspec
-    bump("", :fail => true).should include "Usage instructions: bump --help"
-  end
-
-  it "should fail with invalid options" do
-    write_gemspec
-    bump("xxx", :fail => true).should include "Invalid option"
-  end
-
-  it "should fail with multiple gemspecs" do
-    write_gemspec
-    write("xxxx.gemspec", "Gem::Specification.new{}")
-    bump("current", :fail => true).should include "More than one gemspec file"
-  end
-
-  it "should fail if version is weird" do
-    write_gemspec('"1."+"3.4"')
-    bump("current", :fail => true).should include "Unable to find a file with the gem version"
-  end
-
-  it "should show help" do
-    bump("--help").should include("bump current")
-  end
-
-  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
-
-    it "should tag the version if --tag flag given" do
-      write_gemspec
-
-      bump("patch --tag")
-      `git tag -l`.should include 'v4.2.4'
-    end
-
-    it "should not tag the version if --no-commit and --tag flag given" do
-      write_gemspec
-
-      bump("patch --no-commit --tag")
-      `git tag -l`.should == ''
-    end
-  end
-
-  context ".version in gemspec" do
-    before do
-      write_gemspec
-    end
-
-    it "should find current version" do
-      bump("current").should include("4.2.3")
-      read(gemspec).should include('s.version = "4.2.3"')
-    end
-
-    it "should bump patch" do
-      bump("patch").should include("4.2.4")
-      read(gemspec).should include('s.version = "4.2.4"')
-    end
-
-    it "should bump minor" do
-      bump("minor").should include("4.3.0")
-      read(gemspec).should include('s.version = "4.3.0"')
-    end
-
-    it "should bump major" do
-      bump("major").should include("5.0.0")
-      read(gemspec).should include('s.version = "5.0.0"')
-    end
-
-    it "should set the version" do
-      bump("set 1.2.3").should include("1.2.3")
-      read(gemspec).should include('s.version = "1.2.3"')
-    end
-
-    it "should bump more then 10" do
-      bump("patch").should include("4.2.4")
-      bump("patch").should include("4.2.5")
-      bump("patch").should include("4.2.6")
-      bump("patch").should include("4.2.7")
-      bump("patch").should include("4.2.8")
-      bump("patch").should include("4.2.9")
-      bump("patch").should include("4.2.10")
-      bump("patch").should include("4.2.11")
-      read(gemspec).should include('s.version = "4.2.11"')
-    end
-
-    it "should not bump multiple versions" do
-      version = '"4.2.3"'
-      write gemspec, <<-RUBY
-        Gem::Specification.new do |s|
-          s.name    = 'fixture'
-          s.version = #{version}
-          s.summary = 'Fixture gem'
-          s.runtime_dependency 'rake', #{version}
-        end
-      RUBY
-      bump("patch").should include("4.2.4")
-      read(gemspec).should include('s.version = "4.2.4"')
-      read(gemspec).should include("'rake', #{version}")
-    end
-  end
-
-  context ".version in gemspec within the initializer" do
-    before do
-      write gemspec, <<-RUBY.sub(" "*6, "")
-        Gem::Specification.new "bump", "4.2.3" do
-        end
-      RUBY
-    end
-
-    it "should bump patch" do
-      bump("patch").should include("4.2.4")
-      read(gemspec).should include('"4.2.4"')
-    end
-
-    it "should set the version" do
-      bump("set 1.2.3").should include("1.2.3")
-      read(gemspec).should include('"1.2.3"')
-    end
-  end
-
-  context "VERSION in version.rb" do
-    let(:version_file) { "lib/foo/version.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 set the version" do
-      bump("set 1.2.3").should include("1.2.3")
-      read(version_file).should include('"1.2.3"')
-    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 set Version" do
-      write version_file, <<-RUBY.sub(" "*8, "")
-        module Foo
-          Version = "1.2.3"
-        end
-      RUBY
-      bump("set 1.3.0").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
-
-  context "version in VERSION" do
-    let(:version) { "1.2.3" }
-    let(:version_file) { "lib/foo/version.rb" }
-
-    before do
-      write "VERSION", "#{version}\n"
-    end
-
-    it "show current" do
-      bump("current").should include("#{version}")
-      read("VERSION").should include("#{version}")
-    end
-
-    it "should bump version" do
-      bump("minor").should include("1.3.0")
-      read("VERSION").should include("1.3.0")
-    end
-
-    it "should set the version" do
-      bump("set 1.3.0").should include("1.3.0")
-      read("VERSION").should include("1.3.0")
-    end
-
-    it "should bump if a gemspec & version.rb exists and leave it alone" do
-      write_gemspec "'1.2.0'"
-      write_version_file "File.read('VERSION')"
-      bump("minor").should include("1.3.0")
-      read("VERSION").should include("1.3.0")
-      read(version_file).should include("VERSION = File.read('VERSION')")
-      read(gemspec).should include("version = '1.2.0'")
-    end
-
-    context "with pre-release identifier" do
-      let(:version) { "1.2.3-alpha" }
-      before do
-        write "VERSION", "#{version}\n"
-      end
-
-      it "show current" do
-        bump("current").should include(version)
-        read("VERSION").should include(version)
-      end
-
-      it "minor should drop prerelease" do
-        bump("minor").should include("1.3.0")
-        read("VERSION").should include("1.3.0")
-        bump("minor").should_not include("alpha")
-        read("VERSION").should_not include("alpha")
-      end
-
-      it "major should drop prerelease" do
-        bump("major").should include("2.0.0")
-        read("VERSION").should include("2.0.0")
-        bump("major").should_not include("alpha")
-        read("VERSION").should_not include("alpha")
-      end
-
-      context "alpha" do
-        it "should bump to beta" do
-          bump("pre").should include("1.2.3-beta")
-          read("VERSION").should include("1.2.3-beta")
-        end
-      end
-
-      context "beta" do
-        let(:version) { "1.2.3-beta" }
-        it "should bump to rc" do
-          bump("pre").should include("1.2.3-rc")
-          read("VERSION").should include("1.2.3-rc")
-        end
-      end
-
-      context "rc" do
-        let(:version) { "1.2.3-rc" }
-        it "should bump to final" do
-          bump("pre").should include("1.2.3")
-          read("VERSION").should include("1.2.3")
-        end
-      end
-
-      context "final" do
-        let(:version) { "1.2.3" }
-        it "should bump to alpha" do
-          bump("pre").should include("1.2.3-alpha")
-          read("VERSION").should include("1.2.3-alpha")
-        end
-      end
-    end
-  end
-
-  context "with a Gemfile" do
-    before do
-      write_gemspec('"1.0.0"')
-      write "Gemfile", <<-RUBY
-        source 'https://rubygems.org'
-        # a gem not in the Gemfile used to run this test
-        gem 'a1330ks_bmi', '~> 0.0.1'
-        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`
-      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
-      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 bundle or commit an untracked Gemfile.lock" do
-      bump("patch")
-      read("Gemfile.lock").should include "1.0.0"
-      `git status --porcelain`.should include "?? Gemfile.lock"
-    end
-  end
-
-  context ".current" do
-    it "returns the version as a string" do
-      write_gemspec
-      Bump::Bump.current.should == "4.2.3"
-    end
-  end
-
-  context "VERSION in lib file" do
-    let(:version_file) { "lib/foo.rb" }
-
-    before do
-      write_version_file
-      write("lib/random_other_file.rb", "foo")
-      write("lib/random/other/file.rb", "foo")
-    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 set VERSION" do
-      bump("set 1.3.0").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 set Version" do
-      write version_file, <<-RUBY.sub(" "*8, "")
-        module Foo
-          Version = "1.2.3"
-        end
-      RUBY
-      bump("set 1.3.0").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
-
-    context "that is nested" do
-      let(:version_file) { "lib/bar/baz/foo.rb" }
-
-      it "show current" do
-        bump("current").should include("1.2.3")
-        read(version_file).should include('  VERSION = "1.2.3"')
-      end
-    end
-  end
-
-  context "version in metadata.rb" do
-    let(:version) { "1.2.3" }
-    let(:version_file) { "metadata.rb" }
-
-    before do
-      write version_file, "foo :bar\nversion '#{version}'\nbar :baz\n"
-    end
-
-    it "should bump version" do
-      bump("minor").should include("1.3.0")
-      read(version_file).should include("1.3.0")
-    end
-
-    it "should set the version" do
-      bump("set 1.3.0").should include("1.3.0")
-      read(version_file).should include("1.3.0")
-    end
-  end
-
-  private
-
-  def bump(command="", options={})
-    cmdline = "#{File.expand_path("../../bin/bump", __FILE__)} #{command}"
-    run cmdline, options
-  end
-
-  def write_gemspec(version = '"4.2.3"')
-    write gemspec, <<-RUBY.sub(" "*6, "")
-      Gem::Specification.new do |s|
-        s.author  = 'joe'
-        s.name    = 'fixture'
-        s.version = #{version}
-        s.summary = 'Fixture gem'
-      end
-        RUBY
-  end
-
-  def write_version_file(version = '"1.2.3"')
-    write version_file, <<-RUBY.sub(" "*6, "")
-      module Foo
-        VERSION = #{version}
-      end
-    RUBY
-  end
-end

data/spec/spec_helper.rb

@@ -1,41 +0,0 @@
-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