thor-scmversion 1.0.1 → 1.1.0

data/README.md

@@ -55,6 +55,8 @@ 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

data/lib/thor-scmversion/p4_version.rb

@@ -1,10 +1,4 @@
 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
@@ -71,13 +65,11 @@ module ThorSCMVersion
       end
 
       def depot_path(path)
-        path = File.expand_path(path)
-        path = path.gsub(File::Separator, File::ALT_SEPARATOR) if ThorSCMVersion.windows?
-        `p4 where "#{path}/..."`.split(" ").first.gsub("/...", "")
+        `p4 dirs #{File.expand_path(path)}`.chomp
       end
 
       def module_name(path)
-        depot_path(path).gsub("//", "").gsub("/", "-")
+        File.expand_path(path).split("/").last
       end
 
       def parse_label(label, p4_module_name)
@@ -105,10 +97,10 @@ module ThorSCMVersion
     end
     
     def tag
-      if ThorSCMVersion.windows?
-        `type "#{File.expand_path(get_p4_label_file).gsub(File::Separator, File::ALT_SEPARATOR)}" | p4 label -i`
+      if 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
 
@@ -151,5 +143,9 @@ View:
           file
         end
       end
+
+      def windows?
+        RbConfig::CONFIG["arch"] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+      end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-scmversion
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A small set of Thor tasks you can include in your build scripts to manage