git-scripts 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f33294aba915f09ff4cc35bd2b1669e03e05792
-  data.tar.gz: b8a4d721cd0a92982e6e81eb903dace6febba9e3
+  metadata.gz: e9b4f12ba04e96faf00883173c8d0cea0845c7e0
+  data.tar.gz: 12c60f2f395b73a419140064ed3b1fd2eb017105
 SHA512:
-  metadata.gz: 0acb8ecc2fe94381e12b634db8ecdbfee41ab76337319d90a31a2c8bb8b4efa17ab5696f983eeac743d01116720e4837cbd37b3573c052e3b43f93389b7cbcbf
-  data.tar.gz: 1eed04a999cd8afbd7145bde989a8a49eb6ce225e6d81f6ae9e316adf101ff47335b16474b23c2ac4517db796fe525471b6e01ec1cad78f5e7b37b2c3dcb930d
+  metadata.gz: 70be3f8dd49d10c9ebf885e5d70b8cb47633e1357be73ba0ec9e86bb813259e060fd5967fabee47c21aeafd1eac88b29640715a2d34743a4f4d04dcab95c10d4
+  data.tar.gz: c89cf48939bc391ad923d037f4017155f7406ec430fe49720aa8985e9cba2a796cc7225f26a864b59a7a6749f2efcb0f7363b3dca5f563ea356a069b88cb670c

data/bin/feature

@@ -199,6 +199,11 @@ when 'merge'
    exit 1 unless confirm("Merge feature branch named: '#{feature}' ?")
 
    update = Git::submodules_update("get")
+   pull_desc = pull_info[:description]
+   merge_failure_message =
+    "Merge conflicts detected, merge #{dev_branch} into #{feature} and resolve conflicts."
+   abort_merge =
+    "(git merge --abort && echo #{highlight(failure_message.shellescape)} && exit 1)"
 
    Git::run_safe([
       "git fetch",
@@ -210,7 +215,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 #{pull_info[:description].shellescape} \"#{feature}\"",
+      "git merge --no-ff --edit -m #{pull_desc.shellescape} \"#{feature}\" || #{abort_merge}",
       # init any submodules in the master branch
       "#{update}",
       # delete the local feature-branch
@@ -326,15 +331,6 @@ when 'prune'
       delete.call
    end
 
-when 'clean'
-   args = ''
-
-   # Remove all untracked .gitignore'd files as well
-   args += 'x' if ARGV.include?('--all')
-
-   # -fd alone will NOT remove submodule directories, -ffd is required for this
-   Git::run_safe(["git clean -ffd#{args}"])
-
 when 'pull'
    Git::run_safe(["git fetch"])
 

data/completion/_feature

@@ -11,7 +11,7 @@ _feature() {
 
    case $state in
       commands)
-         _arguments '1:Commands:(list start switch finish finish-issue merge pull prune status stashes clean github-test url)'
+         _arguments '1:Commands:(list start switch finish finish-issue merge pull prune status stashes github-test url)'
       ;;
       params)
          if [[ "$words[2]" == "prune" ]]; then

data/completion/bash_completion.sh

@@ -10,7 +10,7 @@ _git-scripts()
    case "$cmd" in
    feature)
       if [ "$line" = "$cmd $cur" ]; then
-         words="switch start finish finish-issue stashes list merge pull status clean prune url"
+         words="switch start finish finish-issue stashes list merge pull status prune url"
       else
          # get branch names minus hotfixes
          words="$(git branch -a | tr -d ' *' | grep -v 'hotfix-' | sed 's|remotes/origin/||')"
@@ -18,7 +18,7 @@ _git-scripts()
       ;;
    hotfix)
       if [ "$line" = "$cmd $cur" ]; then
-         words="switch start finish finish-issue merge list clean url"
+         words="switch start finish finish-issue merge list url"
       else
          # get hotfix branch names
          words="$(git branch -a | tr -d ' *' | grep 'hotfix-' | sed -e 's|remotes/origin/||' -e 's|hotfix-||')"

data/lib/git.rb

@@ -131,12 +131,13 @@ module Git
 
    def self.run_safe(commands)
       while command = commands.shift
-         puts "> " + command
+         safe_command = command.gsub(/[^[:print:]]+/,' ')
+         puts "> " + safe_command
          unless system(command)
-            puts highlight("\n\tERROR: failed on \`#{command}\`.")
-            puts "\n\tWould have run:"
+            puts highlight("\nERROR: failed on #{safe_command}`.")
+            puts "\nWould have run:"
             commands.each do |command|
-               puts "\t# " + command
+               puts "# " + command.gsub(/[^[:print:]]+/,' ')
             end
             abort
          end

data/lib/github.rb

@@ -7,16 +7,13 @@ require 'highline/import'
 
 module Github
    ##
-   # Get a global git config property
+   # Get a git config property from the first place that defines it. The `git
+   # config` command takes properties, by default, from the repository, the
+   # user's config, and the system config, in that order. We used to specify
+   # `--global` here, but that means to read _only_ from the global config, and
+   # it also prohibits processing includes by default.
    ##
    def self.config(property)
-      `git config --global #{property.to_s.shellescape}`.strip
-   end
-
-   ##
-   # Get a local (to the repo) git config property
-   ##
-   def self.local_config(property)
       `git config #{property.to_s.shellescape}`.strip
    end
 
@@ -35,7 +32,7 @@ module Github
    ##
    def self.api(authorization_info = {})
       # Let Octokit handle pagination automagically for us.
-      Octokit.auto_traversal = true
+      Octokit.auto_paginate = true
       # Defaults
       authorization_info = {
          :scopes => ['repo'],
@@ -49,7 +46,7 @@ module Github
       username = self::config("github.user")
       token    = self::config("github.token")
       if !username.empty? && !token.empty?
-         return {:login => username, :oauth_token => token}
+         return {:login => username, :access_token => token}
       else
          return self::request_authorization(authorization_info)
       end
@@ -83,7 +80,7 @@ module Github
          die("Couldn't set git config")
       end
 
-      return {:login => username, :oauth_token => auth[:token]}
+      return {:login => username, :access_token => auth[:token]}
    end
 
    ##
@@ -93,7 +90,7 @@ module Github
    # Requires the "origin" remote to be set to a github url
    ##
    def self.get_github_repo()
-      url = self::local_config("remote.origin.url")
+      url = self::config("remote.origin.url")
       m = /github\.com.(.*?)\/(.*)/.match(url)
       if m
         return [m[1], m[2].sub(/\.git\Z/, "")].join("/")

data/lib/helpers.rb

@@ -23,7 +23,6 @@ def display_feature_help(command = nil, message = nil)
          :prune   => "feature prune <local | origin> <preview | clean>",
          :status  => "feature status",
          :stashes => "feature stashes [-v]",
-         :clean   => "feature clean [--all]",
          :'github-test' => "feature github-test"
       },
       :command_name => 'feature',

data/man/feature.1

@@ -59,10 +59,6 @@ feature\-stashes(1)
 Show stashes saved on the current branch\.
 .
 .TP
-feature\-clean(1)
-Remove untracked files and submodules\.
-.
-.TP
 feature\-github\-test(1)
 Test Github authentication\.
 .

data/man/feature.1.ronn

@@ -34,8 +34,6 @@ feature(1) - Perform actions on a git feature branch.
       Determine if the current branch is up-to-date with the remote branch.
    * feature-stashes(1):
       Show stashes saved on the current branch.
-   * feature-clean(1):
-      Remove untracked files and submodules.
    * feature-github-test(1):
       Test Github authentication.
 

data/man/index.txt

@@ -7,7 +7,6 @@ feature-merge(1)        feature-merge.1.ronn
 feature-pull(1)         feature-pull.1.ronn
 feature-status(1)       feature-status.1.ronn
 feature-stashes(1)      feature-stashes.1.ronn
-feature-clean(1)        feature-clean.1.ronn
 feature-github-test(1)  feature-github-test.1.ronn
 
 hotfix(1)               hotfix.1.ronn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-scripts
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Beardsley
@@ -11,106 +11,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.19
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.19
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 description: User scripts for managing feature branches and hotfixes.
 email:
 - daniel@ifixit.com
@@ -126,104 +84,60 @@ extra_rdoc_files:
 - README.md
 files:
 - COPYING
-- Rakefile
 - README.md
+- Rakefile
+- bin/feature
+- bin/hotfix
 - completion/_feature
-- completion/bash_completion.sh
 - completion/_hotfix
-- bin/hotfix
-- bin/feature
+- completion/bash_completion.sh
 - lib/git.rb
-- lib/signal_handlers.rb
-- lib/plugins.rb
-- lib/helpers.rb
 - lib/github.rb
-- man/hotfix-switch.1.html
-- man/hotfix-url.1.ronn
-- man/hotfix-start.1.html
-- man/hotfix-finish-issue.1.html
-- man/feature-status.1.html
-- man/feature-stashes.1.html
-- man/hotfix-merge.1.ronn
-- man/feature-github-test.1
-- man/hotfix-switch.1.ronn
-- man/hotfix-finish-issue.1
-- man/feature.1.html
-- man/feature-stashes.1.ronn
-- man/hotfix-url.1.markdown
-- man/feature-clean.1.html
-- man/hotfix.1
+- lib/helpers.rb
+- lib/plugins.rb
+- lib/signal_handlers.rb
 - man/feature-finish-issue.1
-- man/feature-finish-issue.1.html
-- man/hotfix-switch.1
-- man/feature-stashes.1
-- man/feature-start.1.markdown
-- man/feature-start.1.html
-- man/hotfix.1.html
-- man/feature-list.1.markdown
-- man/hotfix-finish.1.markdown
-- man/feature-url.1.html
-- man/hotfix-merge.1.html
-- man/feature-stashes.1.markdown
-- man/feature-merge.1.html
-- man/feature-switch.1.html
-- man/hotfix-start.1
-- man/index.html
-- man/feature-prune.1.ronn
-- man/feature-list.1.html
-- man/hotfix-list.1.markdown
+- man/feature-finish-issue.1.ronn
+- man/feature-finish.1
+- man/feature-finish.1.ronn
+- man/feature-github-test.1
 - man/feature-github-test.1.ronn
-- man/feature-prune.1.markdown
-- man/feature.1.ronn
-- man/feature.1.markdown
-- man/feature-url.1.ronn
-- man/feature-switch.1.markdown
-- man/hotfix.1.markdown
-- man/hotfix-merge.1.markdown
-- man/hotfix.1.ronn
-- man/hotfix-url.1.html
-- man/feature-github-test.1.html
-- man/hotfix-url.1
-- man/hotfix-finish.1.ronn
-- man/feature-merge.1.markdown
-- man/feature-start.1.ronn
-- man/hotfix-finish.1.html
-- man/hotfix-merge.1
-- man/index.txt
-- man/feature-merge.1.ronn
 - man/feature-list.1
-- man/feature-url.1
-- man/feature-url.1.markdown
-- man/feature-finish.1
-- man/feature.1
-- man/hotfix-finish-issue.1.markdown
-- man/hotfix-list.1.ronn
-- man/feature-clean.1.ronn
-- man/feature-clean.1.markdown
+- man/feature-list.1.ronn
 - man/feature-merge.1
-- man/hotfix-finish.1
+- man/feature-merge.1.ronn
 - man/feature-prune.1
-- man/feature-finish-issue.1.ronn
-- man/feature-status.1.ronn
+- man/feature-prune.1.ronn
 - man/feature-start.1
-- man/hotfix-list.1.html
-- man/feature-list.1.ronn
-- man/feature-finish.1.ronn
+- man/feature-start.1.ronn
+- man/feature-stashes.1
+- man/feature-stashes.1.ronn
 - man/feature-status.1
-- man/feature-finish.1.html
-- man/hotfix-switch.1.markdown
-- man/feature-status.1.markdown
-- man/feature-clean.1
-- man/feature-github-test.1.markdown
-- man/hotfix-list.1
-- man/feature-finish-issue.1.markdown
-- man/feature-switch.1.ronn
+- man/feature-status.1.ronn
 - man/feature-switch.1
+- man/feature-switch.1.ronn
+- man/feature-url.1
+- man/feature-url.1.ronn
+- man/feature.1
+- man/feature.1.ronn
+- man/hotfix-finish-issue.1
 - man/hotfix-finish-issue.1.ronn
-- man/hotfix-start.1.markdown
+- man/hotfix-finish.1
+- man/hotfix-finish.1.ronn
+- man/hotfix-list.1
+- man/hotfix-list.1.ronn
+- man/hotfix-merge.1
+- man/hotfix-merge.1.ronn
+- man/hotfix-start.1
 - man/hotfix-start.1.ronn
-- man/feature-finish.1.markdown
-- man/feature-prune.1.html
+- man/hotfix-switch.1
+- man/hotfix-switch.1.ronn
+- man/hotfix-url.1
+- man/hotfix-url.1.ronn
+- man/hotfix.1
+- man/hotfix.1.ronn
+- man/index.html
+- man/index.txt
 homepage: http://ifixit.github.com/git-scripts/
 licenses: []
 metadata: {}
@@ -233,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: User scripts for managing feature branches and hotfixes.

data/man/feature-clean.1

@@ -1,31 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "FEATURE\-CLEAN" "1" "September 2013" "iFixit" ""
-.
-.SH "NAME"
-\fBfeature\-clean\fR \- Remove untracked files and submodules\.
-.
-.SH "SYNOPSIS"
-\fBfeature clean\fR [\-\-all]
-.
-.SH "DESCRIPTION"
-Remove untracked files and submodules\.
-.
-.P
-Compatible with hotfix branches\.
-.
-.SH "OPTIONS"
-.
-.TP
-\fB\-\-clean\fR
-Remove all untracked \.gitignored files as well\.
-.
-.SH "COPYRIGHT"
-Copyright (c) 2012\-2013 iFixit\.
-.
-.SH "SEE ALSO"
-feature(1)
-.
-.SH "WWW"
-https://github\.com/iFixit/git\-scripts

data/man/feature-clean.1.html

@@ -1,120 +0,0 @@
-<!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'>May 2014</li>
-    <li class='tr'>feature-clean(1)</li>
-  </ol>
-
-  </div>
-</body>
-</html>