twig 1.6 → 1.7

data/spec/twig/cli_spec.rb

@@ -20,11 +20,11 @@ describe Twig::Cli do
 
       $stdout = stdout_orig
       expect(stdout_test.string).to eq(
-        prompt + "\n" +
-        "  1. #{choices[0]}\n" +
-        "  2. #{choices[1]}\n" +
-        "  3. #{choices[2]}\n" +
-        "  4. #{choices[3]}\n" +
+        prompt + "\n" \
+        "  1. #{choices[0]}\n" \
+        "  2. #{choices[1]}\n" \
+        "  3. #{choices[2]}\n" \
+        "  4. #{choices[3]}\n" \
         '> '
       )
       expect(result).to eq(choices[3])
@@ -40,148 +40,12 @@ describe Twig::Cli do
     end
   end
 
-  describe '#help_description' do
-    before :each do
-      @twig = Twig.new
-    end
-
-    it 'returns short text in a single line' do
-      text = 'The quick brown fox.'
-      result = @twig.help_description(text, :width => 80)
-      expect(result).to eq([text])
-    end
-
-    it 'returns long text in a string with line breaks' do
-      text = 'The quick brown fox jumps over the lazy, lazy dog.'
-      result = @twig.help_description(text, :width => 20)
-      expect(result).to eq([
-        'The quick brown fox',
-        'jumps over the lazy,',
-        'lazy dog.'
-      ])
-    end
-
-    it 'breaks a long word by max line length' do
-      text = 'Thequickbrownfoxjumpsoverthelazydog.'
-      result = @twig.help_description(text, :width => 20)
-      expect(result).to eq([
-        'Thequickbrownfoxjump',
-        'soverthelazydog.'
-      ])
-    end
-
-    it 'adds a separator line' do
-      text = 'The quick brown fox.'
-      result = @twig.help_description(text, :width => 80, :add_separator => true)
-      expect(result).to eq([text, ' '])
-    end
-  end
-
-  describe '#help_description_for_custom_property' do
-    before :each do
-      @twig = Twig.new
-    end
-
-    it 'returns a help string for a custom property' do
-      option_parser = OptionParser.new
-      expect(@twig).to receive(:help_separator) do |opt_parser, desc, options|
-        expect(opt_parser).to eq(option_parser)
-        expect(desc).to eq("      --test-option                Test option description\n")
-        expect(options).to eq(:trailing => "\n")
-      end
-
-      @twig.help_description_for_custom_property(option_parser, [
-        ['--test-option', 'Test option description']
-      ])
-    end
-
-    it 'supports custom trailing whitespace' do
-      option_parser = OptionParser.new
-      expect(@twig).to receive(:help_separator) do |opt_parser, desc, options|
-        expect(opt_parser).to eq(option_parser)
-        expect(desc).to eq("      --test-option                Test option description\n")
-        expect(options).to eq(:trailing => '')
-      end
-
-      @twig.help_description_for_custom_property(option_parser, [
-        ['--test-option', 'Test option description']
-      ], :trailing => '')
-    end
-  end
-
-  describe '#help_paragraph' do
-    before :each do
-      @twig = Twig.new
-    end
-
-    it 'returns long text in a paragraph with line breaks' do
-      text = Array.new(5) {
-        'The quick brown fox jumps over the lazy dog.'
-      }.join(' ')
-
-      result = @twig.help_paragraph(text)
-
-      expect(result).to eq([
-        "The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the",
-        "lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps",
-        "over the lazy dog. The quick brown fox jumps over the lazy dog."
-      ].join("\n"))
-    end
-  end
-
-  describe '#help_line_for_custom_property?' do
-    before :each do
-      @twig = Twig.new
-    end
-
-    it 'returns true for `--except-foo`' do
-      expect(@twig.help_line_for_custom_property?('  --except-foo  ')).to be_true
-    end
-
-    it 'returns false for `--except-branch`' do
-      expect(@twig.help_line_for_custom_property?('  --except-branch  ')).to be_false
-    end
-
-    it 'returns false for `--except-property`' do
-      expect(@twig.help_line_for_custom_property?('  --except-property  ')).to be_false
-    end
-
-    it 'returns false for `--except-PROPERTY`' do
-      expect(@twig.help_line_for_custom_property?('  --except-PROPERTY  ')).to be_false
-    end
-
-    it 'returns true for `--only-foo`' do
-      expect(@twig.help_line_for_custom_property?('  --only-foo  ')).to be_true
-    end
-
-    it 'returns false for `--only-branch`' do
-      expect(@twig.help_line_for_custom_property?('  --only-branch  ')).to be_false
-    end
-
-    it 'returns false for `--only-property`' do
-      expect(@twig.help_line_for_custom_property?('  --only-property  ')).to be_false
-    end
-
-    it 'returns false for `--only-PROPERTY`' do
-      expect(@twig.help_line_for_custom_property?('  --only-PROPERTY  ')).to be_false
-    end
-
-    it 'returns true for `--foo-width`' do
-      expect(@twig.help_line_for_custom_property?('  --foo-width  ')).to be_true
-    end
-
-    it 'returns false for `--branch-width`' do
-      expect(@twig.help_line_for_custom_property?('  --branch-width  ')).to be_false
-    end
-
-    it 'returns false for `--PROPERTY-width`' do
-      expect(@twig.help_line_for_custom_property?('  --PROPERTY-width  ')).to be_false
-    end
-  end
-
   describe '#run_pager' do
     before :each do
       @twig = Twig.new
+      allow(Twig::System).to receive(:windows?) { false }
+      allow($stdout).to receive(:tty?) { true }
+      allow($stderr).to receive(:tty?) { true }
     end
 
     it 'turns the current process into a `less` pager' do
@@ -200,16 +64,32 @@ describe Twig::Cli do
       @twig.run_pager
     end
 
+    it 'reopens original stdout and stderr if unable to fork' do
+      allow(Kernel).to receive(:fork) { false }
+      expect($stdout).to receive(:reopen)
+      expect($stderr).to receive(:reopen)
+      expect($stdin).not_to receive(:reopen)
+
+      @twig.run_pager
+    end
+
     it 'does nothing if running on Windows' do
       expect(Twig::System).to receive(:windows?).and_return(true)
-      expect(Kernel).not_to receive(:fork)
+      expect(IO).not_to receive(:pipe)
 
       @twig.run_pager
     end
 
-    it 'does nothing if not running on a terminal device' do
+    it 'does nothing if stdout is not running on a terminal device' do
       allow($stdout).to receive(:tty?) { false }
-      expect(Kernel).not_to receive(:fork)
+      expect(IO).not_to receive(:pipe)
+
+      @twig.run_pager
+    end
+
+    it 'does nothing if `Kernel.fork` is not supported' do
+      allow(Kernel).to receive(:respond_to?).with(:fork) { false }
+      expect(IO).not_to receive(:pipe)
 
       @twig.run_pager
     end
@@ -413,7 +293,7 @@ describe Twig::Cli do
     it 'recognizes `--reverse`' do
       expect(@twig.options[:reverse]).to be_nil
       @twig.read_cli_options!(['--reverse'])
-      expect(@twig.options[:reverse]).to be_true
+      expect(@twig.options[:reverse]).to eql(true)
     end
 
     it 'recognizes `--github-api-uri-prefix`' do
@@ -459,12 +339,12 @@ describe Twig::Cli do
     end
 
     it 'prints a message and aborts' do
-      exception = Exception.new('test exception')
       expect(@twig).to receive(:puts) do |message|
-        expect(message).to include('`twig --help`')
+        expect(message).to include('`twig help`')
       end
 
       expect {
+        exception = Exception.new('test exception')
         @twig.abort_for_option_exception(exception)
       }.to raise_exception { |exception|
         expect(exception).to be_a(SystemExit)
@@ -473,48 +353,13 @@ describe Twig::Cli do
     end
   end
 
-  describe '#exec_subcommand_if_any' do
-    before :each do
-      @twig        = Twig.new
-      @branch_name = 'test'
-      allow(Twig).to receive(:run)
-      allow(@twig).to receive(:current_branch_name) { @branch_name }
-    end
-
-    it 'recognizes a subcommand' do
-      command_path = '/path/to/bin/twig-subcommand'
-      expect(Twig).to receive(:run).with('which twig-subcommand 2>/dev/null').
-        and_return(command_path)
-      expect(@twig).to receive(:exec).with(command_path) { exit }
-
-      # Since we're stubbing `exec` (with an expectation), we still need it
-      # to exit early like the real implementation. The following handles the
-      # exit somewhat gracefully.
-      expect {
-        @twig.read_cli_args!(['subcommand'])
-      }.to raise_exception { |exception|
-        expect(exception).to be_a(SystemExit)
-        expect(exception.status).to eq(0)
-      }
-    end
-
-    it 'does not recognize a subcommand' do
-      expect(Twig).to receive(:run).
-        with('which twig-subcommand 2>/dev/null').and_return('')
-      expect(@twig).not_to receive(:exec)
-      allow(@twig).to receive(:abort)
-
-      @twig.read_cli_args!(['subcommand'])
-    end
-  end
-
   describe '#read_cli_args!' do
     before :each do
       @twig = Twig.new
     end
 
     it 'checks for and executes a subcommand if there are any args' do
-      expect(@twig).to receive(:exec_subcommand_if_any).with(['foo']) { exit }
+      expect(Twig::Subcommands).to receive(:exec_subcommand_if_any).with(['foo']) { exit }
 
       expect {
         @twig.read_cli_args!(['foo'])
@@ -525,8 +370,8 @@ describe Twig::Cli do
     end
 
     it 'does not check for a subcommand if there are no args' do
-      branch_list = %[foo bar]
-      expect(@twig).not_to receive(:exec_subcommand_if_any)
+      branch_list = %w[foo bar]
+      expect(Twig::Subcommands).not_to receive(:exec_subcommand_if_any)
       allow(@twig).to receive(:list_branches).and_return(branch_list)
       allow(@twig).to receive(:puts).with(branch_list)
 
@@ -534,7 +379,7 @@ describe Twig::Cli do
     end
 
     it 'lists branches' do
-      branch_list = %[foo bar]
+      branch_list = %w[foo bar]
       expect(@twig).to receive(:list_branches).and_return(branch_list)
       expect(@twig).to receive(:puts).with(branch_list)
 

data/spec/twig/commit_time_spec.rb

@@ -3,51 +3,220 @@ require 'spec_helper'
 describe Twig::CommitTime do
   before :each do
     @time = Time.utc(2000, 12, 1, 12, 00, 00)
+    allow(Twig::CommitTime).to receive(:now) { @time }
   end
 
   describe '#initialize' do
     it 'stores a Time object' do
-      commit_time = Twig::CommitTime.new(@time, '99 days ago')
+      commit_time = Twig::CommitTime.new(@time)
       expect(commit_time.instance_variable_get(:@time)).to eq(@time)
     end
 
     it 'stores a "time ago" string as its shortened version' do
-      expect(Twig::CommitTime.new(@time, '1 year, 1 month ago').
-        instance_variable_get(:@time_ago)).to eq('1y ago')
-      expect(Twig::CommitTime.new(@time, '2 years, 2 months ago').
+      seconds_in_a_year = 60 * 60 * 24 * 365
+      seconds_in_a_week = 60 * 60 * 24 * 7
+      seconds_in_a_day  = 60 * 60 * 24
+
+      expect(Twig::CommitTime.new(@time - (seconds_in_a_year * 2)).
         instance_variable_get(:@time_ago)).to eq('2y ago')
-      expect(Twig::CommitTime.new(@time, '1 year ago').
+      expect(Twig::CommitTime.new(@time - (seconds_in_a_year * 1)).
         instance_variable_get(:@time_ago)).to eq('1y ago')
-      expect(Twig::CommitTime.new(@time, '2 years ago').
-        instance_variable_get(:@time_ago)).to eq('2y ago')
-      expect(Twig::CommitTime.new(@time, '2 months ago').
+
+      two_months_ago = @time - (7 * seconds_in_a_week)
+      expect(Twig::CommitTime.new(two_months_ago).
         instance_variable_get(:@time_ago)).to eq('2mo ago')
-      expect(Twig::CommitTime.new(@time, '2 weeks ago').
+
+      two_weeks_ago = @time - (2 * seconds_in_a_week)
+      expect(Twig::CommitTime.new(two_weeks_ago).
         instance_variable_get(:@time_ago)).to eq('2w ago')
-      expect(Twig::CommitTime.new(@time, '2 days ago').
+
+      two_days_ago = @time - (2 * seconds_in_a_day)
+      expect(Twig::CommitTime.new(two_days_ago).
         instance_variable_get(:@time_ago)).to eq('2d ago')
-      expect(Twig::CommitTime.new(@time, '2 hours ago').
+
+      two_hours_ago = @time - (60 * 120)
+      expect(Twig::CommitTime.new(two_hours_ago).
         instance_variable_get(:@time_ago)).to eq('2h ago')
-      expect(Twig::CommitTime.new(@time, '2 minutes ago').
+
+      expect(Twig::CommitTime.new(@time - 120).
         instance_variable_get(:@time_ago)).to eq('2m ago')
-      expect(Twig::CommitTime.new(@time, '2 seconds ago').
+
+      expect(Twig::CommitTime.new(@time - 2).
         instance_variable_get(:@time_ago)).to eq('2s ago')
+
+      expect(Twig::CommitTime.new(@time).
+        instance_variable_get(:@time_ago)).to eq('0s ago')
+    end
+  end
+
+  describe '#count_years_ago' do
+    it 'returns 0 for the actual date' do
+      ref_time = @time
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_years_ago).to eq(0)
+    end
+
+    it 'returns 1 for one year ago' do
+      ref_time = @time - (60 * 60 * 24 * 365)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_years_ago).to eq(1)
+    end
+
+    it 'returns 2 for 21 months ago' do
+      ref_time = @time - (60 * 60 * 24 * 30 * 21)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_years_ago).to eq(2)
+    end
+  end
+
+  describe '#count_months_ago' do
+    it 'returns 0 for the actual date' do
+      ref_time = @time
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_months_ago).to eq(0)
+    end
+
+    it 'returns 1 for 20 days ago' do
+      ref_time = @time - (60 * 60 * 24 * 20)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_months_ago).to eq(1)
+    end
+
+    it 'returns 2 for 50 days ago' do
+      ref_time = @time - (60 * 60 * 24 * 50)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_months_ago).to eq(2)
+    end
+  end
+
+  describe '#count_weeks_ago' do
+    it 'returns 0 for the actual date' do
+      ref_time = @time
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_weeks_ago).to eq(0)
+    end
+
+    it 'returns 1 for 8 days ago' do
+      ref_time = @time - (60 * 60 * 24 * 8)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_weeks_ago).to eq(1)
+    end
+
+    it 'returns 2 for 14 days ago' do
+      ref_time = @time - (60 * 60 * 24 * 14)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_weeks_ago).to eq(2)
+    end
+
+    it 'returns 3 for 2.5 weeks ago' do
+      ref_time = @time - (60 * 60 * 24 * 7 * 2.5)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_weeks_ago).to eq(3)
+    end
+  end
+
+  describe '#count_days_ago' do
+    it 'returns 0 for the actual date' do
+      ref_time = @time
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_days_ago).to eq(0)
+    end
+
+    it 'returns 1 for one day ago' do
+      ref_time = @time - (60 * 60 * 24)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_days_ago).to eq(1)
+    end
+
+    it 'returns 2 for 1.5 days ago' do
+      ref_time = @time - (60 * 60 * 24 * 1.5)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_days_ago).to eq(2)
+    end
+  end
+
+  describe '#count_hours_ago' do
+    it 'returns 0 for the actual date' do
+      ref_time = @time
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_days_ago).to eq(0)
+    end
+
+    it 'returns 1 for one hour ago' do
+      ref_time = @time - (60 * 60)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_hours_ago).to eq(1)
+    end
+
+    it 'returns 2 for 1.5 hours ago' do
+      ref_time = @time - (60 * 60 * 1.5)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_hours_ago).to eq(2)
+    end
+  end
+
+  describe '#count_minutes_ago' do
+    it 'returns 0 for the actual date' do
+      ref_time = @time
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_minutes_ago).to eq(0)
+    end
+
+    it 'returns 1 for one minute ago' do
+      ref_time = @time - 60
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_minutes_ago).to eq(1)
+    end
+
+    it 'returns 20 for 20 minutes ago' do
+      ref_time = @time - (60 * 20)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_minutes_ago).to eq(20)
+    end
+
+    it 'returns 21 for 20.5 minutes ago' do
+      ref_time = @time - (60 * 20.5)
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_minutes_ago).to eq(21)
+    end
+  end
+
+  describe '#count_seconds_ago' do
+    it 'returns 0 for the actual date' do
+      ref_time = @time
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_seconds_ago).to eq(0)
+    end
+
+    it 'returns 1 for one second ago' do
+      ref_time = @time - 1
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_seconds_ago).to eq(1)
+    end
+
+    it 'returns 70 for one minute and 10 second ago' do
+      ref_time = @time - 70
+      commit_time = Twig::CommitTime.new(ref_time)
+      expect(commit_time.count_seconds_ago).to eq(70)
     end
   end
 
   describe '#to_i' do
     it 'returns the time as an integer' do
-      commit_time = Twig::CommitTime.new(@time, '99 days ago')
+      commit_time = Twig::CommitTime.new(@time)
       expect(commit_time.to_i).to eq(@time.to_i)
     end
   end
 
   describe '#to_s' do
     it 'returns a formatted string, including time ago' do
-      commit_time = Twig::CommitTime.new(@time, '99 days ago')
+      ref_time = @time - (60 * 60)
+      commit_time = Twig::CommitTime.new(ref_time)
+
       result = commit_time.to_s
+
       expect(result).to include('2000-12-01')
-      expect(result).to include('(99d ago)')
+      expect(result).to include('(1h ago)')
     end
   end
 end