step-up 0.2.1 → 0.3.0

data/lib/step-up/cli.rb

@@ -11,6 +11,7 @@ module StepUp
     desc "version ACTION [OPTIONS]", "manage versions of your project"
     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
     VERSION_ACTIONS = %w[show create help]
     def version(action = nil)
       action = "show" unless VERSION_ACTIONS.include?(action)
@@ -24,13 +25,17 @@ module StepUp
     desc "init", "adds .stepuprc to your project and prepare your local repository to use notes"
     method_options :update => :boolean
     def init
+      # creates .stepuprc file
       content = File.read(File.expand_path("../config/step-up.yml", __FILE__))
       if options[:update] || ! File.exists?(".stepuprc")
-        puts "#{File.exists?(".stepuprc") ? 'updating' : 'creating' } .stepuprc"
+        say_status File.exists?(".stepuprc") ? :update : :create, ".stepuprc", :green
         File.open(".stepuprc", "w") do |f|
           f.write content
         end
+      else
+        say_status :skip, "Creating .stepuprc", :yellow
       end
+      # add entry to .git/config
       remotes_with_notes = driver.fetched_remotes('notes')
       unfetched_remotes = driver.fetched_remotes - remotes_with_notes
       unless remotes_with_notes.any? || unfetched_remotes.empty?
@@ -40,9 +45,66 @@ module StepUp
         else
           remote = unfetched_remotes.first
         end
-        puts "Adding attribute below to .git/config (remote.#{ remote })"
-        puts "  fetch = +refs/notes/*:refs/notes/*"
-        `git config --add remote.#{ remote }.fetch +refs/notes/*:refs/notes/*`
+        cmds = ["git config --add remote.#{ remote }.fetch +refs/notes/*:refs/notes/*"]
+        print_or_run(cmds, false)
+      end
+      # Changing Gemfile
+      if File.exists?("Gemfile")
+        gem_file = File.read("Gemfile")
+        if gem_file =~ /\bstep-up\b/
+          say_status :skip, "Adding dependency to step-up on Gemfile", :yellow
+        else
+          say_status :update, "Adding dependency to step-up on Gemfile", :green
+          content = File.read(File.expand_path(File.join(__FILE__, '..', '..', '..', 'templates', 'default', 'Gemfile')))
+          stepup_dependency = template_render(content)
+          File.open("Gemfile", "w") do |f|
+            f.write gem_file
+            f.write "\n" unless gem_file.end_with?("\n")
+            f.write stepup_dependency
+          end
+        end
+      else
+        say_status :skip, "Gemfile not found", :yellow
+      end
+      # Creating lib/version.rb
+      content = File.read(File.expand_path(File.join(__FILE__, '..', '..', '..', 'templates', 'default', 'lib', 'version.rb')))
+      new_version_rb = template_render(content)
+      Dir.mkdir('lib') unless File.exists?('lib')
+      if File.exists?("lib/version.rb")
+        version_rb = File.read("lib/version.rb")
+        if version_rb =~ /\bStepUp\b/
+          say_status :skip, "Creating lib/version.rb", :yellow
+        else
+          say_status :update, "Appending to lib/version.rb", :green
+          File.open("lib/version.rb", "w") do |f|
+            f.write version_rb
+            f.write "\n" unless version_rb.end_with?("\n")
+            f.write new_version_rb
+          end
+        end
+      else
+        say_status :create, "Creating lib/version.rb", :green
+        File.open("lib/version.rb", "w") do |f|
+          f.write new_version_rb
+        end
+      end
+      # Creating lib/tasks/versioning.rake
+      if File.exists?("lib/tasks/versioning.rake")
+        say_status :skip, "Creating lib/tasks/versioning.rake", :yellow
+      else
+        say_status :create, "Creating lib/tasks/versioning.rake", :green
+        content = File.read(File.expand_path(File.join(__FILE__, '..', '..', '..', 'templates', 'default', 'lib', 'tasks', 'versioning.rake')))
+        content = template_render(content)
+        Dir.mkdir('lib/tasks') unless File.exists?('lib/tasks')
+        File.open("lib/tasks/versioning.rake", "w") do |f|
+          f.write content
+        end
+      end
+      # Appending .gitignore
+      unless File.exists?(".gitignore") && File.read(".gitignore") =~ /^#{gsub_params['version_file']}$/
+        run "echo #{gsub_params['version_file']} >> .gitignore"
+      else
+        say_status :skip, "Adding #{gsub_params['version_file']} to .gitignore", :yellow
       end
     end
 
@@ -154,7 +216,9 @@ module StepUp
           puts " - #{level}"
         end
       else
-        puts driver.last_version_tag("HEAD", true)
+        mask = options[:mask]
+        mask = nil if mask !~ /0/
+        puts driver(mask).last_version_tag("HEAD", true)
       end
     end
 
@@ -191,7 +255,8 @@ module StepUp
       end
     end
 
-    def driver
+    def driver(mask = nil)
+      return StepUp::Driver::Git.new mask unless mask.nil?
       @driver ||= StepUp::Driver::Git.new
     end
 
@@ -254,12 +319,20 @@ module StepUp
     end
     
     def print_or_run(steps, print)
+      opts = {:capture => false}
       if print
-        puts steps.join("\n")
+        steps.each{ |step| say_status :step, step, :green }
       else
+        status = true
         steps.each do |step|
-          run step
+          if status
+            status = run(step, opts)
+            say_status(:fail, "Problems when running `#{step}` (exit status #{$?.exitstatus})", :red) unless status
+          else
+            say_status(:skip, step, :yellow)
+          end
         end
+        exit(1) unless status
       end
     end
     
@@ -267,5 +340,17 @@ module StepUp
       message = options[:message]
       (message && !message.strip.empty?) ? message : nil
     end
+
+    def gsub_params
+      @gsub_params ||= {
+        'stepup_version' => StepUp::VERSION,
+        'version_file' => "CURRENT_VERSION",
+        'version_blank' => driver.mask.blank
+      }
+    end
+
+    def template_render(tmpl)
+      tmpl.gsub(/\{\{(.*?)\}\}/){ |m| gsub_params[$1] || m }
+    end
   end
 end

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

@@ -22,10 +22,9 @@ notes:
       label: "Deploy steps:"
       tag: "deploy_step"
 versioning:
-  version_mask: "v0.0.0.9.rc9"
+  version_mask: "v0.0.0.9"
   version_levels:
     - major
     - minor
-    - tiny
     - patch
-    - rc
+    - tiny

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

@@ -5,8 +5,8 @@ module StepUp
       
       include GitExtensions::Notes
       attr_reader :mask
-      def initialize
-        @mask = Parser::VersionMask.new(CONFIG.versioning.version_mask)
+      def initialize(mask = nil)
+        @mask = Parser::VersionMask.new(mask || CONFIG.versioning.version_mask)
       end
 
       def self.last_version
@@ -17,11 +17,11 @@ module StepUp
         options = args.last.is_a?(Hash) ? args.pop : {}
         top = args.shift
         top = "-n#{ top }" unless top.nil?
-        commits = `git log --pretty=oneline --no-color --no-notes #{ top } #{ commit_base }`
+        commits = `git log --pretty=oneline --no-color #{ top } #{ commit_base }`
         if options[:with_messages]
-          commits.split(/\n/).map{ |commit| commit =~ /^(\w+)\s+(.*)$/ ? [$1, $2] : nil }
+          commits.scan(/^(\w+)\s+(.*)$/)
         else
-          commits.gsub(/^(\w+)\s.*$/, '\1').split(/\n/)
+          commits.scan(/^(\w+)\s/).flatten
         end
       end
 
@@ -30,8 +30,8 @@ module StepUp
         commit_history(commit_base, *args)
       end
 
-      def all_tags
-        `git tag -l`.split("\n")
+      def tags
+        @tags ||= `git tag -l`
       end
 
       def objects_with_notes_of(ref)
@@ -47,7 +47,7 @@ module StepUp
       end
 
       def all_version_tags
-        @version_tags ||= all_tags.map{ |tag| mask.parse(tag) }.compact.sort.map{ |tag| mask.format(tag) }.reverse
+        @version_tags ||= tags.scan(mask.regex).map{ |tag| tag.collect(&:to_i) }.sort.map{ |tag| mask.format(tag) }.reverse
       end
 
       def version_tag_info(tag)

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

@@ -2,58 +2,29 @@ module StepUp
   module Parser
     class VersionMask
       attr_reader :mask
-      attr_reader :iterator
+      attr_reader :to_regex, :regex
       def initialize(mask)
-        @mask = mask.scan(/\D+[09]/)
-        raise ArgumentError if mask != @mask.join
-        @iterator = @mask.map do |token|
-          Regexp.new token.sub(/\./, '\\.').sub(/[09]$/,'(\d+)')
-        end
-      end
-
-      def to_regex
-        re = []
-        mask.each_with_index do |level, index|
-          re << "(?:#{ iterator[index].source })#{ '?' if level.end_with?('9') }"
-        end
-        re.join
+        raise ArgumentError if mask.nil? || mask =~ /[1-8]|[09][09]|9.+0/
+        @mask = mask.scan(/(\D*)([09])/)
+        @to_regex = ""
+        @mask.each { |level| @to_regex << "(?:#{level.first.gsub(/([\\\.\*\?\{\}\(\)\[\]])/, '\\\\\1')}(\\d+))#{'?' if level.last == '9'}" }
+        @regex = /^#{to_regex}$/
       end
 
       def parse(version)
         return unless version.is_a?(String)
-        i = 0
-        v = []
-        iterator.each_with_index do |pattern, index|
-          pos = version.index(pattern, i)
-          if pos.nil?
-            if mask[index] =~ /9$/
-              v << 0
-            else
-              return
-            end
-          else
-            if pos == i
-              n = $1
-              i += mask[index].size + n.size - 1
-              v << n.to_i
-            elsif mask[index] =~ /9$/
-              v << 0
-            else
-              return
-            end
-          end
-        end
-        v
+        v = version.scan(regex).first
+        v.nil? ? nil : v.collect(&:to_i)
       end
 
       def format(version)
         raise ArgumentError unless version.is_a?(Array) && version.size == mask.size
         v = []
-        iterator.each_with_index do |pattern, index|
+        mask.each_with_index do |part, index|
           level = version[index] || 0
           raise ArgumentError unless level.is_a?(Fixnum)
-          unless level.zero? && mask[index] =~ /9$/
-            v << mask[index].sub(/[09]$/, level.to_s)
+          unless level.zero? && part.last == '9'
+            v << "#{part.first}#{level}"
           end
         end
         v.join
@@ -61,7 +32,7 @@ module StepUp
 
       def increase_version(version, level)
         v = parse version
-        level = version_levels.index(level)
+        level = CONFIG.versioning.version_levels.index(level)
         (v.size-level).times do |index|
           v[level+index] = (index.zero? ? (v[level+index] || 0) + 1 : nil)
         end
@@ -71,12 +42,6 @@ module StepUp
       def blank
         format mask.size.times.map{ 0 }
       end
-
-      private
-
-      def version_levels
-        CONFIG["versioning"]["version_levels"]
-      end
     end
   end
 end

data/spec/lib/config_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe StepUp::CONFIG do
+describe "StepUp::CONFIG" do
   before do
     @c = StepUp::CONFIG
   end

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

@@ -34,7 +34,7 @@ describe StepUp::Driver::Git 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.10 v0.1.2 v0.1.1.rc3]
-      @driver.stubs(:all_tags).returns(tags)
+      @driver.stubs(:tags).returns(tags.join("\n"))
       @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

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

@@ -39,7 +39,7 @@ describe StepUp::Parser::VersionMask do
 
   context "increasing version" do
     before do
-      @mask.stubs(:version_levels).returns(%w[major minor tiny patch build rc])
+      StepUp::CONFIG.versioning.stubs(:version_levels).returns(%w[major minor tiny patch build rc])
     end
     it "should increase by levels" do
       version = "v2.3.1.6.4.rc5"

data/templates/default/Gemfile

@@ -0,0 +1 @@
+gem 'step-up', "~> {{stepup_version}}", :group => [:preparing]

data/templates/default/lib/tasks/versioning.rake

@@ -0,0 +1,8 @@
+namespace :stepup do
+  desc "Generates file with the latest version of the application"
+  task :version_file do
+    require 'step-up'
+    puts "Generating the version file {{version_file}} with the latest version of the application"
+    File.open('{{version_file}}', 'w') { |f| f.write StepUp::Driver::Git.new.last_version_tag("HEAD", true) }
+  end
+end

data/templates/default/lib/version.rb

@@ -0,0 +1,15 @@
+# created by StepUp
+module Version
+  def self.to_s
+    unless defined? @version
+      txt = File.expand_path File.join(__FILE__, '..', '..', '{{version_file}}')
+      if File.exists?(txt)
+        @version = File.read(txt).chomp
+      else
+        @version = "{{version_blank}}+"
+      end
+    end
+    @version
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: step-up
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marcelo Manzan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -02:00
+date: 2011-02-04 00:00:00 -02:00
 default_executable: stepup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,9 @@ files:
 - lib/step-up/parser/version_mask.rb
 - lib/step-up/ranged_notes.rb
 - lib/step-up/version.rb
+- templates/default/Gemfile
+- templates/default/lib/tasks/versioning.rake
+- 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