twig 1.0.0 → 1.0.1

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
+.rvmrc
 Gemfile.lock
 _site/

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7

data/CONTRIBUTING.md

@@ -13,7 +13,9 @@ If you want to hack on some code, even better! Here are the basics:
     for stable builds only.
 3.  Run the tests to make sure that they pass on your machine: `bundle && rake`
 4.  Add one or more failing tests for your feature or bug fix.
-5.  Write your feature or bug fix to make the test(s) pass.
+5.  Write your feature or bug fix to make the test(s) pass. Tests should pass in
+    the latest **Ruby 1.8.7** and **Ruby 1.9.3**, which you can do with
+    [rvm][rvm] or [rbenv][rbenv].
 6.  Test the change manually:
     1.  `gem build twig.gemspec`
     2.  `gem install twig-x.y.z.gem` (fill in the current version number)
@@ -24,3 +26,5 @@ Thanks for contributing!
 [issues]:     https://github.com/rondevera/twig/issues
 [twitter]:    https://twitter.com/ronalddevera
 [dev branch]: https://github.com/rondevera/twig/commits/development
+[rvm]:        https://rvm.io/
+[rbenv]:      http://rbenv.org/

data/HISTORY.md

@@ -1,6 +1,20 @@
 Twig
 ====
 
-1.0
----
+1.0.1 (2013-02-13)
+------------------
+* ENHANCEMENT: Add Travis CI integration for running tests in multiple versions
+  of Ruby.
+* FIX: Gracefully handle Git config settings where the value is missing.
+  (GH-1. Thanks [chrismanderson](https://github.com/chrismanderson)!)
+* FIX: Fix failing test in Ruby 1.9.3.
+  (GH-7. Thanks [joelmoss](https://github.com/joelmoss)!)
+* FIX: Suppress `which` errors.
+  (GH-9. Thanks [badboy](https://github.com/badboy)!)
+* FIX: Exit with a non-zero status when trying to get a branch property that
+  doesn't exist.
+* FIX: In list view, render line breaks (in properties) as spaces.
+
+1.0 (2013-02-05)
+----------------
 * Initial release.

data/README.md

@@ -212,16 +212,16 @@ it to the [Twig wiki][wiki]!
 More info
 =========
 
-- **Requirements:** Tested with Git 1.6.5 and Ruby 1.8.7. Probably works with
-  older software, but it's not guaranteed.
-- **Contributing:** Found a bug or have a suggestion? [Please open an
+* **Requirements:** Tested with Git 1.6.5 and Ruby 1.8.7/1.9.2/1.9.3. Probably
+  works with older software, but it's not guaranteed.
+* **Contributing:** Found a bug or have a suggestion? [Please open an
   issue][issues] or ping [@ronalddevera on Twitter][twitter]. If you want to
   hack on some features or contribute a subcommand you've written, feel free to
   fork and send a pull request for the **[development branch][dev branch]**.
   (The master branch is for stable builds only.) See the full details in the
   [Contributing][contributing] instructions.
-- **History:** [History/changelog for Twig][history]
-- **License:** Twig is released under the [MIT License][license].
+* **History:** [History/changelog for Twig][history]
+* **License:** Twig is released under the [MIT License][license].
 
 [issues]:         https://github.com/rondevera/twig/issues
 [wiki]:           https://github.com/rondevera/twig/wiki

data/bin/twig-gh-update

@@ -70,7 +70,7 @@ TwigGithubRepo.new do |gh_repo|
           issues[issue_data['number']] = issue_data
         end
       else
-        puts "\nERROR: Couldn't get open issues from GitHub. " <<
+        abort "\nERROR: Couldn't get open issues from GitHub. " <<
           "(Response: #{response.code})"
       end
     end

data/lib/twig/branch.rb

@@ -12,7 +12,9 @@ class Twig
 
         properties = config_lines.map do |line|
           # Split by rightmost `=`, allowing branch names to contain `=`:
-          key, value = line.match(/(.+)=(.+)/)[1..2]
+          key = value = nil
+          line.match(/(.+)=(.+)/).tap { |m| key, value = m[1..2] if m }
+          next if key.nil?
 
           key_parts = key.split('.')
           key_parts.last if key_parts[0] == 'branch' && key_parts.size > 2

data/lib/twig/cli.rb

@@ -134,7 +134,7 @@ class Twig
       if args.any?
         # Run subcommand binary, if any, and exit here
         possible_subcommand_name = args[0]
-        command_path = Twig.run("which twig-#{possible_subcommand_name}")
+        command_path = Twig.run("which twig-#{possible_subcommand_name} 2>/dev/null")
         unless command_path.empty?
           command = ([command_path] + args[1..-1]).join(' ')
           exec(command)
@@ -161,7 +161,7 @@ class Twig
           if value && !value.empty?
             puts value
           else
-            puts %{The branch "#{branch_name}" does not have the property "#{property_name}".}
+            abort %{The branch "#{branch_name}" does not have the property "#{property_name}".}
           end
         end
       elsif property_to_unset

data/lib/twig/display.rb

@@ -77,6 +77,7 @@ class Twig
       properties = Twig::Branch.all_properties.inject({}) do |result, property_name|
         property = get_branch_property(branch.name, property_name).strip
         property = column(EMPTY_BRANCH_PROPERTY_INDICATOR) if property.empty?
+        property.gsub!(/[\n\r]+/, ' ')
         result.merge(property_name => property)
       end
 

data/lib/twig/version.rb

@@ -1,3 +1,3 @@
 class Twig
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/twig/branch_spec.rb

@@ -49,6 +49,13 @@ describe Twig::Branch do
       result.should == %w[eqproperty test0 test1 test2]
     end
 
+    it 'skips path values with an equal sign but no value' do
+      @config << 'foo_path='
+      Twig.should_receive(:run).with('git config --list').and_return(@config)
+      result = Twig::Branch.all_properties
+      result.should_not include 'foo_path'
+    end
+
     it 'memoizes the result' do
       Twig.should_receive(:run).once.and_return(@config)
       2.times { Twig::Branch.all_properties }

data/spec/twig/cli_spec.rb

@@ -146,22 +146,34 @@ describe Twig::Cli do
     context 'running a subcommand' do
       before :each do
         Twig.stub(:run)
-        @twig.stub(:current_branch_name => 'test')
-        @twig.stub(:puts)
+        @branch_name = 'test'
+        @twig.stub(:current_branch_name => @branch_name)
       end
 
       it 'recognizes a subcommand' do
         command_path = '/path/to/bin/twig-subcommand'
-        Twig.should_receive(:run).with('which twig-subcommand').
+        Twig.should_receive(:run).with('which twig-subcommand 2>/dev/null').
           and_return(command_path)
-        @twig.should_receive(:exec).with(command_path)
+        @twig.should_receive(:exec).with(command_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.
+        expected_exception = nil
+        begin
+          @twig.read_cli_args!(['subcommand'])
+        rescue SystemExit => exception
+          expected_exception = exception
+        end
 
-        @twig.read_cli_args!(['subcommand'])
+        expected_exception.should_not be_nil
+        expected_exception.status.should == 0
       end
 
       it 'does not recognize a subcommand' do
-        Twig.should_receive(:run).with('which twig-subcommand').and_return('')
+        Twig.should_receive(:run).with('which twig-subcommand 2>/dev/null').and_return('')
         @twig.should_not_receive(:exec)
+        @twig.stub(:abort)
 
         @twig.read_cli_args!(['subcommand'])
       end
@@ -190,8 +202,8 @@ describe Twig::Cli do
         it 'shows an error if getting a property that is not set' do
           @twig.should_receive(:get_branch_property).
             with(@branch_name, @property_name).and_return('')
-          @twig.should_receive(:puts) do |error|
-            error.should include(
+          @twig.should_receive(:abort) do |message|
+            message.should include(
               %{The branch "#{@branch_name}" does not have the property "#{@property_name}"}
             )
           end
@@ -217,8 +229,8 @@ describe Twig::Cli do
         it 'shows an error if getting a property that is not set' do
           @twig.should_receive(:get_branch_property).
             with(@branch_name, @property_name).and_return('')
-          @twig.should_receive(:puts) do |error|
-            error.should include(
+          @twig.should_receive(:abort) do |message|
+            message.should include(
               %{The branch "#{@branch_name}" does not have the property "#{@property_name}"}
             )
           end

data/spec/twig/display_spec.rb

@@ -59,7 +59,7 @@ describe Twig::Display do
   describe '#branch_list_line' do
     before :each do
       @current_branch_name = 'my-branch'
-      Twig::Branch.stub(:all_properties => ['foo', 'bar'])
+      Twig::Branch.stub(:all_properties => %w[foo bar])
       @twig.should_receive(:get_branch_property).
         with(anything, 'foo').and_return('foo!')
       @twig.should_receive(:get_branch_property).
@@ -89,6 +89,18 @@ describe Twig::Display do
 
       result.should =~ /2000-01-01\s+foo!\s+bar!\s+#{Regexp.escape(branch.name)}/
     end
+
+    it 'changes line break characters to spaces' do
+      branch = Twig::Branch.new('my-branch')
+      branch.should_receive(:last_commit_time).and_return(@commit_time)
+      Twig::Branch.stub(:all_properties => %w[foo bar linebreaks])
+      @twig.should_receive(:get_branch_property).
+        with(anything, 'linebreaks').and_return("line\r\nbreaks!")
+
+      result = @twig.branch_list_line(branch)
+
+      result.should include('line breaks')
+    end
   end
 
   describe '#format_string' do

data/spec/twig_spec.rb

@@ -158,7 +158,7 @@ describe Twig do
     end
 
     it 'returns a message if all branches were filtered out by options' do
-      @twig.stub(:all_branches => %[foo bar])
+      @twig.stub(:all_branches => %w[foo bar])
       @twig.stub(:branches => [])
 
       @twig.list_branches.should include(

data/twig.gemspec

@@ -6,15 +6,15 @@ require 'twig/version'
 Gem::Specification.new do |spec|
   spec.name          = 'twig'
   spec.version       = Twig::VERSION
-  spec.date          = '2012-12-13'
   spec.authors       = ['Ron DeVera']
   spec.email         = ["hello@rondevera.com"]
-  spec.homepage      = 'https://github.com/rondevera/twig'
-  spec.summary       = %{Track progress on your Git branches.}
+  spec.homepage      = 'http://rondevera.github.com/twig'
+  spec.summary       = %{Your personal Git branch assistant.}
   spec.description   =
-    'Twig is a command-line tool for tracking progress on your Git ' <<
-    'branches, remembering ticket ids for each branch, and more. Twig ' <<
-    'supports subcommands for managing branches however you want.'
+    'Twig is your personal Git branch assistant. It\'s a command-line tool ' <<
+    'for tracking progress on your branches, remembering ticket ids for ' <<
+    'each branch, and more. Twig supports subcommands for managing branches ' <<
+    'however you want.'
   spec.post_install_message =
     "\n**************************************************************" <<
     "\n*                                                            *" <<

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twig
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ron DeVera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-13 00:00:00 -08:00
+date: 2013-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,7 @@ dependencies:
         version: 2.11.0
   type: :development
   version_requirements: *id003
-description: Twig is a command-line tool for tracking progress on your Git branches, remembering ticket ids for each branch, and more. Twig supports subcommands for managing branches however you want.
+description: Twig is your personal Git branch assistant. It's a command-line tool for tracking progress on your branches, remembering ticket ids for each branch, and more. Twig supports subcommands for managing branches however you want.
 email: 
 - hello@rondevera.com
 executables: 
@@ -80,7 +80,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .rvmrc
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - HISTORY.md
@@ -91,7 +91,6 @@ files:
 - bin/twig-gh-open
 - bin/twig-gh-update
 - bin/twig-help
-- install
 - lib/twig.rb
 - lib/twig/branch.rb
 - lib/twig/cli.rb
@@ -110,7 +109,7 @@ files:
 - spec/twig_spec.rb
 - twig.gemspec
 has_rdoc: true
-homepage: https://github.com/rondevera/twig
+homepage: http://rondevera.github.com/twig
 licenses: []
 
 post_install_message: |+
@@ -154,7 +153,7 @@ rubyforge_project:
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Track progress on your Git branches.
+summary: Your personal Git branch assistant.
 test_files: 
 - spec/spec_helper.rb
 - spec/twig/branch_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.8.7-p358@twig --create

data/install

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-twig_bin_path = File.expand_path(File.dirname(__FILE__)) + '/bin/**/twig*'
-twig_bins = Dir.glob(twig_bin_path)
-user_bin_path = '~/bin'
-
-twig_bins.each do |bin|
-  `ln -fs #{bin} #{user_bin_path}`
-end
-
-if `which twig` && $?.success?
-  puts 'All set! Run `twig` to list your local branches.'
-  puts 'For more info, run `twig --help`.'
-else
-  puts 'Argh! Something went wrong. Please try symlinking the files in '
-  puts '`./bin/` to `~/bin/` and ensure that `~/bin/` is in your `$PATH`, or '
-  puts 'contact rondevera on GitHub.'
-end