git_presenter 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5ba20617b68266cf04cc9435c4439623fe4710
-  data.tar.gz: 030a0879ae001a8f46e4e8e55deab84c7ef2145c
+  metadata.gz: a10c89461bdb37a5cd273e9c6c70794d106351b3
+  data.tar.gz: e528f67d7e7f05213b322bfaa3345f5c41fad457
 SHA512:
-  metadata.gz: b523ad6a05eede43461ad29345532a09e69bd3c8e85fa220c63cf1ece1a64adc6288916e655514b44f250a158739f57535fa9bbaf16a21bee12f79c72ab5da33
-  data.tar.gz: 47465803ae5bf9e8a8438bd5430f3c0d7edc38615b804ff9ed45fcdb1cdbb5776d64a9efe74babcdfe0170fde88b4413c3e1df31c55505609258ad0ac76e3ab9
+  metadata.gz: 1e039a8308e57e799cd64bb7731319b519cca0778538ff753851db2ffa33c95a79d6845a61b849197f08fa4600870d965a3688321660ed24a3fd5873dc3ba064
+  data.tar.gz: c803d8136b08d35a94d7994a008d4a8d9f7a01799242f2651573e7e54fbba0b55cf55b25de6da9f5bfbd4e3a30683b7ebc99fd8bff4bb3ec97f433de10b118c3

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
   - 2.0.0
   - 2.1.0
   # - jruby-19mode # JRuby in 1.9 mode
+script: "bundle exec rspec spec"

data/README.markdown

@@ -35,7 +35,7 @@ gem install git_presenter
 * start/s: move to start of presentation
 * list/l : list slides in presentation
 * help/h: display this message
- 
+
 ## Other resources
 There are couple of videos showing git presenter and how to us it
 * (video 1)[https://vimeo.com/38949496]
@@ -56,6 +56,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

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.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.0.0 ruby lib
+# stub: git_presenter 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git_presenter"
-  s.version = "1.0.0"
+  s.version = "1.1.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-02-26"
+  s.date = "2014-06-14"
   s.description = "Code presentation tool using git"
   s.email = "pythonandchips@gmail.com"
   s.executables = ["git-presenter"]

data/lib/git_presenter.rb

@@ -4,9 +4,9 @@ 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'
 
   def initialize(current_dir, interactive=true)
     @controller = Controller.new(current_dir)

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
@@ -24,7 +24,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)
@@ -54,4 +53,8 @@ class GitPresenter::Controller
       }
     end
   end
+
+  def current_branch
+    `git rev-parse --abbrev-ref HEAD`.strip
+  end
 end

data/lib/git_presenter/presentation.rb

@@ -2,6 +2,7 @@ class GitPresenter::Presentation
   attr_reader :slides, :current_slide
 
   def initialize(presentation)
+    @branch = presentation["branch"]
     @slides = presentation["slides"].map{|slide| GitPresenter::Slide.new(slide["slide"])}
     @current_slide = slides.first
   end
@@ -39,7 +40,7 @@ class GitPresenter::Presentation
   end
 
   def exit
-    `git checkout -q master`
+    `git checkout -q #{@branch}`
     :exit
   end
 

data/spec/integration/initialize_presentation_spec.rb

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

data/spec/lib/git_presenter/presentation_spec.rb

@@ -4,7 +4,8 @@ describe GitPresenter::Presentation do
   let(:presentation){ {"slides" => [
                           {"slide" => {"commit" => "0"}},
                           {"slide" => {"commit" => "1"}},
-                          {"slide" => {"commit" => "2"}}]
+                          {"slide" => {"commit" => "2"}}],
+                       "branch" => "test"
                       }
                     }
   context "when displaying the command line" do
@@ -83,5 +84,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Colin Gemmell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git