twig 1.1 → 1.2

data/spec/twig/display_spec.rb

@@ -172,30 +172,34 @@ describe Twig::Display do
     end
   end
 
-  describe '#formatted_string_display_size' do
-    it 'returns the width of a plain text string' do
-      @twig.formatted_string_display_size('foo').should == 3
+  describe '#unformat_string' do
+    it 'unformats a plain text string' do
+      string = 'foo'
+      @twig.unformat_string(string).should == string
     end
 
-    it 'returns the width of a string with color' do
-      string = @twig.format_string('foo', :color => :red)
-      string.size.should > 3 # Precondition
+    it 'unformats a string with color' do
+      string = 'foo'
+      formatted_string = @twig.format_string(string, :color => :red)
+      formatted_string.size.should > 3 # Precondition
 
-      @twig.formatted_string_display_size(string).should == 3
+      @twig.unformat_string(formatted_string).should == string
     end
 
-    it 'returns the width of a string with weight' do
-      string = @twig.format_string('foo', :weight => :bold)
-      string.size.should > 3 # Precondition
+    it 'unformats a string with weight' do
+      string = 'foo'
+      formatted_string = @twig.format_string(string, :weight => :bold)
+      formatted_string.size.should > 3 # Precondition
 
-      @twig.formatted_string_display_size(string).should == 3
+      @twig.unformat_string(formatted_string).should == string
     end
 
-    it 'returns the width of a string with color and weight' do
-      string = @twig.format_string('foo', :color => :red, :weight => :bold)
-      string.size.should > 3 # Precondition
+    it 'unformats a string with color and weight' do
+      string = 'foo'
+      formatted_string = @twig.format_string(string, :color => :red, :weight => :bold)
+      formatted_string.size.should > 3 # Precondition
 
-      @twig.formatted_string_display_size(string).should == 3
+      @twig.unformat_string(formatted_string).should == string
     end
   end
 end

data/spec/twig/options_spec.rb

@@ -31,28 +31,36 @@ describe Twig::Options do
       File.should_receive(:open).with(Twig::CONFIG_FILE).and_yield(file)
       file.should_receive(:read).and_return([
         'branch:        test',
-        'except-branch: test-except',
-        'only-branch:   test-only',
+        'header-style:  green bold',
         'max-days-old:  30.5',
-        'header-style:  green bold'
+        'except-branch: test-except-branch',
+        'only-branch:   test-only-branch',
+        'except-foo:    test-except-foo',
+        'only-foo:      test-only-foo'
       ].join("\n"))
 
       # Check preconditions
       @twig.options[:branch].should be_nil
-      @twig.options[:branch_except].should be_nil
-      @twig.options[:branch_only].should be_nil
-      @twig.options[:max_days_old].should be_nil
       @twig.options[:header_color].should == Twig::DEFAULT_HEADER_COLOR
       @twig.options[:header_weight].should be_nil
+      @twig.options[:max_days_old].should be_nil
+      @twig.options[:property_except].should be_nil
+      @twig.options[:property_only].should be_nil
 
       @twig.read_config_file!
 
       @twig.options[:branch].should == 'test'
-      @twig.options[:branch_except].should == /test-except/
-      @twig.options[:branch_only].should == /test-only/
-      @twig.options[:max_days_old].should == 30.5
       @twig.options[:header_color].should == :green
       @twig.options[:header_weight].should == :bold
+      @twig.options[:max_days_old].should == 30.5
+      @twig.options[:property_except].should == {
+        :branch => /test-except-branch/,
+        :foo    => /test-except-foo/
+      }
+      @twig.options[:property_only].should == {
+        :branch => /test-only-branch/,
+        :foo    => /test-only-foo/
+      }
     end
 
     it 'skips comments' do
@@ -82,13 +90,13 @@ describe Twig::Options do
       ].join("\n"))
 
       # Check preconditions
-      @twig.options[:branch_except].should be_nil
-      @twig.options[:branch_only].should be_nil
+      @twig.options[:property_except].should be_nil
+      @twig.options[:property_only].should be_nil
 
       @twig.read_config_file!
 
-      @twig.options[:branch_except].should == /test-except/
-      @twig.options[:branch_only].should == /test-only/
+      @twig.options[:property_except].should == { :branch => /test-except/ }
+      @twig.options[:property_only].should == { :branch => /test-only/ }
     end
 
     it 'fails gracefully if the config file is not readable' do
@@ -125,18 +133,6 @@ describe Twig::Options do
       end
     end
 
-    it 'sets a :branch_except option' do
-      @twig.options[:branch_except].should be_nil # Precondition
-      @twig.set_option(:branch_except, 'unwanted_prefix_')
-      @twig.options[:branch_except].should == /unwanted_prefix_/
-    end
-
-    it 'sets a :branch_only option' do
-      @twig.options[:branch_only].should be_nil # Precondition
-      @twig.set_option(:branch_only, 'important_prefix_')
-      @twig.options[:branch_only].should == /important_prefix_/
-    end
-
     it 'sets a :header_style option' do
       style = 'red bold'
       @twig.should_receive(:set_header_style_option).with(style)
@@ -165,6 +161,18 @@ describe Twig::Options do
       end
     end
 
+    it 'sets a :property_except option' do
+      @twig.options[:property_except].should be_nil # Precondition
+      @twig.set_option(:property_except, :branch => 'unwanted_prefix_')
+      @twig.options[:property_except].should == { :branch => /unwanted_prefix_/ }
+    end
+
+    it 'sets a :property_only option' do
+      @twig.options[:property_only].should be_nil # Precondition
+      @twig.set_option(:property_only, :branch => 'important_prefix_')
+      @twig.options[:property_only].should == { :branch => /important_prefix_/ }
+    end
+
     it 'sets an :unset_property option' do
       @twig.options[:unset_property].should be_nil # Precondition
       @twig.set_option(:unset_property, 'unwanted_property')

data/spec/twig_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tmpdir'
 
 describe Twig do
   describe '#initialize' do
@@ -72,16 +73,19 @@ describe Twig do
         fix_some_of_the_things
         fix_some_other_of_the_things
         fix_nothing
+        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 * 30, '30 days ago'),
+        Twig::CommitTime.new(Time.now - 86400 * 40, '40 days ago')
       ]
       @branches = [
         Twig::Branch.new(branch_names[0], :last_commit_time => commit_times[0]),
         Twig::Branch.new(branch_names[1], :last_commit_time => commit_times[1]),
-        Twig::Branch.new(branch_names[2], :last_commit_time => commit_times[2])
+        Twig::Branch.new(branch_names[2], :last_commit_time => commit_times[2]),
+        Twig::Branch.new(branch_names[3], :last_commit_time => commit_times[3])
       ]
       @twig.stub(:all_branches => @branches)
     end
@@ -90,22 +94,44 @@ describe Twig do
       @twig.branches.should == @branches
     end
 
-    it 'returns only branches matching a name pattern' do
-      @twig.set_option(:branch_only, /fix_some/)
+    it 'returns only branches below a certain age' do
+      @twig.set_option(:max_days_old, 25)
       @twig.branches.map { |branch| branch.name }.
         should == [@branches[0].name, @branches[1].name]
     end
 
     it 'returns all branches except those matching a name pattern' do
-      @twig.set_option(:branch_except, /fix_some/)
-      @twig.branches.map { |branch| branch.name }.should == [@branches[2].name]
+      @twig.set_option(:property_except, :branch => /fix_some/)
+      @twig.branches.map { |branch| branch.name }.
+        should == [@branches[2].name, @branches[3].name]
     end
 
-    it 'returns only branches below a certain age' do
-      @twig.set_option(:max_days_old, 25)
+    it 'returns only branches matching a name pattern' do
+      @twig.set_option(:property_only, :branch => /fix_some/)
       @twig.branches.map { |branch| branch.name }.
         should == [@branches[0].name, @branches[1].name]
     end
+
+    context 'with property filtering' do
+      before :each do
+        @branches[0].stub(:get_property).with('foo') { 'bar1' }
+        @branches[1].stub(:get_property).with('foo') { 'bar2' }
+        @branches[2].stub(:get_property).with('foo') { 'baz' }
+        @branches[3].stub(:get_property).with('foo') { nil }
+      end
+
+      it 'returns all branches except those matching a property pattern' do
+        @twig.set_option(:property_except, :foo => /bar/)
+        @twig.branches.map { |branch| branch.name }.
+          should == [@branches[2].name, @branches[3].name]
+      end
+
+      it 'returns only branches matching a property pattern' do
+        @twig.set_option(:property_only, :foo => /bar/)
+        @twig.branches.map { |branch| branch.name }.
+          should == [@branches[0].name, @branches[1].name]
+      end
+    end
   end
 
   describe '#branch_names' do
@@ -211,4 +237,25 @@ describe Twig do
     end
   end
 
+  describe '#repo?' do
+    it 'is true when the working directory is a git repository' do
+      Dir.chdir(File.dirname(__FILE__)) do
+        Twig.new.should be_repo
+      end
+    end
+
+    it 'is false when the working directory is not a git repository' do
+      Dir.mktmpdir do |tmpdir|
+        Dir.chdir(tmpdir) do
+          Twig.new.should_not be_repo
+        end
+      end
+    end
+
+    it 'captures stderr' do
+      Twig.should_receive(:run).with(/2>&1/)
+      twig = Twig.new
+      twig.repo?
+    end
+  end
 end

data/twig.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.8.7'
   spec.add_runtime_dependency     'json',  '~> 1.7.5'
   spec.add_development_dependency 'rake',  '~> 0.9.2'
-  spec.add_development_dependency 'rspec', '~> 2.11.0'
+  spec.add_development_dependency 'rspec', '~> 2.13.0'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: twig
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 1
-  version: "1.1"
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Ron DeVera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-06 00:00:00 -08:00
+date: 2013-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 59
         segments: 
         - 2
-        - 11
+        - 13
         - 0
-        version: 2.11.0
+        version: 2.13.0
   type: :development
   version_requirements: *id003
 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.
@@ -101,6 +101,7 @@ files:
 - lib/twig/cli.rb
 - lib/twig/commit_time.rb
 - lib/twig/display.rb
+- lib/twig/github.rb
 - lib/twig/options.rb
 - lib/twig/util.rb
 - lib/twig/version.rb