twig 1.0.1 → 1.1

data/spec/twig/options_spec.rb

@@ -16,9 +16,7 @@ describe Twig::Options 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(:read).and_return(%{
-        branch: test
-      }.gsub(/^\s+/, ''))
+      file.should_receive(:read).and_return('branch: test')
       @twig.options[:branch].should be_nil # Precondition
 
       @twig.read_config_file!
@@ -31,16 +29,21 @@ describe Twig::Options 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(:read).and_return(%{
-        branch:        test
-        except-branch: test-except
-        only-branch:   test-only
-        max-days-old:  30.5
-      }.gsub(/^\s+/, ''))
-      @twig.options[:branch].should be_nil # Precondition
-      @twig.options[:branch_except].should be_nil # Precondition
-      @twig.options[:branch_only].should be_nil # Precondition
-      @twig.options[:max_days_old].should be_nil # Precondition
+      file.should_receive(:read).and_return([
+        'branch:        test',
+        'except-branch: test-except',
+        'only-branch:   test-only',
+        'max-days-old:  30.5',
+        'header-style:  green bold'
+      ].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.read_config_file!
 
@@ -48,6 +51,44 @@ describe Twig::Options do
       @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
+    end
+
+    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(:read).and_return([
+        '# max-days-old: 40',
+        'max-days-old: 30',
+        '# max-days-old: 20'
+      ].join("\n"))
+      @twig.options[:max_days_old].should be_nil # Precondition
+
+      @twig.read_config_file!
+
+      @twig.options[:max_days_old].should == 30
+    end
+
+    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(:read).and_return([
+        'except-branch: test-except',
+        '',
+        'only-branch:   test-only'
+      ].join("\n"))
+
+      # Check preconditions
+      @twig.options[:branch_except].should be_nil
+      @twig.options[:branch_only].should be_nil
+
+      @twig.read_config_file!
+
+      @twig.options[:branch_except].should == /test-except/
+      @twig.options[:branch_only].should == /test-only/
     end
 
     it 'fails gracefully if the config file is not readable' do
@@ -63,16 +104,22 @@ describe Twig::Options do
       end
 
       it 'succeeds' do
+        branch_name = 'foo'
         @twig.should_receive(:branch_names).and_return(%[foo bar])
-        @twig.set_option(:branch, 'foo')
-        @twig.options[:branch].should == 'foo'
+
+        @twig.set_option(:branch, branch_name)
+
+        @twig.options[:branch].should == branch_name
       end
 
       it 'fails if the branch is unknown' do
+        branch_name = 'foo'
         @twig.should_receive(:branch_names).and_return([])
-        @twig.should_receive(:abort)
+        @twig.should_receive(:abort) do |message|
+          message.should include(%{branch "#{branch_name}" could not be found})
+        end
 
-        @twig.set_option(:branch, 'foo')
+        @twig.set_option(:branch, branch_name)
 
         @twig.options[:branch].should be_nil
       end
@@ -90,6 +137,13 @@ describe Twig::Options do
       @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)
+
+      @twig.set_option(:header_style, style)
+    end
+
     context 'when setting a :max_days_old option' do
       before :each do
         @twig.options[:max_days_old].should be_nil # Precondition
@@ -101,8 +155,12 @@ describe Twig::Options do
       end
 
       it 'fails if the option is not numeric' do
-        @twig.should_receive(:abort)
-        @twig.set_option(:max_days_old, 'blargh')
+        value = 'blargh'
+        @twig.should_receive(:abort) do |message|
+          message.should include("`--max-days-old=#{value}` is invalid")
+        end
+        @twig.set_option(:max_days_old, value)
+
         @twig.options[:max_days_old].should be_nil
       end
     end
@@ -114,6 +172,91 @@ describe Twig::Options do
     end
   end
 
+  describe '#set_header_style_option' do
+    before :each do
+      # Preconditions:
+      @twig.options[:header_color].should == Twig::DEFAULT_HEADER_COLOR
+      @twig.options[:header_weight].should be_nil
+    end
+
+    it 'succeeds at setting a color option' do
+      @twig.set_header_style_option('red')
+      @twig.options[:header_color].should == :red
+      @twig.options[:header_weight].should be_nil
+    end
+
+    it 'succeeds at setting a weight option' do
+      @twig.set_header_style_option('bold')
+      @twig.options[:header_color].should == Twig::DEFAULT_HEADER_COLOR
+      @twig.options[:header_weight].should == :bold
+    end
+
+    it 'succeeds at setting color and weight options, color first' do
+      @twig.set_header_style_option('red bold')
+      @twig.options[:header_color].should == :red
+      @twig.options[:header_weight].should == :bold
+    end
+
+    it 'succeeds at setting color and weight options, weight first' do
+      @twig.set_header_style_option('bold red')
+      @twig.options[:header_color].should == :red
+      @twig.options[:header_weight].should == :bold
+    end
+
+    it 'succeeds at setting color and weight options with extra space between words' do
+      @twig.set_header_style_option('red   bold')
+      @twig.options[:header_color].should == :red
+      @twig.options[:header_weight].should == :bold
+    end
+
+    it 'fails if the one-word option is invalid' do
+      style = 'handsofblue' # Two by two...
+      @twig.should_receive(:abort) do |message|
+        message.should include("`--header-style=#{style}` is invalid")
+      end
+      @twig.set_header_style_option(style)
+
+      @twig.options[:header_color].should == Twig::DEFAULT_HEADER_COLOR
+      @twig.options[:header_weight].should be_nil
+    end
+
+    it 'fails if the color of the two-word option is invalid' do
+      style = 'handsofblue bold'
+      @twig.should_receive(:abort) do |message|
+        message.should include("`--header-style=#{style}` is invalid")
+      end
+
+      @twig.set_header_style_option(style)
+    end
+
+    it 'fails if the weight of the two-word option is invalid' do
+      style = 'red extrabold'
+      @twig.should_receive(:abort) do |message|
+        message.should include("`--header-style=#{style}` is invalid")
+      end
+
+      @twig.set_header_style_option(style)
+    end
+
+    it 'fails if there are two colors' do
+      style = 'red green'
+      @twig.should_receive(:abort) do |message|
+        message.should include("`--header-style=#{style}` is invalid")
+      end
+
+      @twig.set_header_style_option(style)
+    end
+
+    it 'fails if there are two weights' do
+      style = 'bold bold'
+      @twig.should_receive(:abort) do |message|
+        message.should include("`--header-style=#{style}` is invalid")
+      end
+
+      @twig.set_header_style_option(style)
+    end
+  end
+
   describe '#unset_option' do
     it 'unsets an option' do
       @twig.set_option(:max_days_old, 1)

data/spec/twig_spec.rb

@@ -4,14 +4,9 @@ describe Twig do
   describe '#initialize' do
     it 'creates a Twig instance' do
       twig = Twig.new
-      twig.options.should == {}
-    end
-
-    it 'creates a Twig instance with arbitrary options' do
-      options = {:foo => 'bar'}
-      twig = Twig.new(options)
-
-      twig.options.should == options
+      twig.options.should == {
+        :header_color => Twig::DEFAULT_HEADER_COLOR
+      }
     end
   end
 
@@ -35,14 +30,13 @@ describe Twig do
         fix_some_other_of_the_things
         fix_nothing
       ]
-      branch_refs = @branch_names.map { |name| Twig::REF_PREFIX + name }
       @commit_time_strings = ['2001-01-01',   '2002-02-02',   '2003-03-03'  ]
       @commit_time_agos    = ['111 days ago', '222 days ago', '333 days ago']
       @command =
         %{git for-each-ref #{Twig::REF_PREFIX} --format="#{Twig::REF_FORMAT}"}
 
       @branch_tuples = (0..2).map do |i|
-        "#{branch_refs[i]},#{@commit_time_strings[i]},#{@commit_time_agos[i]}"
+        "#{@branch_names[i]},#{@commit_time_strings[i]},#{@commit_time_agos[i]}"
       end.join("\n")
     end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: twig
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 13
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  version: "1.1"
 platform: ruby
 authors: 
 - Ron DeVera
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-13 00:00:00 -08:00
+date: 2013-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,8 +71,11 @@ email:
 executables: 
 - twig
 - twig-gh-open
+- twig-gh-open-issue
 - twig-gh-update
 - twig-help
+- twig-init-completion
+- twig-init-completion-bash
 extensions: []
 
 extra_rdoc_files: []
@@ -89,8 +91,11 @@ files:
 - Rakefile
 - bin/twig
 - 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
 - lib/twig.rb
 - lib/twig/branch.rb
 - lib/twig/cli.rb