thor-scmversion 1.1.0 → 1.2.1

data/LICENSE

@@ -1,13 +1,24 @@
-Copyright (c) 2012, Riot Games, Inc.
+Portions copyright (c) 2012 Riot Games, Inc.
+Portions copyright (c) 2010 Andre Arko
+Portions copyright (c) 2009 Engine Yard
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+MIT License
 
-    http://www.apache.org/licenses/LICENSE-2.0
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -13,13 +13,13 @@ file conflicts.
 ## Integrating into your project
 
 Since Thor is written in Ruby, you'll need Ruby to make this work, on
-your workstation and on your CI server. See http://whatisthor.com/ for
+your workstation and on your CI server. See <http://whatisthor.com/> for
 more in how to use Thor.
 
 ### Get the gem
 
 If you don't already have a Gemfile, you should probably get one. See
-http://gembundler.com/ for more details on Bundler and Gemfiles. Not
+<http://gembundler.com/> for more details on Bundler and Gemfiles. Not
 required, but will save you a lot of hassle.
 
 Add this line to your application's Gemfile:
@@ -52,22 +52,21 @@ Now when you list your thor tasks you'll see 2 new ones.
     thor version:current    # Show current SCM tagged version
 
 Usage Examples:
-  $ thor version:current
-  1.2.1
-  $ thor version:bump auto
-  1.2.1+build.1
-  $ thor version:bump patch
-  1.2.2
-  $ thor version:bump major
-  2.0.0
-  $ thor version:bump prerelease
-  2.0.1-alpha.1
-  $ thor version:bump prerelease
-  2.0.1-alpha.2
-  $ thor version:bump prerelease beta
-  2.0.1-beta.1
-  $ thor version:bump minor
-  2.1.0
+
+    $ thor version:current
+    1.2.1
+    $ thor version:bump auto
+    1.2.2
+    $ thor version:bump major
+    2.0.0
+    $ thor version:bump prerelease
+    2.0.1-alpha.1
+    $ thor version:bump prerelease
+    2.0.1-alpha.2
+    $ thor version:bump prerelease beta
+    2.0.1-beta.1
+    $ thor version:bump minor
+    2.1.0
 
 ### Remove your VERSION file from source control
 

data/features/bump.feature

@@ -5,28 +5,33 @@ Feature: Bump
 
   Scenario Outline: Bumping a version
     Given I have a <scm> project of version '<starting version>'
-    When I run `bundle exec thor version:bump <bump type>` from the temp directory
+    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>'
 
     Examples:
-      | scm | starting version | bump type         |     resulting version |
-      | git |            1.0.0 | patch             |                 1.0.1 |
-      | git |            1.0.0 | minor             |                 1.1.0 |
-      | git |            1.0.0 | major             |                 2.0.0 |
-      | git |            1.1.5 | minor             |                 1.2.0 |
-      | git |            1.1.5 | major             |                 2.0.0 |
-      | git |            1.0.0 | prerelease        |         1.0.1-alpha.1 |
-      | git |            1.0.0 | prerelease someth |        1.0.1-someth.1 |
-      | git |    1.0.0-alpha.1 | prerelease        |         1.0.0-alpha.2 |
-      | git |    1.0.0-alpha.5 | prerelease beta   |          1.0.0-beta.1 |
-      | git |            1.0.0 | build             |         1.0.0+build.2 |
-      | git |    1.0.0-alpha.3 | build             | 1.0.0-alpha.3+build.2 |
-      | p4  |            1.0.0 | patch             |                 1.0.1 |
-      | p4  |            1.0.0 | minor             |                 1.1.0 |
-      | p4  |            1.0.0 | major             |                 2.0.0 |
-      | p4  |            1.1.5 | minor             |                 1.2.0 |
-      | p4  |            1.1.5 | major             |                 2.0.0 |
+      | scm | starting version | bump type         |     resulting version | flags           |
+      | git |            1.0.0 | patch             |                 1.0.1 |                 |
+      | git |            1.0.0 | minor             |                 1.1.0 |                 |
+      | git |            1.0.0 | major             |                 2.0.0 |                 |
+      | git |            1.1.5 | minor             |                 1.2.0 |                 |
+      | git |            1.1.5 | major             |                 2.0.0 |                 |
+      | git |            1.0.0 | prerelease        |         1.0.1-alpha.1 |                 |
+      | git |            1.0.0 | prerelease someth |        1.0.1-someth.1 |                 |
+      | git |    1.0.0-alpha.1 | prerelease        |         1.0.0-alpha.2 |                 |
+      | git |    1.0.0-alpha.5 | prerelease beta   |          1.0.0-beta.1 |                 |
+      | git |    1.0.0-alpha.5 | auto              |         1.0.0-alpha.6 | -d prerelease   |
+      | git |            1.0.0 | build             |         1.0.0+build.2 |                 |
+      | git |    1.0.0-alpha.3 | build             | 1.0.0-alpha.3+build.2 |                 |
+      | git |            1.0.0 | auto              |                 1.0.1 | --default patch |
+      | git |            1.0.0 | auto              |                 1.0.1 | -d patch        |
+      | git |            1.0.0 | auto              |         1.0.0+build.2 |                 |
+      | p4  |            1.0.0 | patch             |                 1.0.1 |                 |
+      | p4  |            1.0.0 | minor             |                 1.1.0 |                 |
+      | 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 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'

data/lib/thor-scmversion.rb

@@ -13,8 +13,9 @@ module ThorSCMVersion
     namespace "version"
 
     desc "bump TYPE [PRERELEASE_TYPE]", "Bump version number (type is major, minor, patch, prerelease or auto)"
+    method_option :default, type: :string, aliases: "-d"
     def bump(type, prerelease_type = nil)
-      current_version.bump! type, prerelease_type
+      current_version.bump! type, options.merge(prerelease_type: prerelease_type)
       begin
         say "Creating and pushing tags", :yellow
         current_version.tag

data/lib/thor-scmversion/git_version.rb

@@ -22,7 +22,7 @@ module ThorSCMVersion
     end
 
     # Check the commit messages to see what type of bump is required
-    def auto_bump
+    def auto_bump(options)
       last_tag = self.class.from_path.to_s
       logs = ShellUtils.sh "git log --abbrev-commit --format=oneline #{last_tag}.."
       guess = if logs =~ /\[major\]|\#major/i
@@ -35,9 +35,9 @@ module ThorSCMVersion
               elsif logs =~ /\[patch\]|\#patch/i
                 :patch
               else
-                :build
+                options[:default] or :build
               end
-      bump!(guess, prerelease_type)
+      bump!(guess, prerelease_type: prerelease_type)
     end
   end
 end

data/lib/thor-scmversion/p4_version.rb

@@ -1,4 +1,10 @@
 module ThorSCMVersion
+  class << self
+    def windows?
+      RbConfig::CONFIG["arch"] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+    end
+  end
+
   class MissingP4ConfigException < StandardError
     def initialize(config_option)
       @config_option = config_option
@@ -65,11 +71,13 @@ module ThorSCMVersion
       end
 
       def depot_path(path)
-        `p4 dirs #{File.expand_path(path)}`.chomp
+        path = File.expand_path(path)
+        path = path.gsub(File::Separator, File::ALT_SEPARATOR) if ThorSCMVersion.windows?
+        `p4 where "#{path}/..."`.split(" ").first.gsub("/...", "")
       end
 
       def module_name(path)
-        File.expand_path(path).split("/").last
+        depot_path(path).gsub("//", "").gsub("/", "-")
       end
 
       def parse_label(label, p4_module_name)
@@ -97,14 +105,14 @@ module ThorSCMVersion
     end
     
     def tag
-      if windows?
-        `type #{File.expand_path(get_p4_label_file).gsub(File::Separator, File::ALT_SEPARATOR)} | p4 label -i`
+      if ThorSCMVersion.windows?
+        `type "#{File.expand_path(get_p4_label_file).gsub(File::Separator, File::ALT_SEPARATOR)}" | p4 label -i`
       else
-        `cat #{File.expand_path(get_p4_label_file)} | p4 label -i`
+        `cat "#{File.expand_path(get_p4_label_file)}" | p4 label -i`
       end
     end
 
-    def auto_bump
+    def auto_bump(options)
       # TODO: actually implement this
       bump!(:patch)
     end
@@ -143,9 +151,5 @@ View:
           file
         end
       end
-
-      def windows?
-        RbConfig::CONFIG["arch"] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
-      end
   end
 end

data/lib/thor-scmversion/scm_version.rb

@@ -73,10 +73,10 @@ module ThorSCMVersion
     # @param [Symbol] type Type of bump to be performed
     # @param [String] prerelease_type Type of prerelease to bump to when doing a :prerelease bump
     # @return [ScmVersion]
-    def bump!(type, prerelease_type = nil)
+    def bump!(type, options = {})
       case type.to_sym
       when :auto
-        self.auto_bump
+        self.auto_bump(options)
       when :major
         self.major += 1        
       when :minor
@@ -84,6 +84,7 @@ module ThorSCMVersion
       when :patch
         self.patch += 1
       when :prerelease
+        prerelease_type = options[:prerelease_type]
         if self.prerelease
           if prerelease_type.nil? || prerelease_type == self.prerelease.type
             self.prerelease += 1
@@ -148,7 +149,7 @@ module ThorSCMVersion
 
     # Perform a bump by reading recent commit messages in the SCM
     # Abstract method. Must be implemented by subclasses.
-    def auto_bump(prerelease_type = nil)
+    def auto_bump(options)
       raise NotImplementedError
     end
 

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

@@ -28,14 +28,19 @@ module ThorSCMVersion
         it 'patch' do
           subject.bump!(:patch).to_s.should == '1.2.4'
         end
+        describe 'auto' do
+          it "should respect a default level of bump" do
+            subject.bump!(:auto, default: :patch).to_s.should == '1.2.4'
+          end
+        end
         describe 'prerelease' do
           describe 'with explicit type' do
             it do
-              subject.bump!(:prerelease, 'someth').to_s.should == '1.2.3-someth.1'
+              subject.bump!(:prerelease, prerelease_type: 'someth').to_s.should == '1.2.3-someth.1'
             end
             it 'with no prerelease on previous version' do
               subject.prerelease = nil
-              subject.bump!(:prerelease, 'someth').to_s.should == '1.2.4-someth.1'
+              subject.bump!(:prerelease, prerelease_type: 'someth').to_s.should == '1.2.4-someth.1'
             end
           end
           describe 'with default type' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-scmversion
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor