step-up 0.9.9 → 0.9.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 741ce18e2574616e043e432311d193449f7c02ef
+  data.tar.gz: a17024a67859205ef4cda3743a4dce2f554ded7f
+SHA512:
+  metadata.gz: 68f80d3c7e3df2e0eb0aefdd3f594df9b5b5afcd2d5ed89d91fbf0e00d18670c8ae86a92a9e256f087394d8ec590c803ff4d1e86cddaf9ed1c68814a74b3ff46
+  data.tar.gz: 760d780b3bd738f5466157e5086a456bacb0dc149a6053b6d3e8ade960670aa9789ae0f8a337f02945a59fb38d2bee59bbfddb86cf7026d64f91c1704ebe188b

data/.stepuprc

@@ -1,6 +1,5 @@
 notes:
   after_versioned:
-    #strategy: "remove"
     strategy: "keep"
     section: "versioning"
     changelog_message: "available on {version}"

data/GEM_VERSION

@@ -0,0 +1 @@
+v0.9.11

data/README.md

@@ -1,31 +1,42 @@
 # StepUp: a project to step up your projects
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/kawamanza/step-up?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[<img src="https://pledgie.com/campaigns/30770.png?skin_name=chrome" border="0" align="right" alt="Click here to lend your support to: StepUp Utility and make a donation at pledgie.com !"/>](https://pledgie.com/campaigns/30770)
 
-Project badges:
+Project badges:  
 [![Gem Version](https://badge.fury.io/rb/step-up.svg)](http://badge.fury.io/rb/step-up)
-[![GitHub version](https://badge.fury.io/gh/kawamanza%2Fstep-up.svg)](http://badge.fury.io/gh/kawamanza%2Fstep-up)
-
-Code badges:
+[![GitHub version](https://badge.fury.io/gh/kawamanza%2Fstep-up.svg)](http://badge.fury.io/gh/kawamanza%2Fstep-up)  
+Code badges:  
 [![Dependency Status](https://gemnasium.com/kawamanza/step-up.svg)](https://gemnasium.com/kawamanza/step-up)
 
+## Introduction
+
 StepUp is a tool to manage versioning.
 That means you can bump the version of your project, for example, from v3.0.11 to v4.0.0, check the current version, summarize all the history of versions in a changelog and more.
 
-StepUp is based on source control management features (i.e. tags, branches, commits, notes etc), so it doesn't need to keep files with the current version (but it supports it, if you want), it has visibility of all history of changes and versions (doesn't matter if they are spread in many different branches), which adds a variety of possibilities in terms of management, depending on your project needs.
+StepUp is based on source control management features (i.e. tags, branches, commits, notes etc), so it doesn't need to keep files with the current version, it has visibility of all history of changes and versions (doesn't matter if they are spread in many different branches), which adds a variety of possibilities in terms of management, depending on your project needs.
 
-## Installation
+## Features
 
-    gem install step-up
+* Allow you to attach notes to existing commits to mark fixes or new features that are being delivered.
+* Organize notes into sections of bugfixes, features, minor changes and so on.
+* View release notes for the next version of the project that will be boosted.
+* Auto-increment the version of the project based in the release notes (according to [semver.org](http://semver.org/) guidelines).
 
-## First of all
+## Installation
 
-Your installed git-scm version must be v1.7.1 or higher.
+```sh
+$ gem install step-up
+```
 
 ## The Basics
 
 ### Checking current project version
 
-    stepup [version]
+Run the following command into your project's root folder:
+
+```sh
+$ stepup [version]
+```
 
 An example of output would be
 
@@ -46,7 +57,7 @@ where **LEVEL_NAME**, by default, could be
 * patch
 * tiny
 
-This command will ask user to input a message for the version and will increment the version number accordingly.
+This command will increment the version number according with the specified level.
 
 Each level corresponds to a position in the version mask.
 Considering default settings, this means:
@@ -63,6 +74,9 @@ The versioning increment is based on the last version tag found in the repositor
 As you can see, the TINY level is omitted when its value is zero.
 The mask allows you to configure the less relevant levels this way.
 
+> **Note:**  
+> In order to maintain the convention indicated by the [semver.org](http://semver.org/), the TINY level will be deprecated in future releases.
+
 ### Checking out the changelog
 
     stepup changelog [--top=N]
@@ -115,9 +129,19 @@ The result would be something like the following:
       - rake db:seed
       - rake categories:reload
 
+## Continuous Integration
+
+You can use the `stepup` commands to extract information of your project and display them on Continuous Integration tools.
+
+![Jenkins Example](https://raw.githubusercontent.com/kawamanza/step-up/master/docs/images/stepup_ci.png)
+
+## Contributing
 
-## Project
-* https://github.com/kawamanza/step-up
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
 
 ## Report bugs and suggestions
 * [Issue Tracker](https://github.com/kawamanza/step-up/issues)

data/lib/step-up/cli.rb

@@ -9,6 +9,11 @@ module StepUp
     
     default_task :version
 
+    desc "commands", "list avaliable commands"
+    def commands
+      puts self.class.all_commands.keys.join " "
+    end
+
     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]
@@ -67,6 +72,7 @@ module StepUp
     method_options :"with-commit" => :boolean
     method_options %w[section -s] => :string
     method_options :sections => :array
+    method_options :force => :boolean
     def notes(action = "show", commit_base = nil)
       unless %w[show add remove help].include?(action)
         commit_base ||= action
@@ -200,6 +206,13 @@ module StepUp
         puts "This repository has no commit history"
         exit 1
       end
+      parents = `git rev-list --parents -n 1 #{last_commit.first}`.split(' ')
+      # Check if it is a merge-commit
+      if parents.size > 2 && ! options[:force]
+        puts "It's recommended not to add notes to merge-commit, but if you need to"
+        puts "do this anyway, please use the --force option."
+        exit 1
+      end
       unless message
         message = last_commit.last
         message << <<-TEXT
@@ -281,7 +294,13 @@ module StepUp
         mask = nil if mask !~ /0/
         version = nil
         if options[:"next-release"]
-          tag = driver.cached_next_version_tag(commit_object, options[:level])
+          level = options[:level] || driver.next_release_level(commit_object)
+          unless STDIN.tty?
+            tag = STDIN.first.chomp
+            all_tags = driver.tags.scan(/[^\r\n]+/)
+            tag = all_tags.include?(tag) ? driver.mask.increase_version(tag, level) : nil
+          end
+          tag = tag || driver.cached_next_version_tag(commit_object, level)
           version = tag
         else
           version = driver(mask).last_version_tag(commit_object || "HEAD", true)

data/lib/step-up/config/step-up.yml

@@ -1,6 +1,5 @@
 notes:
   after_versioned:
-    strategy: "keep" # Valid options: "keep" or "remove"
     section: "versioning"
     changelog_message: "available on {version}"
   sections:
@@ -21,7 +20,7 @@ notes:
       label: "Deploy steps:"
       tag: "deploy_step"
 versioning:
-  version_mask: "v0.0.0.9"
+  version_mask: "v0.0.0"
   auto_increment:
     sections_level:
       minor:
@@ -34,4 +33,3 @@ versioning:
     - major
     - minor
     - patch
-    - tiny

data/lib/step-up/git_extensions.rb

@@ -7,7 +7,7 @@ module StepUp
 
     module Notes
       def steps_for_archiving_notes(objects_with_notes, tag)
-        strategy = CONFIG.notes.after_versioned.strategy
+        strategy = CONFIG.notes.after_versioned["strategy"] || "keep"
         raise ArgumentError, "unknown strategy: #{ strategy }" unless NOTES_STRATEGIES.include?(strategy)
         NOTES_STRATEGIES[strategy].steps_for_archiving_notes(objects_with_notes, tag, self)
       end
@@ -34,25 +34,6 @@ module StepUp
     end
 
     module Strategy
-      class RemoveNotes
-        def steps_for_archiving_notes(objects_with_notes, tag, driver)
-          commands = []
-          CONFIG.notes_sections.names.each do |section|
-            next unless objects_with_notes.has_key?(section)
-            removed_notes = []
-            objects_with_notes[section].each do |object|
-              next if object[2] == RangedNotes::COMMIT_NOTE
-              removed_notes << "git notes --ref=#{ section } remove #{ object[0] }"
-            end
-            unless removed_notes.empty?
-              commands += removed_notes
-              commands << "git push #{ driver.notes_remote } refs/notes/#{ section }" if driver.cached_fetched_remotes.any?
-            end
-          end
-          commands
-        end
-      end
-
       class KeepNotes
         def steps_for_archiving_notes(objects_with_notes, tag, driver)
           commands = []
@@ -74,7 +55,6 @@ module StepUp
         end
       end
     end
-    register_notes_strategy "remove", Strategy::RemoveNotes.new
     register_notes_strategy "keep", Strategy::KeepNotes.new
   end
 end

data/lib/step-up/parser/version_mask.rb

@@ -22,7 +22,7 @@ module StepUp
         v = []
         mask.each_with_index do |part, index|
           level = version[index] || 0
-          raise ArgumentError unless level.is_a?(Fixnum)
+          raise ArgumentError unless level.is_a?(Integer)
           unless level.zero? && part.last == '9'
             v << "#{part.first}#{level}"
           end

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

@@ -99,45 +99,6 @@ describe StepUp::Driver::Git do
     end
 
 
-    context "using 'remove' as after_versioned:strategy" do
-      before do
-        StepUp::CONFIG.notes.after_versioned.stubs(:strategy).returns("remove")
-        @steps = <<-STEPS
-        git fetch
-
-        git tag -a -m "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" v0.1.0 f4cfcc2
-
-        git push origin refs/tags/v0.1.0
-
-        git notes --ref=test_changes remove 8299243c7dac8f27c3572424a348a7f83ef0ce28
-
-        git notes --ref=test_changes remove 2fb8a3281fb6777405aadcd699adb852b615a3e4
-
-        git push origin refs/notes/test_changes
-
-        git notes --ref=test_bugfixes remove d7b0fa26ca547b963569d7a82afd7d7ca11b71ae
-
-        git push origin refs/notes/test_bugfixes
-        STEPS
-        @steps = @steps.rstrip.split(/\n\n/).collect{ |step| step.gsub(/^\s{8}/, '') }
-      end
-      it "should return steps" do
-        @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
         StepUp::CONFIG.notes.after_versioned.stubs(:strategy).returns("keep")

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: step-up
 version: !ruby/object:Gem::Version
-  version: 0.9.9
-  prerelease: 
+  version: 0.9.11
 platform: ruby
 authors:
 - Marcelo Manzan
@@ -10,70 +9,80 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.2
 description: StepUp manages a project's versioning through its entire lifecycle
@@ -85,11 +94,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .stepuprc
+- ".stepuprc"
+- GEM_VERSION
 - Gemfile
 - README.md
 - Rakefile
 - bin/stepup
+- docs/images/stepup_ci.png
 - lib/step-up.rb
 - lib/step-up/capistrano.rb
 - lib/step-up/cli.rb
@@ -103,41 +114,37 @@ files:
 - lib/step-up/parser/version_mask.rb
 - lib/step-up/ranged_notes.rb
 - lib/step-up/version.rb
-- templates/default/Capfile
-- templates/default/Gemfile
-- templates/default/Rakefile
-- templates/default/lib/version.rb
 - spec/lib/config_spec.rb
 - spec/lib/step-up/driver/git_spec.rb
 - spec/lib/step-up/parser/version_mask_spec.rb
 - spec/lib/step-up/ranged_notes_spec.rb
 - spec/spec_helper.rb
+- templates/default/Capfile
+- templates/default/Gemfile
+- templates/default/Rakefile
+- templates/default/lib/version.rb
 homepage: https://github.com/kawamanza/step-up
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3590876933529297334
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: step-up
-rubygems_version: 1.8.24
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The best way to manage your project's versioning
 test_files:
 - spec/lib/config_spec.rb