git-utils 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c558401be11b46c831946e0d92fc292c9f559c7992ead65979373bc0d4703a49
-  data.tar.gz: 3e3d7516ce925568cf030f2391ff72de690affefc363febe203420bc60b818d3
+  metadata.gz: dc7e18850e6bd2ccc17a911e1884c00df08f8318686ccfd90970a8d6b323f7c2
+  data.tar.gz: 1bc5d574a523470425b0fefc1dcb69e80c58ffb0597cf575c22dfb987332f7d5
 SHA512:
-  metadata.gz: c92927ab40c200212b7891affeb7f111012b205d873cf86a2846db362b4c4b6d97134aba209dc96ee870c681a3d2b1e6fdb6bac2bf6fcee88127f7cf1fb5c154
-  data.tar.gz: 1eaa0ece4ba1638bd21e7724b384e21f41acc0416dc349a6bcb69c9f39036610fb7ee9c5d9d19db472562dc8b2446d196994fbcd4ae054d89cbe4eea3f0a53f7
+  metadata.gz: e63b742743af06a52425ff7d4942740d5abd9e272e502b0593a0864b101022d41e2352ebb435719a400a69d6305c6f8fbc04aac95eb9cfd9f4500914764fc3d2
+  data.tar.gz: 56c86af4c83ac1a1af52cdca22a3386de105d6c00eca53b5dd01b3d9789cdaa6cb725022891b24735a5adf1abae7cab04aaa9ff7756f03e3bddf746bdc599bc7

data/README.md

@@ -1,6 +1,6 @@
 # Git utilities
 
-This repo contains some Git utility scripts. The highlights are `git open`, `git pull-request`, `git push-branch`, and `git undo`, which you'll never understand how you did without.
+This repo contains some Git utility scripts. The highlights are `git open`, `git pull-request`, `git push-branch`, and `git undo`, which you’ll never understand how you did without.
 
 The commands are especially useful when combined with [pivotal-github](https://github.com/mhartl/pivotal-github) gem (which, despite its name, also works with Bitbucket).
 
@@ -11,18 +11,19 @@ The `git-utils` used to be pure Bash scripts, but they are now available as a Ru
 ## Commands
 
 * `git amend`: alias for `git commit --amend`
-* `git bump`: makes a commit with the message "Bump version number"
+* `git bump`: makes a commit with the message `"Bump version number"`
 * `git cleanup`: deletes every branch already merged into current branch (apart from `master`, `staging`, `development`, and any branches listed in `~/.git-cleanup-preserved`). Pass the `-r` option to delete remote merged branches.
 * `git merge-into-branch [branch]`: merges current branch into given branch (defaults to `master`)
-* `git minor`: makes a commit with the message "Make minor changes"
+* `git minor`: makes a commit with the message `"Make minor changes"`
 * `git open`: opens the remote page for the repo (OS X & Linux)
-* `git polish`: makes a commit with the message "Polish"
+* `git polish`: makes a commit with the message `"Polish"`
 * `git pull-request`: pushes the branch and opens the remote page for issuing a new a pull request (OS X only)
 * `git push-branch`: pushes the current branch up to origin
 * `git delete-remote-branch <branch>`: deletes the remote branch if it is safe to do so
 * `git switch <pattern>`: switches to the first branch matching the given pattern
 * `git sync [branch]`: syncs the given branch with the remote branch (defaults to master)
-* `git typo`: makes a commit with the message "Fix typo"
+* `git sync-fork`: syncs the `master` branch of a fork with the original upstream `master` (assumes upstream configuration as in “[Configuring a remote for a fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork)”)
+* `git typo`: makes a commit with the message `"Fix typo"`
 * `git undo`: undoes the last commit
 * `git graph`: displays full repository history in graphical format; alias for `git log --graph --oneline --decorate --all --full-history --author-date-order --no-notes`
 
@@ -81,7 +82,7 @@ The main purpose of `git sync` is to prepare the current branch for merging with
     $ git fetch
     $ git merge origin/master
 
-but I don't like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
+but I don’t like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
 
 ## Installation
 

data/bin/git-sync-fork

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/sync_fork'
+
+# Syncs the local master branch with remote.
+exit Command.run!(SyncFork, ARGV.dup)

data/lib/git-utils.rb

@@ -7,4 +7,5 @@ require "git-utils/delete_remote_branch"
 require "git-utils/push_branch"
 require "git-utils/switch"
 require "git-utils/sync"
+require "git-utils/sync_fork"
 require "git-utils/pull_request"

data/lib/git-utils/sync_fork.rb

@@ -0,0 +1,21 @@
+require 'git-utils/command'
+
+class SyncFork < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git sync-fork"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns a command appropriate for executing at the command line.
+  def cmd
+    c = ["git checkout master"]
+    c << "git fetch upstream"
+    c << "git merge upstream/master"
+    c.join("\n")
+  end
+end

data/lib/git-utils/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Utils
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/spec/commands/sync_fork_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe SyncFork do
+
+  let(:command) { SyncFork.new }
+  subject { command }
+
+  its(:cmd) { should match /git checkout master/ }
+  its(:cmd) { should match /git fetch upstream/ }
+  its(:cmd) { should match /git merge upstream\/master/ }
+
+
+  describe "command-line command" do
+    subject { `bin/git-sync-fork --debug` }
+    it { should match /git fetch upstream/ }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-utils
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Hartl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies: []
 description: Add some Git utilities
 email:
@@ -27,6 +27,7 @@ executables:
 - git-push-branch
 - git-switch
 - git-sync
+- git-sync-fork
 - git-typo
 - git-undo
 extensions: []
@@ -53,6 +54,7 @@ files:
 - bin/git-push-branch
 - bin/git-switch
 - bin/git-sync
+- bin/git-sync-fork
 - bin/git-typo
 - bin/git-undo
 - git-utils.gemspec
@@ -66,6 +68,7 @@ files:
 - lib/git-utils/push_branch.rb
 - lib/git-utils/switch.rb
 - lib/git-utils/sync.rb
+- lib/git-utils/sync_fork.rb
 - lib/git-utils/version.rb
 - spec/.DS_Store
 - spec/commands/.DS_Store
@@ -76,6 +79,7 @@ files:
 - spec/commands/pull_request_spec.rb
 - spec/commands/push_branch_spec.rb
 - spec/commands/switch_spec.rb
+- spec/commands/sync_fork_spec.rb
 - spec/commands/sync_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mhartl/git-utils
@@ -97,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: See the README for full documentation
@@ -112,5 +115,6 @@ test_files:
 - spec/commands/pull_request_spec.rb
 - spec/commands/push_branch_spec.rb
 - spec/commands/switch_spec.rb
+- spec/commands/sync_fork_spec.rb
 - spec/commands/sync_spec.rb
 - spec/spec_helper.rb