twig 1.6 → 1.7

data/spec/twig/subcommands_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Twig::Subcommands do
   describe '.all_names' do
     it 'returns a unique, sorted list of known subcommands' do
-      allow(Twig::Subcommands).to receive(:bin_dir_paths) { %w[foo/bin bar/bin] }
+      stub_const('ENV', ENV.to_hash.merge('PATH' => 'foo/bin:bar/bin'))
       expect(Dir).to receive(:glob).with('foo/bin/twig-*').
         and_yield('foo/bin/twig-subcommand-2').
         and_yield('foo/bin/twig-subcommand-1')
@@ -16,7 +16,7 @@ describe Twig::Subcommands do
     end
 
     it 'returns an empty array if no subcommands are found' do
-      allow(Twig::Subcommands).to receive(:bin_dir_paths) { %w[foo/bin bar/bin] }
+      stub_const('ENV', ENV.to_hash.merge('PATH' => 'foo/bin:bar/bin'))
       expect(Dir).to receive(:glob).with('foo/bin/twig-*')
       expect(Dir).to receive(:glob).with('bar/bin/twig-*')
 
@@ -26,4 +26,37 @@ describe Twig::Subcommands do
     end
   end
 
+  describe '.exec_subcommand_if_any' do
+    before :each do
+      @branch_name = 'test'
+      allow(Twig).to receive(:run)
+    end
+
+    it 'recognizes a subcommand' do
+      subcommand_name = 'foo'
+      subcommand_path = '/path/to/bin/twig-foo'
+      expect(Twig).to receive(:run).with('which twig-foo 2>/dev/null').
+        and_return(subcommand_path)
+      expect(Twig::Subcommands).to receive(:exec).with(subcommand_path) { exit }
+
+      # Since we're stubbing `exec` (with an expectation), we still need it
+      # to exit early like the real implementation. The following handles the
+      # exit somewhat gracefully.
+      expect {
+        Twig::Subcommands.exec_subcommand_if_any([subcommand_name])
+      }.to raise_exception { |exception|
+        expect(exception).to be_a(SystemExit)
+        expect(exception.status).to eq(0)
+      }
+    end
+
+    it 'does not recognize a subcommand' do
+      subcommand_name = 'foo'
+      expect(Twig).to receive(:run).
+        with('which twig-foo 2>/dev/null').and_return('')
+      expect(Twig::Subcommands).not_to receive(:exec)
+
+      Twig::Subcommands.exec_subcommand_if_any([subcommand_name])
+    end
+  end
 end

data/spec/twig/system_spec.rb

@@ -5,32 +5,31 @@ describe Twig::System do
     it 'returns true if `host_os` is `windows`' do
       expect(RbConfig::CONFIG).to receive(:[]).with('host_os').
         and_return('windows')
-      expect(Twig::System.windows?).to be_true
+      expect(Twig::System.windows?).to be_truthy
     end
 
     it 'returns true if `host_os` is `win32`' do
       expect(RbConfig::CONFIG).to receive(:[]).with('host_os').
         and_return('win32')
-      expect(Twig::System.windows?).to be_true
+      expect(Twig::System.windows?).to be_truthy
     end
 
     it 'returns true if `host_os` is Cygwin' do
       expect(RbConfig::CONFIG).to receive(:[]).with('host_os').
         and_return('cygwin')
-      expect(Twig::System.windows?).to be_true
+      expect(Twig::System.windows?).to be_truthy
     end
 
     it 'returns true if `host_os` is MinGW' do
       expect(RbConfig::CONFIG).to receive(:[]).with('host_os').
         and_return('mingw')
-      expect(Twig::System.windows?).to be_true
+      expect(Twig::System.windows?).to be_truthy
     end
 
     it 'returns false if `host_os` is `darwin` (OS X)' do
       expect(RbConfig::CONFIG).to receive(:[]).with('host_os').
         and_return('darwin')
-      expect(Twig::System.windows?).to be_false
+      expect(Twig::System.windows?).to be_falsy
     end
-
   end
 end

data/spec/twig/util_spec.rb

@@ -3,37 +3,37 @@ require 'spec_helper'
 describe Twig::Util do
   describe '.numeric?' do
     it 'returns true if an object is numeric' do
-      expect(Twig::Util.numeric?(1)).to be_true
-      expect(Twig::Util.numeric?('1')).to be_true
+      expect(Twig::Util.numeric?(1)).to eql(true)
+      expect(Twig::Util.numeric?('1')).to eql(true)
     end
 
     it 'returns false if an object is not numeric' do
-      expect(Twig::Util.numeric?('x')).to be_false
-      expect(Twig::Util.numeric?([])).to be_false
-      expect(Twig::Util.numeric?({})).to be_false
+      expect(Twig::Util.numeric?('x')).to eql(false)
+      expect(Twig::Util.numeric?([])).to eql(false)
+      expect(Twig::Util.numeric?({})).to eql(false)
     end
   end
 
   describe '.truthy?' do
     it 'returns true if an object is truthy' do
-      expect(Twig::Util.truthy?('true')).to be_true
-      expect(Twig::Util.truthy?('TRUE')).to be_true
-      expect(Twig::Util.truthy?(true)).to be_true
-      expect(Twig::Util.truthy?('yes')).to be_true
-      expect(Twig::Util.truthy?('YES')).to be_true
-      expect(Twig::Util.truthy?('y')).to be_true
-      expect(Twig::Util.truthy?('Y')).to be_true
-      expect(Twig::Util.truthy?('on')).to be_true
-      expect(Twig::Util.truthy?('ON')).to be_true
-      expect(Twig::Util.truthy?('1')).to be_true
-      expect(Twig::Util.truthy?(1)).to be_true
+      expect(Twig::Util.truthy?('true')).to eql(true)
+      expect(Twig::Util.truthy?('TRUE')).to eql(true)
+      expect(Twig::Util.truthy?(true)).to eql(true)
+      expect(Twig::Util.truthy?('yes')).to eql(true)
+      expect(Twig::Util.truthy?('YES')).to eql(true)
+      expect(Twig::Util.truthy?('y')).to eql(true)
+      expect(Twig::Util.truthy?('Y')).to eql(true)
+      expect(Twig::Util.truthy?('on')).to eql(true)
+      expect(Twig::Util.truthy?('ON')).to eql(true)
+      expect(Twig::Util.truthy?('1')).to eql(true)
+      expect(Twig::Util.truthy?(1)).to eql(true)
     end
 
     it 'returns false if an object is falsy' do
-      expect(Twig::Util.truthy?('false')).to be_false
-      expect(Twig::Util.truthy?(false)).to be_false
-      expect(Twig::Util.truthy?('yep')).to be_false
-      expect(Twig::Util.truthy?('sure, why not')).to be_false
+      expect(Twig::Util.truthy?('false')).to eql(false)
+      expect(Twig::Util.truthy?(false)).to eql(false)
+      expect(Twig::Util.truthy?('yep')).to eql(false)
+      expect(Twig::Util.truthy?('sure, why not')).to eql(false)
     end
   end
 

data/spec/twig_spec.rb

@@ -83,6 +83,21 @@ describe Twig do
     end
   end
 
+  describe '#target_branch' do
+    before :each do
+      @twig = Twig.new
+    end
+
+    it 'returns a Branch object for the target branch name' do
+      branch_name = 'feature-branch'
+      allow(@twig).to receive(:target_branch_name).and_return(branch_name)
+
+      branch = @twig.target_branch
+
+      expect(branch.name).to eq(branch_name)
+    end
+  end
+
   describe '#branches' do
     before :each do
       @twig = Twig.new
@@ -93,10 +108,10 @@ describe Twig do
         fix_everything
       ]
       commit_times = [
-        Twig::CommitTime.new(Time.now - 86400 * 10, '10 days ago'),
-        Twig::CommitTime.new(Time.now - 86400 * 20, '20 days ago'),
-        Twig::CommitTime.new(Time.now - 86400 * 30, '30 days ago'),
-        Twig::CommitTime.new(Time.now - 86400 * 40, '40 days ago')
+        Twig::CommitTime.new(Time.now - 86400 * 10),
+        Twig::CommitTime.new(Time.now - 86400 * 20),
+        Twig::CommitTime.new(Time.now - 86400 * 30),
+        Twig::CommitTime.new(Time.now - 86400 * 40)
       ]
       @branches = [
         Twig::Branch.new(branch_names[0], :last_commit_time => commit_times[0]),
@@ -212,8 +227,8 @@ describe Twig do
       @twig = Twig.new
       @list_headers = '[branch list headers]'
       commit_times = [
-        Twig::CommitTime.new(Time.now, '111 days ago'),
-        Twig::CommitTime.new(Time.now, '222 days ago')
+        Twig::CommitTime.new(Time.now),
+        Twig::CommitTime.new(Time.now)
       ]
       allow(commit_times[0]).to receive(:to_i) {  2000_01_01  }
       allow(commit_times[0]).to receive(:to_s) { '2000-01-01' }

data/twig.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'twig/homepage'
@@ -21,19 +20,19 @@ Gem::Specification.new do |spec|
     of time.
   ].join(' ')
   spec.post_install_message =
-    "\n**************************************************************" <<
-    "\n*                                                            *" <<
-    "\n* Welcome to Twig!                                           *" <<
-    "\n*                                                            *" <<
-    "\n* Quick start:                                               *" <<
-    "\n*                                                            *" <<
-    "\n* 1. Run `twig init` to set up tab completion.               *" <<
-    "\n* 2. Run `twig` to list your Git branches.                   *" <<
-    "\n*                                                            *" <<
-    "\n* For more info, run `twig --help` or visit                  *" <<
-    "\n* #{sprintf('%-59s', Twig::HOMEPAGE)                        }*" <<
-    "\n*                                                            *" <<
-    "\n**************************************************************" <<
+    "\n*************************************************" \
+    "\n*                                               *" \
+    "\n* Welcome to Twig!                              *" \
+    "\n*                                               *" \
+    "\n* Quick start:                                  *" \
+    "\n*                                               *" \
+    "\n* 1. Run `twig init` to set up tab completion.  *" \
+    "\n* 2. Run `twig` to list your Git branches.      *" \
+    "\n*                                               *" \
+    "\n* For more info, run `twig help` or visit       *" \
+    "\n* #{sprintf('%-46s', Twig::HOMEPAGE)           }*" \
+    "\n*                                               *" \
+    "\n*************************************************" \
     "\n\n"
 
   spec.files         = `git ls-files`.split($/)
@@ -45,6 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     'json',        '~> 1.7.5'
   spec.add_runtime_dependency     'launchy',     '~> 2.3.0'
   spec.add_development_dependency 'rake',        '~> 0.9.2'
-  spec.add_development_dependency 'rspec',       '~> 2.14.1'
-  spec.add_development_dependency 'rspec-radar', '~> 0.1.0'
+  spec.add_development_dependency 'rspec',       '~> 3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twig
 version: !ruby/object:Gem::Version 
-  version: "1.6"
+  version: "1.7"
 platform: ruby
 authors: 
 - Ron DeVera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-04 00:00:00 Z
+date: 2014-07-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -48,19 +48,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.14.1
+        version: 3.0.0
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-radar
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
-  type: :development
-  version_requirements: *id005
 description: Twig is your personal Git branch assistant. It's a command-line tool for listing your most recent branches, and for remembering branch details for you, like issue tracker ids and todos. It supports subcommands, like automatically fetching statuses from your issue tracking system. It's flexible enough to fit your everyday Git workflow, and will save you a ton of time.
 email: 
 - hello@rondevera.com
@@ -77,6 +67,7 @@ executables:
 - twig-init
 - twig-init-completion
 - twig-init-completion-bash
+- twig-init-config
 - twig-rebase
 extensions: []
 
@@ -103,10 +94,13 @@ files:
 - bin/twig-init
 - bin/twig-init-completion
 - bin/twig-init-completion-bash
+- bin/twig-init-config
 - bin/twig-rebase
+- config/twigconfig
 - lib/twig.rb
 - lib/twig/branch.rb
 - lib/twig/cli.rb
+- lib/twig/cli/help.rb
 - lib/twig/commit_time.rb
 - lib/twig/display.rb
 - lib/twig/github.rb
@@ -118,6 +112,7 @@ files:
 - lib/twig/version.rb
 - spec/spec_helper.rb
 - spec/twig/branch_spec.rb
+- spec/twig/cli/help_spec.rb
 - spec/twig/cli_spec.rb
 - spec/twig/commit_time_spec.rb
 - spec/twig/display_spec.rb
@@ -135,19 +130,19 @@ metadata: {}
 
 post_install_message: |+
   
-  **************************************************************
-  *                                                            *
-  * Welcome to Twig!                                           *
-  *                                                            *
-  * Quick start:                                               *
-  *                                                            *
-  * 1. Run `twig init` to set up tab completion.               *
-  * 2. Run `twig` to list your Git branches.                   *
-  *                                                            *
-  * For more info, run `twig --help` or visit                  *
-  * http://rondevera.github.io/twig/                           *
-  *                                                            *
-  **************************************************************
+  *************************************************
+  *                                               *
+  * Welcome to Twig!                              *
+  *                                               *
+  * Quick start:                                  *
+  *                                               *
+  * 1. Run `twig init` to set up tab completion.  *
+  * 2. Run `twig` to list your Git branches.      *
+  *                                               *
+  * For more info, run `twig help` or visit       *
+  * http://rondevera.github.io/twig/              *
+  *                                               *
+  *************************************************
   
 rdoc_options: []
 
@@ -166,13 +161,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Your personal Git branch assistant.
 test_files: 
 - spec/spec_helper.rb
 - spec/twig/branch_spec.rb
+- spec/twig/cli/help_spec.rb
 - spec/twig/cli_spec.rb
 - spec/twig/commit_time_spec.rb
 - spec/twig/display_spec.rb