git_presenter 0.4.0 → 1.4.0

data/spec/lib/git_presenter/slide_spec.rb

@@ -4,12 +4,12 @@ describe GitPresenter::Slide do
   context "when displaying as string" do
     it "should write out the commit id and the message" do
       slide = GitPresenter::Slide.new({"commit" => "012345678901234567890","message" => "message"})
-      slide.to_s.should eql "0123456789, message"
+      expect(slide.to_s).to eql "0123456789, message"
     end
 
     it "should not blow up if no command exists" do
       slide = GitPresenter::Slide.new({"run" => "echo hello world"})
-      slide.to_s.should eql "run: echo hello world"
+      expect(slide.to_s).to eql "run: echo hello world"
     end
   end
 
@@ -18,7 +18,7 @@ describe GitPresenter::Slide do
       it "should run that command" do
         command_line_helper = CommandLineHelper.capture_output
         slide = GitPresenter::Slide.new({"run" => "echo hello world"})
-        slide.execute.strip.should eql "hello world"
+        expect(slide.execute.strip).to eql "hello world"
       end
     end
 
@@ -27,24 +27,24 @@ describe GitPresenter::Slide do
         command_line_helper = CommandLineHelper.capture_output
         slide = GitPresenter::Slide.new({"commit" => "number", "message" => "checkout", "run" => "echo hello world"})
         slide.stub(:checkout).and_return("checkout\n")
-        slide.execute.should eql "checkout\nhello world\n"
+        expect(slide.execute).to eql "checkout\nhello world\n"
       end
     end
 
     context "when slide contains a launch command" do
       it "should launch the application for the file type" do
         command_line_helper = CommandLineHelper.capture_output
-        Launchy.should_receive(:open).with("readme").once
+        expect(Launchy).to receive(:open).with("readme").once
         slide = GitPresenter::Slide.new({"launch" => "readme"})
         slide.execute
       end
 
       it "should not try and launch if no launch supplied" do
         command_line_helper = CommandLineHelper.capture_output
-        Launchy.should_receive(:open).with("readme").never
+        expect(Launchy).to receive(:open).with("readme").never
         slide = GitPresenter::Slide.new({"commit" => "number", "message" => "checkout", "run" => "echo hello world"})
         slide.stub(:checkout).and_return("checkout\n")
-        slide.execute.should eql "checkout\nhello world\n"
+        expect(slide.execute).to eql "checkout\nhello world\n"
       end
     end
 
@@ -53,7 +53,7 @@ describe GitPresenter::Slide do
         command_line_helper = CommandLineHelper.capture_output
         slide = GitPresenter::Slide.new({"commit" => "number", "message" => "checkout"})
         slide.stub(:checkout).and_return("checkout\n")
-        slide.execute.should eql "checkout\n"
+        expect(slide.execute).to eql "checkout\n"
       end
     end
   end

data/spec/support/git_helpers.rb

@@ -16,10 +16,10 @@ class GitHelper
     content = ('a'..'z').to_a
     Dir.mkdir(presentation_dir)
     Dir.chdir(presentation_dir) do
-      @git_repo = Grit::Repo.init(".")
+      @git_repo = Git.init(".")
       (1..no_of_commits).each do |n|
-        edit_file_and_commit("commit number #{n}", content[n])
-        commits << @git_repo.commits[0]
+        commit = edit_file_and_commit("commit number #{n}", content[n])
+        commits << commit
         #need to make it sleep for a second.
         #git is not accurate enough with the speed of the test
         #to sort correctly only when required
@@ -40,7 +40,7 @@ class GitHelper
     edit_file(content)
     @git_repo.add(".")
     @git_repo.commit_all(commit_message)
-    @git_repo.commits[0]
+    @git_repo.log.to_a[0]
   end
 
   def setup_presentation_file(commits)
@@ -56,7 +56,7 @@ class GitHelper
   end
 
   def head_position
-    File.open(@presentation_dir + '/.git/HEAD').lines.first.strip
+    File.open(@presentation_dir + '/.git/HEAD').each_line.first.strip
   end
 
   def initialise_presentation(params={})
@@ -71,12 +71,17 @@ class GitHelper
     commits
   end
 
-  def start_presentation(commands=[])
+  def start_presentation(commands=[], start_slide=0)
     commits = initialise_presentation({:delay => true})
     Dir.chdir(@presentation_dir) do
       add_commands(commands) unless commands.empty?
+      if start_slide != 0
+        `git checkout -q #{commits[start_slide]}`
+      end
       presenter = GitPresenter.new('.', false)
-      presenter = presenter.execute('start')
+      if start_slide == 0
+        presenter = presenter.execute('start')
+      end
       yield(commits, presenter) if block_given?
     end
   end
@@ -143,8 +148,8 @@ class GitHelper
 
   def current_branch
     Dir.chdir(PRESENTATION_DIR) do
-      repo = Grit::Repo.init('.')
-      repo.head
+      repo = Git.open('.')
+      repo.current_branch
     end
   end
 

metadata

@@ -1,104 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Colin Gemmell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
-  requirement: &70174479333640 !ruby/object:Gem::Requirement
-    none: false
+  name: git
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 1.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174479333640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70174478378360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70174478378360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70174478379800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
   type: :development
   prerelease: false
-  version_requirements: *70174478379800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174478381240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 3.10.0
   type: :development
   prerelease: false
-  version_requirements: *70174478381240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174478382680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
   type: :development
   prerelease: false
-  version_requirements: *70174478382680
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70174478385540 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: *70174478385540
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70174478954780 !ruby/object:Gem::Requirement
-    none: false
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 2.3.5
   type: :development
   prerelease: false
-  version_requirements: *70174478954780
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70174478102720 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70174478102720
+        version: 2.3.5
 description: Code presentation tool using git
 email: pythonandchips@gmail.com
 executables:
@@ -108,8 +103,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
 files:
-- .rspec
-- .travis.yml
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -121,6 +116,7 @@ files:
 - lib/git_presenter.rb
 - lib/git_presenter/controller.rb
 - lib/git_presenter/presentation.rb
+- lib/git_presenter/shell.rb
 - lib/git_presenter/slide.rb
 - spec/bugs/max_10_commits_being_parsed_spec.rb
 - spec/integration/initialize_presentation_spec.rb
@@ -136,29 +132,24 @@ files:
 homepage: http://github.com/pythonandchips/git-presenter
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3910658736089827662
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 3.2.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Code presentation tool using git
 test_files: []