primedia-qa_release_tasks 0.5.1 → 0.5.3

data/lib/cli.rb

@@ -1,16 +1,22 @@
 module CLI
   def warn(message)
-    STDERR.puts "*" * 50
-    STDERR.puts "Warning: #{message}"
-    STDERR.puts "*" * 50
+    wrap(STDERR){ STDERR.puts "Warning: #{message}" }
   end
 
   def error(message)
-    STDERR.puts "*" * 50
-    STDERR.puts "Error: #{message}"
-    STDERR.puts "*" * 50
+    wrap(STDERR){ STDERR.puts "Error: #{message}" }
     exit 1
   end
+  
+  def stars(num=50)
+    return "*" * num
+  end
+  
+  def wrap(stream=STDOUT)
+    stream.puts stars
+    yield
+    stream.puts stars
+  end
 
   def ask(question, default=nil, valid_response=nil, invalid_message=nil)
     loop do

data/lib/git/tagger.rb

@@ -14,14 +14,19 @@ module Git
         assert_on_qa_branch
         assert_no_local_modifications
         update_qa if options[:update]
+        fetch_tags
         tag_next_version(options)
-        git_push_tags
+        push_tags
       ensure
         system 'git checkout qa_branch' unless get_branch == 'qa_branch'
       end
     end
 
     private
+    
+    def fetch_tags
+      system("git fetch --tags")
+    end
 
     def assert_no_local_modifications
       if needs_commit?
@@ -36,10 +41,11 @@ module Git
     end
 
     def update_qa
+      verify_update_is_ok
       system("git checkout master")    &&
-      system("git pull")               &&
+      system("git pull --rebase")      &&
       system("git checkout qa_branch") &&
-      system("git pull")               &&
+      system("git pull --rebase")      &&
       response = %x(git merge master)
 
       unless $?.success?
@@ -56,6 +62,14 @@ module Git
         warn "There are outstanding changes in qa_branch that may need to be merged into master"
       end
     end
+    
+    def verify_update_is_ok
+      wrap do
+        answer = ask "This will pull the latest changes from master into the qa_branch. Continue?",
+            nil, /^yes|no$/i, "You must enter either 'yes' or 'no'"
+        abort "Exiting" unless answer.match(/^yes$/i)
+      end
+    end
 
     def tag_next_version(options={})
       tag = next_version(options)
@@ -66,7 +80,7 @@ module Git
       system "git tag #{tag}"
     end
 
-    def git_push_tags
+    def push_tags
       system "git push --tags"
     end
   end

data/lib/qa_release_tasks.rb

@@ -6,7 +6,7 @@ require 'git/tagger'
 require 'tasks/qa_release'
 
 module QaReleaseTasks
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: primedia-qa_release_tasks
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors: 
 - Jason Noble
@@ -10,7 +10,7 @@ autorequire: qa_release_tasks
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: git-changelog
 dependencies: []