git_presenter 0.1.1 → 0.2.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode

data/README.markdown

@@ -1,6 +1,9 @@
 # git-presenter
 
+[![Build Status](https://secure.travis-ci.org/pythonandchips/git-presenter.png?branch=master)](http://travis-ci.org/pythonandchips/git-presenter)
+
 When presenting code live on stage you have a few choices:
+
 * Change code live on stage and risk making a mistake and the code not working.
 * Place code in a slide and not be able to run the code live.
 
@@ -14,25 +17,24 @@ Any and all feedback is welcome
 ## Pre-requisites
 
 * Git
-* Ruby
+* Ruby version 1.9.2 or 1.9.3 or jruby in 1.9 mode (basically anything with 1.9 at the end)
 
 ## Installation
 
-gem install git-presenter
+gem install git_presenter
 
 ## Usage
 
-Commit to git as you develop you code.
-When the code is ready use the "git-presenter init" command to initialise
-Once it is initialised you can start the presentation with "git-presenter start"
-Then use the following command to navigate the presentation
-
-next/n: move to next slide
-back/b: move back a slide
-end/e:  move to end of presentation
-start/s: move to start of presentation
-list/l : list slides in presentation
-help/h: display this message
+* Commit to git as you develop your code.
+* When the code is ready use the "git-presenter init" command to initialise
+* Once it is initialised you can start the presentation with "git-presenter start"
+* Then use the following command to navigate the presentation
+* next/n: move to next slide
+* back/b: move back a slide
+* end/e:  move to end of presentation
+* start/s: move to start of presentation
+* list/l : list slides in presentation
+* help/h: display this message
 
 ## Contributing to git-presenter
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/git-presenter

@@ -10,9 +10,12 @@ if ARGV[0] == "init"
   puts "run 'git-presenter start' to begin the presentation"
 elsif ARGV[0] == "start"
   presenter = GitPresenter.start_presentation(Dir.pwd)
+  puts presenter.current_slide
 
   while command = Readline.readline(presenter.status_line, true)
-    p presenter.execute(command)
+    result = presenter.execute(command)
+    exit if result == :exit
+    puts result
   end
 else
   puts "what you talkin bout willis"

data/git_presenter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "git_presenter"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin Gemmell"]
-  s.date = "2012-03-20"
+  s.date = "2012-03-26"
   s.description = "Code presentation tool using git"
   s.email = "pythonandchips@gmail.com"
   s.executables = ["git-presenter"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -28,13 +29,19 @@ Gem::Specification.new do |s|
     "bin/git-presenter",
     "git_presenter.gemspec",
     "lib/git_presenter.rb",
+    "lib/git_presenter/parser.rb",
+    "lib/git_presenter/presentation.rb",
+    "lib/git_presenter/slide.rb",
+    "lib/git_presenter/writer.rb",
     "spec/integration/initialize_presentation_spec.rb",
     "spec/integration/moving_through_presentation_spec.rb",
-    "spec/integration/processing_user_command_spec.rb",
     "spec/integration/start_presentation_spec.rb",
-    "spec/integration/status_line_spec.rb",
+    "spec/lib/git_presenter/presentation_spec.rb",
+    "spec/lib/git_presenter/slide_spec.rb",
+    "spec/lib/git_presenter/writer_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/repo_helpers.rb"
+    "spec/support/command_line_helper.rb",
+    "spec/support/git_helpers.rb"
   ]
   s.homepage = "http://github.com/pythonandchips/git-presenter"
   s.licenses = ["MIT"]

data/lib/git_presenter/parser.rb

@@ -0,0 +1,16 @@
+module GitPresenter
+  class Parser
+    def initialize(presentation_dir)
+      @presentation_dir = presentation_dir
+    end
+
+    def presentation
+      presenter = nil
+      yaml = YAML.parse(File.open(@presentation_dir + "/.presentation", "r")).to_ruby
+      presenter = GitPresenter::Presentation.new(yaml)
+      presenter.start
+      presenter
+    end
+
+  end
+end

data/lib/git_presenter/presentation.rb

@@ -0,0 +1,104 @@
+module GitPresenter
+  class Presentation
+    attr_reader :slides, :current_slide
+
+    def initialize(presentation)
+      @slides = presentation["slides"].map{|slide| Slide.new(slide["slide"])}
+      @current_slide = slides.first
+    end
+
+    def command_for(command)
+      return :commit if command =~ /^[0-9]+$/
+      return :command if command[0] == "!"
+      {"n" => :next, "next" => :next,
+       "back" => :previous, "b" => :previous,
+       "start" => :start, "s" => :start,
+       "end" => :end, "e" => :end,
+       "list" => :list, "l" => :list,
+       "help" => :help, "h" => :help,
+       "exit" => :exit
+      }[command]
+    end
+
+    def execute(user_command)
+      command = command_for(user_command)
+      if command.nil?
+        puts "I canny understand ye, gonna try again"
+        return
+      end
+      return commit(user_command.to_i) if command == :commit
+      return bash_command(user_command) if command == :command
+      return :exit if command == :exit
+      self.send(command)
+    end
+
+    def bash_command(user_command)
+      puts `#{user_command[1..-1]}`
+    end
+
+    def status_line
+      "#{position+1}/#{total_slides} >"
+    end
+
+    def position
+      slides.index(@current_slide)
+    end
+
+    def total_slides
+      @slides.length
+    end
+
+    def start
+      @current_slide = slides.first
+      @current_slide.execute
+    end
+
+    def help
+      <<-EOH
+Git Presenter Reference
+
+next/n: move to next slide
+back/b: move back a slide
+end/e:  move to end of presentation
+start/s: move to start of presentation
+list/l : list slides in presentation
+help/h: display this message
+!(exclimation mark): execute following in terminal
+exit: exit from the presentation
+EOH
+    end
+
+    def end
+      @current_slide = slides.last
+      @current_slide.execute
+    end
+
+    def commit(slide_number)
+      @current_slide = slides[slide_number - 1]
+      @current_slide.execute
+    end
+
+    def next
+      return if position.nil?
+      @current_slide = slides[position + 1] || @current_slide
+      @current_slide.execute
+    end
+
+    def previous
+      return @current_slide if position == 0
+      @current_slide = slides[position - 1]
+      @current_slide.execute
+    end
+
+    def list
+      @slides.map do |slide|
+        if slide == @current_slide
+          "*#{slide}"
+        else
+          slide
+        end
+      end.join("\n")
+    end
+
+  end
+end

data/lib/git_presenter/slide.rb

@@ -0,0 +1,30 @@
+module GitPresenter
+  class Slide
+    attr_reader :commit, :message, :run
+
+    def initialize(slide)
+      @commit  = slide["commit"]
+      @message = slide["message"]
+      @run = slide["run"]
+    end
+
+    def execute
+      output = ""
+      output << checkout unless @commit.nil?
+      output << `#{run}` unless @run.nil?
+      output
+    end
+
+    def to_s
+      "#{@commit[0..9]}, #{@message}"
+    end
+
+    private
+
+    def checkout
+      `git checkout -q . `
+      `git checkout -q #{@commit}`
+      @message + "\n"
+    end
+  end
+end

data/lib/git_presenter/writer.rb

@@ -0,0 +1,32 @@
+module GitPresenter
+  class Writer
+    CONFIG_FILE = ".presentation"
+
+    def initialize(file_path)
+      @presentation_dir = file_path
+    end
+
+    def output_presenatation_file
+      yaml = {"slides" => create_slides}.to_yaml
+      File.open(presentation_file_location, "w") do |file|
+        file.write(yaml)
+      end
+    end
+
+    private
+
+    def presentation_file_location
+      File.join(@presentation_dir, CONFIG_FILE)
+    end
+
+    def create_slides
+      repo = Grit::Repo.new(".", "master")
+      repo.commits.reverse.map do |commit|
+        {"slide" =>
+          {"commit"  => commit.id,
+           "message" => commit.message}
+        }
+    end
+    end
+  end
+end

data/lib/git_presenter.rb

@@ -1,116 +1,19 @@
 require "grit"
+require "yaml"
 
-class GitPresenter
-  def initialize(commits)
-    @commits = commits
-    @current_commit = commits.first
-  end
+module GitPresenter
+  require "git_presenter/presentation"
+  require "git_presenter/writer"
+  require "git_presenter/parser"
+  require "git_presenter/slide"
 
   def self.initialise_presentation dir
-    File.open(dir + "/.presentation", "w") do |file|
-      repo = Grit::Repo.new(".", "master")
-      repo.commits.reverse.each do |commit|
-        file.write("#{commit.id}\n")
-      end
-    end
-  end
-
-  def commits
-    @commits
+    builder = Writer.new(dir)
+    builder.output_presenatation_file
   end
 
   def self.start_presentation dir
-    presenter = nil
-    File.open(dir + "/.presentation", "r") do |file|
-      commits = file.lines.map{|line| line.strip}
-      presenter = GitPresenter.new(commits)
-      presenter.start
-    end
-    presenter
-  end
-
-  def command_for(command)
-    return :commit if command =~ /^[0-9]+$/
-    {"n" => :next, "next" => :next,
-     "back" => :previous, "b" => :previous,
-     "start" => :start, "s" => :start,
-     "end" => :end, "e" => :end,
-     "list" => :list, "l" => :list,
-     "help" => :help, "h" => :help
-    }[command]
-  end
-
-  def execute(user_command)
-    command = command_for(user_command)
-    if command.nil?
-      puts "I canny understand ye, gonna try again"
-      return
-    end
-    return commit(user_command.to_i) if command == :commit
-    self.send(command)
-  end
-
-  def status_line
-    "#{position+1}/#{total_slides} >"
-  end
-
-  def position
-    commits.index(@current_commit)
-  end
-
-  def total_slides
-    @commits.length
-  end
-
-
-  def start
-    @current_commit = commits.first
-    checkout_current
-  end
-
-  def help
-<<-EOH
-Git Presenter Reference
-
-next/n: move to next slide
-back/b: move back a slide
-end/e:  move to end of presentation
-start/s: move to start of presentation
-list/l : list slides in presentation
-help/h: display this message
-EOH
-  end
-
-  def end
-    @current_commit = commits.last
-    checkout_current
-  end
-
-  def commit(slide_number)
-    @current_commit = commits[slide_number - 1]
-    checkout_current
-  end
-
-  def next
-    return if position.nil?
-    @current_commit = commits[position + 1]
-    checkout_current
-  end
-
-  def previous
-    position = commits.index(@current_commit)
-    @current_commit = commits[position - 1]
-    checkout_current
-  end
-
-  def list
-    commits = @commits.dup
-    position = commits.index(@current_commit)
-    commits[position] = "*#{commits[position]}"
-    commits.join("\n")
-  end
-
-  def checkout_current
-    `git checkout #{@current_commit}`
+    parser = Parser.new(dir)
+    parser.presentation
   end
 end

data/spec/integration/initialize_presentation_spec.rb

@@ -1,30 +1,40 @@
 require "spec_helper"
 
 describe "initializing a presentation" do
-  let(:presentation_dir){File.dirname(__FILE__) + "/../../presentation"}
+  let(:presentation_dir){GitHelper.presentation_dir}
+
+  before do
+    @helper = GitHelper.new(presentation_dir)
+  end
 
   context ".presentation file" do
     it "should be written to root directory" do
-      initialise_presentation do
+      @helper.initialise_presentation do
         File.exists?(".presentation").should be_true
       end
     end
 
+    it "should have a slides node" do
+      @helper.initialise_presentation do |commits, yaml|
+        yaml["slides"].should_not be_nil
+      end
+    end
+
     it "should contain a line for each commit to the repository" do
-      initialise_presentation do |commits, file|
-        file.lines.to_a.length.should eql commits.length
+      @helper.initialise_presentation do |commits, yaml|
+        yaml["slides"].length.should eql commits.length
       end
     end
 
     it "first line should contain the first commit number" do
-      initialise_presentation(true) do |commits, file|
-        file.lines.first.should include commits.first.id
+      @helper.initialise_presentation(true) do |commits, yaml|
+        yaml["slides"][0]["slide"]["commit"].should eql commits.first.id
       end
     end
 
     it "second line should contain the second commit number" do
-      initialise_presentation(true) do |commits, file|
-        file.lines.to_a[1].should include commits[1].id
+      @helper.initialise_presentation(true) do |commits, yaml|
+        yaml["slides"][1]["slide"]["commit"].should eql commits[1].id
       end
     end
   end

data/spec/integration/moving_through_presentation_spec.rb

@@ -3,80 +3,108 @@ require "spec_helper"
 describe "while giving presentation" do
   let(:presentation_dir){File.dirname(__FILE__) + "/../../presentation"}
 
+  before do
+    @helper = GitHelper.new(presentation_dir)
+  end
+
   context "when moving to the next slide" do
     it "should move to the next commit" do
-      start_presentation do |commits, presenter|
+      @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
-        head_position.should eql commits[1].id
+        @helper.head_position.should eql commits[1].id
       end
     end
 
     it "should continue till the last commit" do
-      start_presentation do |commits, presenter|
+      @helper.start_presentation do |commits, presenter|
+        presenter.execute("next")
+        presenter.execute("next")
+        @helper.head_position.should eql commits[2].id
+      end
+    end
+  end
+
+  context "when a change has been made during a slide" do
+    it "should continue till the last commit" do
+      @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
+        @helper.edit_file("inner commit")
         presenter.execute("next")
-        head_position.should eql commits[2].id
+        @helper.head_position.should eql commits[2].id
       end
     end
   end
 
   context "when the presentation reaches the end" do
     it "should stay on the last commit" do
-      start_presentation do |commits, presenter|
+      @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("next")
-        head_position.should eql commits[2].id
+        @helper.head_position.should eql commits[2].id
       end
     end
   end
 
   context "when going back through the presentation" do
-    it "should o go back to a previous commit" do
-      start_presentation do |commits, presenter|
+    it "should go back to a previous commit" do
+      @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("back")
-        head_position.should eql commits[1].id
+        @helper.head_position.should eql commits[1].id
+      end
+    end
+  end
+
+  context "when going back through the presentation and it reaches the begining" do
+    it "should stay on the last commit" do
+      @helper.start_presentation do |commits, presenter|
+        presenter.execute("next")
+        presenter.execute("next")
+        presenter.execute("back")
+        presenter.execute("back")
+        presenter.execute("back")
+        presenter.execute("back")
+        @helper.head_position.should eql commits[0].id
       end
     end
   end
 
   context "when going back to the start of the presention" do
     it "should move to the first commit" do
-      start_presentation do |commits, presenter|
+      @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("start")
-        head_position.should eql commits[0].id
+        @helper.head_position.should eql commits[0].id
       end
     end
   end
 
   context "when going to the end of the presentation" do
     it "should move the last commit" do
-      start_presentation do |commits, presenter|
+      @helper.start_presentation do |commits, presenter|
         presenter.execute("end")
-        head_position.should eql commits.last.id
+        @helper.head_position.should eql commits.last.id
       end
     end
   end
 
   context "when going to a specific slide" do
     it "should checkout the specific commit" do
-      start_presentation do |commits, presenter|
+      @helper.start_presentation do |commits, presenter|
         presenter.execute("2")
-        head_position.should eql commits[1].id
+        @helper.head_position.should eql commits[1].id
       end
     end
   end
 
   context "list presentation" do
     it "should print a list of commits" do
-      start_presentation do |commits, presenter|
-        commits[0] = "*#{commits[0]}"
-        expected_output = commits.join("\n")
+      @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")
         presentation = presenter.execute("list")
         presentation.should eql expected_output
       end
@@ -85,7 +113,7 @@ describe "while giving presentation" do
 
   context "when asking for help" do
     it "should print a list of command and there usage" do
-      start_presentation do |commits, presenter|
+      @helper.start_presentation do |commits, presenter|
       help_text = <<-EOH
 Git Presenter Reference
 
@@ -95,10 +123,43 @@ end/e:  move to end of presentation
 start/s: move to start of presentation
 list/l : list slides in presentation
 help/h: display this message
+!(exclimation mark): execute following in terminal
+exit: exit from the presentation
 EOH
         message = presenter.execute("help")
         message.should eql help_text
       end
     end
   end
+
+  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|
+        presenter.execute("next")
+        presenter.execute("next")
+        presenter.execute("next").strip.should eql "hello world"
+      end
+    end
+  end
+
+  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|
+        presenter.execute("next")
+        presenter.execute("next").should eql "#{commits[2].message}\nhello world\n"
+      end
+    end
+  end
+
+  context "when executing a command" do
+    it "should run the command in the shell" do
+      command_line_helper = CommandLineHelper.capture_output
+      @helper.start_presentation do |commits, presenter|
+        presenter.execute("!echo hello world")
+        command_line_helper.command_output.strip.should eql "hello world"
+      end
+    end
+  end
 end

data/spec/integration/start_presentation_spec.rb

@@ -3,29 +3,41 @@ require "spec_helper"
 describe "starting a presentation" do
   let(:presentation_dir){File.dirname(__FILE__) + "/../../presentation"}
 
+  before do
+    @helper = GitHelper.new(presentation_dir)
+  end
+
   it "should contian the commits for presentations" do
-    initialise_presentation
+    @helper.initialise_presentation
+    @helper.add_command("echo hello world")
     Dir.chdir(presentation_dir) do
       presenter = GitPresenter.start_presentation(".")
-      presenter.commits.length.should eql 3
+      presenter.slides.length.should eql 4
     end
   end
 
   it "first commit should be first commit in file" do
-    start_presentation do |commits, presenter|
-      presenter.commits[0].should eql commits[0].id
+    @helper.start_presentation do |commits, presenter|
+      presenter.slides[0].commit.should eql commits[0].id
     end
   end
 
   it "second commit should be second commit in file" do
-    start_presentation do |commits, presenter|
-      presenter.commits[1].should eql commits[1].id
+    @helper.start_presentation do |commits, presenter|
+      presenter.slides[1].commit.should eql commits[1].id
+    end
+  end
+
+  it "the last commit should be a command" do
+    command = "echo hello world"
+    @helper.start_presentation(command) do |commits, presenter|
+      presenter.slides[3].run.should eql command
     end
   end
 
   it "should have the presentation at first commit" do
-    start_presentation do |commits, presenter|
-      head_position.should eql commits.first.id
+    @helper.start_presentation do |commits, presenter|
+      @helper.head_position.should eql commits.first.id
     end
   end
 end

data/spec/lib/git_presenter/presentation_spec.rb

@@ -0,0 +1,87 @@
+require "spec_helper"
+
+describe GitPresenter::Presentation do
+  let(:presentation){ {"slides" => [
+                          {"slide" => {"commit" => "0"}},
+                          {"slide" => {"commit" => "1"}},
+                          {"slide" => {"commit" => "2"}}]
+                      }
+                    }
+  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 >"
+    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
+    end
+  end
+
+  context "when processing a user command" do
+    def given_command(command)
+      presenter = GitPresenter::Presentation.new(presentation)
+      presenter.command_for(command)
+    end
+
+    context "with bash command" do
+      it { given_command("!echo hello world").should eql :command }
+    end
+
+    context "with next" do
+      it { given_command("next").should eql :next }
+    end
+
+    context "with next" do
+      it { given_command("n").should eql :next }
+    end
+
+    context "with back" do
+      it { given_command("back").should eql :previous }
+    end
+
+    context "with b" do
+      it { given_command("b").should eql :previous }
+    end
+
+    context "with start" do
+      it { given_command("start").should eql :start }
+    end
+
+    context "with s" do
+      it { given_command("s").should eql :start }
+    end
+
+    context "with end" do
+      it { given_command("end").should eql :end }
+    end
+
+    context "with e" do
+      it { given_command("e").should eql :end }
+    end
+
+    context "with list" do
+      it { given_command("list").should eql :list }
+    end
+
+    context "with l" do
+      it { given_command("l").should eql :list }
+    end
+
+    context "with any number" do
+      it { given_command("6").should eql :commit}
+    end
+
+    context "with h" do
+      it { given_command("h").should eql :help}
+    end
+
+    context "with help" do
+      it { given_command("help").should eql :help}
+    end
+  end
+end

data/spec/lib/git_presenter/slide_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+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"
+    end
+  end
+
+  describe "execute" do
+    context "when slide has only a run command" 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"
+      end
+    end
+
+    context "when slide contains both commit and run message" do
+      it "should checkout the code then run the command" 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"
+      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
+        slide = GitPresenter::Slide.new({"commit" => "number", "message" => "checkout"})
+        slide.stub(:checkout).and_return("checkout\n")
+        slide.execute.should eql "checkout\n"
+      end
+    end
+  end
+end

data/spec/lib/git_presenter/writer_spec.rb

@@ -0,0 +1,4 @@
+require "spec_helper"
+
+describe GitPresenter::Writer do
+end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require 'rspec'
-require "support/repo_helpers"
+require "support/git_helpers"
+require "support/command_line_helper"
 require_relative "../lib/git_presenter"
 
 RSpec.configure do |config|
-
 end
+

data/spec/support/command_line_helper.rb

@@ -0,0 +1,18 @@
+class CommandLineHelper
+
+  def self.capture_output
+    command_helper = CommandLineHelper.new
+    command_helper.set_output_to_string_io
+    command_helper
+  end
+
+  def set_output_to_string_io
+    @command_output = StringIO.new
+    $stdout = @command_output
+  end
+
+  def command_output
+    @command_output.string
+  end
+
+end

data/spec/support/git_helpers.rb

@@ -0,0 +1,95 @@
+class GitHelper
+  PRESENTATION_DIR = File.expand_path(File.dirname(__FILE__) + '/../../presentation')
+
+  def self.presentation_dir
+    PRESENTATION_DIR
+  end
+
+  def initialize(presentation_dir)
+    @presentation_dir = presentation_dir
+  end
+
+  def initialise_test_repo(presentation_dir, delay)
+    clean_up_repo(presentation_dir)
+    @code_file = "a_file.rb"
+    commits = []
+    Dir.mkdir(presentation_dir)
+    Dir.chdir(presentation_dir) do
+      @git_repo = Grit::Repo.init(".")
+      edit_file_and_commit("initial commit", "a")
+      commits << @git_repo.commits[0]
+      #need to make it sleep for a second.
+      #git is not accurate enough with the speed of the test
+      #to sort correctly
+      sleep 1 if delay
+      edit_file_and_commit("second commit", "b")
+      commits << @git_repo.commits[0]
+      sleep 1 if delay
+      edit_file_and_commit("third commit", "c")
+      commits << @git_repo.commits[0]
+    end
+    commits
+  end
+
+
+  def edit_file(content)
+    File.open(@code_file, "a") do |file|
+      file.write(content)
+    end
+  end
+
+  def edit_file_and_commit(commit_message, content)
+    edit_file(content)
+    @git_repo.add(".")
+    @git_repo.commit_all(commit_message)
+  end
+
+  def setup_presentation_file(commits)
+    File.open(".presentation", "w") do |file|
+      @commits.each do |commit|
+        file.write(commit.id + "\n")
+      end
+    end
+  end
+
+  def clean_up_repo(dir)
+    `rm -fr #{dir}`
+  end
+
+  def head_position
+    File.open(@presentation_dir + '/.git/HEAD').lines.first.strip
+  end
+
+  def initialise_presentation(delay=false)
+    commits = initialise_test_repo(@presentation_dir, delay)
+    Dir.chdir(@presentation_dir) do
+      git_presentation = GitPresenter.initialise_presentation(".")
+      yaml = YAML::parse(File.open(File.join(@presentation_dir, ".presentation"))).to_ruby
+      yield(commits, yaml) if block_given?
+    end
+    commits
+  end
+
+  def start_presentation(command="", add_command_to_commit=nil)
+    commits = initialise_presentation(true)
+    Dir.chdir(@presentation_dir) do
+      add_command(command, add_command_to_commit) unless command.empty?
+      presenter = GitPresenter.start_presentation(".")
+      yield(commits, presenter) if block_given?
+    end
+  end
+
+  def add_command(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"]["run"] = command
+      else
+        presentation["slides"] << {"slide" => {"run" => command}}
+      end
+      File.open(".presentation", "w") do |file|
+        file.write(presentation.to_yaml)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70230583824940 !ruby/object:Gem::Requirement
+  requirement: &70214612260380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70230583824940
+  version_requirements: *70214612260380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70230583820200 !ruby/object:Gem::Requirement
+  requirement: &70214612259060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70230583820200
+  version_requirements: *70214612259060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70230583819160 !ruby/object:Gem::Requirement
+  requirement: &70214612272960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230583819160
+  version_requirements: *70214612272960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70230583817940 !ruby/object:Gem::Requirement
+  requirement: &70214612265840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70230583817940
+  version_requirements: *70214612265840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70230583832360 !ruby/object:Gem::Requirement
+  requirement: &70214612322680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70230583832360
+  version_requirements: *70214612322680
 description: Code presentation tool using git
 email: pythonandchips@gmail.com
 executables:
@@ -76,6 +76,7 @@ extra_rdoc_files:
 - README.markdown
 files:
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -85,13 +86,19 @@ files:
 - bin/git-presenter
 - git_presenter.gemspec
 - lib/git_presenter.rb
+- lib/git_presenter/parser.rb
+- lib/git_presenter/presentation.rb
+- lib/git_presenter/slide.rb
+- lib/git_presenter/writer.rb
 - spec/integration/initialize_presentation_spec.rb
 - spec/integration/moving_through_presentation_spec.rb
-- spec/integration/processing_user_command_spec.rb
 - spec/integration/start_presentation_spec.rb
-- spec/integration/status_line_spec.rb
+- spec/lib/git_presenter/presentation_spec.rb
+- spec/lib/git_presenter/slide_spec.rb
+- spec/lib/git_presenter/writer_spec.rb
 - spec/spec_helper.rb
-- spec/support/repo_helpers.rb
+- spec/support/command_line_helper.rb
+- spec/support/git_helpers.rb
 homepage: http://github.com/pythonandchips/git-presenter
 licenses:
 - MIT
@@ -107,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3734643625387462055
+      hash: 2885974692794376119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/integration/processing_user_command_spec.rb

@@ -1,61 +0,0 @@
-require "spec_helper"
-
-describe "when receiving a user command" do
-
-  def given_command(command)
-    presenter = GitPresenter.new([])
-    presenter.command_for(command)
-  end
-
-  context "with next" do
-    it { given_command("next").should eql :next }
-  end
-
-  context "with next" do
-    it { given_command("n").should eql :next }
-  end
-
-  context "with back" do
-    it { given_command("back").should eql :previous }
-  end
-
-  context "with b" do
-    it { given_command("b").should eql :previous }
-  end
-
-  context "with start" do
-    it { given_command("start").should eql :start }
-  end
-
-  context "with s" do
-    it { given_command("s").should eql :start }
-  end
-
-  context "with end" do
-    it { given_command("end").should eql :end }
-  end
-
-  context "with e" do
-    it { given_command("e").should eql :end }
-  end
-
-  context "with list" do
-    it { given_command("list").should eql :list }
-  end
-
-  context "with l" do
-    it { given_command("l").should eql :list }
-  end
-
-  context "with any number" do
-    it { given_command("6").should eql :commit}
-  end
-
-  context "with h" do
-    it { given_command("h").should eql :help}
-  end
-
-  context "with help" do
-    it { given_command("help").should eql :help}
-  end
-end

data/spec/integration/status_line_spec.rb

@@ -1,8 +0,0 @@
-require "spec_helper"
-
-describe "when displaying the command line" do
-  it "should display the current position" do
-    presenter = GitPresenter.new(["0", "1","2"])
-    presenter.status_line.should eql "1/3 >"
-  end
-end

data/spec/support/repo_helpers.rb

@@ -1,65 +0,0 @@
-def initialise_test_repo(presentation_dir, delay)
-  clean_up_repo(presentation_dir)
-  code_file = "a_file.rb"
-  commits = []
-  Dir.mkdir(presentation_dir)
-  Dir.chdir(presentation_dir) do
-    git_repo = Grit::Repo.init(".")
-    File.open(code_file, "w") do |file|
-      file.write("a")
-    end
-    git_repo.add(".")
-    git_repo.commit_all("initial commit")
-    commits << git_repo.commits[0]
-    #need to make it sleep for a second.
-    #git is not accurate enough with the speed of the test
-    #to sort correctly
-    sleep 1 if delay
-    File.open(code_file, "a") do |file|
-      file.write("b")
-    end
-    git_repo.commit_all("second commit")
-    commits << git_repo.commits[0]
-    sleep 1 if delay
-    File.open(code_file, "a") do |file|
-      file.write("c")
-    end
-    git_repo.commit_all("third commit")
-    commits << git_repo.commits[0]
-  end
-  commits
-end
-
-def setup_presentation_file(commits)
-  File.open(".presentation", "w") do |file|
-    @commits.each do |commit|
-      file.write(commit.id + "\n")
-    end
-  end
-end
-
-def clean_up_repo(dir)
-  `rm -fr #{dir}`
-end
-
-def head_position
-  File.open(presentation_dir + '/.git/HEAD').lines.first.strip
-end
-
-def initialise_presentation(delay=false)
-  commits = initialise_test_repo(presentation_dir, delay)
-  Dir.chdir(presentation_dir) do
-    git_presentation = GitPresenter.initialise_presentation(".")
-    file = File.open(File.join(presentation_dir, ".presentation"))
-    yield(commits, file) if block_given?
-  end
-  commits
-end
-
-def start_presentation
-  commits = initialise_presentation(true)
-  Dir.chdir(presentation_dir) do
-    presenter = GitPresenter.start_presentation(".")
-    yield(commits, presenter) if block_given?
-  end
-end