git_presenter 0.4.0 → 1.4.0

data/lib/git_presenter/presentation.rb

@@ -1,9 +1,16 @@
 class GitPresenter::Presentation
   attr_reader :slides, :current_slide
 
-  def initialize(presentation)
+  def initialize(presentation, shell=GitPresenter::Shell.new)
+    @branch = presentation["branch"]
     @slides = presentation["slides"].map{|slide| GitPresenter::Slide.new(slide["slide"])}
-    @current_slide = slides.first
+    @shell = shell
+    @current_slide = find_current_slide
+  end
+
+  def find_current_slide
+    sha = @shell.run("git rev-parse HEAD").strip
+    @slides.detect{|s| s.commit == sha}
   end
 
   def command_for(command)
@@ -39,12 +46,12 @@ class GitPresenter::Presentation
   end
 
   def exit
-    `git checkout -q master`
+    `git checkout -q #{@branch}`
     :exit
   end
 
   def position
-    slides.index(@current_slide)
+    @slides.index(@current_slide)
   end
 
   def total_slides

data/lib/git_presenter/shell.rb

@@ -0,0 +1,5 @@
+class GitPresenter::Shell
+  def run(command)
+    `#{command}`.strip
+  end
+end

data/spec/bugs/max_10_commits_being_parsed_spec.rb

@@ -7,7 +7,7 @@ describe "presentation should parse all commits for a repo" do
 
   it "should parse more than 10 commits" do
     @helper.initialise_presentation({:no_of_commits => 13}) do |commits, yaml|
-      yaml["slides"].length.should eql 13
+      expect(yaml["slides"].length).to eql 13
     end
   end
 end

data/spec/integration/initialize_presentation_spec.rb

@@ -10,31 +10,37 @@ describe "initializing a presentation" do
   context ".presentation file" do
     it "should be written to root directory" do
       @helper.initialise_presentation do
-        File.exists?(".presentation").should be_true
+        expect(File.exists?(".presentation")).to be_truthy
       end
     end
 
     it "should have a slides node" do
       @helper.initialise_presentation do |commits, yaml|
-        yaml["slides"].should_not be_nil
+        expect(yaml["slides"]).not_to be_nil
+      end
+    end
+
+    it 'should have a branch note' do
+      @helper.initialise_presentation do |commits, yaml|
+        expect(yaml["branch"]).not_to be_nil
       end
     end
 
     it "should contain a line for each commit to the repository" do
       @helper.initialise_presentation do |commits, yaml|
-        yaml["slides"].length.should eql commits.length
+        expect(yaml["slides"].length).not_to eql commits.length
       end
     end
 
     it "first line should contain the first commit number" do
       @helper.initialise_presentation({:delay => true}) do |commits, yaml|
-        yaml["slides"][0]["slide"]["commit"].should eql commits.first.id
+        expect(yaml["slides"][0]["slide"]["commit"]).to eql commits.first.sha
       end
     end
 
     it "second line should contain the second commit number" do
       @helper.initialise_presentation({:delay => true}) do |commits, yaml|
-        yaml["slides"][1]["slide"]["commit"].should eql commits[1].id
+        expect(yaml["slides"][1]["slide"]["commit"]).to eql commits[1].sha
       end
     end
   end

data/spec/integration/moving_through_presentation_spec.rb

@@ -11,7 +11,7 @@ describe "while giving presentation" do
     it "should move to the next commit" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
-        @helper.head_position.should eql commits[1].id
+        expect(@helper.head_position).to eql commits[1].sha
       end
     end
 
@@ -19,7 +19,7 @@ describe "while giving presentation" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
         presenter.execute("next")
-        @helper.head_position.should eql commits[2].id
+        expect(@helper.head_position).to eql commits[2].sha
       end
     end
   end
@@ -30,7 +30,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         @helper.edit_file("inner commit")
         presenter.execute("next")
-        @helper.head_position.should eql commits[2].id
+        expect(@helper.head_position).to eql commits[2].sha
       end
     end
   end
@@ -42,7 +42,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("next")
-        @helper.head_position.should eql commits[2].id
+        expect(@helper.head_position).to eql commits[2].sha
       end
     end
   end
@@ -53,7 +53,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("back")
-        @helper.head_position.should eql commits[1].id
+        expect(@helper.head_position).to eql commits[1].sha
       end
     end
   end
@@ -67,7 +67,7 @@ describe "while giving presentation" do
         presenter.execute("back")
         presenter.execute("back")
         presenter.execute("back")
-        @helper.head_position.should eql commits[0].id
+        expect(@helper.head_position).to eql commits[0].sha
       end
     end
   end
@@ -78,7 +78,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("start")
-        @helper.head_position.should eql commits[0].id
+        expect(@helper.head_position).to eql commits[0].sha
       end
     end
   end
@@ -87,7 +87,7 @@ describe "while giving presentation" do
     it "should move the last commit" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("end")
-        @helper.head_position.should eql commits.last.id
+        expect(@helper.head_position).to eql commits.last.sha
       end
     end
   end
@@ -96,7 +96,7 @@ describe "while giving presentation" do
     it "should checkout the specific commit" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("2")
-        @helper.head_position.should eql commits[1].id
+        expect(@helper.head_position).to eql commits[1].sha
       end
     end
   end
@@ -104,9 +104,9 @@ describe "while giving presentation" do
   context "list presentation" do
     it "should print a list of commits" do
       @helper.start_presentation do |commits, presenter|
-        expected_output = (["*#{commits.first.id[0..9]}, #{commits.first.message}"] + commits[1..-1].map{|commit| "#{commit.id[0..9]}, #{commit.message}"}).join("\n")
+        expected_output = (["*#{commits.first.sha[0..9]}, #{commits.first.message}"] + commits[1..-1].map{|commit| "#{commit.sha[0..9]}, #{commit.message}"}).join("\n")
         presentation = presenter.execute("list")
-        presentation.should eql expected_output
+        expect(presentation).to eql expected_output
       end
     end
   end
@@ -127,7 +127,7 @@ help/h: display this message
 exit: exit from the presentation
 EOH
         message = presenter.execute("help")
-        message.should eql help_text
+        expect(message).to eql help_text
       end
     end
   end
@@ -138,7 +138,7 @@ EOH
       @helper.start_presentation([:run => "echo hello world"]) do |commits, presenter|
         presenter.execute("next")
         presenter.execute("next")
-        presenter.execute("next").strip.should eql "hello world"
+        expect(presenter.execute("next").strip).to eql "hello world"
       end
     end
   end
@@ -148,7 +148,7 @@ EOH
       command_line_helper = CommandLineHelper.capture_output
       @helper.start_presentation([:run => "echo hello world",:on_slide => 2]) do |commits, presenter|
         presenter.execute("next")
-        presenter.execute("next").should eql "#{commits[2].message}\nhello world\n"
+        expect(presenter.execute("next")).to eql "#{commits[2].message}\nhello world\n"
       end
     end
   end
@@ -158,7 +158,7 @@ EOH
       command_line_helper = CommandLineHelper.capture_output
       @helper.start_presentation do |commits, presenter|
         presenter.execute("!echo hello world")
-        command_line_helper.command_output.strip.should end_with "hello world"
+        expect(command_line_helper.command_output.strip).to end_with "hello world"
       end
     end
   end
@@ -167,7 +167,7 @@ EOH
     it "should open the with launchy" do
       command_line_helper = CommandLineHelper.capture_output
       @helper.start_presentation([:launch => 'readme', :on_slide => 2]) do |commits, presenter|
-        Launchy.should_receive(:open).with('readme').once
+        expect(Launchy).to receive(:open).with('readme').once
         presenter.execute("next")
         presenter.execute("next")
       end
@@ -179,8 +179,17 @@ EOH
       @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
         presenter.execute("exit")
-        @helper.current_branch.should_not be_nil
-        @helper.current_branch.name.should eql "master"
+        expect(@helper.current_branch).not_to be_nil
+        expect(@helper.current_branch).to eql "master"
+      end
+    end
+  end
+
+  context "when running in command mode" do
+    it "should set the current slide to commit" do
+      @helper.start_presentation([], 1) do |commits, presenter|
+        presenter.execute("list")
+        expect(presenter.current_slide.commit).to eql commits[1].sha
       end
     end
   end

data/spec/integration/start_presentation_spec.rb

@@ -13,32 +13,32 @@ describe "starting a presentation" do
     Dir.chdir(presentation_dir) do
       presenter = GitPresenter.new(".", false)
       presentation = presenter.execute('start')
-      presentation.slides.length.should eql 4
+      expect(presentation.slides.length).to eql 4
     end
   end
 
   it "first commit should be first commit in file" do
     @helper.start_presentation do |commits, presenter|
-      presenter.slides[0].commit.should eql commits[0].id
+      expect(presenter.slides[0].commit).to eql commits[0].sha
     end
   end
 
   it "second commit should be second commit in file" do
     @helper.start_presentation do |commits, presenter|
-      presenter.slides[1].commit.should eql commits[1].id
+      expect(presenter.slides[1].commit).to eql commits[1].sha
     end
   end
 
   it "the last commit should be a command" do
     command = "echo hello world"
     @helper.start_presentation([:run => command]) do |commits, presenter|
-      presenter.slides[3].run.should eql command
+      expect(presenter.slides[3].run).to eql command
     end
   end
 
   it "should have the presentation at first commit" do
     @helper.start_presentation do |commits, presenter|
-      @helper.head_position.should eql commits.first.id
+      expect(@helper.head_position).to eql commits.first.sha
     end
   end
 end

data/spec/integration/update_presentation_spec.rb

@@ -10,7 +10,7 @@ describe "update presentation with any new commits" do
     commits = @helper.initialise_presentation({:delay => true})
     new_commit = @helper.edit_file_and_commit("forth commit", "d")
     @helper.update_presentation do |yaml|
-      yaml["slides"].length.should eql (commits.length + 1)
+      expect(yaml["slides"].length).to eql (commits.length + 1)
     end
   end
 
@@ -18,7 +18,7 @@ describe "update presentation with any new commits" do
     commits = @helper.initialise_presentation({:delay => true})
     new_commit = @helper.edit_file_and_commit("forth commit", "d")
     @helper.update_presentation do |yaml|
-      yaml["slides"].last["slide"]["commit"].should eql new_commit.id
+      expect(yaml["slides"].last["slide"]["commit"]).to eql new_commit.sha
     end
   end
 
@@ -27,7 +27,7 @@ describe "update presentation with any new commits" do
     removed_commit = @helper.remove_from_presentation_at(1)
     new_commit = @helper.edit_file_and_commit("forth commit", "d")
     @helper.update_presentation do |yaml|
-      yaml["slides"].length.should eql (commits.length)
+      expect(yaml["slides"].length).to eql (commits.length)
     end
   end
 
@@ -36,7 +36,7 @@ describe "update presentation with any new commits" do
     removed_commit = @helper.remove_from_presentation_at(1)
     new_commit = @helper.edit_file_and_commit("forth commit", "d")
     @helper.update_presentation
-    @command_line.command_output.should include "Your presentation has been updated"
+    expect(@command_line.command_output).to include "Your presentation has been updated"
   end
 
 end

data/spec/lib/git_presenter/presentation_spec.rb

@@ -1,24 +1,37 @@
 require "spec_helper"
 
+class FakeShell
+  attr_reader :ran_commands
+  def initialize()
+    @ran_commands = []
+  end
+  def run(command)
+    @ran_commands << command
+  end
+end
 describe GitPresenter::Presentation do
   let(:presentation){ {"slides" => [
                           {"slide" => {"commit" => "0"}},
                           {"slide" => {"commit" => "1"}},
-                          {"slide" => {"commit" => "2"}}]
+                          {"slide" => {"commit" => "2"}}],
+                       "branch" => "test"
                       }
                     }
+  let(:fake_shell){ FakeShell.new }
   context "when displaying the command line" do
     it "should display the current position" do
-      presenter = GitPresenter::Presentation.new(presentation)
-      presenter.status_line.should eql "1/3 >"
+      fake_shell.should_receive(:run).with("git rev-parse HEAD").and_return("0")
+      presenter = GitPresenter::Presentation.new(presentation, fake_shell)
+      expect(presenter.status_line).to eql "1/3 >"
     end
   end
 
 
   context "when calculating the position" do
     it "should return the index of the current commit" do
-      presenter = GitPresenter::Presentation.new(presentation)
-      presenter.position.should eql 0
+      expect(fake_shell).to receive(:run).with("git rev-parse HEAD").and_return("0")
+      presenter = GitPresenter::Presentation.new(presentation, fake_shell)
+      expect(presenter.position).to eql 0
     end
   end
 
@@ -29,59 +42,70 @@ describe GitPresenter::Presentation do
     end
 
     context "with bash command" do
-      it { given_command("!echo hello world").should eql :command }
+      it { expect(given_command("!echo hello world")).to eql :command }
     end
 
     context "with next" do
-      it { given_command("next").should eql :next }
+      it { expect(given_command("next")).to eql :next }
     end
 
     context "with next" do
-      it { given_command("n").should eql :next }
+      it { expect(given_command("n")).to eql :next }
     end
 
     context "with back" do
-      it { given_command("back").should eql :previous }
+      it { expect(given_command("back")).to eql :previous }
     end
 
     context "with b" do
-      it { given_command("b").should eql :previous }
+      it { expect(given_command("b")).to eql :previous }
     end
 
     context "with start" do
-      it { given_command("start").should eql :start }
+      it { expect(given_command("start")).to eql :start }
     end
 
     context "with s" do
-      it { given_command("s").should eql :start }
+      it { expect(given_command("s")).to eql :start }
     end
 
     context "with end" do
-      it { given_command("end").should eql :end }
+      it { expect(given_command("end")).to eql :end }
     end
 
     context "with e" do
-      it { given_command("e").should eql :end }
+      it { expect(given_command("e")).to eql :end }
     end
 
     context "with list" do
-      it { given_command("list").should eql :list }
+      it { expect(given_command("list")).to eql :list }
     end
 
     context "with l" do
-      it { given_command("l").should eql :list }
+      it { expect(given_command("l")).to eql :list }
     end
 
     context "with any number" do
-      it { given_command("6").should eql :commit}
+      it { expect(given_command("6")).to eql :commit}
     end
 
     context "with h" do
-      it { given_command("h").should eql :help}
+      it { expect(given_command("h")).to eql :help}
     end
 
     context "with help" do
-      it { given_command("help").should eql :help}
+      it { expect(given_command("help")).to eql :help}
+    end
+
+    context "with exit" do
+      it { given_command("exit").should eql :exit}
+      it 'checks out to the correct branch' do
+        presenter = GitPresenter::Presentation.new(presentation)
+
+        expect(presenter).to receive(:'`').with("git checkout -q #{presentation['branch']}")
+
+        presenter.exit
+      end
     end
   end
 end