step-up 0.1.0 → 0.2.0

data/lib/step-up/version.rb

@@ -1,28 +1,6 @@
 module StepUp
-  path = File.expand_path('../..', __FILE__)
-  v = nil
-  if path =~ /\/step-up-([\w\.\-]+)/
-    v = $1
-  end
-  if v.nil?
-    $:.each do |path|
-      if path =~ /\/step-up-([\w\.\-]+)/
-        v = $1
-        break
-      end
-    end
-  end
-  if v.nil?
-    path = File.expand_path('../../../.git', __FILE__)
-    if File.exists?(path)
-      v = Driver::Git.last_version
-    end
-  end
-  if v.nil?
-    VERSION = "0.0.0"
-  else
-    v.sub!(/^v/, '')
-    v.sub!(/\+$/, '')
-    VERSION = v
-  end
+  version = nil
+  version = $1 if ::File.expand_path('../..', __FILE__) =~ /\/step-up-([\w\.\-]+)/
+  version = Driver::Git.new.last_version_tag if version.nil? && ::File.exists?(::File.expand_path('../../../.git', __FILE__))
+  VERSION = version.gsub(/^v?([^\+]+)\+?\d*$/, '\1')
 end

data/spec/lib/config_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe StepUp::CONFIG do
+  before do
+    @c = StepUp::CONFIG
+  end
+
+  context "getting an attribute" do
+    it "that does not exists" do
+      lambda { @c.notes2 }.should raise_error(NoMethodError)
+    end
+    it "that exists" do
+      @c.should_not respond_to(:notes)
+      @c.notes.should be_kind_of(Hash)
+      @c.notes.should be_kind_of(StepUp::ConfigExt)
+      @c.notes.should_not respond_to(:sections)
+      @c.notes.sections.should be_kind_of(Array)
+      @c.notes.should_not respond_to(:after_versioned)
+      @c.notes.after_versioned.should be_kind_of(Hash)
+      @c.notes.after_versioned.should be_kind_of(StepUp::ConfigExt)
+      @c.notes.after_versioned.should_not respond_to(:section)
+      @c.notes.after_versioned.section.should be_kind_of(String)
+    end
+  end
+
+
+  context "getting notes sections" do
+    it "by names" do
+      @c.notes_sections.should be_kind_of(Array)
+      @c.notes_sections.should respond_to(:names)
+      @c.notes_sections.names.should be == %w[changes bugfixes features deploy_steps]
+    end
+
+    it "by prefixes" do
+      @c.notes_sections.should be_kind_of(Array)
+      @c.notes_sections.should respond_to(:prefixes)
+      @c.notes_sections.prefixes.should be == ["change: ", "bugfix: ", "feature: ", "deploy_step: "]
+    end
+
+    it "by labels" do
+      @c.notes_sections.should be_kind_of(Array)
+      @c.notes_sections.should respond_to(:labels)
+      @c.notes_sections.labels.should be == ["Changes:", "Bugfixes:", "Features:", "Deploy steps:"]
+    end
+  end
+end

data/spec/lib/step-up/driver/git_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'time'
 
 describe StepUp::Driver::Git do
   before do
@@ -12,94 +13,101 @@ describe StepUp::Driver::Git do
       @driver.commit_history("f4cfcc2").should be == ["f4cfcc2c8b1f7edb1b7817b4e8a9063d21db089b", "2fb8a3281fb6777405aadcd699adb852b615a3e4", "d7b0fa26ca547b963569d7a82afd7d7ca11b71ae", "8b38f7c842496fd50b4e1b7ca5e883940b9cbf83", "f76c8d7bf64678963aeef84009be54f1819e3389", "8299243c7dac8f27c3572424a348a7f83ef0ce28", "570fe2e6e7f0b06140ae109e50a1e86628819493", "cdd4d5aa885b22136f4a08c1b35076f888f9536e", "72174c160b50ec73a8f67c8150e0dcd976857411", "b2da007b4fb35e0274858c14a83a836852d055a4", "4f0e7e0f6b3df2d49ed0029ed01998bf2102b28f"]
       @driver.commit_history("f4cfcc2", 3).should be == ["f4cfcc2c8b1f7edb1b7817b4e8a9063d21db089b", "2fb8a3281fb6777405aadcd699adb852b615a3e4", "d7b0fa26ca547b963569d7a82afd7d7ca11b71ae"]
     end
+    it "should get commits between a fist commit and a last_commit" do
+      @driver.should respond_to :commits_between
+      @driver.commits_between("63c8b23", "d133b9e").should be == %w[
+        d133b9e3b5be37c8a3332a83e55b410e87d9c3a3
+        abd9ee53283de0981fd6fd659af50a2aef4fc5c6
+        13de54b5cfdaf05fd4e3c3db57ec9f021362d9c7
+        67931ecf42431719b5c67f88ec65cb57e7e11744
+      ]
+      @driver.commits_between("67931ec", "d133b9e").size.should be == 6
+    end
+    it "should get all remotes" do
+      @driver.fetched_remotes.should be == %w[origin]
+    end
+    it "should get version tag info" do
+      @driver.version_tag_info("v0.1.0").should be == {:message => "Features:\n\n  - command line to show notes for the next version (unversioned notes)", :tagger => "Marcelo Manzan", :date => Time.parse("Thu Dec 9 02:42:14 2010 -0200")}
+    end
   end
-
-
-  context 'fetching tags' do
+  
+  context 'fetching all tags' do
     it "should get tags sorted" do
-      tags = %w[note-v0.2.0-1 v0.1.0 v0.1.1 v0.1.2 v0.1.1.rc3]
+      tags = %w[note-v0.2.0-1 v0.1.0 v0.1.1 v0.1.10 v0.1.2 v0.1.1.rc3]
       @driver.stubs(:all_tags).returns(tags)
-      @driver.all_version_tags.should be == %w[v0.1.2 v0.1.1.rc3 v0.1.1 v0.1.0]
+      @driver.all_version_tags.should be == %w[v0.1.10 v0.1.2 v0.1.1.rc3 v0.1.1 v0.1.0]
     end
-
+  end
+  
+  context "fetching the last version tag" do
     it "should return last tag visible" do
       @driver.last_version_tag("f4cfcc2").should be == "v0.0.1+"
       @driver.last_version_tag("570fe2e").should be == "v0.0.1"
-      @driver.class.last_version("f4cfcc2").should be == "v0.0.1+"
-      @driver.class.last_version("570fe2e").should be == "v0.0.1"
     end
-
-    it "should get no tag visible" do
-      @driver.last_version_tag("cdd4d5a").should be_nil
+        
+    it "should get last tag visible with the count of commits after it" do
+      @driver.last_version_tag("f42bdd1", true).should be == "v0.0.2+22"
+      @driver.last_version_tag("13de54b", true).should be == "v0.0.2+22"
+      @driver.last_version_tag("d133b9e", true).should be == "v0.0.2+27"
     end
-
-    it "should get a blank tag" do
-      @driver.mask.blank.should be == "v0.0.0"
-      @driver.class.last_version("cdd4d5a").should be == "v0.0.0+"
+        
+    context "if there is no version tag" do
+      context "in the project" do
+        before do
+          @driver.stubs(:all_version_tags).returns([])
+        end
+        
+        it "should return a blank tag" do
+          @driver.last_version_tag.should == "v0.0.0+"
+        end
+      end
+      
+      context "in the commit history, but there is in the project" do
+        it "should return nil" do
+          @driver.last_version_tag("cdd4d5a").should be_nil
+        end
+      end
     end
   end
 
 
-  context "fetching notes" do
-    context "from test_* sections" do
-      before do
-        @driver.stubs(:notes_sections).returns(%w[test_changes test_bugfixes test_features])
-        @objects_with_notes = {"test_changes" => ["8299243c7dac8f27c3572424a348a7f83ef0ce28", "2fb8a3281fb6777405aadcd699adb852b615a3e4"], "test_bugfixes" => ["d7b0fa26ca547b963569d7a82afd7d7ca11b71ae"], "test_features" => []}
-        @messages = {"test_changes" => ["removing files from gemspec\n  .gitignore\n  lastversion.gemspec\n", "loading default configuration yaml\n\nloading external configuration yaml\n"], "test_bugfixes" => ["sorting tags according to the mask parser\n"], "test_features" => []}
-        @changelog_full = <<-MSG
-  - removing files from gemspec (8299243c7dac8f27c3572424a348a7f83ef0ce28)
-    - .gitignore
-    - lastversion.gemspec
-  - loading default configuration yaml (2fb8a3281fb6777405aadcd699adb852b615a3e4)
-  - loading external configuration yaml
-
-Test bugfixes:
-
-  - sorting tags according to the mask parser (d7b0fa26ca547b963569d7a82afd7d7ca11b71ae)
-MSG
-        @changelog = @changelog_full.gsub(/\s\(\w+\)$/, '')
-        @all_objects_with_notes = @driver.all_objects_with_notes("f4cfcc2")
-      end
-      it "should get all objects with notes" do
-        @all_objects_with_notes.should be == @objects_with_notes
-      end
-      it "should get all notes messages" do
-        @all_objects_with_notes.should respond_to(:messages)
-        @all_objects_with_notes.messages.should be == @messages
-      end
-      it "should get changelog message" do
-        @all_objects_with_notes.should respond_to(:to_changelog)
-        @all_objects_with_notes.sections.should be == @driver.notes_sections
-        @all_objects_with_notes.messages.should be == @messages
-        @all_objects_with_notes.messages.to_changelog.should be == @changelog
-        @all_objects_with_notes.to_changelog.should be == @changelog
-        @all_objects_with_notes.messages.to_changelog(:mode => :with_objects).should be == @changelog_full
-        @all_objects_with_notes.to_changelog(:mode => :with_objects).should be == @changelog_full
-      end
-      it "should get unversioned changelog message" do
-        @all_objects_with_notes.should be == @objects_with_notes
-        object = @objects_with_notes["test_changes"].shift
-        @all_objects_with_notes.stubs(:kept_notes).returns([object])
-        @all_objects_with_notes.should respond_to(:unversioned_only)
-        @all_objects_with_notes.unversioned_only.should be == @objects_with_notes
-      end
+  context "adding notes" do
+    before do
+      @steps = <<-STEPS
+      git fetch
+
+      git notes --ref=jjj_changes add -m "alteracao na variavel de ambiente \\"\\$ENV\\"" v0.1.0~1
+
+      git push origin refs/notes/jjj_changes
+      STEPS
+      @steps = @steps.rstrip.split(/\n\n/).collect{ |step| step.gsub(/^\s{6}/, '') }
+    end
+    it "should return steps" do
+      @driver.steps_for_add_notes("jjj_changes", "alteracao na variavel de ambiente \"$ENV\"", "v0.1.0~1").should be == @steps
     end
   end
 
 
   context "increasing version" do
     before do
-      @driver.stubs(:notes_sections).returns(%w[test_changes test_bugfixes test_features])
+      notes_sections = %w[test_changes test_bugfixes test_features]
+      class << notes_sections
+        include StepUp::ConfigSectionsExt
+      end
+      StepUp::CONFIG.stubs(:notes_sections).returns(notes_sections)
+      StepUp::CONFIG.notes.after_versioned.stubs(:section).returns("test_versioning")
     end
 
 
     context "using 'remove' as after_versioned:strategy" do
       before do
-        @driver.stubs(:notes_after_versioned).returns({"strategy" => "remove", "section" => "test_versioning", "changelog_message" => "available on {version}"})
+        StepUp::CONFIG.notes.after_versioned.stubs(:strategy).returns("remove")
         @steps = <<-STEPS
         git fetch
 
-        git tag -a -m "  - removing files from gemspec
+        git tag -a -m "Test changes:
+        
+          - removing files from gemspec
             - .gitignore
             - lastversion.gemspec
           - loading default configuration yaml
@@ -107,8 +115,7 @@ MSG
         
         Test bugfixes:
         
-          - sorting tags according to the mask parser
-        " v0.1.0
+          - sorting tags according to the mask parser" v0.1.0
 
         git push --tags
 
@@ -122,22 +129,24 @@ MSG
 
         git push origin refs/notes/test_bugfixes
         STEPS
-        @steps = @steps.chomp.split(/\n\n/).collect{ |step| step.gsub(/^\s{8}/, '') }
+        @steps = @steps.rstrip.split(/\n\n/).collect{ |step| step.gsub(/^\s{8}/, '') }
       end
       it "should return steps" do
-        @driver.should respond_to :increase_version_tag
-        @driver.increase_version_tag("minor", "f4cfcc2").should be == @steps
+        @driver.should respond_to :steps_to_increase_version
+        @driver.steps_to_increase_version("minor", "f4cfcc2").should be == @steps
       end
     end
 
 
     context "using 'keep' as after_versioned:strategy" do
       before do
-        @driver.stubs(:notes_after_versioned).returns({"strategy" => "keep", "section" => "test_versioning", "changelog_message" => "available on {version}"})
+        StepUp::CONFIG.notes.after_versioned.stubs(:strategy).returns("keep")
         @steps = <<-STEPS
         git fetch
 
-        git tag -a -m "  - removing files from gemspec
+        git tag -a -m "Test changes:
+        
+          - removing files from gemspec
             - .gitignore
             - lastversion.gemspec
           - loading default configuration yaml
@@ -145,8 +154,7 @@ MSG
         
         Test bugfixes:
         
-          - sorting tags according to the mask parser
-        " v0.1.0
+          - sorting tags according to the mask parser" v0.1.0
 
         git push --tags
 
@@ -158,11 +166,11 @@ MSG
 
         git push origin refs/notes/test_versioning
         STEPS
-        @steps = @steps.chomp.split(/\n\n/).collect{ |step| step.gsub(/^\s{8}/, '') }
+        @steps = @steps.rstrip.split(/\n\n/).collect{ |step| step.gsub(/^\s{8}/, '') }
       end
       it "should return steps" do
-        @driver.should respond_to :increase_version_tag
-        @driver.increase_version_tag("minor", "f4cfcc2").should be == @steps
+        @driver.should respond_to :steps_to_increase_version
+        @driver.steps_to_increase_version("minor", "f4cfcc2").should be == @steps
       end
     end
   end
@@ -170,7 +178,7 @@ MSG
 
   context "checking helper methods" do
     it "should load default notes' sections" do
-      @driver.send(:notes_sections).should be == StepUp::CONFIG["notes"]["sections"]
+      StepUp::CONFIG.notes_sections.should be == StepUp::CONFIG["notes"]["sections"]
     end
   end
 end

data/spec/lib/step-up/parser/version_mask_spec.rb

@@ -6,7 +6,10 @@ describe StepUp::Parser::VersionMask do
       @mask = StepUp::Parser::VersionMask.new("v0.0.0.9.9.rc9")
     }.should_not raise_error ArgumentError
   end
-
+  
+  it "should be able to provide a blank mask" do
+    @mask.blank.should be == "v0.0.0"
+  end
 
   context "parsing" do
     it "should parse" do
@@ -36,9 +39,9 @@ describe StepUp::Parser::VersionMask do
 
   context "increasing version" do
     before do
-      @mask.stubs(:version_parts).returns(%w[major minor tiny patch build rc])
+      @mask.stubs(:version_levels).returns(%w[major minor tiny patch build rc])
     end
-    it "should increase by parts" do
+    it "should increase by levels" do
       version = "v2.3.1.6.4.rc5"
       @mask.increase_version(version, "major").should be == "v3.0.0"
       @mask.increase_version(version, "minor").should be == "v2.4.0"
@@ -48,4 +51,25 @@ describe StepUp::Parser::VersionMask do
       @mask.increase_version(version, "rc").should be == "v2.3.1.6.4.rc6"
     end
   end
+
+
+  context "getting Regepx" do
+    it "should get regexp string" do
+      @mask.should respond_to(:to_regex)
+      @mask.to_regex.should be == "(?:v(\\d+))(?:\\.(\\d+))(?:\\.(\\d+))(?:\\.(\\d+))?(?:\\.(\\d+))?(?:\\.rc(\\d+))?"
+    end
+    it "should parse message" do
+      re = /^available on (?:#{ @mask.to_regex })$/
+      "available on v0.1.0".should =~ re
+      "available on v0.1.0.rc3".should =~ re
+      "available on v0.1.0.1.rc3".should =~ re
+      "available on v0.1.0.2.4.rc3".should =~ re
+    end
+    it "should not parse message" do
+      re = /^available on (?:#{ @mask.to_regex })$/
+      "available on v0.1".should_not =~ re
+      "now in v0.1.0".should_not =~ re
+      "available on v0.1.0 tag".should_not =~ re
+    end
+  end
 end

data/spec/lib/step-up/ranged_notes_spec.rb

@@ -0,0 +1,140 @@
+require "spec_helper"
+
+describe StepUp::RangedNotes do
+  before do
+    @driver = StepUp::Driver::Git.new
+  end
+
+  context "checking notes" do
+    it "should bring all notes between v0.0.2 and v0.1.0" do
+      @notes = StepUp::RangedNotes.new(@driver, "v0.0.2", "v0.1.0")
+      @notes.all_notes.should be == [
+        [3, "features", 1, "3baad37d5098ad3b09935229e14e617c3ec8b7ee",
+         "command line to show notes for the next version (unversioned notes)\n"]
+      ]
+    end
+  end
+
+  context "testing notes" do
+    before do
+      notes_sections = %w[test_changes test_bugfixes test_features]
+      class << notes_sections
+        include StepUp::ConfigSectionsExt
+      end
+      StepUp::CONFIG.stubs(:notes_sections).returns(notes_sections)
+      StepUp::CONFIG.notes.after_versioned.stubs(:section).returns("test_versioning")
+    end
+    context "until object f4cfcc2" do
+      before do
+        @notes = StepUp::RangedNotes.new(@driver, nil, "f4cfcc2")
+      end
+      it "should get all detached notes" do
+        @notes.notes.should be == [
+          [5, "test_changes", 1, "8299243c7dac8f27c3572424a348a7f83ef0ce28",
+           "removing files from gemspec\n  .gitignore\n  lastversion.gemspec\n"],
+          [2, "test_bugfixes", 1, "d7b0fa26ca547b963569d7a82afd7d7ca11b71ae",
+           "sorting tags according to the mask parser\n"],
+          [1, "test_changes", 1, "2fb8a3281fb6777405aadcd699adb852b615a3e4",
+           "loading default configuration yaml\n\nloading external configuration yaml\n"]
+        ]
+      end
+      it "should get a hash of distinct notes" do
+        @notes.notes.should respond_to :as_hash
+        @notes.notes.as_hash.should be == {
+          "test_changes" => [
+            ["8299243c7dac8f27c3572424a348a7f83ef0ce28",
+             "removing files from gemspec\n  .gitignore\n  lastversion.gemspec\n", 1],
+            ["2fb8a3281fb6777405aadcd699adb852b615a3e4",
+             "loading default configuration yaml\n\nloading external configuration yaml\n", 1]
+          ],
+          "test_bugfixes" => [
+            ["d7b0fa26ca547b963569d7a82afd7d7ca11b71ae",
+             "sorting tags according to the mask parser\n", 1]
+          ]
+        }
+      end
+      it "should get the changelog message without objects" do
+        @notes.notes.as_hash.should respond_to :to_changelog
+        changelog = <<-EOF
+        Test changes:
+        
+          - removing files from gemspec
+            - .gitignore
+            - lastversion.gemspec
+          - loading default configuration yaml
+          - loading external configuration yaml
+        
+        Test bugfixes:
+        
+          - sorting tags according to the mask parser
+        EOF
+        changelog.gsub!(/^\s{8}/, '')
+        changelog = changelog.rstrip
+        @notes.notes.as_hash.to_changelog.should be == changelog
+      end
+      it "should get the changelog message with objects" do
+        @notes.notes.as_hash.should respond_to :to_changelog
+        changelog = <<-EOF
+        Test changes:
+        
+          - removing files from gemspec (8299243c7dac8f27c3572424a348a7f83ef0ce28)
+            - .gitignore
+            - lastversion.gemspec
+          - loading default configuration yaml (2fb8a3281fb6777405aadcd699adb852b615a3e4)
+          - loading external configuration yaml
+        
+        Test bugfixes:
+        
+          - sorting tags according to the mask parser (d7b0fa26ca547b963569d7a82afd7d7ca11b71ae)
+        EOF
+        changelog.gsub!(/^\s{8}/, '')
+        changelog = changelog.rstrip
+        @notes.notes.as_hash.to_changelog(:mode => :with_objects).should be == changelog
+      end
+      it "should get the changelog message with custom message" do
+        @notes.notes.as_hash.should respond_to :to_changelog
+        changelog = <<-EOF
+        Custom message:
+        
+          - New version create feature
+          - Removed old version create feature
+        
+        Test changes:
+        
+          - removing files from gemspec
+            - .gitignore
+            - lastversion.gemspec
+          - loading default configuration yaml
+          - loading external configuration yaml
+        
+        Test bugfixes:
+        
+          - sorting tags according to the mask parser
+        EOF
+        changelog.gsub!(/^\s{8}/, '')
+        changelog = changelog.rstrip
+        message_option = {:custom_message => "New version create feature\n\nRemoved old version create feature"}
+        @notes.notes.as_hash.to_changelog(message_option).should be == changelog
+      end
+      it "should get the changelog message without custom message" do
+        @notes.notes.as_hash.should respond_to :to_changelog
+        changelog = <<-EOF
+        Test changes:
+        
+          - removing files from gemspec
+            - .gitignore
+            - lastversion.gemspec
+          - loading default configuration yaml
+          - loading external configuration yaml
+        
+        Test bugfixes:
+        
+          - sorting tags according to the mask parser
+        EOF
+        changelog.gsub!(/^\s{8}/, '')
+        changelog = changelog.rstrip
+        @notes.notes.as_hash.to_changelog.should be == changelog
+      end
+    end
+  end
+end