gitscape 1.3.4 → 1.3.5

data/bin/gitscape

@@ -4,12 +4,52 @@ begin
   require 'gitscape'
 rescue LoadError
   require 'rubygems'
+  require "optparse"
   require 'gitscape'
 end
 
+
+OVERVIEW = <<-EOS
+gitscape   perform git-related promotions in a consistent manner.
+
+The following actions are supported.
+
+  hotfix_start <branch-name>      Creates a branch off live called hotfix/<branch-name>
+  hotfix_finish [<branch-name>]   Merges the branch hotfix/<branch-name> into live,
+                                  the current release branch and master. If <branch-name> is
+                                  omitted and you are already on a hotfix branch, it is used.
+  release_start                   Branches master, incrementing the release number to create
+                                  a new release branch, release/i<version+1>. The release
+                                  branch is forced to the qa branch.
+                                  ** These actions update the origin server. **
+  release_finish                  After performing several validations, it merges the latest
+                                  release branch into live and master. Tags are created that
+                                  facilitate a rollback.
+                                  ** These actions update the origin server. **
+EOS
+
+# Parse option overrides.
+options = {}
+
+op = OptionParser.new do |op|
+  op.banner = 'Usage: gitscape [action] [options]'
+  op.separator('Options:')
+  op.on '--trace', 'Verbose output for debugging' do
+    options[:trace] = true
+  end
+  op.on '-h', '--help', 'Show a list of actions' do
+    puts OVERVIEW
+    exit
+  end
+end
+
+args = op.parse(ARGV)
+
+# Get the app name.  Note that if the app name is 'app', we have to rename it
+# so that it doesn't conflict with the 'app' subdirectory.
+
 if ARGV.size < 1
-  puts "*** Improper Usage ***"
-  puts "TODO: write usage help text"
+  puts op
   exit(1)
 else
   case ARGV[0]
@@ -21,8 +61,6 @@ else
       Gitscape::Base.new.release_start
     when "release_finish"
       Gitscape::Base.new.release_finish ARGV[1].to_i
-    when "promote_to_qa"
-      Gitscape::Base.new.promote_to_qa ARGV[1].to_i
     else
       puts "Unknown command"
   end

data/gitscape.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name        = "gitscape"
   s.version     = Gitscape::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jon Botelho"]
+  s.authors     = ["Jon Botelho", "Xavier Matos"]
   s.email	= ["gitscape@eachscape.com"]
   s.homepage	= "https://github.com/eachscape/gitscape"
   s.summary     = "Various Git utilities for cherry-pick/rebase workflows."

data/lib/gitscape/base.rb

@@ -58,8 +58,8 @@ class Gitscape::Base
   end
 
   def git_has_conflicts puts_conflicts=true
-    conflicts_status = `git status --porcelain | grep UU`
-    has_conflicts = conflicts_status.length > 0
+    conflicts_status = `git status --porcelain`
+    has_conflicts = conflicts_status.scan(/[AUD]{2}/).count > 0
 
     puts conflicts_status if has_conflicts && puts_conflicts
 
@@ -198,8 +198,13 @@ class Gitscape::Base
       end
     end
 
+    # Checkout release branch
+    puts `git checkout #{release_branch_name}`
+    puts `git pull live`
+
     # Checkout live
-    `git checkout live`
+    puts `git checkout live`
+    puts `git pull live`
 
     # Record the revision of live used for the rollback tag
     live_rollback_revision = `git log -n1 --oneline`.scan(/(^[^ ]+) .*$/).flatten[0]
@@ -207,7 +212,7 @@ class Gitscape::Base
     merge_options = "--no-ff -s recursive -Xignore-space-change"
 
     # Merge the release branch into live
-    `git merge #{merge_options} #{release_branch_name}`
+    puts `git merge #{merge_options} #{release_branch_name}`
 
     # Error and conflict checking
     if !$?.success? then exit 4 end
@@ -230,8 +235,9 @@ class Gitscape::Base
     live_release_revision = `git log -n1 --oneline`.scan(/(^[^ ]+) .*$/).flatten[0]
 
     # Merge the release branch into master 
-    `git checkout master`
-    `git merge #{merge_options} #{release_branch_name}`
+    puts `git checkout master`
+    puts `git pull`
+    puts `git merge #{merge_options} #{release_branch_name}`
 
     # Error and conflict checking
     if !$?.success? then exit 4 end
@@ -242,21 +248,20 @@ class Gitscape::Base
     end
 
     # Tag the state of live for both release and rollback
-    `git tag rollback-to/i#{current_version_number} #{live_rollback_revision}`
+    puts `git tag rollback-to/i#{current_version_number} #{live_rollback_revision}`
     if !$?.success? then
       puts "=== WARNING: Failed to create rollback-to/i#{current_version_number} tag"
-      `git tag -d rollback-to/i#{current_version_number}`
     end
 
     `git tag live/i#{new_version_number}/release #{live_release_revision}`
     if !$?.success? then
-      `git tag -d rollback-to/i#{current_version_number}`
-      `git tag -d live/i#{new_version_number}/release #{live_release_revision}`
+      puts "=== WARNING: Failed to create live/i#{new_version_number}/release"
+      puts `git tag -d rollback-to/i#{current_version_number}`
       exit 4
     end
 
-    `git push origin live --tags`
-    `git push origin master`
+    puts `git push origin live --tags`
+    puts `git push origin master`
   end
 
   # Returns true if the supplied Git commit hash or reference exists

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
 module Gitscape
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

metadata

@@ -5,16 +5,17 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: ruby
 authors: 
 - Jon Botelho
+- Xavier Matos
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-03-08 00:00:00 -05:00
+date: 2013-03-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency