step-up 0.8.1 → 0.8.2

data/GEM_VERSION

@@ -1 +1 @@
-v0.8.1
+v0.8.2

data/lib/step-up/cli.rb

@@ -10,6 +10,7 @@ module StepUp
     default_task :version
 
     desc "version ACTION [base_object] [OPTIONS]", "manage versions of your project"
+    method_options %w[next-release -n] => :boolean # stepup version --next-release
     method_options %w(levels -L) => :boolean # $ stepup version [--levels|-L]
     method_options %w(level -l) => :string, %w(steps -s) => :boolean, %w(message -m) => :string, :'no-editor' => :boolean  # $ stepup version create [--level|-l <level-name>] [--steps|-s] [--message|-m <comment-string>] [--no-editor]
     method_options %w(mask -M) => :string # stepup version show --mask development_hudson_build_0
@@ -245,7 +246,12 @@ module StepUp
       else
         mask = options[:mask]
         mask = nil if mask !~ /0/
-        puts driver(mask).last_version_tag(commit_object || "HEAD", true)
+        if options[:"next-release"]
+          tag = driver.next_version_tag(commit_object, options[:level])
+          puts tag if tag
+        else
+          puts driver(mask).last_version_tag(commit_object || "HEAD", true)
+        end
       end
     end
 
@@ -257,15 +263,7 @@ module StepUp
       level = options[:level] || "auto"
       message = get_notes(true, get_custom_message)
 
-      if level == "auto" && CONFIG.versioning["auto_increment"].is_a?(Hash)
-        detached_notes = driver.cached_detached_notes_as_hash(commit_object || "HEAD")
-        level = version_levels.last
-        version_levels.reverse.each do |name|
-          sections = CONFIG.versioning.auto_increment.sections_level[name]
-          next if sections.nil?
-          level = name if detached_notes.any?{ |section, notes| sections.include?(section) && notes.any? }
-        end
-      end
+      level = driver.next_release_level(commit_object) if level == "auto"
 
       if version_levels.include? level
         unless options[:'no-editor']

data/lib/step-up/driver/git.rb

@@ -107,10 +107,31 @@ check with the following bash command:
         RangedNotes.new(self, tag, commit_base, :notes_sections => notes_sections).notes.as_hash
       end
 
+      def next_release_level(commit_base)
+        level = CONFIG.versioning.version_levels.last
+        if CONFIG.versioning["auto_increment"].is_a?(Hash)
+          detached_notes = cached_detached_notes_as_hash(commit_base)
+          CONFIG.versioning.version_levels.reverse.each do |name|
+            sections = CONFIG.versioning.auto_increment.sections_level[name]
+            next if sections.nil?
+            level = name if detached_notes.any?{ |section, notes| sections.include?(section) && notes.any? }
+          end
+        end
+        level
+      end
+
+      def next_version_tag(commit_base, level = nil)
+        level = next_release_level(commit_base) if level.nil?
+        if commit_base && mask.parse(commit_base)
+          mask.increase_version(commit_base, level)
+        else
+          tag = cached_last_version_tag(commit_base)
+          tag =~ /\+/ ? mask.increase_version($`, level) : nil
+        end
+      end
+
       def steps_to_increase_version(level, commit_base = "HEAD", message = nil)
-        tag = cached_last_version_tag(commit_base)
-        tag = tag.sub(/\+$/, '')
-        new_tag = mask.increase_version(tag, level)
+        new_tag = next_version_tag(commit_base, level)
         notes = cached_detached_notes_as_hash(commit_base)
         commands = []
         commands << "git fetch" if cached_fetched_remotes.any?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: step-up
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Marcelo Manzan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 Z
+date: 2013-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor