RubyGems - hub - Versions diffs - 1.10.6 → 1.11.0 - Mend

hub 1.10.6 → 1.11.0

Potentially problematic release.

This version of hub might be problematic. Click here for more details.

Files changed (27) hide show

data/man/hub.1.ronn CHANGED Viewed

@@ -25,9 +25,10 @@ hub(1) -- git + hub = github
 `git create` [<NAME>] [`-p`] [`-d` <DESCRIPTION>] [`-h` <HOMEPAGE>]
 `git browse` [`-u`] [[<USER>`/`]<REPOSITORY>] [SUBPAGE]
-`git compare` [`-u`] [<USER>] [<START>...]<END>
+`git compare` [`-u`] [<USER>] [[<START>...]<END>]
 `git fork` [`--no-remote`]
-`git pull-request` [`-f`] [<TITLE>|`-i` <ISSUE>] [`-b` <BASE>] [`-h` <HEAD>]
+`git pull-request` [`-f`] [`-m` <MESSAGE>|`-F` <FILE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]
+`git ci-status` [`-v`] [<COMMIT>]
 ## DESCRIPTION
@@ -50,8 +51,12 @@ hub enhances various git commands to ease most common workflows with GitHub.
   * `git clone` [`-p`] <OPTIONS> [<USER>`/`]<REPOSITORY> <DIRECTORY>:
     Clone repository "git://github.com/<USER>/<REPOSITORY>.git" into
     <DIRECTORY> as with git-clone(1). When <USER>/ is omitted, assumes
-    your GitHub login. With `-p`, clone private repositories over SSH.
-    For repositories under your GitHub login, `-p` is implicit.
+    your GitHub login.
+    If the repository is private or the current user has push access to the
+    repository, hub will use the ssh protocol for cloning. Use `-p` to select
+    the ssh protocol unconditionally. HTTPS protocol can be used instead by
+    setting "hub.protocol" (see <CONFIGURATION>).
   * `git remote add` [`-p`] <OPTIONS> <USER>[`/`<REPOSITORY>]:
     Add remote "git://github.com/<USER>/<REPOSITORY>.git" as with
@@ -122,20 +127,22 @@ hub also adds some custom commands that are otherwise not present in git:
     specified, `browse` opens the page of the repository found in the current
     directory. If SUBPAGE is specified, the browser will open on the specified
     subpage: one of "wiki", "commits", "issues" or other (the default is
-    "tree").
+    "tree"). With `-u`, outputs the URL rather than opening the browser.
-  * `git compare` [`-u`] [<USER>] [<START>...]<END>:
+  * `git compare` [`-u`] [<USER>] [[<START>...]<END>]:
     Open a GitHub compare view page in the system's default web browser.
     <START> to <END> are branch names, tag names, or commit SHA1s specifying
     the range of history to compare. If a range with two dots (`a..b`) is given,
     it will be transformed into one with three dots. If <START> is omitted,
     GitHub will compare against the base branch (the default is "master").
+    If <END> is omitted, GitHub compare view is opened for the current branch.
+    With `-u`, outputs the URL rather than opening the browser.
   * `git fork` [`--no-remote`]:
     Forks the original project (referenced by "origin" remote) on GitHub and
     adds a new remote for it under your username.
-  * `git pull-request` [`-f`] [<TITLE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]:
+  * `git pull-request` [`-f`] [`-m` <MESSAGE>|`-F` <FILE>|`-i` <ISSUE>|<ISSUE-URL>] [`-b` <BASE>] [`-h` <HEAD>]:
     Opens a pull request on GitHub for the project that the "origin" remote
     points to. The default head of the pull request is the current branch.
     Both base and head of the pull request can be explicitly given in one of
@@ -144,12 +151,20 @@ hub also adds some custom commands that are otherwise not present in git:
     branch has local commits that are not yet pushed to its upstream branch
     on the remote. To skip this check, use `-f`.
-    If <TITLE> is omitted, a text editor will open in which title and body of
-    the pull request can be entered in the same manner as git commit message.
+    Without <MESSAGE> or <FILE>, a text editor will open in which title and body
+    of the pull request can be entered in the same manner as git commit message.
+    Pull request message can also be passed via stdin with `-F -`.
+    Issue to pull request conversion via `-i <ISSUE>` or <ISSUE-URL>
+    arguments is deprecated and will likely be removed from the future versions
+    of both hub and GitHub API.
+  * `git ci-status` [`-v`] [<COMMIT>]:
+    Looks up the SHA for <COMMIT> in GitHub Status API and displays the latest
+    status. Exits with one of:
+    success (0), error (1), failure (1), pending (2), no status (3)
-    If instead of normal <TITLE> an issue number is given with `-i`, the pull
-    request will be attached to an existing GitHub issue. Alternatively, instead
-    of title you can paste a full URL to an issue on GitHub.
+    If `-v` is given, additionally print the URL to CI build results.
 ## CONFIGURATION
@@ -186,14 +201,14 @@ variable:
 ## BUGS
-<https://github.com/defunkt/hub/issues>
+<https://github.com/github/hub/issues>
 ## AUTHORS
-<https://github.com/defunkt/hub/contributors>
+<https://github.com/github/hub/contributors>
 ## SEE ALSO
 git(1), git-clone(1), git-remote(1), git-init(1),
 <http://github.com>,
-<https://github.com/defunkt/hub>
+<https://github.com/github/hub>

data/script/cached-bundle ADDED Viewed

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Usage: cached-bundle install --deployment
+#
+# After running `bundle`, caches the `vendor/bundle` directory to S3.
+# On the next run, restores the cached directory before running `bundle`.
+# When `Gemfile.lock` changes, the cache gets rebuilt.
+#
+# Requirements:
+# - Gemfile.lock
+# - TRAVIS_REPO_SLUG
+# - TRAVIS_RUBY_VERSION
+# - AMAZON_S3_BUCKET
+# - script/s3-put
+# - bundle
+# - curl
+#
+# Author: Mislav Marohnić
+set -e
+compute_md5() {
+  local output="$(openssl md5)"
+  echo "${output##* }"
+}
+download() {
+  curl --tcp-nodelay -qsfL "$1" -o "$2"
+}
+bundle_path="vendor/bundle"
+gemfile_hash="$(compute_md5 <"${BUNDLE_GEMFILE:-Gemfile}.lock")"
+cache_name="${TRAVIS_RUBY_VERSION}-${gemfile_hash}.tgz"
+fetch_url="http://${AMAZON_S3_BUCKET}.s3.amazonaws.com/${TRAVIS_REPO_SLUG}/${cache_name}"
+if download "$fetch_url" "$cache_name"; then
+  echo "Reusing cached bundle ${cache_name}"
+  tar xzf "$cache_name"
+fi
+bundle "$@"
+if [ ! -f "$cache_name" ]; then
+  echo "Caching \`${bundle_path}' to S3"
+  tar czf "$cache_name" "$bundle_path"
+  script/s3-put "$cache_name" "${AMAZON_S3_BUCKET}:${TRAVIS_REPO_SLUG}/${cache_name}"
+fi

data/script/s3-put ADDED Viewed

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+# Usage: s3-put <FILE> <S3_BUCKET>[:<PATH>] [<CONTENT_TYPE>]
+#
+# Uploads a file to the Amazon S3 service.
+# Outputs the URL for the newly uploaded file.
+#
+# Requirements:
+# - AMAZON_ACCESS_KEY_ID
+# - AMAZON_SECRET_ACCESS_KEY
+# - openssl
+# - curl
+#
+# Author: Mislav Marohnić
+set -e
+authorization() {
+  local signature="$(string_to_sign | hmac_sha1 | base64)"
+  echo "AWS ${AMAZON_ACCESS_KEY_ID?}:${signature}"
+}
+hmac_sha1() {
+  openssl dgst -binary -sha1 -hmac "${AMAZON_SECRET_ACCESS_KEY?}"
+}
+base64() {
+  openssl enc -base64
+}
+bin_md5() {
+  openssl dgst -binary -md5
+}
+string_to_sign() {
+  echo "$http_method"
+  echo "$content_md5"
+  echo "$content_type"
+  echo "$date"
+  echo "x-amz-acl:$acl"
+  printf "/$bucket/$remote_path"
+}
+date_string() {
+  LC_TIME=C date "+%a, %d %h %Y %T %z"
+}
+file="$1"
+bucket="${2%%:*}"
+remote_path="${2#*:}"
+content_type="$3"
+if [ -z "$remote_path" ] || [ "$remote_path" = "$bucket" ]; then
+  remote_path="${file##*/}"
+fi
+http_method=PUT
+acl="public-read"
+content_md5="$(bin_md5 < "$file" | base64)"
+date="$(date_string)"
+url="https://$bucket.s3.amazonaws.com/$remote_path"
+curl -qsSf -T "$file" \
+  -H "Authorization: $(authorization)" \
+  -H "x-amz-acl: $acl" \
+  -H "Date: $date" \
+  -H "Content-MD5: $content_md5" \
+  -H "Content-Type: $content_type" \
+  "$url"
+echo "$url"

data/script/test ADDED Viewed

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -e
+STATUS=0
+warnings="${TMPDIR:-/tmp}/hub-warnings.$$"
+run() {
+  # Save warnings on stderr to a separate file
+  RUBYOPT="$RUBYOPT -w" bundle exec "$@" \
+    2> >(tee >(grep 'warning:' >>"$warnings") | grep -v 'warning:') || STATUS=$?
+}
+check_warnings() {
+  # Display Ruby warnings from this project's source files. Abort if any were found.
+  num="$(grep -F "$PWD" "$warnings" | grep -v "${PWD}/vendor/bundle" | sort | uniq -c | sort -rn | tee /dev/stderr | wc -l)"
+  rm -f "$warnings"
+  if [ "$num" -gt 0 ]; then
+    echo "FAILED: this test suite doesn't tolerate Ruby syntax warnings!" >&2
+    exit 1
+  fi
+}
+if tmux -V; then
+  if [ -n "$CI" ]; then
+    git --version
+    bash --version | head -1
+    zsh --version
+    echo
+  fi
+  profile="all"
+else
+  echo "warning: skipping shell completion tests (install tmux to enable)" >&2
+  profile="default"
+fi
+run rake test
+run cucumber -p "$profile"
+check_warnings
+exit $STATUS

data/script/test_each ADDED Viewed

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -e
+# 1.8.6-p420 ??
+for RBENV_VERSION in 1.8.7-p374 1.9.3-p194 2.0.0-p247; do
+  export RBENV_VERSION
+  bundle install
+  script/test
+done

data/test/context_test.rb ADDED Viewed

@@ -0,0 +1,79 @@
+require 'helper'
+class ContextTest < Minitest::Test
+  class Context
+    include Hub::Context
+    def initialize(&block)
+      @git_reader = Hub::Context::GitReader.new('git', &block)
+    end
+    public :git_editor
+  end
+  attr_reader :context
+  def setup
+    super
+    @stubs = {}
+    @context = Context.new do |_, cmd|
+      @stubs.fetch(cmd)
+    end
+  end
+  def test_editor
+    stub_command_output 'var GIT_EDITOR', 'vim'
+    assert_equal %w'vim', context.git_editor
+  end
+  def test_editor_with_argument
+    stub_command_output 'var GIT_EDITOR', 'subl -w'
+    assert_equal %w'subl -w', context.git_editor
+  end
+  def test_editor_with_spaces
+    stub_command_output 'var GIT_EDITOR', '"my editor" -w arg2'
+    assert_equal %w'my\ editor -w arg2', context.git_editor
+  end
+  def test_editor_with_tilde
+    stub_command_output 'var GIT_EDITOR', '~/bin/vi'
+    with_env('HOME', '/home/mislav') do
+      assert_equal %w'/home/mislav/bin/vi', context.git_editor
+    end
+  end
+  def test_editor_with_env_variable
+    stub_command_output 'var GIT_EDITOR', '$EDITOR'
+    with_env('EDITOR', 'subl -w') do
+      assert_equal %w'subl -w', context.git_editor
+    end
+  end
+  def test_editor_with_embedded_env_variable
+    stub_command_output 'var GIT_EDITOR', '$EDITOR -w'
+    with_env('EDITOR', 'subl') do
+      assert_equal %w'subl -w', context.git_editor
+    end
+  end
+  def test_editor_with_curly_brackets_embedded_env_variable
+    stub_command_output 'var GIT_EDITOR', 'my${EDITOR}2 -w'
+    with_env('EDITOR', 'subl') do
+      assert_equal %w'mysubl2 -w', context.git_editor
+    end
+  end
+  private
+  def stub_command_output(cmd, value)
+    @stubs[cmd] = value.nil? ? nil : value.to_s
+  end
+  def with_env(name, value)
+    dir, ENV[name] = ENV[name], value
+    yield
+  ensure
+    ENV[name] = dir
+  end
+end

data/test/fakebin/git CHANGED Viewed

@@ -6,6 +6,6 @@ elif [ "$1" = "--exec-path" ]; then
 elif [ "$1" = "--html-path" ]; then
   echo "/usr/share/doc/git-doc"
 else
-  echo "ERROR: git was called, but wasn't supposed to:" git $*
+  echo "ERROR: git was called, but wasn't supposed to:" git $* >&2
   exit 1
 fi

data/test/fakebin/open CHANGED Viewed

@@ -1,3 +1,3 @@
 #!/bin/sh
-echo "ERROR: open was called, but wasn't supposed to:" open $*
-exit 1
+echo "ERROR: open was called, but wasn't supposed to:" open $* >&2
+exit 1

data/test/github_api_test.rb ADDED Viewed

@@ -0,0 +1,79 @@
+require 'helper'
+require 'hub/github_api'
+require 'forwardable'
+require 'delegate'
+class FileStoreTest < Minitest::Test
+  extend Forwardable
+  def_delegators :@store, :yaml_dump, :yaml_load
+  def setup
+    @store = Hub::GitHubAPI::FileStore.new('')
+  end
+  class OrderedHash < DelegateClass(::Hash)
+    def self.[](*args)
+      hash = new
+      while args.any?
+        key, value = args.shift, args.shift
+        hash[key] = value
+      end
+      hash
+    end
+    def initialize(hash = {})
+      @keys = hash.keys
+      super(hash)
+    end
+    def []=(key, value) @keys << key; super end
+    def each
+      @keys.each { |key| yield(key, self[key]) }
+    end
+  end
+  def test_yaml_dump
+    output = yaml_dump("github.com" => [
+      OrderedHash['user', 'mislav', 'oauth_token', 'OTOKEN'],
+      OrderedHash['user', 'tpw', 'oauth_token', 'POKEN'],
+    ])
+    assert_equal <<-YAML.chomp, output
+---
+github.com:
+- user: mislav
+  oauth_token: OTOKEN
+- user: tpw
+  oauth_token: POKEN
+    YAML
+  end
+  def test_yaml_load
+    data = yaml_load <<-YAML
+---
+github.com:
+- user: mislav
+  oauth_token: OTOKEN
+- user: tpw
+  oauth_token: POKEN
+    YAML
+    assert_equal 'mislav', data['github.com'][0]['user']
+    assert_equal 'OTOKEN', data['github.com'][0]['oauth_token']
+    assert_equal 'tpw',    data['github.com'][1]['user']
+    assert_equal 'POKEN',  data['github.com'][1]['oauth_token']
+  end
+  def test_yaml_load_quoted
+    data = yaml_load <<-YAML
+---
+github.com:
+- user: 'true'
+  oauth_token: '1234'
+    YAML
+    assert_equal 'true', data['github.com'][0]['user']
+    assert_equal '1234', data['github.com'][0]['oauth_token']
+  end
+end

data/test/helper.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'hub'
 # We're checking for `open` in our tests
@@ -28,7 +28,7 @@ Hub::Commands.extend Module.new {
   end
 }
-class Test::Unit::TestCase
+class Minitest::Test
   # Shortcut for creating a `Hub` instance. Pass it what you would
   # normally pass `hub` on the command line, e.g.
   #