twig 1.4 → 1.5

data/spec/twig/subcommands_spec.rb

@@ -0,0 +1,29 @@
+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] }
+      expect(Dir).to receive(:glob).with('foo/bin/twig-*').
+        and_yield('foo/bin/twig-subcommand-2').
+        and_yield('foo/bin/twig-subcommand-1')
+      expect(Dir).to receive(:glob).with('bar/bin/twig-*').
+        and_yield('bar/bin/twig-subcommand-1')
+
+      names = Twig::Subcommands.all_names
+
+      expect(names).to eq(%w[subcommand-1 subcommand-2])
+    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] }
+      expect(Dir).to receive(:glob).with('foo/bin/twig-*')
+      expect(Dir).to receive(:glob).with('bar/bin/twig-*')
+
+      names = Twig::Subcommands.all_names
+
+      expect(names).to eq([])
+    end
+  end
+
+end

data/spec/twig/system_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Twig::System do
+  describe '.windows?' 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
+    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
+    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
+    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
+    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
+    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
-      Twig::Util.numeric?(1).should be_true
-      Twig::Util.numeric?('1').should be_true
+      expect(Twig::Util.numeric?(1)).to be_true
+      expect(Twig::Util.numeric?('1')).to be_true
     end
 
     it 'returns false if an object is not numeric' do
-      Twig::Util.numeric?('x').should be_false
-      Twig::Util.numeric?([]).should be_false
-      Twig::Util.numeric?({}).should be_false
+      expect(Twig::Util.numeric?('x')).to be_false
+      expect(Twig::Util.numeric?([])).to be_false
+      expect(Twig::Util.numeric?({})).to be_false
     end
   end
 
   describe '.truthy?' do
     it 'returns true if an object is truthy' do
-      Twig::Util.truthy?('true').should be_true
-      Twig::Util.truthy?('TRUE').should be_true
-      Twig::Util.truthy?(true).should be_true
-      Twig::Util.truthy?('yes').should be_true
-      Twig::Util.truthy?('YES').should be_true
-      Twig::Util.truthy?('y').should be_true
-      Twig::Util.truthy?('Y').should be_true
-      Twig::Util.truthy?('on').should be_true
-      Twig::Util.truthy?('ON').should be_true
-      Twig::Util.truthy?('1').should be_true
-      Twig::Util.truthy?(1).should be_true
+      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
     end
 
     it 'returns false if an object is falsy' do
-      Twig::Util.truthy?('false').should be_false
-      Twig::Util.truthy?(false).should be_false
-      Twig::Util.truthy?('yep').should be_false
-      Twig::Util.truthy?('sure, why not').should be_false
+      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
     end
   end
 

data/spec/twig_spec.rb

@@ -5,20 +5,20 @@ describe Twig do
   describe '.repo?' do
     it 'is true when the working directory is a git repository' do
       Dir.chdir(File.dirname(__FILE__)) do
-        Twig.should be_repo
+        expect(Twig).to 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.should_not be_repo
+          expect(Twig).not_to be_repo
         end
       end
     end
 
     it 'captures stderr' do
-      Twig.should_receive(:run).with(/2>&1/)
+      expect(Twig).to receive(:run).with(/2>&1/)
       Twig.repo?
     end
   end
@@ -26,9 +26,11 @@ describe Twig do
   describe '#initialize' do
     it 'creates a Twig instance' do
       twig = Twig.new
-      twig.options.should == {
+      expect(twig.options).to eq(
+        :github_api_uri_prefix => Twig::DEFAULT_GITHUB_API_URI_PREFIX,
+        :github_uri_prefix => Twig::DEFAULT_GITHUB_URI_PREFIX,
         :header_color => Twig::DEFAULT_HEADER_COLOR
-      }
+      )
     end
   end
 
@@ -36,12 +38,12 @@ describe Twig do
     it 'returns the current branch name' do
       twig        = Twig.new
       branch_name = 'fix_all_the_things'
-      Twig.should_receive(:run).
+      expect(Twig).to receive(:run).
         with('git rev-parse --abbrev-ref HEAD').
         once. # Should memoize
         and_return(branch_name)
 
-      2.times { twig.current_branch_name.should == branch_name }
+      2.times { expect(twig.current_branch_name).to eq(branch_name) }
     end
   end
 
@@ -52,35 +54,42 @@ describe Twig do
         fix_some_other_of_the_things
         fix_nothing
       ]
-      @commit_time_strings = ['2001-01-01',   '2002-02-02',   '2003-03-03'  ]
-      @commit_time_agos    = ['111 days ago', '222 days ago', '333 days ago']
+      @commit_time_strings = ['2001-01-01',   '2002-02-02',   '2003-03-03'           ]
+      @commit_time_agos    = ['111 days ago', '2 months ago', '3 years, 3 months ago']
       @command =
         %{git for-each-ref #{Twig::REF_PREFIX} --format="#{Twig::REF_FORMAT}"}
 
       @branch_tuples = (0..2).map do |i|
-        "#{@branch_names[i]},#{@commit_time_strings[i]},#{@commit_time_agos[i]}"
+        [
+          @branch_names[i],
+          @commit_time_strings[i],
+          @commit_time_agos[i]
+        ].join(Twig::REF_FORMAT_SEPARATOR)
       end.join("\n")
     end
 
     it 'returns an array of branches' do
-      Twig.should_receive(:run).with(@command).and_return(@branch_tuples)
+      expect(Twig).to receive(:run).with(@command).and_return(@branch_tuples)
       twig = Twig.new
 
       branches = twig.all_branches
 
-      branches[0].name.should == @branch_names[0]
-      branches[0].last_commit_time.to_s.
-        should =~ %r{#{@commit_time_strings[0]} .* \(111d ago\)}
-      branches[1].name.should == @branch_names[1]
-      branches[1].last_commit_time.to_s.
-        should =~ %r{#{@commit_time_strings[1]} .* \(222d ago\)}
-      branches[2].name.should == @branch_names[2]
-      branches[2].last_commit_time.to_s.
-        should =~ %r{#{@commit_time_strings[2]} .* \(333d ago\)}
+      expect(branches[0].name).to eq(@branch_names[0])
+      expect(branches[0].last_commit_time.to_s).to match(
+        %r{#{@commit_time_strings[0]} .* \(111d ago\)}
+      )
+      expect(branches[1].name).to eq(@branch_names[1])
+      expect(branches[1].last_commit_time.to_s).to match(
+        %r{#{@commit_time_strings[1]} .* \(2mo ago\)}
+      )
+      expect(branches[2].name).to eq(@branch_names[2])
+      expect(branches[2].last_commit_time.to_s).to match(
+        %r{#{@commit_time_strings[2]} .* \(3y ago\)}
+      )
     end
 
     it 'memoizes the result' do
-      Twig.should_receive(:run).with(@command).once.and_return(@branch_tuples)
+      expect(Twig).to receive(:run).with(@command).once.and_return(@branch_tuples)
       twig = Twig.new
 
       2.times { twig.all_branches }
@@ -108,49 +117,78 @@ describe Twig do
         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)
+      allow(@twig).to receive(:all_branches) { @branches }
     end
 
     it 'returns all branches' do
-      @twig.branches.should == @branches
+      expect(@twig.branches).to eq(@branches)
     end
 
     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]
+
+      branch_names = @twig.branches.map { |branch| branch.name }
+      expect(branch_names).to eq([@branches[0].name, @branches[1].name])
     end
 
     it 'returns all branches except those matching a name pattern' do
       @twig.set_option(:property_except, :branch => /fix_some/)
-      @twig.branches.map { |branch| branch.name }.
-        should == [@branches[2].name, @branches[3].name]
+
+      branch_names = @twig.branches.map { |branch| branch.name }
+      expect(branch_names).to eq([@branches[2].name, @branches[3].name])
     end
 
     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]
+
+      branch_names = @twig.branches.map { |branch| branch.name }
+      expect(branch_names).to eq([@branches[0].name, @branches[1].name])
+    end
+
+    it 'returns a list of branches, most recently modified first' do
+      branch_names = @twig.branches.map { |branch| branch.name }
+
+      expect(branch_names).to eq([
+        @branches[0].name,
+        @branches[1].name,
+        @branches[2].name,
+        @branches[3].name
+      ])
+    end
+
+    it 'returns a list of branches, least recently modified first' do
+      @twig.set_option(:reverse, true)
+
+      branch_names = @twig.branches.map { |branch| branch.name }
+
+      expect(branch_names).to eq([
+        @branches[3].name,
+        @branches[2].name,
+        @branches[1].name,
+        @branches[0].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 }
+        allow(@branches[0]).to receive(:get_property).with('foo') { 'bar1' }
+        allow(@branches[1]).to receive(:get_property).with('foo') { 'bar2' }
+        allow(@branches[2]).to receive(:get_property).with('foo') { 'baz' }
+        allow(@branches[3]).to receive(: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]
+
+        branch_names = @twig.branches.map { |branch| branch.name }
+        expect(branch_names).to eq([@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]
+
+        branch_names = @twig.branches.map { |branch| branch.name }
+        expect(branch_names).to eq([@branches[0].name, @branches[1].name])
       end
     end
   end
@@ -160,9 +198,9 @@ describe Twig do
       twig = Twig.new
       branch_names = %w[foo bar baz]
       branches = branch_names.map { |name| Twig::Branch.new(name) }
-      twig.should_receive(:all_branches).and_return(branches)
+      expect(twig).to receive(:all_branches).and_return(branches)
 
-      twig.all_branch_names.should == branch_names
+      expect(twig.all_branch_names).to eq(branch_names)
     end
   end
 
@@ -174,10 +212,10 @@ describe Twig do
         Twig::CommitTime.new(Time.now, '111 days ago'),
         Twig::CommitTime.new(Time.now, '222 days ago')
       ]
-      commit_times[0].stub(:to_i => 2000_01_01 )
-      commit_times[0].stub(:to_s =>'2000-01-01')
-      commit_times[1].stub(:to_i => 2000_01_02 )
-      commit_times[1].stub(:to_s =>'2000-01-02')
+      allow(commit_times[0]).to receive(:to_i) {  2000_01_01  }
+      allow(commit_times[0]).to receive(:to_s) { '2000-01-01' }
+      allow(commit_times[1]).to receive(:to_i) {  2000_01_02  }
+      allow(commit_times[1]).to receive(:to_s) { '2000-01-02' }
       @branches = [
         Twig::Branch.new('foo', :last_commit_time => commit_times[0]),
         Twig::Branch.new('foo', :last_commit_time => commit_times[1])
@@ -185,47 +223,36 @@ describe Twig do
       @branch_lines = ['[foo line]', '[bar line]']
     end
 
-    it 'returns a list of branches, most recently modified first' do
-      @twig.should_receive(:branches).at_least(:once).and_return(@branches)
-      @twig.should_receive(:branch_list_headers).and_return(@list_headers)
-      @twig.should_receive(:branch_list_line).with(@branches[0]).
+    it 'returns a formatted list of branches' do
+      expect(@twig).to receive(:branches).at_least(:once).and_return(@branches)
+      expect(@twig).to receive(:branch_list_headers).and_return(@list_headers)
+      expect(@twig).to receive(:branch_list_line).with(@branches[0]).
         and_return(@branch_lines[0])
-      @twig.should_receive(:branch_list_line).with(@branches[1]).
+      expect(@twig).to receive(:branch_list_line).with(@branches[1]).
         and_return(@branch_lines[1])
 
       result = @twig.list_branches
 
-      result.should == "\n" + @list_headers +
-        @branch_lines[1] + "\n" + @branch_lines[0]
-    end
-
-    it 'returns a list of branches, least recently modified first' do
-      @twig.set_option(:reverse, true)
-      @twig.stub(:branches) { @branches }
-      @twig.stub(:branch_list_headers) { @list_headers }
-      @twig.stub(:branch_list_line).with(@branches[0]) { @branch_lines[0] }
-      @twig.stub(:branch_list_line).with(@branches[1]) { @branch_lines[1] }
-
-      result = @twig.list_branches
-
-      result.should == "\n" + @list_headers +
-        @branch_lines[0] + "\n" + @branch_lines[1]
+      expect(result).to eq(
+        "\n" + @list_headers + @branch_lines[0] +
+        "\n" + @branch_lines[1]
+      )
     end
 
     it 'returns a message if all branches were filtered out by options' do
-      @twig.stub(:all_branches => %w[foo bar])
-      @twig.stub(:branches => [])
+      allow(@twig).to receive(:all_branches) { %w[foo bar] }
+      allow(@twig).to receive(:branches) { [] }
 
-      @twig.list_branches.should include(
+      expect(@twig.list_branches).to include(
         'There are no branches matching your selected options'
       )
     end
 
     it 'returns a message if the repo has no branches' do
-      @twig.stub(:all_branches => [])
-      @twig.stub(:branches => [])
+      allow(@twig).to receive(:all_branches) { [] }
+      allow(@twig).to receive(:branches) { [] }
 
-      @twig.list_branches.should include('This repository has no branches')
+      expect(@twig.list_branches).to include('This repository has no branches')
     end
   end
 
@@ -238,12 +265,12 @@ describe Twig do
     it 'calls `Twig::Branch#get_property`' do
       property_name  = 'foo'
       property_value = 'bar'
-      Twig::Branch.should_receive(:new).with(@branch.name).and_return(@branch)
-      @branch.should_receive(:get_property).with(property_name).
+      expect(Twig::Branch).to receive(:new).with(@branch.name).and_return(@branch)
+      expect(@branch).to receive(:get_property).with(property_name).
         and_return(property_value)
 
       result = @twig.get_branch_property(@branch.name, property_name)
-      result.should == property_value
+      expect(result).to eq(property_value)
     end
   end
 
@@ -253,8 +280,8 @@ describe Twig do
       branch = Twig::Branch.new('test')
       property_name  = 'foo'
       property_value = 'bar'
-      Twig::Branch.should_receive(:new).with(branch.name).and_return(branch)
-      branch.should_receive(:set_property).with(property_name, property_value)
+      expect(Twig::Branch).to receive(:new).with(branch.name).and_return(branch)
+      expect(branch).to receive(:set_property).with(property_name, property_value)
 
       twig.set_branch_property(branch.name, property_name, property_value)
     end
@@ -265,8 +292,8 @@ describe Twig do
       twig   = Twig.new
       branch = Twig::Branch.new('test')
       property_name = 'foo'
-      Twig::Branch.should_receive(:new).with(branch.name).and_return(branch)
-      branch.should_receive(:unset_property).with(property_name)
+      expect(Twig::Branch).to receive(:new).with(branch.name).and_return(branch)
+      expect(branch).to receive(:unset_property).with(property_name)
 
       twig.unset_branch_property(branch.name, property_name)
     end