git_presenter 0.4.0 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 16d1088ab5afeafb7357fb67a07d0b80c29715b75f0e90ba7fcc549f58cdeb84
+  data.tar.gz: fe4948246f729b01c8678e11f03f8bdbd979b3988d896edd7142c35dd3c23ec8
+SHA512:
+  metadata.gz: ab27a51ae79c16e0dc42775ecec088f135b405864487e44dcb01a35345711374e4614a5b9d3a83aac5bdd5cc1ce57f358fa48cf6bff9d8c1e3f484433f6cdbf0
+  data.tar.gz: 9ccf1f24f2d908b2fb1b98b4936a027cae95f29d1f933a36b3df22e9bab20574e0e78a434f4d5ff4adfa185f6540e2bee13056694ca79cb04926759b59c7ba24

data/.travis.yml

@@ -2,4 +2,8 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 3.0.0
   # - jruby-19mode # JRuby in 1.9 mode
+script: "bundle exec rspec spec"

data/Gemfile

@@ -3,16 +3,14 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 #
-gem "grit", "~> 2.4"
-gem "launchy", "~> 2.1"
+gem "git", "1.8.1"
+gem 'launchy', "2.5.0"
 
 # 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'
+  gem "pry", "0.14.1"
+  gem "rspec", "3.10.0"
+  gem "bundler", "2.2.3"
+  gem 'jeweler', "2.3.5"
 end

data/Gemfile.lock

@@ -1,51 +1,102 @@
 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)
-      bundler (~> 1.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.15.0-java)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (4.1.0)
+    highline (2.0.3)
+    jar-dependencies (0.4.1)
+    jeweler (2.3.5)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api (~> 0.11.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       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.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)
+      semver2
+    jwt (2.2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
+    method_source (1.0.0)
+    mini_portile2 (2.1.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-java)
+    oauth2 (1.4.7)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry (0.14.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      spoon (~> 0.0)
+    psych (2.2.4)
+    psych (2.2.4-java)
+      jar-dependencies (>= 0.1.7)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    rdoc (6.3.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    semver2 (3.4.2)
+    spoon (0.0.6)
+      ffi
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  bundler
-  grit (~> 2.4)
-  jeweler (~> 1.6)
-  launchy (~> 2.1)
-  pry
-  rcov (~> 0.9)
-  rspec (~> 2.7)
+  bundler (= 2.2.3)
+  git (= 1.8.1)
+  jeweler (= 2.3.5)
+  launchy (= 2.5.0)
+  pry (= 0.14.1)
+  rspec (= 3.10.0)
+
+BUNDLED WITH
+   2.2.3

data/README.markdown

@@ -1,6 +1,6 @@
 # git-presenter
 
-[![Build Status](https://secure.travis-ci.org/pythonandchips/git-presenter.png?branch=master)](http://travis-ci.org/pythonandchips/git-presenter)
+[![Build Status](https://drone.io/github.com/pythonandchips/git-presenter/status.png)](https://drone.io/github.com/pythonandchips/git-presenter/latest)
 
 When presenting code live on stage you have a few choices:
 
@@ -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
 
@@ -39,7 +36,20 @@ gem install git_presenter
 * list/l : list slides in presentation
 * help/h: display this message
 
-## Bugs/Features/Prase
+### Command mode
+
+The default for git presenter is interactive mode however if you want to use git presenter from a text editor you can use command mode.
+
+To start a presentation in command mode use "git-presenter start -c"
+
+Once started you run "git-presenter {{command}}" e.g. to move to the next slide run "git-presenter next"
+
+## 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/Praise
 
 It you find any bugs or have some feature requests please add an issue on the repository. Or if you just want to get in touch and tell me how awesome git presenter is you can get me on twitter @colin_gemmell or drop me an email at pythonandchips{at}gmail.com
 
@@ -54,6 +64,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
@@ -76,4 +90,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

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.4.0

data/bin/git-presenter

@@ -1,8 +1,14 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 require "rubygems"
 require_relative "../lib/git_presenter"
 
-YAML::ENGINE.yamler = 'psych'
+YAML::ENGINE.yamler = 'psych' if defined?(Psych::ENGINE)
 
-presenter = GitPresenter.new(Dir.pwd)
+if ARGV[1] == "-c"
+  interactive = false
+else
+  interactive = true
+end
+
+presenter = GitPresenter.new(Dir.pwd, interactive)
 presenter.execute(ARGV[0])

data/git_presenter.gemspec

@@ -2,17 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: git_presenter 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "git_presenter"
-  s.version = "0.4.0"
+  s.name = "git_presenter".freeze
+  s.version = "1.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Colin Gemmell"]
-  s.date = "2012-07-10"
-  s.description = "Code presentation tool using git"
-  s.email = "pythonandchips@gmail.com"
-  s.executables = ["git-presenter"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Colin Gemmell".freeze]
+  s.date = "2021-05-01"
+  s.description = "Code presentation tool using git".freeze
+  s.email = "pythonandchips@gmail.com".freeze
+  s.executables = ["git-presenter".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -31,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/git_presenter.rb",
     "lib/git_presenter/controller.rb",
     "lib/git_presenter/presentation.rb",
+    "lib/git_presenter/shell.rb",
     "lib/git_presenter/slide.rb",
     "spec/bugs/max_10_commits_being_parsed_spec.rb",
     "spec/integration/initialize_presentation_spec.rb",
@@ -44,43 +47,29 @@ Gem::Specification.new do |s|
     "spec/support/command_line_helper.rb",
     "spec/support/git_helpers.rb"
   ]
-  s.homepage = "http://github.com/pythonandchips/git-presenter"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
-  s.summary = "Code presentation tool using git"
+  s.homepage = "http://github.com/pythonandchips/git-presenter".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.2.3".freeze
+  s.summary = "Code presentation tool using git".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
+  end
 
-    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"])
-      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<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
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<git>.freeze, ["= 1.8.1"])
+    s.add_runtime_dependency(%q<launchy>.freeze, ["= 2.5.0"])
+    s.add_development_dependency(%q<pry>.freeze, ["= 0.14.1"])
+    s.add_development_dependency(%q<rspec>.freeze, ["= 3.10.0"])
+    s.add_development_dependency(%q<bundler>.freeze, ["= 2.2.3"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.5"])
   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"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6"])
-    s.add_dependency(%q<rcov>, ["~> 0.9"])
-    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<git>.freeze, ["= 1.8.1"])
+    s.add_dependency(%q<launchy>.freeze, ["= 2.5.0"])
+    s.add_dependency(%q<pry>.freeze, ["= 0.14.1"])
+    s.add_dependency(%q<rspec>.freeze, ["= 3.10.0"])
+    s.add_dependency(%q<bundler>.freeze, ["= 2.2.3"])
+    s.add_dependency(%q<jeweler>.freeze, ["= 2.3.5"])
   end
 end
 

data/lib/git_presenter.rb

@@ -1,12 +1,13 @@
-require 'grit'
+require 'git'
 require 'yaml'
 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'
+  require_relative 'git_presenter/shell'
 
   def initialize(current_dir, interactive=true)
     @controller = Controller.new(current_dir)
@@ -24,11 +25,18 @@ class GitPresenter
     elsif command == 'update'
       @controller.update_presentation
     else
+      if @presentation.nil?
+        @presentation = @controller.load_presentation
+      end
       puts @presentation.execute(command)
     end
     @presentation
   end
 
+  def current_slide
+    @presentation.current_slide
+  end
+
   private
 
   def enter_run_loop

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
@@ -14,9 +14,13 @@ class GitPresenter::Controller
     puts "run 'git-presenter start' to begin the presentation"
   end
 
-  def start_presentation
+  def load_presentation
     yaml = YAML.parse(File.open(@presentation_dir + "/.presentation", "r")).to_ruby
-    presenter = GitPresenter::Presentation.new(yaml)
+    GitPresenter::Presentation.new(yaml)
+  end
+
+  def start_presentation
+    presenter = load_presentation
     puts presenter.start
     presenter
   end
@@ -24,7 +28,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)
@@ -44,14 +47,18 @@ 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
   end
+
+  def current_branch
+    `git rev-parse --abbrev-ref HEAD`.strip
+  end
 end