thor-scmversion 1.2.1 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c086a835e56747f0bda71f360fb49e0fc2189512
+  data.tar.gz: 2f82d25b031619974b0943a25b8c4f03c1008874
+SHA512:
+  metadata.gz: a0ca30ca6c7aacf32f3d4da22bfc22723600cec7b96599b6a67b1424369b4d273dbf811512c4f75558d969dfb5e303835983a785c127074d10a19f5f45fd002a
+  data.tar.gz: f14750060d9e4291696701f2918dce167d91dd6f326abe6e4d4903391c995066687a5286214e0e02da96aa97f8756a3df41beeac7268ee065d738f6521a52d66

data/features/bump.feature

@@ -5,6 +5,7 @@ Feature: Bump
 
   Scenario Outline: Bumping a version
     Given I have a <scm> project of version '<starting version>'
+    And there is a version '9.9.9' on another branch
     When I run `bundle exec thor version:bump <bump type> <flags>` from the temp directory
     Then the version should be '<resulting version>'
     And the <scm> server version should be '<resulting version>'
@@ -31,7 +32,18 @@ Feature: Bump
       | p4  |            1.0.0 | major             |                 2.0.0 |                 |
       | p4  |            1.1.5 | minor             |                 1.2.0 |                 |
       | p4  |            1.1.5 | major             |                 2.0.0 |                 |
+ 
+  Scenario: Bumping a version where there is a nonversion tag
+    Given I have a git project of version '1.0.0-alpha.6'
+    And there is a tag 'notaversion'
+    When I run `bundle exec thor version:bump patch` from the temp directory
+    Then the git server version should be '1.0.1'
 
+  Scenario: Bumping a version where the next version that would be bumped to is already tagged in the repository
+    Given I have a git project of version '1.0.0'
+    And there is a version '1.0.1' on another branch
+    When I run `bundle exec thor version:bump patch` from the temp directory and expect a non-zero exit
+    Then the git server version should be '1.0.0'
 
   Scenario: Bumping a patch version in Git when the server has an advanced version not yet fetched
     Given I have a git project of version '1.0.0'
@@ -39,3 +51,10 @@ Feature: Bump
     When I run `bundle exec thor version:bump patch` from the temp directory
     Then the version should be '1.0.11'
     And the git server version should be '1.0.11'
+
+   Scenario: Bumping a version in a git submodule
+     Given I have a git project of version '1.2.3'
+     And .git is a file pointing to the .git folder in a parent module
+     When I run `bundle exec thor version:bump patch ` from the temp directory
+     Then the version should be '1.2.4'
+     And the git server version should be '1.2.4'

data/features/bump_tags.feature

@@ -5,11 +5,14 @@ Feature: Guessing the level of a bump
 
   Scenario Outline: changeset tags
     Given I have a git project of version '<starting version>'
-    And a commit message "<message 1>"
-    And a commit message "<message 2>"
-    And a commit message "<message 3>"
+    And a commit with the message "<message 1>" on the "master" branch
+    And a commit with the message "<message 2>" on the "master" branch
+    And a commit with the message "<message 3>" on the "master" branch
     When I run `bundle exec thor version:bump auto` from the temp directory
     Then the version should be '<resulting version>'
+    # TODO: Figure out how to set up remote branch tracking so this
+    # does not have to be called explicitly
+    And I run `git push origin master --tags` from the temp directory
     And the <scm> server version should be '<resulting version>'
 
   Examples:

data/features/step_definitions/bump_steps.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 Given /^I have a git project of version '(.*)'$/ do |version|
   Dir.chdir(origin_dir) do
     `git init`
@@ -16,15 +18,18 @@ Given /^I have a git project of version '(.*)'$/ do |version|
     $?.success?.should be_true
     `git tag -a -m "Version #{version}" #{version}`
     $?.success?.should be_true
-    `git push origin master -u`
+    `git push origin master -u --tags`
     $?.success?.should be_true
     setup_directory
   end
 end
 
-Given /^a commit message "(.*?)"$/ do |msg|
+Given /^a commit with the message "(.*?)" on the "(.*?)" branch$/ do |msg, branch|
   Dir.chdir(project_dir) do
-    `git commit --allow-empty -m "#{msg}"`
+    `echo #{SecureRandom.uuid} > Randomfile`
+    `git add Randomfile`
+    `git commit -m "#{msg}"`
+    `git push origin #{branch}`
   end
 end
 
@@ -53,9 +58,13 @@ Given /^the origin version is '(.+)'$/ do |version|
   }  
 end
 
-When /^I run `(.*)` from the temp directory$/ do |run|
+When /^I run `(.*)` from the temp directory( and expect a non-zero exit)?$/ do |command, nonzero_exit|
   Dir.chdir(project_dir) {
-    `#{run}`
+    out = `#{command}`
+    unless $?.success? or nonzero_exit
+      puts out
+      fail
+    end
   }
 end
 
@@ -97,3 +106,31 @@ Then /^the p4 server version should be '(.*)'$/ do |version|
   end
 end
 
+Then(/^there is a version '(.+)' on another branch$/) do |version|
+  Dir.chdir(project_dir) do
+    `git checkout -b another_branch`
+    $?.success?.should be_true
+    `echo anotherbranch > README`
+    $?.success?.should be_true
+    `git commit -am 'commit'`
+    $?.success?.should be_true
+    `git tag #{version}`
+    $?.success?.should be_true
+    `git checkout master`
+    $?.success?.should be_true
+  end
+end
+
+Given(/^there is a tag '(.*)'$/) do |version|
+  Dir.chdir(project_dir) do
+    `git tag #{version}`
+  end
+end
+
+Given(/^.git is a file pointing to the .git folder in a parent module$/) do
+  project_git_path = File.join(project_dir, '.git')
+  git_folder_path  = File.join(parent_module_dir, '.git')
+  File.directory?( project_git_path ).should be_true
+  File.rename project_git_path, git_folder_path
+  `echo "gitdir: #{ git_folder_path }" > "#{ project_git_path }"`
+end

data/features/support/env.rb

@@ -19,6 +19,10 @@ def origin_dir
   @origindir ||= Dir.mktmpdir
 end
 
+def parent_module_dir
+  @parentmoduledir ||= Dir.mktmpdir
+end
+
 def fixtures_dir
   File.join(File.dirname(__FILE__), "..", "fixtures")
 end

data/lib/thor-scmversion.rb

@@ -24,8 +24,12 @@ module ThorSCMVersion
         say "Tagged: #{current_version}", :green
       rescue => e
         say "Tagging #{current_version} failed due to error", :red
-        say e, :red
-        exit 1
+        say e.to_s, :red
+        if e.respond_to? :status_code
+          exit e.status_code
+        else
+          exit 1
+        end
       end
     end
 

data/lib/thor-scmversion/errors.rb

@@ -23,4 +23,16 @@ module ThorSCMVersion
   class InvalidPrereleaseFormatError < TagFormatError
     def to_s; super + " Format must be: #{Prerelease::FORMAT.inspect}."; end
   end
+
+  class GitError < SCMVersionError; end
+  class GitTagDuplicateError < GitError
+    status_code(100)
+    def initialize(tag)
+      @tag = tag
+    end
+
+    def to_s
+      msg = "Tried to tag #{@tag}, but it already exists! Either build from the latest tag at this bump level or choose a lower order bump level."
+    end
+  end
 end

data/lib/thor-scmversion/git_version.rb

@@ -6,18 +6,27 @@ module ThorSCMVersion
       def all_from_path(path)
         Dir.chdir(path) do
           tags = Open3.popen3("git tag") { |stdin, stdout, stderr| stdout.read }.split(/\n/)
-          version_tags = tags.select { |tag| tag.match(ScmVersion::VERSION_FORMAT) }
-          version_tags.collect { |tag| from_tag(tag) }.sort.reverse
+          tags.select { |tag| tag.match(ScmVersion::VERSION_FORMAT) }
+            .collect { |tag| from_tag(tag) }
+            .select { |tag| contained_in_current_branch?(tag) }.sort.reverse
         end
       end
 
+      def contained_in_current_branch?(tag)
+        ShellUtils.sh("git branch --contains #{tag}") =~ /\*/
+      end
+
       def retrieve_tags
         ShellUtils.sh("git fetch --all")
       end
     end
         
     def tag
-      ShellUtils.sh "git tag -a -m \"Version #{self}\" #{self}"
+      begin
+        ShellUtils.sh "git tag -a -m \"Version #{self}\" #{self}"
+      rescue => e
+        raise GitTagDuplicateError.new(self.to_s)
+      end
       ShellUtils.sh "git push --tags || true"
     end
 

data/lib/thor-scmversion/scm_version.rb

@@ -5,7 +5,7 @@ module ThorSCMVersion
     #
     # @return [#kind_of? ScmVersion]
     def versioner
-      if(File.directory?(".git"))
+      if(File.exist?  (".git"))
         return GitVersion
       else
         return P4Version

data/spec/lib/thor-scmversion/git_version_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+module ThorSCMVersion
+  describe GitVersion do
+    it "should detect if a commit is contained on a given branch" do
+      ShellUtils.stub(:sh).and_return(<<OUT)
+* constrain_bump_to_branch
+  master
+OUT
+      expect(GitVersion.contained_in_current_branch?('0.0.1')).to be_true
+    end
+  end
+end

data/thor-scmversion.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'aruba'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'debugger'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-scmversion
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Ivey
@@ -11,134 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: geminabox
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Thor tasks to manage a VERSION file based on SCM tags
@@ -172,33 +169,33 @@ files:
 - lib/thor-scmversion/shell_utils.rb
 - lib/thor-scmversion/version.rb
 - lib/thor/scmversion.rb
+- spec/lib/thor-scmversion/git_version_spec.rb
 - spec/lib/thor-scmversion/prerelease_spec.rb
 - spec/lib/thor-scmversion/scm_version_spec.rb
 - spec/spec_helper.rb
 - thor-scmversion.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A small set of Thor tasks you can include in your build scripts to manage
   a VERSION file based on SCM tags. This allows you to keep VERSION out of cource
   control, allowing your continuous integration system to version each build.
@@ -208,6 +205,7 @@ test_files:
 - features/fixtures/Thorfile
 - features/step_definitions/bump_steps.rb
 - features/support/env.rb
+- spec/lib/thor-scmversion/git_version_spec.rb
 - spec/lib/thor-scmversion/prerelease_spec.rb
 - spec/lib/thor-scmversion/scm_version_spec.rb
 - spec/spec_helper.rb