git_presenter 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a10c89461bdb37a5cd273e9c6c70794d106351b3
-  data.tar.gz: e528f67d7e7f05213b322bfaa3345f5c41fad457
+  metadata.gz: d3a5108af02483b24a244e6fe0c5809b56ce2aa0
+  data.tar.gz: 1d1c4eab9e7368b19d91ba088cdd3d2ae75e834d
 SHA512:
-  metadata.gz: 1e039a8308e57e799cd64bb7731319b519cca0778538ff753851db2ffa33c95a79d6845a61b849197f08fa4600870d965a3688321660ed24a3fd5873dc3ba064
-  data.tar.gz: c803d8136b08d35a94d7994a008d4a8d9f7a01799242f2651573e7e54fbba0b55cf55b25de6da9f5bfbd4e3a30683b7ebc99fd8bff4bb3ec97f433de10b118c3
+  metadata.gz: 41df6ca731e1c83fabc4c4c7f6aa9cda9c85e3f5559e358733818d641a7467c5c30fb741c97609513d7898d06642e555596744b46ebd07cb405095df2dc2549f
+  data.tar.gz: 19017243d18c056bc53fdbb72054749504196b3ff12976d74ff70631f849c15006ffba5c8baf8550e5a84286fb45bab075046438985f110749020fe90c3eab06

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:
 
@@ -36,6 +36,14 @@ gem install git_presenter
 * list/l : list slides in presentation
 * help/h: display this message
 
+###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]
@@ -82,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/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.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,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: git_presenter 1.1.0 ruby lib
+# stub: git_presenter 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git_presenter"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Colin Gemmell"]
-  s.date = "2014-06-14"
+  s.date = "2014-07-09"
   s.description = "Code presentation tool using git"
   s.email = "pythonandchips@gmail.com"
   s.executables = ["git-presenter"]
@@ -33,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",

data/lib/git_presenter.rb

@@ -7,6 +7,7 @@ class GitPresenter
   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)
@@ -24,11 +25,18 @@ class GitPresenter
     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

@@ -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

data/lib/git_presenter/presentation.rb

@@ -1,10 +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)
@@ -45,7 +51,7 @@ class GitPresenter::Presentation
   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/integration/moving_through_presentation_spec.rb

@@ -184,4 +184,13 @@ EOH
       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
 end

data/spec/lib/git_presenter/presentation_spec.rb

@@ -1,5 +1,14 @@
 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"}},
@@ -8,9 +17,11 @@ describe GitPresenter::Presentation do
                        "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
@@ -18,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

data/spec/support/git_helpers.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Colin Gemmell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -116,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