git_presenter 0.3.0 → 0.4.0

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 #
 gem "grit", "~> 2.4"
+gem "launchy", "~> 2.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.8)
     coderay (1.0.6)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -14,6 +15,8 @@ GEM
       rake
       rdoc
     json (1.7.3)
+    launchy (2.1.0)
+      addressable (~> 2.2.6)
     method_source (0.7.1)
     mime-types (1.18)
     posix-spawn (0.3.6)
@@ -42,6 +45,7 @@ DEPENDENCIES
   bundler
   grit (~> 2.4)
   jeweler (~> 1.6)
+  launchy (~> 2.1)
   pry
   rcov (~> 0.9)
   rspec (~> 2.7)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/git_presenter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "git_presenter"
-  s.version = "0.3.0"
+  s.version = "0.4.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.date = "2012-07-10"
   s.description = "Code presentation tool using git"
   s.email = "pythonandchips@gmail.com"
   s.executables = ["git-presenter"]
@@ -55,6 +55,7 @@ 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_runtime_dependency(%q<launchy>, ["~> 2.1"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.7"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -63,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<grit>, ["~> 2.4"])
+      s.add_dependency(%q<launchy>, ["~> 2.1"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.7"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<grit>, ["~> 2.4"])
+    s.add_dependency(%q<launchy>, ["~> 2.1"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.7"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/lib/git_presenter.rb

@@ -1,11 +1,12 @@
-require "grit"
-require "yaml"
-require "readline"
+require 'grit'
+require 'yaml'
+require 'readline'
+require 'launchy'
 
 class GitPresenter
-  require "git_presenter/presentation"
-  require "git_presenter/controller"
-  require "git_presenter/slide"
+  require 'git_presenter/presentation'
+  require 'git_presenter/controller'
+  require 'git_presenter/slide'
 
   def initialize(current_dir, interactive=true)
     @controller = Controller.new(current_dir)
@@ -13,14 +14,14 @@ 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
       puts @presentation.execute(command)

data/lib/git_presenter/presentation.rb

@@ -40,6 +40,7 @@ class GitPresenter::Presentation
 
   def exit
     `git checkout -q master`
+    :exit
   end
 
   def position

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/moving_through_presentation_spec.rb

@@ -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,6 +163,17 @@ 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|

data/spec/integration/start_presentation_spec.rb

@@ -31,7 +31,7 @@ describe "starting a presentation" do
 
   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

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

@@ -71,10 +71,10 @@ class GitHelper
     commits
   end
 
-  def start_presentation(command="", add_command_to_commit=nil)
+  def start_presentation(commands=[])
     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?
       presenter = GitPresenter.new('.', false)
       presenter = presenter.execute('start')
       yield(commits, presenter) if block_given?
@@ -102,6 +102,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70193289098420 !ruby/object:Gem::Requirement
+  requirement: &70174479333640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70193289098420
+  version_requirements: *70174479333640
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70174478378360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70174478378360
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70193289097940 !ruby/object:Gem::Requirement
+  requirement: &70174478379800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193289097940
+  version_requirements: *70174478379800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70193289097460 !ruby/object:Gem::Requirement
+  requirement: &70174478381240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70193289097460
+  version_requirements: *70174478381240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70193289096980 !ruby/object:Gem::Requirement
+  requirement: &70174478382680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193289096980
+  version_requirements: *70174478382680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70193289096500 !ruby/object:Gem::Requirement
+  requirement: &70174478385540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70193289096500
+  version_requirements: *70174478385540
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70193289096020 !ruby/object:Gem::Requirement
+  requirement: &70174478954780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70193289096020
+  version_requirements: *70174478954780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70193289095540 !ruby/object:Gem::Requirement
+  requirement: &70174478102720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193289095540
+  version_requirements: *70174478102720
 description: Code presentation tool using git
 email: pythonandchips@gmail.com
 executables:
@@ -137,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2611368202741633093
+      hash: -3910658736089827662
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: