twig 1.3 → 1.4

data/spec/twig/cli_spec.rb

@@ -191,13 +191,13 @@ describe Twig::Cli do
       end
 
       it 'recognizes `--only-<property>` and sets a `:property_only` option' do
-        Twig::Branch.stub(:all_properties) { %w[foo] }
+        Twig::Branch.stub(:all_property_names) { %w[foo] }
         @twig.read_cli_options!(%w[--only-foo test])
         @twig.options[:property_only].should == { :foo => /test/ }
       end
 
       it 'recognizes `--only-branch` and `--only-<property>` together' do
-        Twig::Branch.stub(:all_properties) { %w[foo] }
+        Twig::Branch.stub(:all_property_names) { %w[foo] }
 
         @twig.read_cli_options!(%w[--only-branch test --only-foo bar])
 
@@ -209,7 +209,7 @@ describe Twig::Cli do
 
       it 'does not recognize `--only-<property>` for a missing property' do
         property_name = 'foo'
-        Twig::Branch.all_properties.should_not include(property_name) # Precondition
+        Twig::Branch.all_property_names.should_not include(property_name) # Precondition
         @twig.stub(:puts)
 
         begin
@@ -230,13 +230,13 @@ describe Twig::Cli do
       end
 
       it 'recognizes `--except-<property>` and sets a `:property_except` option' do
-        Twig::Branch.stub(:all_properties) { %w[foo] }
+        Twig::Branch.stub(:all_property_names) { %w[foo] }
         @twig.read_cli_options!(%w[--except-foo test])
         @twig.options[:property_except].should == { :foo => /test/ }
       end
 
       it 'recognizes `--except-branch` and `--except-<property>` together' do
-        Twig::Branch.stub(:all_properties) { %w[foo] }
+        Twig::Branch.stub(:all_property_names) { %w[foo] }
 
         @twig.read_cli_options!(%w[--except-branch test --except-foo bar])
 
@@ -248,7 +248,7 @@ describe Twig::Cli do
 
       it 'does not recognize `--except-<property>` for a missing property' do
         property_name = 'foo'
-        Twig::Branch.all_properties.should_not include(property_name) # Precondition
+        Twig::Branch.all_property_names.should_not include(property_name) # Precondition
         @twig.stub(:puts)
 
         begin
@@ -283,7 +283,7 @@ describe Twig::Cli do
     end
 
     it 'recognizes `--<property>-width`' do
-      Twig::Branch.stub(:all_properties) { %w[foo] }
+      Twig::Branch.stub(:all_property_names) { %w[foo] }
       @twig.options[:property_width].should be_nil
       @twig.should_receive(:set_option).with(:property_width, :foo => '10')
 
@@ -304,6 +304,24 @@ describe Twig::Cli do
       @twig.options[:reverse].should be_true
     end
 
+    it 'recognizes `--github-api-uri-prefix`' do
+      @twig.options[:github_api_uri_prefix].should be_nil
+      prefix = 'https://github-enterprise.example.com/api/v3'
+
+      @twig.read_cli_options!(['--github-api-uri-prefix', prefix])
+
+      @twig.options[:github_api_uri_prefix].should == prefix
+    end
+
+    it 'recognizes `--github-uri-prefix`' do
+      @twig.options[:github_uri_prefix].should be_nil
+      prefix = 'https://github-enterprise.example.com'
+
+      @twig.read_cli_options!(['--github-uri-prefix', prefix])
+
+      @twig.options[:github_uri_prefix].should == prefix
+    end
+
     it 'handles invalid options' do
       @twig.should_receive(:abort_for_option_exception) do |exception|
         exception.should be_a(OptionParser::InvalidOption)

data/spec/twig/display_spec.rb

@@ -74,7 +74,7 @@ describe Twig::Display do
 
   describe '#branch_list_headers' do
     before :each do
-      Twig::Branch.stub(:all_properties => %w[foo quux])
+      Twig::Branch.stub(:all_property_names => %w[foo quux])
     end
 
     it 'returns a string of branch properties and underlines' do
@@ -146,23 +146,28 @@ describe Twig::Display do
 
   describe '#branch_list_line' do
     before :each do
-      @current_branch_name = 'my-branch'
-      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).
-        with(anything, 'bar').and_return('bar!')
-      @twig.should_receive(:current_branch_name).
-        and_return(@current_branch_name)
-      @commit_time = Twig::CommitTime.new(Time.now, '')
-      @commit_time.should_receive(:to_s).and_return('2000-01-01')
+      @current_branch = Twig::Branch.new('my-branch')
+      @other_branch   = Twig::Branch.new('other-branch')
+      @twig.should_receive(:current_branch_name).and_return(@current_branch.name)
+      Twig::Branch.stub(:all_property_names => %w[foo bar])
+      @current_branch.stub(:get_properties => {
+        'foo' => 'foo!',
+        'bar' => 'bar!'
+      })
+      @other_branch.stub(:get_properties => {
+        'foo' => 'foo!',
+        'bar' => 'bar!'
+      })
+      commit_time = Twig::CommitTime.new(Time.now, '')
+      commit_time.should_receive(:to_s).and_return('2000-01-01')
+      @current_branch.stub(:last_commit_time => commit_time)
+      @other_branch.stub(:last_commit_time => commit_time)
     end
 
     it 'returns a line for the current branch' do
       indicator     = Twig::Display::CURRENT_BRANCH_INDICATOR
-      branch        = Twig::Branch.new('my-branch')
+      branch        = @current_branch
       branch_regexp = /#{Regexp.escape(indicator)}#{Regexp.escape(branch.name)}/
-      branch.should_receive(:last_commit_time).and_return(@commit_time)
 
       result = @twig.branch_list_line(branch)
 
@@ -170,20 +175,14 @@ describe Twig::Display do
     end
 
     it 'returns a line for a branch other than the current branch' do
-      branch = Twig::Branch.new('other-branch')
-      branch.should_receive(:last_commit_time).and_return(@commit_time)
-
+      branch = @other_branch
       result = @twig.branch_list_line(branch)
-
       result.should =~ /2000-01-01\s+foo!\s+bar!\s+#{Regexp.escape(branch.name)}/
     end
 
     it 'returns a line containing an empty branch property' do
-      Twig::Branch.stub(:all_properties => %w[foo bar baz])
-      @twig.should_receive(:get_branch_property).
-        with(anything, 'baz').and_return(nil)
-      branch = Twig::Branch.new('other-branch')
-      branch.should_receive(:last_commit_time).and_return(@commit_time)
+      Twig::Branch.should_receive(:all_property_names).and_return(%w[foo bar baz])
+      branch = @other_branch
 
       result = @twig.branch_list_line(branch)
 
@@ -192,11 +191,14 @@ describe Twig::Display do
     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!")
+      branch = @current_branch
+      property_names = %w[foo bar linebreaks]
+      branch.should_receive(:get_properties).with(property_names).and_return(
+        'foo' => 'foo!',
+        'bar' => 'bar!',
+        'linebreaks' => "line\r\nbreaks!"
+      )
+      Twig::Branch.should_receive(:all_property_names).and_return(property_names)
 
       result = @twig.branch_list_line(branch)
 
@@ -204,8 +206,7 @@ describe Twig::Display do
     end
 
     it 'returns a line with custom column widths' do
-      branch = Twig::Branch.new('other-branch')
-      branch.should_receive(:last_commit_time).and_return(@commit_time)
+      branch = @other_branch
       @twig.set_option(:property_width, :foo => 5)
 
       result = @twig.branch_list_line(branch)
@@ -225,9 +226,8 @@ describe Twig::Display do
 
       it 'returns a line for the current branch' do
         indicator     = Twig::Display::CURRENT_BRANCH_INDICATOR
-        branch        = Twig::Branch.new('my-branch')
+        branch        = @current_branch
         branch_regexp = /#{Regexp.escape(indicator)}#{Regexp.escape(branch.name)}/
-        branch.should_receive(:last_commit_time).and_return(@commit_time)
 
         result = @twig.branch_list_line(branch)
         unformatted_result = @twig.unformat_string(result)
@@ -241,8 +241,7 @@ describe Twig::Display do
       end
 
       it 'returns a line for a branch other than the current branch' do
-        branch = Twig::Branch.new('other-branch')
-        branch.should_receive(:last_commit_time).and_return(@commit_time)
+        branch = @other_branch
 
         result = @twig.branch_list_line(branch)
 

data/spec/twig/options_spec.rb

@@ -7,15 +7,15 @@ describe Twig::Options do
 
   describe '#read_config_file!' do
     before :each do
-      File.should_receive(:expand_path).with(Twig::CONFIG_FILE).
-        and_return(Twig::CONFIG_FILE)
+      File.should_receive(:expand_path).with(Twig::CONFIG_PATH).
+        and_return(Twig::CONFIG_PATH)
     end
 
     it 'reads and sets a single option' do
       @twig.stub(:all_branch_names => ['test'])
       file = double('file')
-      File.should_receive(:readable?).with(Twig::CONFIG_FILE).and_return(true)
-      File.should_receive(:open).with(Twig::CONFIG_FILE).and_yield(file)
+      File.should_receive(:readable?).with(Twig::CONFIG_PATH).and_return(true)
+      File.should_receive(:open).with(Twig::CONFIG_PATH).and_yield(file)
       file.should_receive(:read).and_return('branch: test')
       @twig.options[:branch].should be_nil # Precondition
 
@@ -24,11 +24,32 @@ describe Twig::Options do
       @twig.options[:branch].should == 'test'
     end
 
+    it 'reads an option if only the deprecated config file exists' do
+      @twig.stub(:all_branch_names => ['test'])
+      file = double('file')
+      path = Twig::CONFIG_PATH
+      deprecated_path = Twig::DEPRECATED_CONFIG_PATH
+      File.should_receive(:readable?).with(path).and_return(false)
+      File.should_receive(:readable?).with(deprecated_path).and_return(true)
+      File.should_receive(:expand_path).with(deprecated_path).
+        and_return(deprecated_path)
+      File.should_receive(:open).with(deprecated_path).and_yield(file)
+      file.should_receive(:read).and_return('branch: test')
+      $stderr.should_receive(:puts) do |message|
+        message.should =~ /^DEPRECATED:/
+      end
+      @twig.options[:branch].should be_nil
+
+      @twig.read_config_file!
+
+      @twig.options[:branch].should == 'test'
+    end
+
     it 'reads and sets multiple options' do
       @twig.stub(:all_branch_names => ['test'])
       file = double('file')
-      File.should_receive(:readable?).with(Twig::CONFIG_FILE).and_return(true)
-      File.should_receive(:open).with(Twig::CONFIG_FILE).and_yield(file)
+      File.should_receive(:readable?).with(Twig::CONFIG_PATH).and_return(true)
+      File.should_receive(:open).with(Twig::CONFIG_PATH).and_yield(file)
       file.should_receive(:read).and_return([
         # Filtering branches:
         'branch:        test',
@@ -41,11 +62,17 @@ describe Twig::Options do
         # Displaying branches:
         'header-style:  green bold',
         'reverse:       true',
-        'foo-width:     4'
+        'foo-width:     4',
+
+        # GitHub integration:
+        'github-api-uri-prefix: https://github-enterprise.example.com/api/v3',
+        'github-uri-prefix:     https://github-enterprise.example.com'
       ].join("\n"))
 
       # Check preconditions
       @twig.options[:branch].should be_nil
+      @twig.options[:github_api_uri_prefix].should be_nil
+      @twig.options[:github_uri_prefix].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
@@ -57,6 +84,10 @@ describe Twig::Options do
       @twig.read_config_file!
 
       @twig.options[:branch].should == 'test'
+      @twig.options[:github_api_uri_prefix].
+        should == 'https://github-enterprise.example.com/api/v3'
+      @twig.options[:github_uri_prefix].
+        should == 'https://github-enterprise.example.com'
       @twig.options[:header_color].should == :green
       @twig.options[:header_weight].should == :bold
       @twig.options[:max_days_old].should == 30.5
@@ -74,8 +105,8 @@ describe Twig::Options do
 
     it 'skips comments' do
       file = double('file')
-      File.should_receive(:readable?).with(Twig::CONFIG_FILE).and_return(true)
-      File.should_receive(:open).with(Twig::CONFIG_FILE).and_yield(file)
+      File.should_receive(:readable?).with(Twig::CONFIG_PATH).and_return(true)
+      File.should_receive(:open).with(Twig::CONFIG_PATH).and_yield(file)
       file.should_receive(:read).and_return([
         '# max-days-old: 40',
         'max-days-old: 30',
@@ -91,8 +122,8 @@ describe Twig::Options do
 
     it 'skips line breaks' do
       file = double('file')
-      File.should_receive(:readable?).with(Twig::CONFIG_FILE).and_return(true)
-      File.should_receive(:open).with(Twig::CONFIG_FILE).and_yield(file)
+      File.should_receive(:readable?).with(Twig::CONFIG_PATH).and_return(true)
+      File.should_receive(:open).with(Twig::CONFIG_PATH).and_yield(file)
       file.should_receive(:read).and_return([
         'except-branch: test-except',
         '',
@@ -110,7 +141,12 @@ describe Twig::Options do
     end
 
     it 'fails gracefully if the config file is not readable' do
-      File.should_receive(:readable?).with(Twig::CONFIG_FILE).and_return(false)
+      path = Twig::CONFIG_PATH
+      deprecated_path = Twig::DEPRECATED_CONFIG_PATH
+      File.should_receive(:readable?).with(path).and_return(false)
+      File.should_receive(:readable?).with(deprecated_path).and_return(false)
+      File.should_receive(:expand_path).with(deprecated_path).
+        and_return(deprecated_path)
       lambda { @twig.read_config_file! }.should_not raise_exception
     end
   end
@@ -143,6 +179,18 @@ describe Twig::Options do
       end
     end
 
+    it 'sets a :github_api_uri_prefix option' do
+      prefix = 'https://github-enterprise.example.com/api/v3'
+      @twig.set_option(:github_api_uri_prefix, prefix)
+      @twig.options[:github_api_uri_prefix].should == prefix
+    end
+
+    it 'sets a :github_uri_prefix option' do
+      prefix = 'https://github-enterprise.example.com'
+      @twig.set_option(:github_uri_prefix, prefix)
+      @twig.options[:github_uri_prefix].should == prefix
+    end
+
     it 'sets a :header_style option' do
       style = 'red bold'
       @twig.should_receive(:set_header_style_option).with(style)

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: twig
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  version: "1.3"
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - Ron DeVera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-22 00:00:00 -07:00
+date: 2013-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,12 +86,14 @@ email:
 - hello@rondevera.com
 executables: 
 - twig
+- twig-diff
 - twig-gh-open
 - twig-gh-open-issue
 - twig-gh-update
 - twig-help
 - twig-init-completion
 - twig-init-completion-bash
+- twig-rebase
 extensions: []
 
 extra_rdoc_files: []
@@ -106,12 +108,14 @@ files:
 - README.md
 - Rakefile
 - bin/twig
+- bin/twig-diff
 - bin/twig-gh-open
 - bin/twig-gh-open-issue
 - bin/twig-gh-update
 - bin/twig-help
 - bin/twig-init-completion
 - bin/twig-init-completion-bash
+- bin/twig-rebase
 - lib/twig.rb
 - lib/twig/branch.rb
 - lib/twig/cli.rb