git_presenter 0.4.0 → 1.0.0

checksums.yaml

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

data/.travis.yml

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

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 #
-gem "grit", "~> 2.4"
+gem "git"
 gem "launchy", "~> 2.1"
 
 # Add dependencies to develop your gem here.
@@ -13,6 +13,4 @@ group :development do
   gem "rspec", "~> 2.7"
   gem "bundler"
   gem "jeweler", "~> 1.6"
-  gem "rcov", "~> 0.9"
-  gem 'pry'
 end

data/Gemfile.lock

@@ -1,51 +1,86 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.8)
-    coderay (1.0.6)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    jeweler (1.8.3)
+    addressable (2.3.5)
+    builder (3.2.2)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    ffi (1.9.3-java)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       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)
-    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)
-    rdoc (3.12)
+    json (1.8.1)
+    json (1.8.1-java)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    launchy (2.4.2-java)
+      addressable (~> 2.3)
+      spoon (~> 0.0.1)
+    method_source (0.8.2)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    nokogiri (1.5.10-java)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry (0.9.12.6-java)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
       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)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    slop (3.4.7)
+    spoon (0.0.4)
+      ffi
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   bundler
-  grit (~> 2.4)
+  git
   jeweler (~> 1.6)
   launchy (~> 2.1)
   pry
-  rcov (~> 0.9)
   rspec (~> 2.7)

data/README.markdown

@@ -11,15 +11,12 @@ Git-presenter hope to solve this problem by giving a presentation style interfac
 
 ## Current status
 
-Early version but the basics are there to be used.
-Any and all feedback is welcome
+Complete.
 
 ## Pre-requisites
 
 * Git
-* Ruby version 1.9.2 or 1.9.3
-
-Note jruby is currently unsupported as there is a problem with posix-spawn and jruby
+* Ruby version 1.9.2, 1.9.3, 2.0.0, 2.1.0 and jruby
 
 ## Installation
 
@@ -38,6 +35,11 @@ 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]
+* (video 2)[https://vimeo.com/39225144]
 
 ## Bugs/Features/Prase
 

data/Rakefile

@@ -24,26 +24,3 @@ Jeweler::Tasks.new do |gem|
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "git_presenter #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.4.0
+1.0.0

data/git_presenter.gemspec

@@ -2,14 +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
 
 Gem::Specification.new do |s|
   s.name = "git_presenter"
-  s.version = "0.4.0"
+  s.version = "1.0.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 = "2012-07-10"
+  s.date = "2014-02-26"
   s.description = "Code presentation tool using git"
   s.email = "pythonandchips@gmail.com"
   s.executables = ["git-presenter"]
@@ -46,41 +48,34 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/pythonandchips/git-presenter"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "2.2.2"
   s.summary = "Code presentation tool using git"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     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<git>, [">= 0"])
       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"])
       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<git>, [">= 0"])
       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"])
       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<git>, [">= 0"])
     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"])
     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.rb

@@ -1,4 +1,4 @@
-require 'grit'
+require 'git'
 require 'yaml'
 require 'readline'
 require 'launchy'

data/lib/git_presenter/controller.rb

@@ -44,12 +44,12 @@ class GitPresenter::Controller
   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?
+    repo = Git.open(".")
+    commits = repo.log.to_a.reverse
+    commits = commits.drop_while{|commit| commit.sha != last_commit}[1..-1] unless last_commit.nil?
     commits.map do |commit|
       {"slide" =>
-        {"commit"  => commit.id,
+         {"commit"  => commit.sha,
          "message" => commit.message}
       }
     end

data/spec/integration/initialize_presentation_spec.rb

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

data/spec/integration/moving_through_presentation_spec.rb

@@ -11,7 +11,7 @@ describe "while giving presentation" do
     it "should move to the next commit" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
-        @helper.head_position.should eql commits[1].id
+        @helper.head_position.should eql commits[1].sha
       end
     end
 
@@ -19,7 +19,7 @@ describe "while giving presentation" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("next")
         presenter.execute("next")
-        @helper.head_position.should eql commits[2].id
+        @helper.head_position.should eql commits[2].sha
       end
     end
   end
@@ -30,7 +30,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         @helper.edit_file("inner commit")
         presenter.execute("next")
-        @helper.head_position.should eql commits[2].id
+        @helper.head_position.should eql commits[2].sha
       end
     end
   end
@@ -42,7 +42,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("next")
-        @helper.head_position.should eql commits[2].id
+        @helper.head_position.should eql commits[2].sha
       end
     end
   end
@@ -53,7 +53,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("back")
-        @helper.head_position.should eql commits[1].id
+        @helper.head_position.should eql commits[1].sha
       end
     end
   end
@@ -67,7 +67,7 @@ describe "while giving presentation" do
         presenter.execute("back")
         presenter.execute("back")
         presenter.execute("back")
-        @helper.head_position.should eql commits[0].id
+        @helper.head_position.should eql commits[0].sha
       end
     end
   end
@@ -78,7 +78,7 @@ describe "while giving presentation" do
         presenter.execute("next")
         presenter.execute("next")
         presenter.execute("start")
-        @helper.head_position.should eql commits[0].id
+        @helper.head_position.should eql commits[0].sha
       end
     end
   end
@@ -87,7 +87,7 @@ describe "while giving presentation" do
     it "should move the last commit" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("end")
-        @helper.head_position.should eql commits.last.id
+        @helper.head_position.should eql commits.last.sha
       end
     end
   end
@@ -96,7 +96,7 @@ describe "while giving presentation" do
     it "should checkout the specific commit" do
       @helper.start_presentation do |commits, presenter|
         presenter.execute("2")
-        @helper.head_position.should eql commits[1].id
+        @helper.head_position.should eql commits[1].sha
       end
     end
   end
@@ -104,7 +104,7 @@ describe "while giving presentation" do
   context "list presentation" do
     it "should print a list of commits" do
       @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")
+        expected_output = (["*#{commits.first.sha[0..9]}, #{commits.first.message}"] + commits[1..-1].map{|commit| "#{commit.sha[0..9]}, #{commit.message}"}).join("\n")
         presentation = presenter.execute("list")
         presentation.should eql expected_output
       end
@@ -180,7 +180,7 @@ EOH
         presenter.execute("next")
         presenter.execute("exit")
         @helper.current_branch.should_not be_nil
-        @helper.current_branch.name.should eql "master"
+        @helper.current_branch.should eql "master"
       end
     end
   end

data/spec/integration/start_presentation_spec.rb

@@ -19,13 +19,13 @@ describe "starting a presentation" do
 
   it "first commit should be first commit in file" do
     @helper.start_presentation do |commits, presenter|
-      presenter.slides[0].commit.should eql commits[0].id
+      presenter.slides[0].commit.should eql commits[0].sha
     end
   end
 
   it "second commit should be second commit in file" do
     @helper.start_presentation do |commits, presenter|
-      presenter.slides[1].commit.should eql commits[1].id
+      presenter.slides[1].commit.should eql commits[1].sha
     end
   end
 
@@ -38,7 +38,7 @@ describe "starting a presentation" do
 
   it "should have the presentation at first commit" do
     @helper.start_presentation do |commits, presenter|
-      @helper.head_position.should eql commits.first.id
+      @helper.head_position.should eql commits.first.sha
     end
   end
 end

data/spec/integration/update_presentation_spec.rb

@@ -18,7 +18,7 @@ describe "update presentation with any new commits" 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
+      yaml["slides"].last["slide"]["commit"].should eql new_commit.sha
     end
   end
 

data/spec/support/git_helpers.rb

@@ -16,10 +16,10 @@ class GitHelper
     content = ('a'..'z').to_a
     Dir.mkdir(presentation_dir)
     Dir.chdir(presentation_dir) do
-      @git_repo = Grit::Repo.init(".")
+      @git_repo = Git.init(".")
       (1..no_of_commits).each do |n|
-        edit_file_and_commit("commit number #{n}", content[n])
-        commits << @git_repo.commits[0]
+        commit = edit_file_and_commit("commit number #{n}", content[n])
+        commits << commit
         #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
@@ -40,7 +40,7 @@ class GitHelper
     edit_file(content)
     @git_repo.add(".")
     @git_repo.commit_all(commit_message)
-    @git_repo.commits[0]
+    @git_repo.log.to_a[0]
   end
 
   def setup_presentation_file(commits)
@@ -56,7 +56,7 @@ class GitHelper
   end
 
   def head_position
-    File.open(@presentation_dir + '/.git/HEAD').lines.first.strip
+    File.open(@presentation_dir + '/.git/HEAD').each_line.first.strip
   end
 
   def initialise_presentation(params={})
@@ -143,8 +143,8 @@ class GitHelper
 
   def current_branch
     Dir.chdir(PRESENTATION_DIR) do
-      repo = Grit::Repo.init('.')
-      repo.head
+      repo = Git.open('.')
+      repo.current_branch
     end
   end
 

metadata

@@ -1,104 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: git_presenter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Colin Gemmell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
-  requirement: &70174479333640 !ruby/object:Gem::Requirement
-    none: false
+  name: git
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174479333640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70174478378360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70174478378360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70174478379800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174478379800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174478381240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70174478381240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174478382680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174478382680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70174478385540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70174478385540
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70174478954780 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: *70174478954780
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &70174478102720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70174478102720
+        version: '1.6'
 description: Code presentation tool using git
 email: pythonandchips@gmail.com
 executables:
@@ -136,29 +131,25 @@ files:
 homepage: http://github.com/pythonandchips/git-presenter
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3910658736089827662
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Code presentation tool using git
 test_files: []