git_presenter 0.2.2 → 0.3.0

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
+  # - jruby-19mode # JRuby in 1.9 mode

data/Gemfile

@@ -8,8 +8,10 @@ gem "grit", "~> 2.4"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "pry"
   gem "rspec", "~> 2.7"
   gem "bundler"
   gem "jeweler", "~> 1.6"
   gem "rcov", "~> 0.9"
+  gem 'pry'
 end

data/Gemfile.lock

@@ -1,26 +1,39 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    coderay (1.0.6)
     diff-lcs (1.1.3)
     git (1.2.5)
-    grit (2.4.1)
+    grit (2.5.0)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-    jeweler (1.6.4)
+      posix-spawn (~> 0.3.6)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mime-types (1.17.2)
+      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)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    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)
 
 PLATFORMS
   ruby
@@ -29,5 +42,6 @@ DEPENDENCIES
   bundler
   grit (~> 2.4)
   jeweler (~> 1.6)
+  pry
   rcov (~> 0.9)
   rspec (~> 2.7)

data/README.markdown

@@ -17,7 +17,9 @@ Any and all feedback is welcome
 ## Pre-requisites
 
 * Git
-* Ruby version 1.9.2 or 1.9.3 or jruby in 1.9 mode (basically anything with 1.9 at the end)
+* Ruby version 1.9.2 or 1.9.3
+
+Note jruby is currently unsupported as there is a problem with posix-spawn and jruby
 
 ## Installation
 
@@ -28,6 +30,7 @@ gem install git_presenter
 * 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"
+* Make more commits if need be and use "git-presenter update"
 * Then use the following command to navigate the presentation
 * next/n: move to next slide
 * back/b: move back a slide

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/bin/git-presenter

@@ -1,24 +1,8 @@
 #!/usr/bin/ruby
-
 require "rubygems"
-require "readline"
 require_relative "../lib/git_presenter"
 
 YAML::ENGINE.yamler = 'psych'
 
-if ARGV[0] == "init"
-  GitPresenter.initialise_presentation(Dir.pwd)
-  puts "Presentation has been initalised"
-  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)
-    result = presenter.execute(command)
-    exit if result == :exit
-    puts result
-  end
-else
-  puts "what you talkin bout willis"
-end
+presenter = GitPresenter.new(Dir.pwd)
+presenter.execute(ARGV[0])

data/git_presenter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "git_presenter"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin Gemmell"]
-  s.date = "2012-04-17"
+  s.date = "2012-06-29"
   s.description = "Code presentation tool using git"
   s.email = "pythonandchips@gmail.com"
   s.executables = ["git-presenter"]
@@ -29,16 +29,17 @@ Gem::Specification.new do |s|
     "bin/git-presenter",
     "git_presenter.gemspec",
     "lib/git_presenter.rb",
-    "lib/git_presenter/parser.rb",
+    "lib/git_presenter/controller.rb",
     "lib/git_presenter/presentation.rb",
     "lib/git_presenter/slide.rb",
-    "lib/git_presenter/writer.rb",
+    "spec/bugs/max_10_commits_being_parsed_spec.rb",
     "spec/integration/initialize_presentation_spec.rb",
     "spec/integration/moving_through_presentation_spec.rb",
     "spec/integration/start_presentation_spec.rb",
+    "spec/integration/update_presentation_spec.rb",
+    "spec/lib/git_presenter/controller_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/command_line_helper.rb",
     "spec/support/git_helpers.rb"
@@ -54,23 +55,29 @@ Gem::Specification.new do |s|
 
     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
   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
 end
 

data/lib/git_presenter/controller.rb

@@ -0,0 +1,57 @@
+class GitPresenter::Controller
+  CONFIG_FILE = ".presentation"
+
+  def initialize(file_path)
+    @presentation_dir = file_path
+  end
+
+  def initialise_presentation
+    yaml = {"slides" => create_slides}.to_yaml
+    File.open(presentation_file_location, "w") do |file|
+      file.write(yaml)
+    end
+    puts "Presentation has been initalised"
+    puts "run 'git-presenter start' to begin the presentation"
+  end
+
+  def start_presentation
+    yaml = YAML.parse(File.open(@presentation_dir + "/.presentation", "r")).to_ruby
+    presenter = GitPresenter::Presentation.new(yaml)
+    puts presenter.start
+    presenter
+  end
+
+  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)
+    puts "Your presentation has been updated"
+  end
+
+  private
+
+  def write_file(yaml)
+    File.open(presentation_file_location, "w") do |file|
+      file.write(yaml)
+    end
+  end
+
+  def presentation_file_location
+    File.join(@presentation_dir, CONFIG_FILE)
+  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?
+    commits.map do |commit|
+      {"slide" =>
+        {"commit"  => commit.id,
+         "message" => commit.message}
+      }
+    end
+  end
+end

data/lib/git_presenter/presentation.rb

@@ -1,60 +1,62 @@
-module GitPresenter
-  class Presentation
-    attr_reader :slides, :current_slide
+class GitPresenter::Presentation
+  attr_reader :slides, :current_slide
 
-    def initialize(presentation)
-      @slides = presentation["slides"].map{|slide| Slide.new(slide["slide"])}
-      @current_slide = slides.first
-    end
+  def initialize(presentation)
+    @slides = presentation["slides"].map{|slide| GitPresenter::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 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)
+  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
+    self.send(command)
+  end
 
-    def bash_command(user_command)
-      puts `#{user_command[1..-1]}`
-    end
+  def bash_command(user_command)
+    puts `#{user_command[1..-1]}`
+  end
 
-    def status_line
-      "#{position+1}/#{total_slides} >"
-    end
+  def status_line
+    "#{position+1}/#{total_slides} >"
+  end
 
-    def position
-      slides.index(@current_slide)
-    end
+  def exit
+    `git checkout -q master`
+  end
 
-    def total_slides
-      @slides.length
-    end
+  def position
+    slides.index(@current_slide)
+  end
 
-    def start
-      @current_slide = slides.first
-      @current_slide.execute
-    end
+  def total_slides
+    @slides.length
+  end
 
-    def help
-      <<-EOH
+  def start
+    @current_slide = slides.first
+    @current_slide.execute
+  end
+
+  def help
+    <<-EOH
 Git Presenter Reference
 
 next/n: move to next slide
@@ -66,39 +68,37 @@ 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
+  end
 
-    def commit(slide_number)
-      @current_slide = slides[slide_number - 1]
-      @current_slide.execute
-    end
+  def end
+    @current_slide = slides.last
+    @current_slide.execute
+  end
 
-    def next
-      return if position.nil?
-      @current_slide = slides[position + 1] || @current_slide
-      @current_slide.execute
-    end
+  def commit(slide_number)
+    @current_slide = slides[slide_number - 1]
+    @current_slide.execute
+  end
 
-    def previous
-      return @current_slide if position == 0
-      @current_slide = slides[position - 1]
-      @current_slide.execute
-    end
+  def next
+    return if position.nil?
+    @current_slide = slides[position + 1] || @current_slide
+    @current_slide.execute
+  end
 
-    def list
-      @slides.map do |slide|
-        if slide == @current_slide
-          "*#{slide}"
-        else
-          slide
-        end
-      end.join("\n")
-    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

data/lib/git_presenter/slide.rb

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

data/lib/git_presenter.rb

@@ -1,19 +1,40 @@
 require "grit"
 require "yaml"
+require "readline"
 
-module GitPresenter
+class GitPresenter
   require "git_presenter/presentation"
-  require "git_presenter/writer"
-  require "git_presenter/parser"
+  require "git_presenter/controller"
   require "git_presenter/slide"
 
-  def self.initialise_presentation dir
-    builder = Writer.new(dir)
-    builder.output_presenatation_file
+  def initialize(current_dir, interactive=true)
+    @controller = Controller.new(current_dir)
+    @interactive = interactive
   end
 
-  def self.start_presentation dir
-    parser = Parser.new(dir)
-    parser.presentation
+  def execute(command)
+    if command == "init"
+      @controller.initialise_presentation
+    elsif command == "start"
+      @presentation = @controller.start_presentation
+      if @interactive
+        enter_run_loop
+      end
+    elsif command == "update"
+      @controller.update_presentation
+    else
+      puts @presentation.execute(command)
+    end
+    @presentation
+  end
+
+  private
+
+  def enter_run_loop
+    while command = Readline.readline(@presentation.status_line, true)
+      result = @presentation.execute(command)
+      exit if result == :exit
+      puts result
+    end
   end
 end

data/spec/bugs/max_10_commits_being_parsed_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "presentation should parse all commits for a repo" do
+  before do
+    @helper = GitHelper.new
+  end
+
+  it "should parse more than 10 commits" do
+    @helper.initialise_presentation({:no_of_commits => 13}) do |commits, yaml|
+      yaml["slides"].length.should eql 13
+    end
+  end
+end

data/spec/integration/initialize_presentation_spec.rb

@@ -27,13 +27,13 @@ describe "initializing a presentation" do
     end
 
     it "first line should contain the first commit number" do
-      @helper.initialise_presentation(true) do |commits, yaml|
+      @helper.initialise_presentation({:delay => 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
-      @helper.initialise_presentation(true) do |commits, yaml|
+      @helper.initialise_presentation({:delay => true}) do |commits, yaml|
         yaml["slides"][1]["slide"]["commit"].should eql commits[1].id
       end
     end

data/spec/integration/moving_through_presentation_spec.rb

@@ -158,7 +158,18 @@ 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 eql "hello world"
+        command_line_helper.command_output.strip.should end_with "hello world"
+      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"
       end
     end
   end

data/spec/integration/start_presentation_spec.rb

@@ -11,8 +11,9 @@ describe "starting a presentation" do
     @helper.initialise_presentation
     @helper.add_command("echo hello world")
     Dir.chdir(presentation_dir) do
-      presenter = GitPresenter.start_presentation(".")
-      presenter.slides.length.should eql 4
+      presenter = GitPresenter.new(".", false)
+      presentation = presenter.execute('start')
+      presentation.slides.length.should eql 4
     end
   end
 

data/spec/integration/update_presentation_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe "update presentation with any new commits" do
+
+  before do
+    @helper = GitHelper.new
+  end
+
+  it "should add the new commits to the presentation" 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)
+    end
+  end
+
+  it "should add the new commits to the end of the presentation" 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
+    end
+  end
+
+  it "should not contain any commits that have been removed in the middle of the presentation" do
+    commits = @helper.initialise_presentation({:delay => true})
+    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)
+    end
+  end
+
+  it "should tell inform the user the presentation has been updated" do
+    commits = @helper.initialise_presentation({:delay => true})
+    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"
+  end
+
+end

data/spec/lib/git_presenter/controller_spec.rb

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

data/spec/spec_helper.rb

@@ -1,8 +1,13 @@
 require 'rspec'
+require 'pry'
 require "support/git_helpers"
 require "support/command_line_helper"
 require_relative "../lib/git_presenter"
+require 'pry'
 
 RSpec.configure do |config|
+  config.before(:each) do
+    @command_line = CommandLineHelper.capture_output
+  end
 end
 

data/spec/support/git_helpers.rb

@@ -5,28 +5,26 @@ class GitHelper
     PRESENTATION_DIR
   end
 
-  def initialize(presentation_dir)
+  def initialize(presentation_dir=GitHelper::PRESENTATION_DIR)
     @presentation_dir = presentation_dir
   end
 
-  def initialise_test_repo(presentation_dir, delay)
+  def initialise_test_repo(presentation_dir, delay, no_of_commits)
     clean_up_repo(presentation_dir)
     @code_file = "a_file.rb"
     commits = []
+    content = ('a'..'z').to_a
     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]
+      (1..no_of_commits).each do |n|
+        edit_file_and_commit("commit number #{n}", content[n])
+        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 only when required
+        sleep 1 if delay
+      end
     end
     commits
   end
@@ -42,6 +40,7 @@ class GitHelper
     edit_file(content)
     @git_repo.add(".")
     @git_repo.commit_all(commit_message)
+    @git_repo.commits[0]
   end
 
   def setup_presentation_file(commits)
@@ -60,10 +59,12 @@ class GitHelper
     File.open(@presentation_dir + '/.git/HEAD').lines.first.strip
   end
 
-  def initialise_presentation(delay=false)
-    commits = initialise_test_repo(@presentation_dir, delay)
+  def initialise_presentation(params={})
+    settings = {:no_of_commits => 3, :delay => false}.merge(params)
+    commits = initialise_test_repo(@presentation_dir, settings[:delay], settings[:no_of_commits])
     Dir.chdir(@presentation_dir) do
-      git_presentation = GitPresenter.initialise_presentation(".")
+      presentation = GitPresenter.new(@presentation_dir, false)
+      git_presentation = presentation.execute("init")
       yaml = YAML::parse(File.open(File.join(@presentation_dir, ".presentation"))).to_ruby
       yield(commits, yaml) if block_given?
     end
@@ -71,14 +72,36 @@ class GitHelper
   end
 
   def start_presentation(command="", add_command_to_commit=nil)
-    commits = initialise_presentation(true)
+    commits = initialise_presentation({:delay => true})
     Dir.chdir(@presentation_dir) do
       add_command(command, add_command_to_commit) unless command.empty?
-      presenter = GitPresenter.start_presentation(".")
+      presenter = GitPresenter.new('.', false)
+      presenter = presenter.execute('start')
       yield(commits, presenter) if block_given?
     end
   end
 
+  def update_presentation
+    Dir.chdir(@presentation_dir) do
+      presentation = GitPresenter.new(@presentation_dir, false)
+      presentation.execute("update")
+      yaml = YAML::parse(File.open(File.join(@presentation_dir, ".presentation"))).to_ruby
+      yield(yaml) if block_given?
+    end
+  end
+
+  def remove_from_presentation_at(index)
+    removed_commit = nil
+    Dir.chdir(@presentation_dir) do
+      yaml = YAML.parse(File.open(@presentation_dir + "/.presentation", "r")).to_ruby
+      removed_commit = yaml['slides'].delete_at(index)
+      File.open(File.open(File.join(@presentation_dir, ".presentation")), "w") do |file|
+        file.write(yaml.to_yaml)
+      end
+    end
+    removed_commit
+  end
+
   def add_command(command, add_command_to_commit=nil)
     Dir.chdir(PRESENTATION_DIR) do
       presentation = YAML.parse(File.open(".presentation")).to_ruby
@@ -92,4 +115,12 @@ class GitHelper
       end
     end
   end
+
+  def current_branch
+    Dir.chdir(PRESENTATION_DIR) do
+      repo = Grit::Repo.init('.')
+      repo.head
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70104411025040 !ruby/object:Gem::Requirement
+  requirement: &70193289098420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70104411025040
+  version_requirements: *70193289098420
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70193289097940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70193289097940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70104411024120 !ruby/object:Gem::Requirement
+  requirement: &70193289097460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70104411024120
+  version_requirements: *70193289097460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70104411023420 !ruby/object:Gem::Requirement
+  requirement: &70193289096980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104411023420
+  version_requirements: *70193289096980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70104411021140 !ruby/object:Gem::Requirement
+  requirement: &70193289096500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70104411021140
+  version_requirements: *70193289096500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70104411062300 !ruby/object:Gem::Requirement
+  requirement: &70193289096020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,18 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70104411062300
+  version_requirements: *70193289096020
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70193289095540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70193289095540
 description: Code presentation tool using git
 email: pythonandchips@gmail.com
 executables:
@@ -86,16 +108,17 @@ files:
 - bin/git-presenter
 - git_presenter.gemspec
 - lib/git_presenter.rb
-- lib/git_presenter/parser.rb
+- lib/git_presenter/controller.rb
 - lib/git_presenter/presentation.rb
 - lib/git_presenter/slide.rb
-- lib/git_presenter/writer.rb
+- spec/bugs/max_10_commits_being_parsed_spec.rb
 - spec/integration/initialize_presentation_spec.rb
 - spec/integration/moving_through_presentation_spec.rb
 - spec/integration/start_presentation_spec.rb
+- spec/integration/update_presentation_spec.rb
+- spec/lib/git_presenter/controller_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/command_line_helper.rb
 - spec/support/git_helpers.rb
@@ -114,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2111319268477866572
+      hash: 2611368202741633093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/git_presenter/parser.rb

@@ -1,16 +0,0 @@
-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/writer.rb

@@ -1,32 +0,0 @@
-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/spec/lib/git_presenter/writer_spec.rb

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