step-up 0.3.0 → 0.3.1

data/.stepuprc

@@ -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/cli.rb

@@ -35,24 +35,19 @@ module StepUp
       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?
-        if unfetched_remotes.size > 1
-          remote = choose(unfetched_remotes, "Which remote would you like to fetch notes?")
-          return unless unfetched_remotes.include?(remote)
-        else
-          remote = unfetched_remotes.first
-        end
-        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
+          regex = /^(\s*gem\s+(?:'step-up'|"step-up")\s*,\s*['"])((?:~>|=>|=)\s*.*?)(['"])/
+          if gem_file =~ regex && ! $2.end_with?(StepUp::VERSION)
+            say_status :update, "Updating dependency to step-up on Gemfile", :green
+            File.open("Gemfile", "w") do |f|
+              f.write gem_file.gsub(regex, '\1~> '+StepUp::VERSION+'\3')
+            end
+          else
+            say_status :skip, "Adding dependency to step-up on Gemfile", :yellow
+          end
         else
           say_status :update, "Adding dependency to step-up on Gemfile", :green
           content = File.read(File.expand_path(File.join(__FILE__, '..', '..', '..', 'templates', 'default', 'Gemfile')))
@@ -88,16 +83,43 @@ module StepUp
           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
+      # Updating Rakefile
+      if File.exists?("Rakefile")
+        content = File.read(File.expand_path(File.join(__FILE__, '..', '..', '..', 'templates', 'default', 'Rakefile')))
+        content = template_render(content)
+        if File.exists?("lib/tasks/versioning.rake") && File.read("lib/tasks/versioning.rake") =~ /\bstep-up\b/
+          content = File.read("lib/tasks/versioning.rake")
+          say_status :remove, "Removing lib/tasks/versioning.rake", :blue
+          `rm lib/tasks/versioning.rake`
+        end
+        rake_file = File.read("Rakefile")
+        if rake_file =~ /\bstep-up\b/
+          say_status :skip, "Appending to Rakefile", :yellow
+        else
+          say_status :update, "Appending to Rakefile", :green
+          File.open("Rakefile", "w") do |f|
+            f.write rake_file
+            f.write "\n" unless rake_file.end_with?("\n")
+            f.write content
+          end
+        end
       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')))
+        say_status :ignore, "Ignoring creation of lib/tasks/versioning.rake", :yellow
+      end
+      # Updating Capfile
+      if File.exists?("Capfile") && File.exists?("Rakefile")
+        content = File.read(File.expand_path(File.join(__FILE__, '..', '..', '..', 'templates', 'default', 'Capfile')))
         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
+        cap_file = File.read("Capfile")
+        if cap_file =~ /\bstepup\b/
+          say_status :skip, "Appending to Capfile", :yellow
+        else
+          say_status :update, "Appending to Capfile", :green
+          File.open("Capfile", "w") do |f|
+            f.write cap_file
+            f.write "\n" unless cap_file.end_with?("\n")
+            f.write content
+          end
         end
       end
       # Appending .gitignore
@@ -130,7 +152,7 @@ module StepUp
         action = "show"
       end
       if self.respond_to?("notes_#{action}")
-        send("notes_#{action}", commit_base)
+        check_notes_config && send("notes_#{action}", commit_base)
       else
         puts "invalid action: #{action}"
       end
@@ -335,6 +357,24 @@ module StepUp
         exit(1) unless status
       end
     end
+
+    def check_notes_config
+      remotes_with_notes = driver.fetched_remotes('notes')
+      unfetched_remotes = driver.fetched_remotes - remotes_with_notes
+      unless remotes_with_notes.any? || unfetched_remotes.empty?
+        answer = raw_ask("To perform this operation you need some additional fetch instruction on your git-config file.\nMay stepup add the missing instruction for you? [yes/no]:")
+        return false unless answer == "yes"
+        if unfetched_remotes.size > 1
+          remote = choose(unfetched_remotes, "Which remote would you like to fetch notes?")
+          return false unless unfetched_remotes.include?(remote)
+        else
+          remote = unfetched_remotes.first
+        end
+        cmds = ["git config --add remote.#{remote}.fetch +refs/notes/*:refs/notes/*", "git fetch #{remote}"]
+        print_or_run(cmds, false)
+      end
+      true
+    end
     
     def get_custom_message
       message = options[:message]

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

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

data/templates/default/Capfile

@@ -0,0 +1,8 @@
+
+after   "deploy:update_code"    , "stepup:version_file"
+namespace :stepup do
+  desc "[internal] Creates tempfile {{version_file}}"
+  task :version_file do
+    run %(cd #{current_release};rake stepup:version_file)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: step-up
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Marcelo Manzan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -02:00
+date: 2011-02-10 00:00:00 -02:00
 default_executable: stepup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,8 +87,9 @@ 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/lib/tasks/versioning.rake
+- templates/default/Rakefile
 - templates/default/lib/version.rb
 - spec/lib/config_spec.rb
 - spec/lib/step-up/driver/git_spec.rb