gitscape 0.1 → 0.2

data/bin/gitscape

@@ -8,8 +8,12 @@ rescue LoadError
 end
 
 if ARGV.size < 2
-  puts "Usage: gitscape upstream head"
+  puts "Examples: "
+  puts "\tgitscape diff master staging"
+  puts "\tgitscape deploy_iteration i22"
   exit(1)
-else
-  GitScape.branch_diff(ARGV[0], ARGV[1])
+elsif ARGV[0] == "diff"
+  GitScape.compare(ARGV[1], ARGV[2])
+elsif ARGV[0] == "deploy_iteration"
+  GitScape.deploy_iteration(ARGV[1])
 end

data/lib/gitscape/base.rb

@@ -1,5 +1,20 @@
 class GitScape
-  def self.branch_diff(upstream, head)
+  # Returns true if the supplied Git commit hash or reference exists
+  def self.commit_exists?(commit_id)
+    `git rev-parse #{commit_id}`
+    if $? == 0
+      true
+    else
+      raise "Invalid commit/ref ID: #{commit_id}"
+    end
+  end
+
+
+  def self.abort!
+
+  end
+
+  def self.compare(upstream, head)
     puts "#" * 80
     puts "# Commits on #{head} not on #{upstream}"
     puts "#" * 80
@@ -11,5 +26,88 @@ class GitScape
       puts
     end
   end
+
+  def self.run_script(script, quiet=true)
+    IO.popen(script.split("\n").join(" && ")) do |io|
+      while (line = io.gets) do
+        unless quiet
+          puts line
+        end
+      end
+    end
+    $?.exitstatus
+  end
+
+  def promote_commit(commit_id, upstream)
+    commit_exists? commit_id
+    run_script <<-EOH
+        git stash
+        git checkout master
+        git pull
+        git checkout staging
+        git reset --hard origin/staging
+        git cherry-pick #{commit_id}
+        git push origin staging
+    EOH
+  end
+
+  def promote_branch(head, upstream)
+    run_script <<-EOH
+        git fetch
+        git stash
+        git checkout #{head}
+        git reset --hard origin/#{head}
+        git push -f origin #{head}:#{upstream}
+    EOH
+  end
+
+
+  def self.result_ok?(result)
+    if result.nil? or result == 0
+      puts "done"
+      return true
+    else
+      puts "failed"
+      puts "Aborting"
+      run_script "git checkout master"
+      return false
+    end
+  end
+
+  def self.deploy_iteration(iteration, projects=%w{android-client builder ios-client rails3 web-client})
+
+    date = `date +%Y%m%d-%H%M`.strip
+    tag = "#{iteration}-#{date}"
+    puts "Starting deploy of #{iteration}"
+    puts "Will tag with '#{tag}'"
+    puts
+
+    projects.each do |proj|
+      print "Tagging #{proj}..."
+      result = run_script <<-EOH
+        cd /code/#{proj}/
+        git stash
+        git checkout qa
+        git fetch
+        git reset --hard origin/qa
+        git tag -a #{tag} -m 'Release to live'
+      EOH
+      return unless result_ok?(result)
+    end
+
+    projects.each do |proj|
+      print "Pushing #{proj}..."
+      result = run_script <<-EOH
+        cd /code/#{proj}/
+        git push -f origin qa:live
+        git push --tags
+        git checkout master
+      EOH
+      #return unless result_ok?(result)
+    end
+
+    puts
+    puts "Deploy of #{iteration} completed successfully."
+  end
 end
 

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
 module GitScape
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gitscape
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Jon Botelho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-07-12 00:00:00 Z
 dependencies: []
 
 description: Various Git utilities for cherry-pick/rebase workflows.