gitscape 0.2 → 1.1

data/bin/gitscape

@@ -8,12 +8,15 @@ rescue LoadError
 end
 
 if ARGV.size < 2
-  puts "Examples: "
-  puts "\tgitscape diff master staging"
-  puts "\tgitscape deploy_iteration i22"
+  puts "TODO: write usage help text"
   exit(1)
-elsif ARGV[0] == "diff"
-  GitScape.compare(ARGV[1], ARGV[2])
-elsif ARGV[0] == "deploy_iteration"
-  GitScape.deploy_iteration(ARGV[1])
+else
+  case ARGV[0]
+    when "hotfix_start"
+      GitScape.new.hotfix_start
+    when "hotfix_finish"
+      GitScape.new.hotfix_finish
+    else
+      puts "Unknown command"
+  end
 end

data/gitscape.gemspec

@@ -5,14 +5,16 @@ require "gitscape/version"
 
 Gem::Specification.new do |s|
   s.name        = "gitscape"
-  s.version     = GitScape::VERSION
+  s.version     = Gitscape::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jon Botelho"]
   s.email	= ["gitscape@eachscape.com"]
-  s.homepage	= "https://github.com/jon-eachscape/gitscape"
+  s.homepage	= "https://github.com/eachscape/gitscape"
   s.summary     = "Various Git utilities for cherry-pick/rebase workflows."
   s.description = "Various Git utilities for cherry-pick/rebase workflows."
 
+  s.add_dependency "git", "~> 1.2.5"
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/gitscape.rb

@@ -1 +1,5 @@
+require 'gitscape/version.rb'
+
+# Add requires for other files you add to your project here, so
+# you just need to require this one file in your bin file
 require "gitscape/base"

data/lib/gitscape/base.rb

@@ -1,29 +1,121 @@
-class GitScape
-  # 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
+require "git"
+
+
+class Gitscape::Base
+
+  def initialize
+    # Use the current directory as our target repository
+    @repo = Git.open "."
+
+    # Always add a merge commit at the end of a merge
+    @merge_options = "--no-ff"
+    # Setup additional merge options based on the version of Git we have
+    if git_version_at_least "1.7.4.0"
+      @merge_options += "-s recursive -Xignore-space-change"
     else
-      raise "Invalid commit/ref ID: #{commit_id}"
+      warn "Ignoring whitespace changes in merges is only available on Git 1.7.4+"
     end
   end
 
+  def branch_names
+    @repo.branches.map { |b| b.full }
+  end
 
-  def self.abort!
+  # Get the system's current git version
+  def git_version
+    @git_version ||= `git --version`.strip.split(" ").last
+  end
 
+  def checkout(branch_name)
+    begin
+      @repo.revparse(branch_name)
+    rescue
+      raise Exception.new "No branch '#{branch_name}' found"
+    end
+    puts "Switching to branch '#{branch_name}'..."
+    @repo.checkout(branch_name)
   end
 
-  def self.compare(upstream, head)
-    puts "#" * 80
-    puts "# Commits on #{head} not on #{upstream}"
-    puts "#" * 80
-    puts
-    `git cherry #{upstream} #{head}`.split("\n").select { |x| x.start_with? "+" }.each do |x|
-      puts `git show -s --format=medium #{x.split(" ").last}`
-      puts
-      puts "-" * 80
-      puts
+  # Check if the system's git version is at least as recent as the version specified
+  def git_version_at_least(min_version)
+    def split_version(v)
+      v.split(".").map { |x| x.to_i }
+    end
+    local_version = split_version(git_version)
+    min_version = split_version(min_version)
+
+    raise "Git version string must have 4 parts" if min_version.size != 4
+
+    4.times do |i|
+      return false unless local_version[i] >= min_version[i]
+    end
+    true
+  end
+
+  def hotfix_start(hotfix_branch_name=nil)
+    checkout "master"
+
+    hotfix_branch_name = "hotfix/#{hotfix_branch_name}"
+    puts "Creating hotfix branch '#{hotfix_branch_name}'..."
+    @repo.checkout(@repo.branch.create(hotfix_branch_name))
+  end
+
+  def hotfix_finish(hotfix_branch_name=nil)
+    # TODO:
+    # 1. Tag the new live revision with 'live/<branch_name_without_prefix>'
+
+    usage_string = "expected usage: hotfix_finish [<hotfix_branch_name>]
+    hotfix_branch_name: the name of the hotfix branch to finish.
+      if ommitted, you must currently be on a hotfix branch"
+
+    previous_branch = @repo.current_branch
+
+    if previous_branch.start_with? "hotfix"
+      hotfix_branch_name ||= previous_branch
+    end
+
+    unless @repo.branches.include? hotfix_branch_name
+    end
+
+    merge_master = true
+
+    if hotfix_branch_name.empty?
+      puts "!!! not currently on a hotfix branch, and no branch name was provided as an argument !!!"
+      puts usage_string
+      exit 1
+    end
+
+    hotfix_branch = @repo.branch hotfix_branch_name
+    development_branch = @repo.branches.select {|branch| branch.full.start_with? "release/"}.sort.last
+    development_branch = @repo.branch "master" if development_branch == nil
+    live_branch = @repo.branch "live"
+
+    # Collect the set of branches we'd like to merge the hotfix into
+    merge_branches = [development_branch, live_branch]
+
+    # Merge the hotfix into branches
+    for branch in merge_branches
+      merge_options = @merge_options
+      merge_options += " --log" if branch == "master"
+
+      `git checkout #{branch.full}`
+      `git merge #{merge_options} #{hotfix_branch.full}`
+      exit 1 if !$?.success?
+      raise "Merge on #{branch.full} has failed.\nResolve the conflicts and run the script again." if git_has_conflicts
+    end
+
+    # Checkout previous branch for user convenience
+    `git checkout #{previous_branch}`
+  end
+
+
+  # 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
 
@@ -38,30 +130,16 @@ class GitScape
     $?.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}
+      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"
@@ -74,8 +152,21 @@ class GitScape
     end
   end
 
-  def self.deploy_iteration(iteration, projects=%w{android-client builder ios-client rails3 web-client})
+  def self.start_iteration(iteration, projects=PROJECTS)
+    projects.each do |proj|
+      print "Cutting branch #{iteration} for #{proj}..."
+      result = run_script <<-EOH
+        cd /code/#{proj}/
+        git fetch
+        git branch #{iteration} origin/master
+        git push origin #{iteration}
+        git push -f origin #{iteration}:qa
+      EOH
+      return unless result_ok?(result)
+    end
+  end
 
+  def self.deploy_iteration(iteration, projects=PROJECTS)
     date = `date +%Y%m%d-%H%M`.strip
     tag = "#{iteration}-#{date}"
     puts "Starting deploy of #{iteration}"

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
-module GitScape
-  VERSION = "0.2"
-end
+module Gitscape
+  VERSION = '1.1'
+end

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: gitscape
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  prerelease: false
   segments: 
-  - 0
-  - 2
-  version: "0.2"
+  - 1
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Jon Botelho
@@ -14,9 +13,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 Z
-dependencies: []
-
+date: 2012-12-19 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: git
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  type: :runtime
+  version_requirements: *id001
 description: Various Git utilities for cherry-pick/rebase workflows.
 email: 
 - gitscape@eachscape.com
@@ -36,7 +49,8 @@ files:
 - lib/gitscape.rb
 - lib/gitscape/base.rb
 - lib/gitscape/version.rb
-homepage: https://github.com/jon-eachscape/gitscape
+has_rdoc: true
+homepage: https://github.com/eachscape/gitscape
 licenses: []
 
 post_install_message: 
@@ -45,27 +59,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Various Git utilities for cherry-pick/rebase workflows.