thor-scmversion 0.2.4 → 0.3.1

data/Thorfile

@@ -18,8 +18,8 @@ class ThorSCMVersion < Thor
     system("gem install pkg/thor-scmversion-#{current_version}.gem")
   end
 
-  desc "release TYPE", "Bump version, make a build, and push to Rubygems"
-  def release(type)
+  desc "release [TYPE]", "Bump version, make a build, and push to Rubygems"
+  def release(type='auto')
     @current_version = nil
     invoke "version:bump", [type]
     invoke "build", []

data/bin/scmversion

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.push File.expand_path("../../lib", __FILE__)
+require 'thor-scmversion'
+
+ThorSCMVersion::Tasks.start

data/lib/thor-scmversion.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+require 'tmpdir'
 require 'thor'
 require 'thor-scmversion/scm_version'
 require 'thor-scmversion/git_version'
@@ -24,9 +26,13 @@ module ThorSCMVersion
       end
     end
 
+    method_option :version_file_path,
+      :type => :string,
+      :default => nil,
+      :desc => "An additional path to copy a VERSION file to on the file system."
     desc "current", "Show current SCM tagged version"
     def current
-      write_version
+      write_version(options[:version_file_path])
       say current_version.to_s
     end
 
@@ -35,14 +41,10 @@ module ThorSCMVersion
       @current_version ||= ThorSCMVersion.versioner.from_path
     end
 
-    def write_version
-      ver = current_version.to_s
-      version_files.each do |ver_file|
-        File.open(ver_file, 'w+') do |f| 
-          f.write ver
-        end
-      end
-      ver
+    def write_version(version_file_path=nil)
+      files_to_write = version_files
+      files_to_write << File.join(File.expand_path(version_file_path), 'VERSION') if version_file_path
+      current_version.write_version(files_to_write)
     end
 
     eval "def source_root ; Pathname.new File.dirname(__FILE__) ; end"

data/lib/thor-scmversion/p4_version.rb

@@ -47,25 +47,105 @@ module ThorSCMVersion
   class P4Version < ScmVersion
     class << self
       def all_from_path(path)
-        file_path = File.expand_path(File.join(path, 'VERSION'))
-        version = new(*File.read(file_path).strip.split("."))
-        version.version_file_path = file_path
-        [version]
+        Dir.chdir(path) do
+          all_labels_array = `p4 labels -e \"#{module_name(path)}*\"`.split("\n")
+          thor_scmversion_labels = get_thor_scmversion_labels(all_labels_array, module_name(path))
+
+          current_versions = thor_scmversion_labels.collect do |label|
+            new_instance = new(*parse_label(label, module_name(path)))
+          end.sort.reverse
+
+          if current_versions.empty?
+            first_instance = new(0, 0, 0)
+          end 
+
+          current_versions << first_instance if current_versions.empty?
+          current_versions
+        end
       end
+
+      def depot_path(path)
+        `p4 dirs #{File.expand_path(path)}`.chomp
+      end
+
+      def module_name(path)
+        File.expand_path(path).split("/").last
+      end
+
+      def parse_label(label, p4_module_name)
+        label.split(" ")[1].gsub("#{p4_module_name}-", "").split('.')
+      end
+
+      def get_thor_scmversion_labels(labels, p4_module_name)
+        labels.select{|label| label.split(" ")[1].gsub("#{p4_module_name}-", "").match(ScmVersion::VERSION_FORMAT)}        
+      end
+    end
+
+    def initialize(major=0, minor=0, patch=0)
+      self.p4_depot_path = self.class.depot_path('.')
+      self.p4_module_name = self.class.module_name('.')
+      super(major, minor, patch)
     end
     
     attr_accessor :version_file_path
+    attr_accessor :p4_depot_path
+    attr_accessor :p4_module_name
+
+    def retrieve_tags
+      # noop
+      # p4 always has labels available, you just have to ask the server for them.
+    end
     
     def tag
-      description = "Bump version to #{to_s}."
-      `p4 edit -c default "#{self.version_file_path}"`
-      File.open(self.version_file_path, 'w') { |f| f.write to_s }
-      `p4 submit -d "#{description}"`
+      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`
+      end
     end
 
     def auto_bump
       # TODO: actually implement this
       bump!(:patch)
     end
+
+    private
+
+      def get_label_name
+        "#{p4_module_name}-#{self}"  
+      end
+
+      def get_p4_label_template
+        %{
+Label:  #{get_label_name}
+
+Description:
+  Created by thor-scmversion.
+
+Owner: #{ENV["P4USER"]}
+
+Options:  unlocked
+
+Revision: @#{get_last_submitted_p4_changelist}
+
+View:
+  #{p4_depot_path}/...}
+      end
+
+      def get_last_submitted_p4_changelist
+        `p4 changes -s submitted -m 1 #{p4_depot_path}/...`.split(' ')[1]
+      end
+
+      def get_p4_label_file
+        tmp_dir = Dir.mktmpdir
+        File.open(File.join(tmp_dir, "p4_label.tmp"), "w") do |file|
+          file.write(get_p4_label_template)
+          file
+        end
+      end
+
+      def windows?
+        RbConfig::CONFIG["arch"] =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+      end
   end
 end

data/lib/thor-scmversion/scm_version.rb

@@ -14,6 +14,7 @@ module ThorSCMVersion
     include Comparable
     
     VERSION_FORMAT = /^(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)$/
+    VERSION_FILENAME = 'VERSION'
     class << self
       def from_path(path = '.')
         retrieve_tags
@@ -53,7 +54,16 @@ module ThorSCMVersion
       raise "Version: #{self.to_s} is less than or equal to the existing version." if self <= self.class.from_path
       self
     end
-    
+
+    def write_version(files = [ScmVersion::VERSION_FILENAME])
+      files.each do |ver_file|
+        File.open(ver_file, 'w+') do |f| 
+          f.write self.to_s
+        end
+      end
+      self
+    end
+
     def tag
       raise NotImplementedError
     end

data/spec/lib/scm_version_spec.rb

@@ -24,4 +24,13 @@ here
       ENV["P4USER"].should == "kallan"
     end
   end
-end
+
+  describe P4Version do
+    it 'should parse labels correctly' do
+      described_class.parse_label("Label testing-1.0.0 2012/10/01 'Created by kallan. '", "testing").should eq(["1","0","0"])
+      described_class.parse_label("Label testing-1.0.1 2012/10/01 'Created by kallan. '", "testing").should eq(["1","0","1"])
+      described_class.parse_label("Label testing-2.0.5 2012/10/01 'Created by kallan. '", "testing").should eq(["2","0","5"])
+      described_class.parse_label("Label testing-4.2.2 2012/10/01 'Created by kallan. '", "testing").should eq(["4","2","2"])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-scmversion
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000Z
+date: 2012-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70295688203360 !ruby/object:Gem::Requirement
+  requirement: &70281121566680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295688203360
+  version_requirements: *70281121566680
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70295688706320 !ruby/object:Gem::Requirement
+  requirement: &70281121904800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295688706320
+  version_requirements: *70281121904800
 - !ruby/object:Gem::Dependency
   name: geminabox
-  requirement: &70295689010460 !ruby/object:Gem::Requirement
+  requirement: &70281122109820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295689010460
+  version_requirements: *70281122109820
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70295689371080 !ruby/object:Gem::Requirement
+  requirement: &70281122489560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295689371080
+  version_requirements: *70281122489560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70295689476520 !ruby/object:Gem::Requirement
+  requirement: &70281125870580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295689476520
+  version_requirements: *70281125870580
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70295689535300 !ruby/object:Gem::Requirement
+  requirement: &70281126177140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295689535300
+  version_requirements: *70281126177140
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70295692467880 !ruby/object:Gem::Requirement
+  requirement: &70281126843440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295692467880
+  version_requirements: *70281126843440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295692789340 !ruby/object:Gem::Requirement
+  requirement: &70281126962300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,13 +100,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295692789340
+  version_requirements: *70281126962300
 description: Thor tasks to manage a VERSION file based on SCM tags
 email:
 - ivey@gweezlebur.com
 - kallan@riotgames.com
 - josiah@skirmisher.net
-executables: []
+executables:
+- scmversion
 extensions: []
 extra_rdoc_files: []
 files:
@@ -116,6 +117,7 @@ files:
 - README.md
 - Rakefile
 - Thorfile
+- bin/scmversion
 - features/bump.feature
 - features/bump_tags.feature
 - features/fixtures/Thorfile