branch_cli 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4b756cb09351d8216b599d29aa0d6ee7cccc79f2
+  data.tar.gz: 122054773404b0c5e5381c9c43b1d72df359e9b6
+SHA512:
+  metadata.gz: 16968f525b1cc7177c2afe372e962462b26f5798e8e66bceec21110ddd2b4b97ebd7b3862cb6a16d01a3b5bef0eeeaaabab655dd86444dcea8227f10c1c587e0
+  data.tar.gz: a3b917ad7dbadf14a6840fa6c7ab9bbb476db48a6a4793161e4ad97b7b1ba95ec0d9c0b8bbb4a371d5a9c0d7dc8a62f479dd0a18ec919b9bb048344afa3f0a2b

data/.gitignore

@@ -0,0 +1 @@
+spec/examples.txt

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    branch_cli (0.7.0)
+      binding_of_caller (~> 0.7.2)
+      formatador (~> 0.2.5)
+      inquirer (~> 0.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.1)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    formatador (0.2.5)
+    inquirer (0.2.1)
+      term-ansicolor (>= 1.2.2)
+    method_source (0.8.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    slop (3.6.0)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    tins (1.14.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  branch_cli!
+  pry (~> 0.10.4)
+  rspec (~> 3.6)
+
+BUNDLED WITH
+   1.14.6

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Daniel Inkpen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -0,0 +1,29 @@
+# branch cli
+
+`branch` simplifies the average workflow of Git. By working on simple assumptions of workflow, it's easier, more memorable, quicker and safer to use.
+
+The assumptions `branch` makes are:
+- You don't care about staging/unstaging files. All changes are treated as staged.
+- You use a single remote (origin) and your local "my-branch" is always going to have the upstream as "origin/my-branch"
+
+![Screenshot](screenshot.png)
+
+## Basic usage
+
+- Use `branch` as an alternative for `git status`
+- to change branch, use `branch BRANCH-NAME`
+- To get a list of the most recent branches `branch --list`
+
+## Features
+
+- When changing branch
+  - Warns if you have local changes and prompts on whether to continue
+  - Warns if the remote branch has diverged and prompts on whether you want to keep your local branch or to reset with the remote
+- Formatted list of most recent branches with `--list` argument
+
+## Future ideas/plans
+
+- Recording base branch when creating a new one
+- Suggestion to rebase if it detects that you should (i.e. automatic `git pull --rebase` and `git rebase origin/base-branch`)
+- Nicer flow for rebasing (visual representation of progress)
+- clear indication of files in conflict (as well as automatic indication of when you have resolved them)

data/bin/branch

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require 'branch_cli'
+main(ARGV)

data/branch_cli.gemspec

@@ -0,0 +1,24 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |gem|
+  gem.name          = 'branch_cli'
+  gem.version       = '0.7.0'
+  gem.authors       = ['Daniel Inkpen']
+  gem.email         = ['dan2552@gmail.com']
+  gem.description   = %q{Faster, safer git branching.}
+  gem.summary       = %q{Branch aims to simplify a developer's daily workflow of Git. It is in no means supposed to replace Git, but provide a quicker and easier way to do some more common functions (with more memorable commands). Branch is pretty opinionated in the way it does things (i.e. I don't care about staging/unstaging files, I just want all of my current changes in a single bucket). It also makes the assumption that you use a single remote (origin) and your local "my-branch" is always going to have the upstream as "origin/my-branch" (i.e. it fits with the most common of workflows).}
+  gem.homepage      = 'https://github.com/Dan2552/branch'
+  gem.license       = 'MIT'
+
+  gem.add_dependency "formatador", '~> 0.2.5'
+  gem.add_dependency "inquirer", '~> 0.2.1'
+  gem.add_dependency "binding_of_caller", '~> 0.7.2'
+
+  gem.add_development_dependency 'rspec', '~> 3.6'
+  gem.add_development_dependency 'pry', '~> 0.10.4'
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+end

data/lib/branch_cli.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+module BranchCli
+  def self.root
+    File.dirname __dir__
+  end
+end
+
+require 'open3'
+
+path = File.expand_path('../../lib/branch_cli', __FILE__)
+$LOAD_PATH.unshift path
+
+require 'formatador'
+require 'inquirer'
+require 'binding_of_caller'
+
+require 'swift_compatibility'
+
+require 'branch'
+require 'commit'
+require 'options'
+require 'print'
+require 'run'
+require 'string'
+
+begin
+  require 'main'
+rescue Interrupt
+  exit 1
+end

data/lib/branch_cli/branch.rb

@@ -0,0 +1,196 @@
+class Branch < SwiftStruct
+  let name = nil
+
+  def origin
+    return "origin/#{name}"
+  end
+end
+
+def getCurrentBranch
+  let result = runCommand("git symbolic-ref HEAD")
+  let matches = result.stdout.matches(forRegex: "heads\\/(.*)")
+  if matches.count == 0
+    return nil
+  else
+    return Branch.new(name: matches[0])
+  end
+end
+
+def setCurrentBranch(branch)
+  prettyPrint("Switching to branch #{branch.name.s.Bold}...")
+  fetch
+  detectChanges
+  resetLocal
+  switchBranch(branch)
+  detectAhead
+  resetToOrigin
+end
+
+def detectChanges
+  let status = gitStatus
+  if status.contains("to be committed") || status.contains("for commit:") || status.contains("Untracked files:")
+    uncommitedChanges
+  end
+end
+
+def resetLocal
+  runCommand("git reset --hard")
+end
+
+def switchBranch(branch)
+  runCommand("git checkout #{branch.name}")
+
+  if getCurrentBranch.name != branch.name
+    runCommand("git checkout -b #{branch.name}")
+  end
+
+  runCommand("git branch --set-upstream-to=origin/#{branch.name}")
+
+  if getCurrentBranch.name != branch.name
+    prettyPrint("🤔  Failed to switch branch".f.Red)
+    exit(1)
+  end
+end
+
+def detectAhead
+  let status = gitStatus
+  if status.contains("can be fast-forwarded.") || status.contains("is ahead of 'origin") || status.contains(" have diverged")
+    branchesDiverged
+  end
+end
+
+# On branch master
+# Your branch and 'origin/master' have diverged,
+# and have 1 and 1 different commit each, respectively.
+#   (use "git pull" to merge the remote branch into yours)
+# nothing to commit, working directory clean
+#
+# On branch master
+# Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
+#   (use "git pull" to update your local branch)
+# nothing to commit, working directory clean
+#
+# On branch master
+# Your branch is ahead of 'origin/master' by 1 commit.
+#   (use "git push" to publish your local commits)
+# nothing to commit, working directory clean
+def branchesDiverged
+  prettyPrint("\n😱  You appear to have a diverged branch:".f.Red)
+  let matches = gitStatus.matches(forRegex: "(Your branch .*\\s*.*)")
+
+  matches.each do |match|
+    prettyPrint(match)
+  end
+
+  promptKeepLocal
+end
+
+def resetToOrigin
+  let origin = getCurrentBranch.origin
+  let reset = runCommand("git reset --hard #{origin}")
+
+  if reset.exitStatus == 0
+    prettyPrint("Using remote branch".f.Green)
+  else
+    prettyPrint("Using local branch (no origin branch found)".f.Green)
+  end
+end
+
+def printCurrentBranch
+  let branchName = getCurrentBranch&.name || "no branch"
+  prettyPrint("On branch #{branchName.s.Bold}")
+end
+
+def printRecentBranches
+  let command = runCommand("git for-each-ref --sort=-committerdate --format=\"%(refname)\" --count=30 refs/heads/ refs/remotes")
+  let references = command.stdout.components(separatedBy: "\n")
+
+  commits = references.map do |r|
+    Commit.new(message: "", sha: r.clearQuotes)
+  end
+
+  strings = commits.map do |c|
+    c.printableFormat("%Cgreen%cr%Creset %C(yellow)%d%Creset %C(bold blue)<%an>%Creset%n")
+  end
+  var lastStr = ""
+  strings.each do |str|
+    if str != lastStr
+      prettyPrint(str) # avoid dups
+    end
+    lastStr = str
+  end
+end
+
+def uncommitedChanges
+  prettyPrint("\n😱  You appear to have uncommited changes:".f.Red)
+  printGitStatus
+  promptContinueAnyway
+end
+
+def gitStatus
+  return runCommand("git status").stdout
+end
+
+def printGitStatus(preceedingNewline: false)
+  let diff = gitStatus.matches(forRegex: "\t([a-z ]*:.*)")
+  if diff.count > 0 && preceedingNewline
+    prettyPrint("")
+  end
+
+  diff.each do |line|
+    prettyPrint("\t#{line}".f.Green)
+  end
+end
+
+def promptContinueAnyway
+  puts ""
+  response = Ask.list "Continue anyway? Changes will be lost", [
+    "Stop",
+    "Continue"
+  ]
+
+  exit(1) if response == 0
+end
+
+def promptKeepLocal
+  let choice: String
+  let options = Options.sharedInstance
+
+  if options.preferLocal
+    choice = "local"
+  elsif options.preferRemote
+    choice = "remote"
+  else
+    puts ""
+    response = Ask.list "Keep remote or local copy?", [
+      "Remote",
+      "Local"
+    ]
+
+    choice = "remote" if response == 0
+    choice = "local" if response == 1
+  end
+
+  if choice != "remote"
+    prettyPrint("Using local branch (user specified)")
+    exit(0)
+  end
+end
+
+def addAll
+  runCommand("git reset --mixed")
+  runCommand("git add . -A")
+end
+
+def fetch
+  let fetch = runCommand("git fetch")
+  let error = fetch.stderr
+  if error.contains("No remote repository specified")
+    prettyPrint("\n⚠️  No remote repository is setup\n".f.Yellow)
+    return
+  end
+  if fetch.exitStatus != 0
+    prettyPrint("\n🤔  Failed to fetch.".f.Red)
+    exit(1)
+  end
+end

data/lib/branch_cli/commit.rb

@@ -0,0 +1,55 @@
+class Commit < SwiftStruct
+  var message = nil
+  var sha = nil
+
+  def initialize(message: String, sha: String)
+    self.message = message.clearQuotes
+    self.sha = sha.clearQuotes
+  end
+
+  def self.getCurrentHead
+    return Commit.from(identifier: "HEAD")
+  end
+
+  def self.from(identifier: String)
+    return Commit.new(
+      message: message(forIdentifier: identifier),
+      sha: sha(forIdentifier: identifier)
+    )
+  end
+
+  def commitsLeading(commit: Commit)
+    let run = runCommand("git rev-list #{sha}..#{commit.sha} --reverse").stdout
+    var commits = [] # [Commit]
+    let shas = run.components(separatedBy: "\n")
+    shas.each do |sha|
+      commits.append(Commit.from(identifier: sha))
+    end
+    return commits
+  end
+
+  def mostRecentCommonAncestor(commit: Commit)
+    let mergeBase = runCommand("git merge-base #{sha} #{commit.sha}").stdout
+    return Commit.from(identifier: mergeBase)
+  end
+
+  def printableFormat(format)
+    let command = runCommand("git", args: [
+      "log",
+      "-n1",
+      sha,
+      "--format=\"#{format}\""
+    ])
+    return command.stdout.gsub("\n", "")
+  end
+
+  private
+
+  def self.sha(identifier: String)
+    return runCommand("git log -1 #{identifier} --format=\"%H\"").stdout
+  end
+
+  def self.message(identifier: String)
+    return runCommand("git log -1 #{identifier} --format=\"%s\"").stdout
+  end
+end

data/lib/branch_cli/main.rb

@@ -0,0 +1,36 @@
+def main(arguments)
+  Options.reset
+  let options = Options.sharedInstance
+  options.loadOptions(arguments: arguments)
+
+  if options.isShowVersion
+    spec = Gem::Specification::load("#{BranchCli.root}/branch_cli.gemspec")
+    prettyPrint("branch cli #{spec.version}")
+    exit(0)
+  end
+
+  if options.isShowList
+    printRecentBranches
+    exit(0)
+  end
+
+  if options.isHelp
+    prettyPrint("usage: branch BRANCH-NAME [ARGS]")
+    prettyPrint("")
+    prettyPrint("--version | -v \tShows the current version")
+    prettyPrint("--verbose \t\tPrints all the git commands as they run")
+    prettyPrint("--list | -l \t\tPrints the most recently updated branches")
+    prettyPrint("--prefer=PREFERENCE \tWhere PREFERENCE is local or remote, will use the set preference rather than ask")
+    prettyPrint("--help | help \tShows this help")
+    exit(0)
+  end
+
+  addAll
+
+  if options.isBranchSupplied
+    setCurrentBranch(Branch.new(name: options.suppliedBranch))
+  else
+    printCurrentBranch
+    printGitStatus(preceedingNewline: true)
+  end
+end

data/lib/branch_cli/options.rb

@@ -0,0 +1,58 @@
+class Options < SwiftObject
+  def self.sharedInstance
+    @sharedInstance ||= Options.new
+  end
+
+  def self.reset
+    @sharedInstance = nil
+  end
+
+  var isVerbose = false
+  var isShowVersion = false
+  var suppliedBranch = nil
+  var isHelp = false
+  var isTestRebase = false
+  var isShowList = false
+  var preferLocal = false
+  var preferRemote = false
+
+  def isBranchSupplied
+    return suppliedBranch != nil
+  end
+
+  def loadOptions(arguments:)
+    if arguments.contains("help") || arguments.contains("--help")
+      self.isHelp = true
+    end
+
+    if arguments.contains("--verbose")
+      self.isVerbose = true
+    end
+
+    if arguments.contains("-v") || arguments.contains("--version")
+      self.isShowVersion = true
+    end
+
+    if arguments.contains("--test-rebase")
+      self.isTestRebase = true
+    end
+
+    if arguments.contains("--list") || arguments.contains("-l")
+      self.isShowList = true
+    end
+
+    if arguments.contains("--prefer=local")
+      self.preferLocal = true
+    end
+
+    if arguments.contains("--prefer=remote")
+      self.preferRemote = true
+    end
+
+    if arguments.count > 0
+      if !arguments[0].hasPrefix("-")
+        self.suppliedBranch = arguments[0]
+      end
+    end
+  end
+end

data/lib/branch_cli/print.rb

@@ -0,0 +1,5 @@
+def prettyPrint(str)
+  printer = Formatador.new
+  printer.instance_eval { @indent = 0 }
+  printer.display_line(str.strip)
+end

data/lib/branch_cli/run.rb

@@ -0,0 +1,19 @@
+class RunResult < SwiftStruct
+  let stdout = nil
+  let stderr = nil
+  let exitStatus = nil
+end
+
+def runCommand(command, args: [])
+  command_with_args = "#{command} #{args.join(" ")}"
+
+  if Options.sharedInstance.isVerbose
+    prettyPrint(command_with_args.f.Blue)
+  end
+
+  Open3.popen3(command_with_args) do |stdin, stdout, stderr, wait_thr|
+    RunResult.new(stdout: stdout.read,
+                  stderr: stderr.read,
+                  exitStatus: wait_thr.value.to_i)
+  end
+end

data/lib/branch_cli/string.rb

@@ -0,0 +1,38 @@
+class String
+  def matches(forRegex:)
+    lines = split("\n")
+    lines.map { |l| l.match(forRegex)&.captures }.flatten.compact
+  end
+
+  def clearQuotes
+    gsub("\"", with: "")
+  end
+
+  def s
+    self
+  end
+
+  def Bold
+    "[bold]#{self}[/]"
+  end
+
+  def f
+    self
+  end
+
+  def Green
+    "[green]#{self}[/]"
+  end
+
+  def Blue
+    "[blue]#{self}[/]"
+  end
+
+  def Red
+    "[red]#{self}[/]"
+  end
+
+  def Yellow
+    "[yellow]#{self}[/]"
+  end
+end

data/lib/branch_cli/swift_compatibility.rb

@@ -0,0 +1,70 @@
+class Object
+  def let(*args)
+  end
+
+  def var(*args)
+  end
+end
+
+class SwiftObject
+  def self.let(*args)
+    bind = binding.of_caller(1)
+    bind.local_variables.each do |v|
+      attr_reader(v)
+
+      variable_defaults[v] = bind.local_variable_get(v)
+    end
+  end
+
+  def self.var(*args)
+    bind = binding.of_caller(1)
+    bind.local_variables.each do |v|
+      attr_reader(v)
+      attr_writer(v)
+
+      variable_defaults[v] = bind.local_variable_get(v)
+    end
+  end
+
+  def self.variable_defaults
+    @variable_defaults ||= {}
+  end
+
+  def initialize
+    params = self.class.variable_defaults
+
+    params.each do |key, value|
+      instance_variable_set("@#{key}", value)
+    end
+  end
+end
+
+class SwiftStruct < SwiftObject
+  def initialize(params = {})
+    params = self.class.variable_defaults.merge!(params)
+
+    params.each do |key, value|
+      instance_variable_set("@#{key}", value)
+    end
+  end
+end
+
+class Array
+  def contains(*args)
+    include?(*args)
+  end
+end
+
+class String
+  def contains(*args)
+    include?(*args)
+  end
+
+  def hasPrefix(str)
+    start_with?(str)
+  end
+
+  def components(separatedBy:)
+    split(separatedBy)
+  end
+end

data/spec/integration/help_spec.rb

@@ -0,0 +1,8 @@
+RSpec.describe "Help" do
+  subject { execute(args) }
+  let(:args) { %w{--help} }
+
+  it "prints out help text" do
+    expect_output /Where PREFERENCE is local or remote/
+  end
+end

data/spec/integration/status_spec.rb

@@ -0,0 +1,29 @@
+RSpec.describe "status" do
+  subject { execute(args) }
+  let(:args) { [] }
+
+  it "prints the current branch" do
+    expect_output /On branch .*master/
+  end
+
+  context "when there are changed files" do
+    before do
+      touch "awholenewfile"
+    end
+
+    it "prints out the files" do
+      expect_output /awholenewfile/
+    end
+  end
+
+  context "when there are committed files" do
+    before do
+      touch "awholenewfile"
+      commit
+    end
+
+    it "does not print committed files" do
+      expect_to_not_output "awholenewfile"
+    end
+  end
+end

data/spec/integration/switch_branch_spec.rb

@@ -0,0 +1,57 @@
+RSpec.describe "switching branch" do
+  subject { execute(args) }
+  let(:args) { %w{new-branch} }
+
+  it "prints that it's switching branch" do
+    expect_output /Switching to branch .*new-branch/
+  end
+
+  it "switches the branch" do
+    subject
+    expect_branch "new-branch"
+  end
+
+  context "when the branch doesn't exist on remote" do
+    it "prints that it's using local branch" do
+      expect_output /Using local branch \(no origin branch found\)/
+    end
+  end
+
+  context "when the working copy has changes" do
+    before { touch("changes") }
+
+    it "asks whether to discard changes" do
+      expect(Ask).to receive(:list)
+                 .with("Continue anyway? Changes will be lost", ["Stop", "Continue"])
+      subject
+    end
+  end
+
+  context "when the branch exists on remote" do
+    let(:args) { %w{spec} }
+    before { clone_remote_repo }
+
+    context "when the local branch matches the remote" do
+      let(:args) { %w{master} }
+      before { execute %w{spec --prefer=remote} }
+
+      it "prints that it's using the remote branch" do
+        expect_output /Using remote branch/
+      end
+    end
+
+    context "when the local branch is diverged from the remote" do
+      before do
+        touch "changes"
+        commit
+      end
+      let(:args) { %w{master} }
+
+      it "asks whether to use the remote or local" do
+        expect(Ask).to receive(:list)
+                   .with("Keep remote or local copy?", ["Remote", "Local"])
+        subject
+      end
+    end
+  end
+end

data/spec/integration/version_spec.rb

@@ -0,0 +1,9 @@
+RSpec.describe "Version" do
+  subject { execute(args) }
+  let(:args) { %w{--version} }
+
+  it "prints out the version number of the release" do
+    spec = Gem::Specification::load("#{BranchCli.root}/branch_cli.gemspec")
+    expect_output /branch cli #{spec.version}/
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,77 @@
+require 'rubygems'
+require 'pry'
+require 'branch_cli'
+require_relative 'support/cli'
+
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+
+    # To allow expectations on `nil` and suppress this message, set `config.allow_message_expectations_on_nil` to `true`.
+    # To disallow expectations on `nil`, set `config.allow_message_expectations_on_nil` to `false`.
+    mocks.allow_message_expectations_on_nil = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+end

data/spec/support/cli.rb

@@ -0,0 +1,46 @@
+def execute(args)
+  @original = Dir.pwd
+  Dir.chdir "/tmp/branch-cli-test"
+  main(args)
+rescue SystemExit
+end
+
+def create_test_repo
+  `mkdir /tmp/branch-cli-test`
+  `cd /tmp/branch-cli-test && git init`
+end
+
+def teardown_test_repo
+  `rm -rf /tmp/branch-cli-test`
+  Dir.chdir "/tmp"
+end
+
+def clone_remote_repo
+  teardown_test_repo
+  `cd /tmp && git clone https://github.com/Dan2552/branch.git branch-cli-test`
+end
+
+RSpec.configure do |config|
+  config.before(:each) { teardown_test_repo; create_test_repo }
+  config.after(:each) { teardown_test_repo }
+end
+
+def expect_output(out)
+  expect { subject }.to output(out).to_stdout
+end
+
+def expect_to_not_output(out)
+  expect { subject }.to_not output(out).to_stdout
+end
+
+def expect_branch(branch)
+  expect(`cd /tmp/branch-cli-test && git status`).to match(/On branch #{branch}/)
+end
+
+def touch(filename)
+  `cd /tmp/branch-cli-test && touch #{filename}`
+end
+
+def commit
+   `cd /tmp/branch-cli-test && git add . -A && git commit -m "test"`
+end

metadata

@@ -0,0 +1,152 @@
+--- !ruby/object:Gem::Specification
+name: branch_cli
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+platform: ruby
+authors:
+- Daniel Inkpen
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2017-05-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: inquirer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.4
+description: Faster, safer git branching.
+email:
+- dan2552@gmail.com
+executables:
+- branch
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rspec"
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- bin/branch
+- branch_cli.gemspec
+- lib/branch_cli.rb
+- lib/branch_cli/branch.rb
+- lib/branch_cli/commit.rb
+- lib/branch_cli/main.rb
+- lib/branch_cli/options.rb
+- lib/branch_cli/print.rb
+- lib/branch_cli/run.rb
+- lib/branch_cli/string.rb
+- lib/branch_cli/swift_compatibility.rb
+- screenshot.png
+- spec/integration/help_spec.rb
+- spec/integration/status_spec.rb
+- spec/integration/switch_branch_spec.rb
+- spec/integration/version_spec.rb
+- spec/spec_helper.rb
+- spec/support/cli.rb
+homepage: https://github.com/Dan2552/branch
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+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.6.8
+signing_key: 
+specification_version: 4
+summary: Branch aims to simplify a developer's daily workflow of Git. It is in no
+  means supposed to replace Git, but provide a quicker and easier way to do some more
+  common functions (with more memorable commands). Branch is pretty opinionated in
+  the way it does things (i.e. I don't care about staging/unstaging files, I just
+  want all of my current changes in a single bucket). It also makes the assumption
+  that you use a single remote (origin) and your local "my-branch" is always going
+  to have the upstream as "origin/my-branch" (i.e. it fits with the most common of
+  workflows).
+test_files:
+- spec/integration/help_spec.rb
+- spec/integration/status_spec.rb
+- spec/integration/switch_branch_spec.rb
+- spec/integration/version_spec.rb
+- spec/spec_helper.rb
+- spec/support/cli.rb