twig 1.6 → 1.7

data/spec/twig/display_spec.rb

@@ -5,6 +5,37 @@ describe Twig::Display do
     @twig = Twig.new
   end
 
+  describe '.unformat_string' do
+    it 'unformats a plain text string' do
+      string = 'foo'
+      expect(Twig::Display.unformat_string(string)).to eq(string)
+    end
+
+    it 'unformats a string with color' do
+      string = 'foo'
+      formatted_string = @twig.format_string(string, :color => :red)
+      expect(formatted_string.size).to be > 3
+
+      expect(Twig::Display.unformat_string(formatted_string)).to eq(string)
+    end
+
+    it 'unformats a string with weight' do
+      string = 'foo'
+      formatted_string = @twig.format_string(string, :weight => :bold)
+      expect(formatted_string.size).to be > 3
+
+      expect(Twig::Display.unformat_string(formatted_string)).to eq(string)
+    end
+
+    it 'unformats a string with color and weight' do
+      string = 'foo'
+      formatted_string = @twig.format_string(string, :color => :red, :weight => :bold)
+      expect(formatted_string.size).to be > 3
+
+      expect(Twig::Display.unformat_string(formatted_string)).to eq(string)
+    end
+  end
+
   describe '#column' do
     it 'returns a string with an exact fixed width' do
       expect(@twig.column('foo', :width => 8)).to eq('foo' + (' ' * 5))
@@ -153,8 +184,8 @@ describe Twig::Display do
       header_line = result.split("\n").first
       color = Twig::Display::COLORS[:green]
       expect(header_line.gsub(/\s/, '')).to eq(
-        "\e[#{color}mfoo\e[0m" <<
-        "\e[#{color}mquux\e[0m" <<
+        "\e[#{color}mfoo\e[0m" \
+        "\e[#{color}mquux\e[0m" \
         "\e[#{color}mbranch\e[0m"
       )
     end
@@ -164,8 +195,8 @@ describe Twig::Display do
       header_line = result.split("\n").first
       weight = Twig::Display::WEIGHTS[:bold]
       expect(header_line.gsub(/\s/, '')).to eq(
-        "\e[#{weight}mfoo\e[0m" <<
-        "\e[#{weight}mquux\e[0m" <<
+        "\e[#{weight}mfoo\e[0m" \
+        "\e[#{weight}mquux\e[0m" \
         "\e[#{weight}mbranch\e[0m"
       )
     end
@@ -175,8 +206,8 @@ describe Twig::Display do
       header_line = result.split("\n").first
       color, weight = Twig::Display::COLORS[:red], Twig::Display::WEIGHTS[:bold]
       expect(header_line.gsub(/\s/, '')).to eq(
-        "\e[#{color};#{weight}mfoo\e[0m" <<
-        "\e[#{color};#{weight}mquux\e[0m" <<
+        "\e[#{color};#{weight}mfoo\e[0m" \
+        "\e[#{color};#{weight}mquux\e[0m" \
         "\e[#{color};#{weight}mbranch\e[0m"
       )
     end
@@ -194,7 +225,7 @@ describe Twig::Display do
       allow(@other_branch).to receive(:get_properties) do
         { 'foo' => 'foo!', 'bar' => 'bar!' }
       end
-      commit_time = Twig::CommitTime.new(Time.now, '')
+      commit_time = Twig::CommitTime.new(Time.now)
       expect(commit_time).to receive(:to_s).and_return('2000-01-01')
       allow(@current_branch).to receive(:last_commit_time) { commit_time }
       allow(@other_branch).to receive(:last_commit_time) { commit_time }
@@ -286,12 +317,11 @@ describe Twig::Display do
       end
 
       it 'returns a line for the current branch' do
-        indicator     = Twig::Display::CURRENT_BRANCH_INDICATOR
-        branch        = @current_branch
-        branch_regexp = /#{Regexp.escape(indicator)}#{Regexp.escape(branch.name)}/
+        indicator = Twig::Display::CURRENT_BRANCH_INDICATOR
+        branch    = @current_branch
 
         result = @twig.branch_list_line(branch)
-        unformatted_result = @twig.unformat_string(result)
+        unformatted_result = Twig::Display.unformat_string(result)
 
         column_gutter = @twig.column_gutter
         expect(unformatted_result).to eq(
@@ -303,6 +333,7 @@ describe Twig::Display do
       end
 
       it 'returns a line for a branch other than the current branch' do
+        no_indicator = ' ' * (Twig::Display::CURRENT_BRANCH_INDICATOR.size)
         branch = @other_branch
 
         result = @twig.branch_list_line(branch)
@@ -312,7 +343,7 @@ describe Twig::Display do
           '2000-01-01' + (' ' * 25) + column_gutter +
           'foo!' + (' ' * 12) + column_gutter +
           'bar!' + (' ' * 12) + column_gutter +
-          '  ' + 'other...'
+          no_indicator + 'other...'
         )
       end
     end
@@ -353,11 +384,32 @@ describe Twig::Display do
     end
   end
 
+  describe '#format_strings?' do
+    before :each do
+      @twig = Twig.new
+    end
+
+    it 'returns false if using Windows' do
+      expect(Twig::System).to receive(:windows?) { true }
+      expect(@twig.format_strings?).to eql(false)
+    end
+
+    it 'returns true if expected conditions pass' do
+      expect(Twig::System).to receive(:windows?) { false }
+      expect(@twig.format_strings?).to eql(true)
+    end
+  end
+
   describe '#format_string' do
     it 'returns a plain string' do
       expect(@twig.format_string('foo', {})).to eq('foo')
     end
 
+    it 'returns a plain string if formatting is disabled' do
+      expect(@twig).to receive(:format_strings?) { false }
+      expect(@twig.format_string('foo', :color => :red)).to eql('foo')
+    end
+
     it 'returns a string with a color code' do
       expect(@twig.format_string('foo', :color => :red)).to eq(
         "\e[#{Twig::Display::COLORS[:red]}mfoo\e[0m"
@@ -371,43 +423,12 @@ describe Twig::Display do
     end
 
     it 'returns a string with a color and weight code 'do
-    color_code  = Twig::Display::COLORS[:red]
-    weight_code = Twig::Display::WEIGHTS[:bold]
-
-    expect(@twig.format_string('foo', :color => :red, :weight => :bold)).to eq(
-      "\e[#{color_code};#{weight_code}mfoo\e[0m"
-    )
-    end
-  end
-
-  describe '#unformat_string' do
-    it 'unformats a plain text string' do
-      string = 'foo'
-      expect(@twig.unformat_string(string)).to eq(string)
-    end
-
-    it 'unformats a string with color' do
-      string = 'foo'
-      formatted_string = @twig.format_string(string, :color => :red)
-      expect(formatted_string.size).to be > 3
+      color_code  = Twig::Display::COLORS[:red]
+      weight_code = Twig::Display::WEIGHTS[:bold]
 
-      expect(@twig.unformat_string(formatted_string)).to eq(string)
-    end
-
-    it 'unformats a string with weight' do
-      string = 'foo'
-      formatted_string = @twig.format_string(string, :weight => :bold)
-      expect(formatted_string.size).to be > 3
-
-      expect(@twig.unformat_string(formatted_string)).to eq(string)
-    end
-
-    it 'unformats a string with color and weight' do
-      string = 'foo'
-      formatted_string = @twig.format_string(string, :color => :red, :weight => :bold)
-      expect(formatted_string.size).to be > 3
-
-      expect(@twig.unformat_string(formatted_string)).to eq(string)
+      expect(@twig.format_string('foo', :color => :red, :weight => :bold)).to eq(
+        "\e[#{color_code};#{weight_code}mfoo\e[0m"
+      )
     end
   end
 end

data/spec/twig/github_spec.rb

@@ -26,7 +26,7 @@ describe Twig::GithubRepo do
         block_has_run = true
       end
 
-      expect(block_has_run).to be_true
+      expect(block_has_run).to eql(true)
     end
 
     it 'aborts if this is not a Git repo' do
@@ -35,7 +35,7 @@ describe Twig::GithubRepo do
       allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
       allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
-      expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |message|
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
         expect(message).to include('not a git repository')
       end
 
@@ -47,7 +47,9 @@ describe Twig::GithubRepo do
       allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { '' }
       allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
       allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
-      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
+        expect(message).to include('GitHub repository')
+      end
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
@@ -58,7 +60,9 @@ describe Twig::GithubRepo do
       allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { '' }
       allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
-      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
+        expect(message).to include('GitHub repository')
+      end
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
@@ -69,7 +73,9 @@ describe Twig::GithubRepo do
       allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
       allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { '' }
-      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
+        expect(message).to include('GitHub repository')
+      end
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
@@ -80,7 +86,9 @@ describe Twig::GithubRepo do
       allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
       allow_any_instance_of(Twig::GithubRepo).to receive(:username)   { 'username' }
       allow_any_instance_of(Twig::GithubRepo).to receive(:repository) { 'repository' }
-      expect_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
+      expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
+        expect(message).to include('GitHub repository')
+      end
 
       Twig::GithubRepo.new { |gh_repo| } # Do nothing
     end
@@ -145,7 +153,7 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        expect(is_github_repo).to be_true
+        expect(is_github_repo).to eql(true)
       end
     end
 
@@ -161,7 +169,7 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        expect(is_github_repo).to be_true
+        expect(is_github_repo).to eql(true)
       end
     end
 
@@ -177,7 +185,7 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        expect(is_github_repo).to be_true
+        expect(is_github_repo).to eql(true)
       end
     end
 
@@ -185,7 +193,9 @@ describe Twig::GithubRepo do
       before :each do
         origin_url = @generic_https_url
         allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
-        allow_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
+        expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
+          expect(message).to include('GitHub repository')
+        end
       end
 
       it 'returns false' do
@@ -194,7 +204,7 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        expect(is_github_repo).to be_false
+        expect(is_github_repo).to eql(false)
       end
     end
 
@@ -202,7 +212,9 @@ describe Twig::GithubRepo do
       before :each do
         origin_url = @generic_git_read_only_url
         allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
-        allow_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
+        expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
+          expect(message).to include('GitHub repository')
+        end
       end
 
       it 'returns false' do
@@ -211,7 +223,7 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        expect(is_github_repo).to be_false
+        expect(is_github_repo).to eql(false)
       end
     end
 
@@ -219,7 +231,9 @@ describe Twig::GithubRepo do
       before :each do
         origin_url = @generic_ssh_read_write_url
         allow_any_instance_of(Twig::GithubRepo).to receive(:origin_url) { origin_url }
-        allow_any_instance_of(Twig::GithubRepo).to receive(:abort_for_non_github_repo)
+        expect_any_instance_of(Twig::GithubRepo).to receive(:abort) do |repo, message|
+          expect(message).to include('GitHub repository')
+        end
       end
 
       it 'returns false' do
@@ -228,7 +242,7 @@ describe Twig::GithubRepo do
           is_github_repo = gh_repo.github_repo?
         end
 
-        expect(is_github_repo).to be_false
+        expect(is_github_repo).to eql(false)
       end
     end
   end

data/spec/twig/options_spec.rb

@@ -13,7 +13,7 @@ describe Twig::Options do
 
     context 'with a config path that exists' do
       before :each do
-        expect(File).to receive(:exists?).with(Twig::CONFIG_PATH).and_return(true)
+        expect(File).to receive(:exist?).with(Twig::CONFIG_PATH).and_return(true)
       end
 
       it 'returns the config path if is readable' do
@@ -41,14 +41,14 @@ describe Twig::Options do
 
     context 'with a config path that does not exist' do
       before :each do
-        expect(File).to receive(:exists?).with(Twig::CONFIG_PATH).and_return(false)
+        expect(File).to receive(:exist?).with(Twig::CONFIG_PATH).and_return(false)
         expect(File).to receive(:expand_path).with(Twig::DEPRECATED_CONFIG_PATH).
           and_return(Twig::DEPRECATED_CONFIG_PATH)
       end
 
       it 'prints a deprecation warning and returns the deprecated config path if it exists and is readable' do
         path = Twig::DEPRECATED_CONFIG_PATH
-        expect(File).to receive(:exists?).with(path).and_return(true)
+        expect(File).to receive(:exist?).with(path).and_return(true)
         expect(File).to receive(:readable?).with(path).and_return(true)
         expect($stderr).to receive(:puts) do |message|
           expect(message).to match(/^DEPRECATED:/)
@@ -63,7 +63,7 @@ describe Twig::Options do
 
       it 'prints a deprecation warning and returns nil if the deprecated config path exists but is not readable' do
         path = Twig::DEPRECATED_CONFIG_PATH
-        expect(File).to receive(:exists?).with(path).and_return(true)
+        expect(File).to receive(:exist?).with(path).and_return(true)
         expect(File).to receive(:readable?).with(path).and_return(false)
         expect($stderr).to receive(:puts) do |message|
           expect(message).to match(/^DEPRECATED:/)
@@ -78,7 +78,7 @@ describe Twig::Options do
 
       it 'returns nil if the deprecated config path does not exist' do
         path = Twig::DEPRECATED_CONFIG_PATH
-        expect(File).to receive(:exists?).with(path).and_return(false)
+        expect(File).to receive(:exist?).with(path).and_return(false)
 
         result = @twig.readable_config_file_path
 
@@ -248,7 +248,10 @@ describe Twig::Options do
 
         # GitHub integration:
         'github-api-uri-prefix' => 'https://github-enterprise.example.com/api/v3',
-        'github-uri-prefix'     => 'https://github-enterprise.example.com'
+        'github-uri-prefix'     => 'https://github-enterprise.example.com',
+
+        # Subcommands:
+        'twig-rebase-autoconfirm' => 'true'
       )
 
       # Check preconditions
@@ -269,6 +272,7 @@ describe Twig::Options do
       expect(@twig.options[:property_only_name]).to be_nil
       expect(@twig.options[:property_width]).to be_nil
       expect(@twig.options[:reverse]).to be_nil
+      expect(@twig.options[:twig_rebase_autoconfirm]).to be_nil
 
       @twig.read_config_file!
 
@@ -294,7 +298,8 @@ describe Twig::Options do
       expect(@twig.options[:property_except_name]).to eq(/foo/)
       expect(@twig.options[:property_only_name]).to eq(/bar/)
       expect(@twig.options[:property_width]).to eq(:foo => 4)
-      expect(@twig.options[:reverse]).to be_true
+      expect(@twig.options[:reverse]).to eql(true)
+      expect(@twig.options[:twig_rebase_autoconfirm]).to eql(true)
     end
   end
 
@@ -306,7 +311,7 @@ describe Twig::Options do
 
       it 'succeeds' do
         branch_name = 'foo'
-        expect(Twig::Branch).to receive(:all_branch_names).and_return(%[foo bar])
+        expect(Twig::Branch).to receive(:all_branch_names).and_return(%w[foo bar])
 
         @twig.set_option(:branch, branch_name)
 
@@ -426,7 +431,7 @@ describe Twig::Options do
 
         @twig.set_option(:reverse, input)
 
-        expect(@twig.options[:reverse]).to be_true
+        expect(@twig.options[:reverse]).to eql(true)
       end
 
       it 'sets the option to false when input is not truthy' do
@@ -435,7 +440,31 @@ describe Twig::Options do
 
         @twig.set_option(:reverse, input)
 
-        expect(@twig.options[:reverse]).to be_false
+        expect(@twig.options[:reverse]).to eql(false)
+      end
+    end
+
+    context 'when setting a :twig_rebase_autoconfirm option' do
+      before :each do
+        expect(@twig.options[:twig_rebase_autoconfirm]).to be_nil
+      end
+
+      it 'sets the option to true when input is truthy' do
+        input = 'yes'
+        expect(Twig::Util).to receive(:truthy?).with(input).and_call_original
+
+        @twig.set_option(:twig_rebase_autoconfirm, input)
+
+        expect(@twig.options[:twig_rebase_autoconfirm]).to eql(true)
+      end
+
+      it 'sets the option to false when input is not truthy' do
+        input = 'blargh'
+        expect(Twig::Util).to receive(:truthy?).with(input).and_call_original
+
+        @twig.set_option(:twig_rebase_autoconfirm, input)
+
+        expect(@twig.options[:twig_rebase_autoconfirm]).to eql(false)
       end
     end
 
@@ -549,7 +578,7 @@ describe Twig::Options do
 
       begin
         @twig.set_property_width_option(:branch => width)
-      rescue SystemExit => exception
+      rescue SystemExit
       end
 
       expect(@twig.options[:property_width]).to eq({})
@@ -566,7 +595,7 @@ describe Twig::Options do
 
       begin
         @twig.set_property_width_option(:x => width)
-      rescue SystemExit => exception
+      rescue SystemExit
       end
 
       expect(@twig.options[:property_width]).to eq({})
@@ -583,7 +612,7 @@ describe Twig::Options do
 
       begin
         @twig.set_property_width_option(property_name => width)
-      rescue SystemExit => exception
+      rescue SystemExit
       end
 
       expect(@twig.options[:property_width]).to eq({})