git-scripts 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9a2d6d6518dbc7ecc8f65e1d05f2d726198bbd74
+  data.tar.gz: 676e53c8cc96c98d13745280205c74108d7aa281
+SHA512:
+  metadata.gz: 4d8177e27268f8eb876a17936a196364c7bb633c2ded649e4a715fa22fd6a8d8f6895e7dbe8d57122f03bab8d1ff75291bb46744b0ede02568fa1766c80efeab
+  data.tar.gz: 05cb8fd81e03130a108f45be0d1802cbc5d1bf2ef5faf2250958f2714a87c69a8f3f8c05838cbef976fc727c6cd2b5d9615394cd99f6ad4ace0bc6b9ade6c5d9

data/bin/feature

@@ -26,11 +26,12 @@ when 'start'
    feature = ARGV[1]
 
    exit unless confirm("Create feature branch named: '#{feature}' ?")
+   development_branch = Git::get_branch('development')
 
    Git::run_safe([
-      "git checkout #{Git::development_branch}",
+      "git checkout #{development_branch}",
       "git pull --rebase",
-      "git branch \"#{feature}\" #{Git::development_branch}",
+      "git branch \"#{feature}\" #{development_branch}",
       "git checkout \"#{feature}\"",
    ])
 
@@ -96,7 +97,7 @@ when 'finish'
 
    response = octokit.create_pull_request(
       Github::get_github_repo,
-      Git::development_branch,
+      Git::get_branch('development'),
       feature,
       description[:title],
       description[:body]
@@ -118,7 +119,7 @@ when 'finish-issue'
 
    pull = octokit.create_pull_request_for_issue(
       Github::get_github_repo,
-      Git::development_branch,
+      Git::get_branch('development'),
       feature,
       issue
    )
@@ -156,14 +157,25 @@ Original issue: #{original_title}
    puts "   " + updated_pull[:html_url]
 
 when 'merge'
-   dev_branch = Git::development_branch
+   dev_branch = Git::get_branch('development')
    fail_on_local_changes
 
-   feature = ARGV[1] || Git::current_branch
+   if ARGV[1] == '-n'
+       feature = get_branch_name_from_number(ARGV[2])
+   else
+      feature = ARGV[1] || Git::current_branch
+   end
+
+
+   pull_info = Github::get_pull_request_info_from_api(feature, dev_branch)
+
+   warning = Github::get_commit_status_warning(pull_info[:status])
+   unless warning.empty?
+      puts highlight(warning)
+   end
 
    exit 1 unless confirm("Merge feature branch named: '#{feature}' ?")
 
-   description = Github::get_pull_request_description_from_api(feature, dev_branch)
    update = Git::submodules_update("get")
 
    Git::run_safe([
@@ -176,7 +188,7 @@ when 'merge'
       # rebase the unpushed master commits if any.
       "git rebase --preserve-merges origin/#{dev_branch}",
       # merge the feature branch into master
-      "git merge --no-ff --edit -m #{description.shellescape} \"#{feature}\"",
+      "git merge --no-ff --edit -m #{pull_info[:description].shellescape} \"#{feature}\"",
       # init any submodules in the master branch
       "#{update}",
       # delete the local feature-branch
@@ -216,12 +228,14 @@ when 'prune'
    end
 
    currentBranch = Git::current_branch()
+   development_branch = Git::get_branch('development')
+   stable_branch = Git::get_branch('stable')
 
    def branches_cmd(location, currentBranch)
-      branch = location == 'origin' ? 'origin/master' : 'master'
+      branch = location == 'origin' ? "origin/#{development_branch}" : development_branch
       return "git branch --merged #{branch} |
-         grep -v master |
-         grep -v stable |
+         grep -v #{development_branch} |
+         grep -v #{stable_branch} |
          grep -v #{currentBranch}"
    end
 
@@ -245,9 +259,9 @@ when 'prune'
          system("#{commands} | xargs git branch -d")
       elsif location == "origin"
           system("git remote prune origin &&
-                git branch -r --merged origin/master |
-                grep -v master |
-                grep -v stable |
+                git branch -r --merged origin/#{development_branch} |
+                grep -v #{development_branch} |
+                grep -v #{stable_branch} |
                 grep -v #{currentBranch} |
                 sed -n 's| origin/|:|p' |
                 xargs git push origin")

data/bin/hotfix

@@ -18,13 +18,14 @@ case command
 when 'start'
    require_argument(:hotfix, :start)
    hotfix = hotfix_branch(ARGV[1])
+   stable_branch = Git::get_branch('stable')
 
    exit unless confirm("Create hotfix branch named: '#{hotfix}' ?")
 
    Git::run_safe([
-      "git checkout stable",
+      "git checkout #{stable_branch}",
       "git pull --rebase",
-      "git branch \"#{hotfix}\" stable",
+      "git branch \"#{hotfix}\" #{stable_branch}",
       "git checkout \"#{hotfix}\""
    ])
 
@@ -60,7 +61,7 @@ when 'finish'
 
    response = octokit.create_pull_request(
       Github::get_github_repo,
-      'stable',
+      Git::get_branch('stable'),
       hotfix,
       description[:title],
       description[:body]
@@ -83,7 +84,7 @@ when 'finish-issue'
 
    pull = octokit.create_pull_request_for_issue(
       Github::get_github_repo,
-      'stable',
+      Git::get_branch('stable'),
       hotfix,
       issue
    )
@@ -122,20 +123,24 @@ Original issue: #{original_title}
 
 when 'merge'
    fail_on_local_changes
-   dev_branch = Git::development_branch
+   dev_branch = Git::get_branch('development')
+   stable_branch = Git::get_branch('stable')
    hotfix = current_hotfix_branch
 
    Git::run_safe(["git fetch"])
 
-   exit 1 unless confirm("Merge hotfix named: '#{hotfix}' ?")
+   pull_info = Github::get_pull_request_info_from_api(hotfix, stable_branch)
+
+   warning = Github::get_commit_status_warning(pull_info[:status])
+   unless warning.empty?
+      puts highlight(warning)
+   end
 
-   description = Github::get_pull_request_description_from_api(hotfix, 'stable')
+   exit 1 unless confirm("Merge hotfix named: '#{hotfix}' ?")
 
-   commit_message = Git::get_description_from_user(description)
-   # The first instance of stable should be in the pull request title.
-   dev_commit_message = commit_message.sub('stable', dev_branch)
+   commit_message = Git::get_description_from_user(pull_info[:description])
+   commit_message_dev = commit_message.sub(stable_branch, dev_branch)
 
-   # Get command to init any submodules in the stable branch.
    update = Git::submodules_update("get")
 
    Git::run_safe([
@@ -143,29 +148,29 @@ when 'merge'
       "git checkout #{hotfix.shellescape}",
       "git rebase --preserve-merges origin/#{hotfix.shellescape}",
       # Merge into stable.
-      "git checkout stable",
+      "git checkout #{stable_branch}",
       # Pull the latest changes and rebase the unpushed commits if any.
-      "git rebase --preserve-merges origin/stable",
+      "git rebase --preserve-merges origin/#{stable_branch}",
       # Merge the hotfix branch into stable.
-      "git merge --no-ff --no-edit -m #{commit_message.shellescape} #{hotfix.shellescape}",
+      "git merge --no-ff --no-edit -m #{commit_message.shellescape} \"#{hotfix}\"",
       "#{update}",
       # Merge into master.
       "git checkout #{dev_branch}",
       # Pull the latest changes and rebase the unpushed master commits if any.
       "git rebase origin/#{dev_branch}",
       # Merge the hotfix branch into master.
-      "git merge --no-ff --no-edit -m #{dev_commit_message.shellescape} #{hotfix.shellescape}",
-      # Init any submodules in the master branch. Note: no need to change
-      # directories before calling git submodule since we are already in the
+      "git merge --no-ff --no-edit -m #{commit_message_dev.shellescape} \"#{hotfix}\"",
+      # Init any submodules in the master branch. Note: no need to change.
+      # Directories before calling git submodule since we are already in the
       # projects top-level directory.
       "#{update}",
       # Delete the local hotfix branch.
       "git branch -d #{hotfix.shellescape}",
       # Checkout stable branch.
-      "git checkout stable"
+      "git checkout #{stable_branch}"
    ])
 
-   puts "Successfully merged hotfix branch: #{hotfix} into stable and #{dev_branch}"
+   puts "Successfully merged hotfix branch: #{hotfix} into #{stable_branch} and #{dev_branch}"
    puts "If you are satisfied with the result, do this:\n" + <<CMDS
       git push
       git checkout #{dev_branch}

data/lib/git.rb

@@ -8,15 +8,14 @@ module Git
       return system("git rev-parse")
    end
 
-   # Return the development branch specified by the
-   # feature.development-branch git config value
-   def self.development_branch
-      dev_branch = `git config feature.development-branch`.strip
-      if !dev_branch || $? != 0
-         die("No development branch specified; set it with: " +
-          "git config feature.development-branch master")
+   # Return the specified branch in the feature git config section.
+   def self.get_branch(branch = '')
+      specified_branch = `git config feature.#{branch.shellescape}-branch`.strip
+      if specified_branch.empty? || $? != 0
+         die("No #{branch} branch specified; set it with:\n" +
+          "git config feature.#{branch}-branch \"name-of-branch\"")
       end
-      dev_branch
+      return specified_branch
    end
 
    # Returns the editor specified in the user's gitconfig.
@@ -62,10 +61,11 @@ module Git
 
    # Returns an array of unmerged hotfix branches
    def self.hotfix_branches(type)
+      stable_branch = get_branch('stable')
       branches = if type == :unmerged
-         self.branches_not_merged_into('stable')
+         self.branches_not_merged_into(stable_branch)
       elsif type == :merged
-         self.merged_branches('stable')
+         self.merged_branches(stable_branch)
       else
          raise ArgumentError, 'Must specify :merged or :unmerged in hotfix_branches.'
       end
@@ -75,7 +75,7 @@ module Git
 
    # Returns an array of unmerged feature branches
    def self.feature_branches(type)
-      devBranch = development_branch()
+      devBranch = get_branch('development')
 
       branches = if type == :unmerged
          self.branches_not_merged_into(devBranch)

data/lib/github.rb

@@ -133,14 +133,15 @@ Body of pull-request
       msg.write(message)
       msg.close
 
-      # -c blah only works for vim
-      if (ENV['EDITOR'].include?('vim'))
-         opts = "-c \":set filetype=gitcommit\""
+      editor = Git::editor
+      if (editor == 'vim')
+         opts = "'+set ft=gitcommit' '+set textwidth=72'" +
+          " '+setlocal spell spelllang=en_us'"
       else
          opts = ""
       end
 
-      system("$EDITOR #{opts} #{msg.path.shellescape}")
+      system("#{editor} #{opts} #{msg.path.shellescape}")
       full_message = File.open(msg.path, "r").read
       lines = full_message.split("\n")
       lines = lines.reject {|line| line =~ /^\s*#/ }
@@ -161,22 +162,49 @@ Body of pull-request
       }
    end
 
-   def self.get_pull_request_description_from_api(branch_name, into_branch)
+   def self.get_pull_request_info_from_api(branch_name, into_branch)
       octokit = Github::api
       # Should succeed if authentication is set up.
-      pulls = octokit.pulls(Github::get_github_repo)
+      repo = Github::get_github_repo
+      pulls = octokit.pulls(repo)
       pull = pulls.find {|pull| branch_name == pull[:head][:ref] }
 
       if pull
-         return <<-MSG
+         # This will grab the latest commit and retrieve the state from it.
+         sha = pull[:head][:sha]
+         state = octokit.statuses(repo, sha).shift
+         state = state ? state[:state] : 'none'
+
+         desc = <<-MSG
 Merge #{branch_name} (##{pull[:number]}) into #{into_branch}
 
 #{pull[:title].gsub("\r", '')}
 
 #{pull[:body].gsub("\r", '')}
       MSG
+
+         return {:status => state, :description => desc}
+      else
+         return {:status => nil, :description => "Merge #{branch_name} into #{into_branch}"}
+      end
+   end
+
+   def self.get_commit_status_warning(status)
+      warning = 'Merge with caution.'
+      case status
+      when 'failure'
+         return 'This pull request has failed to pass continuous integration' +
+          " tests. #{warning}"
+      when 'pending'
+         return "Continuous integration tests have not finished. #{warning}"
+      when 'error'
+         return "Build tests were not able to complete. #{warning}"
+      when 'none'
+         return 'Continuous integration has not been set up.'
+      when nil
+         return 'No pull request found for this branch.'
       else
-         return "Merge #{branch_name} into #{into_branch}"
+         return ''
       end
    end
 end

data/lib/helpers.rb

@@ -17,7 +17,7 @@ def display_feature_help(command = nil, message = nil)
          :switch  => "feature switch (name-of-feature | -n number-of-feature) [--clean]",
          :finish  => "feature finish [name-of-feature]",
          :'finish-issue'  => "feature finish-issue issue-number",
-         :merge   => "feature merge [name-of-feature]",
+         :merge   => "feature merge (name-of-feature | -n number-of-feature)",
          :pull    => "feature pull",
          :prune   => "feature prune <local | origin> <preview | clean>",
          :status  => "feature status",
@@ -40,7 +40,7 @@ def display_hotfix_help(command = nil, message = nil)
          :switch  => "hotfix switch (name-of-hotfix | -n number-of-hotfix)",
          :finish  => "hotfix finish [name-of-hotfix]",
          :'finish-issue'  => "hotfix finish-issue issue-number",
-         :merge   => "hotfix merge [name-of-hotfix]"
+         :merge   => "hotfix merge (name-of-hotfix | -n number-of-hotfix)",
       },
       :command_name => 'hotfix',
       :command => command,

data/man/feature-clean.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-CLEAN" "1" "April 2013" "iFixit" ""
+.TH "FEATURE\-CLEAN" "1" "September 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-clean\fR \- Remove untracked files and submodules\.

data/man/feature-clean.1.html

@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>feature-clean(1) - Remove untracked files and submodules.</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+  <style type='text/css' media='all'>
+  /* style: toc */
+  .man-navigation {display:block !important;position:fixed;top:0;left:113ex;height:100%;width:100%;padding:48px 0 0 0;border-left:1px solid #dbdbdb;background:#eee}
+  .man-navigation a,.man-navigation a:hover,.man-navigation a:link,.man-navigation a:visited {display:block;margin:0;padding:5px 2px 5px 30px;color:#999;text-decoration:none}
+  .man-navigation a:hover {color:#111;text-decoration:underline}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#COPYRIGHT">COPYRIGHT</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>feature-clean(1)</li>
+    <li class='tc'></li>
+    <li class='tr'>feature-clean(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>feature-clean</code> - <span class="man-whatis">Remove untracked files and submodules.</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p><code>feature clean</code> [--all]</p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>Remove untracked files and submodules.</p>
+
+<p>Compatible with hotfix branches.</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<dl>
+<dt> <code>--clean</code></dt><dd>  Remove all untracked .gitignored files as well.</dd>
+</dl>
+
+
+<h2 id="COPYRIGHT">COPYRIGHT</h2>
+
+<p>Copyright (c) 2012-2013 iFixit.</p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a></p>
+
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'>iFixit</li>
+    <li class='tc'>September 2013</li>
+    <li class='tr'>feature-clean(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>