git_presenter 0.3.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: ec6e73263bc7b7fe3385a30fefd9473631fd9a2015182f73c437f832296df9ea
+  data.tar.gz: 01c7a2b97c61f48a440b7489019742cbaf1c5da68e1bc084ff9e5a30741e51f1
+SHA512:
+  metadata.gz: fc2b81fa4219096831ec3b6e79d4a5829d9385de50e4883aea10e3af971965402231e0a13ec90f485377bd9860b94cf4bfe7378a0962bc10121765d6868479fe
+  data.tar.gz: 353bca888c8f73082cf757068d582f8148122b87838c3ef7986b979b2573dbece0e42bd95de3b5c5c332bf0401a27a2c554459b358cc2fc285a3bb0ec97c02f8

data/.travis.yml

@@ -2,4 +2,8 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 3.0.0
   # - jruby-19mode # JRuby in 1.9 mode
+script: "bundle exec rspec spec"

data/Gemfile

@@ -3,7 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 #
-gem "grit", "~> 2.4"
+gem "git"
+gem 'launchy', '~> 2.5'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -11,7 +12,5 @@ group :development do
   gem "pry"
   gem "rspec", "~> 2.7"
   gem "bundler"
-  gem "jeweler", "~> 1.6"
-  gem "rcov", "~> 0.9"
-  gem 'pry'
+  gem 'jeweler', '~> 2.3'
 end

data/Gemfile.lock

@@ -1,47 +1,97 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    coderay (1.0.6)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.14.2-java)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (4.1.0)
+    highline (2.0.3)
+    jar-dependencies (0.4.1)
+    jeweler (2.3.5)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api (~> 0.11.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.7.3)
-    method_source (0.7.1)
-    mime-types (1.18)
-    posix-spawn (0.3.6)
-    pry (0.9.9.6)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    slop (2.4.4)
+      semver2
+    jwt (2.2.2)
+    launchy (2.5.0)
+      addressable (~> 2.7)
+    method_source (1.0.0)
+    mini_portile2 (2.1.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-java)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry (0.13.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      spoon (~> 0.0)
+    psych (2.2.4)
+    psych (2.2.4-java)
+      jar-dependencies (>= 0.1.7)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    rdoc (6.3.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    semver2 (3.4.2)
+    spoon (0.0.6)
+      ffi
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   bundler
-  grit (~> 2.4)
-  jeweler (~> 1.6)
+  git
+  jeweler (~> 2.3)
+  launchy (~> 2.5)
   pry
-  rcov (~> 0.9)
   rspec (~> 2.7)
+
+BUNDLED WITH
+   2.2.3

data/README.markdown

@@ -1,6 +1,6 @@
 # git-presenter
 
-[![Build Status](https://secure.travis-ci.org/pythonandchips/git-presenter.png?branch=master)](http://travis-ci.org/pythonandchips/git-presenter)
+[![Build Status](https://drone.io/github.com/pythonandchips/git-presenter/status.png)](https://drone.io/github.com/pythonandchips/git-presenter/latest)
 
 When presenting code live on stage you have a few choices:
 
@@ -11,15 +11,12 @@ Git-presenter hope to solve this problem by giving a presentation style interfac
 
 ## Current status
 
-Early version but the basics are there to be used.
-Any and all feedback is welcome
+Complete.
 
 ## Pre-requisites
 
 * Git
-* Ruby version 1.9.2 or 1.9.3
-
-Note jruby is currently unsupported as there is a problem with posix-spawn and jruby
+* Ruby version 1.9.2, 1.9.3, 2.0.0, 2.1.0 and jruby
 
 ## Installation
 
@@ -39,7 +36,20 @@ gem install git_presenter
 * list/l : list slides in presentation
 * help/h: display this message
 
-## Bugs/Features/Prase
+### Command mode
+
+The default for git presenter is interactive mode however if you want to use git presenter from a text editor you can use command mode.
+
+To start a presentation in command mode use "git-presenter start -c"
+
+Once started you run "git-presenter {{command}}" e.g. to move to the next slide run "git-presenter next"
+
+## Other resources
+There are couple of videos showing git presenter and how to us it
+* (video 1)[https://vimeo.com/38949496]
+* (video 2)[https://vimeo.com/39225144]
+
+## Bugs/Features/Praise
 
 It you find any bugs or have some feature requests please add an issue on the repository. Or if you just want to get in touch and tell me how awesome git presenter is you can get me on twitter @colin_gemmell or drop me an email at pythonandchips{at}gmail.com
 
@@ -54,6 +64,10 @@ It you find any bugs or have some feature requests please add an issue on the re
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+## Contributors
+
+* (Luís Ferreira - Zamith)[https://github.com/zamith]
+
 ## Copyright
 
 Copyright (c) 2012 Colin Gemmell
@@ -76,4 +90,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/Rakefile

@@ -24,26 +24,3 @@ Jeweler::Tasks.new do |gem|
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "git_presenter #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.3.0
+1.3.0

data/bin/git-presenter

@@ -4,5 +4,11 @@ require_relative "../lib/git_presenter"
 
 YAML::ENGINE.yamler = 'psych'
 
-presenter = GitPresenter.new(Dir.pwd)
+if ARGV[1] == "-c"
+  interactive = false
+else
+  interactive = true
+end
+
+presenter = GitPresenter.new(Dir.pwd, interactive)
 presenter.execute(ARGV[0])

data/git_presenter.gemspec

@@ -2,17 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: git_presenter 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "git_presenter"
-  s.version = "0.3.0"
+  s.name = "git_presenter".freeze
+  s.version = "1.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Colin Gemmell"]
-  s.date = "2012-06-29"
-  s.description = "Code presentation tool using git"
-  s.email = "pythonandchips@gmail.com"
-  s.executables = ["git-presenter"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Colin Gemmell".freeze]
+  s.date = "2021-01-11"
+  s.description = "Code presentation tool using git".freeze
+  s.email = "pythonandchips@gmail.com".freeze
+  s.executables = ["git-presenter".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -31,6 +33,7 @@ Gem::Specification.new do |s|
     "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",
@@ -44,40 +47,29 @@ Gem::Specification.new do |s|
     "spec/support/command_line_helper.rb",
     "spec/support/git_helpers.rb"
   ]
-  s.homepage = "http://github.com/pythonandchips/git-presenter"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
-  s.summary = "Code presentation tool using git"
+  s.homepage = "http://github.com/pythonandchips/git-presenter".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.2.3".freeze
+  s.summary = "Code presentation tool using git".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<grit>, ["~> 2.4"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.7"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
-      s.add_development_dependency(%q<rcov>, ["~> 0.9"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-    else
-      s.add_dependency(%q<grit>, ["~> 2.4"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.7"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6"])
-      s.add_dependency(%q<rcov>, ["~> 0.9"])
-      s.add_dependency(%q<pry>, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<git>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<launchy>.freeze, ["~> 2.5"])
+    s.add_development_dependency(%q<pry>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 2.7"])
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
   else
-    s.add_dependency(%q<grit>, ["~> 2.4"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.7"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6"])
-    s.add_dependency(%q<rcov>, ["~> 0.9"])
-    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<git>.freeze, [">= 0"])
+    s.add_dependency(%q<launchy>.freeze, ["~> 2.5"])
+    s.add_dependency(%q<pry>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 2.7"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
   end
 end
 

data/lib/git_presenter.rb

@@ -1,11 +1,13 @@
-require "grit"
-require "yaml"
-require "readline"
+require 'git'
+require 'yaml'
+require 'readline'
+require 'launchy'
 
 class GitPresenter
-  require "git_presenter/presentation"
-  require "git_presenter/controller"
-  require "git_presenter/slide"
+  require_relative 'git_presenter/presentation'
+  require_relative 'git_presenter/controller'
+  require_relative 'git_presenter/slide'
+  require_relative 'git_presenter/shell'
 
   def initialize(current_dir, interactive=true)
     @controller = Controller.new(current_dir)
@@ -13,21 +15,28 @@ class GitPresenter
   end
 
   def execute(command)
-    if command == "init"
+    if command == 'init'
       @controller.initialise_presentation
-    elsif command == "start"
+    elsif command == 'start'
       @presentation = @controller.start_presentation
       if @interactive
         enter_run_loop
       end
-    elsif command == "update"
+    elsif command == 'update'
       @controller.update_presentation
     else
+      if @presentation.nil?
+        @presentation = @controller.load_presentation
+      end
       puts @presentation.execute(command)
     end
     @presentation
   end
 
+  def current_slide
+    @presentation.current_slide
+  end
+
   private
 
   def enter_run_loop

data/lib/git_presenter/controller.rb

@@ -6,7 +6,7 @@ class GitPresenter::Controller
   end
 
   def initialise_presentation
-    yaml = {"slides" => create_slides}.to_yaml
+    yaml = {"slides" => create_slides, "branch" => current_branch}.to_yaml
     File.open(presentation_file_location, "w") do |file|
       file.write(yaml)
     end
@@ -14,9 +14,13 @@ class GitPresenter::Controller
     puts "run 'git-presenter start' to begin the presentation"
   end
 
-  def start_presentation
+  def load_presentation
     yaml = YAML.parse(File.open(@presentation_dir + "/.presentation", "r")).to_ruby
-    presenter = GitPresenter::Presentation.new(yaml)
+    GitPresenter::Presentation.new(yaml)
+  end
+
+  def start_presentation
+    presenter = load_presentation
     puts presenter.start
     presenter
   end
@@ -24,7 +28,6 @@ class GitPresenter::Controller
   def update_presentation
     yaml = YAML.parse(File.open(@presentation_dir + "/.presentation", "r")).to_ruby
     slides = create_slides(yaml['slides'].last["slide"]["commit"])
-    last_commit = yaml["slides"].last
     yaml["slides"] = yaml["slides"] + slides
     yaml["slides"].uniq!
     write_file(yaml.to_yaml)
@@ -44,14 +47,18 @@ class GitPresenter::Controller
   end
 
   def create_slides(last_commit=nil)
-    repo = Grit::Repo.new(".", "master")
-    commits = repo.commits("master", false).reverse
-    commits = commits.drop_while{|commit| commit.id != last_commit}[1..-1] unless last_commit.nil?
+    repo = Git.open(".")
+    commits = repo.log.to_a.reverse
+    commits = commits.drop_while{|commit| commit.sha != last_commit}[1..-1] unless last_commit.nil?
     commits.map do |commit|
       {"slide" =>
-        {"commit"  => commit.id,
+         {"commit"  => commit.sha,
          "message" => commit.message}
       }
     end
   end
+
+  def current_branch
+    `git rev-parse --abbrev-ref HEAD`.strip
+  end
 end

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,11 +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/lib/git_presenter/slide.rb

@@ -5,12 +5,14 @@ class GitPresenter::Slide
     @commit  = slide["commit"]
     @message = slide["message"]
     @run = slide["run"]
+    @launch = slide["launch"]
   end
 
   def execute
     output = ""
     output << checkout unless @commit.nil?
     output << `#{run}` unless @run.nil?
+    Launchy.open(@launch) unless @launch.nil?
     output
   end
 

data/spec/integration/initialize_presentation_spec.rb

@@ -10,7 +10,7 @@ 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
+        File.exists?(".presentation").should be_truthy
       end
     end
 
@@ -20,6 +20,12 @@ describe "initializing a presentation" do
       end
     end
 
+    it 'should have a branch note' do
+      @helper.initialise_presentation do |commits, yaml|
+        yaml["branch"].should_not 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
@@ -28,13 +34,13 @@ describe "initializing a presentation" do
 
     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
+        yaml["slides"][0]["slide"]["commit"].should 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
+        yaml["slides"][1]["slide"]["commit"].should 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
+        @helper.head_position.should 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
+        @helper.head_position.should 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
+        @helper.head_position.should 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
+        @helper.head_position.should 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
+        @helper.head_position.should 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
+        @helper.head_position.should 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
+        @helper.head_position.should 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
+        @helper.head_position.should 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
+        @helper.head_position.should eql commits[1].sha
       end
     end
   end
@@ -104,7 +104,7 @@ 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
       end
@@ -135,7 +135,7 @@ EOH
   context "when the slide contains a run command only" do
     it "should execute the command" do
       command_line_helper = CommandLineHelper.capture_output
-      @helper.start_presentation("echo hello world") do |commits, presenter|
+      @helper.start_presentation([:run => "echo hello world"]) do |commits, presenter|
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("next").strip.should eql "hello world"
@@ -146,7 +146,7 @@ EOH
   context "when the slide has a commit and a run command" do
     it "should checkout the commit and then execute the command" do
       command_line_helper = CommandLineHelper.capture_output
-      @helper.start_presentation("echo hello world", 2) do |commits, presenter|
+      @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"
       end
@@ -163,13 +163,33 @@ EOH
     end
   end
 
+  context "when opening an application" do
+    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
+        presenter.execute("next")
+        presenter.execute("next")
+      end
+    end
+  end
+
   context "when exiting a presentation" do
     it "should set the repo back to the master branch" do
       @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"
+        @helper.current_branch.should 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")
+        presenter.current_slide.commit.should eql commits[1].sha
       end
     end
   end

data/spec/integration/start_presentation_spec.rb

@@ -19,26 +19,26 @@ describe "starting a presentation" do
 
   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
+      presenter.slides[0].commit.should 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
+      presenter.slides[1].commit.should eql commits[1].sha
     end
   end
 
   it "the last commit should be a command" do
     command = "echo hello world"
-    @helper.start_presentation(command) do |commits, presenter|
+    @helper.start_presentation([:run => command]) do |commits, presenter|
       presenter.slides[3].run.should 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
+      @helper.head_position.should eql commits.first.sha
     end
   end
 end

data/spec/integration/update_presentation_spec.rb

@@ -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
+      yaml["slides"].last["slide"]["commit"].should eql new_commit.sha
     end
   end
 

data/spec/lib/git_presenter/presentation_spec.rb

@@ -1,15 +1,27 @@
 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)
+      fake_shell.should_receive(:run).with("git rev-parse HEAD").and_return("0")
+      presenter = GitPresenter::Presentation.new(presentation, fake_shell)
       presenter.status_line.should eql "1/3 >"
     end
   end
@@ -17,7 +29,8 @@ describe GitPresenter::Presentation do
 
   context "when calculating the position" do
     it "should return the index of the current commit" do
-      presenter = GitPresenter::Presentation.new(presentation)
+      fake_shell.should_receive(:run).with("git rev-parse HEAD").and_return("0")
+      presenter = GitPresenter::Presentation.new(presentation, fake_shell)
       presenter.position.should eql 0
     end
   end
@@ -83,5 +96,16 @@ describe GitPresenter::Presentation do
     context "with help" do
       it { given_command("help").should 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

data/spec/lib/git_presenter/slide_spec.rb

@@ -31,6 +31,23 @@ describe GitPresenter::Slide do
       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
+        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
+        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"
+      end
+    end
+
     context "when slide contains only a commit" do
       it "should checkout the code then run the command" do
         command_line_helper = CommandLineHelper.capture_output

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(command="", add_command_to_commit=nil)
+  def start_presentation(commands=[], start_slide=0)
     commits = initialise_presentation({:delay => true})
     Dir.chdir(@presentation_dir) do
-      add_command(command, add_command_to_commit) unless command.empty?
+      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
@@ -102,6 +107,31 @@ class GitHelper
     removed_commit
   end
 
+  def add_commands(commands)
+    commands.each do |command|
+      if command.include?(:run)
+        add_command(command[:run], command[:on_slide])
+      end
+      if command.include?(:launch)
+        add_launch(command[:launch], command[:on_slide])
+      end
+    end
+  end
+
+  def add_launch(command, add_command_to_commit=nil)
+    Dir.chdir(PRESENTATION_DIR) do
+      presentation = YAML.parse(File.open(".presentation")).to_ruby
+      if !add_command_to_commit.nil?
+        presentation["slides"][add_command_to_commit]["slide"]["launch"] = command
+      else
+        presentation["slides"] << {"slide" => {"launch" => command}}
+      end
+      File.open(".presentation", "w") do |file|
+        file.write(presentation.to_yaml)
+      end
+    end
+  end
+
   def add_command(command, add_command_to_commit=nil)
     Dir.chdir(PRESENTATION_DIR) do
       presentation = YAML.parse(File.open(".presentation")).to_ruby
@@ -118,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,93 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Colin Gemmell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
-  requirement: &70193289098420 !ruby/object:Gem::Requirement
-    none: false
+  name: git
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70193289098420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70193289097940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193289097940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70193289097460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70193289097460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70193289096980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193289096980
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70193289096500 !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: *70193289096500
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70193289096020 !ruby/object:Gem::Requirement
-    none: false
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *70193289096020
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70193289095540 !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: *70193289095540
+        version: '2.3'
 description: Code presentation tool using git
 email: pythonandchips@gmail.com
 executables:
@@ -97,8 +103,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
 files:
-- .rspec
-- .travis.yml
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -110,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
@@ -125,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: 2611368202741633093
 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: []