tp 0.1.1 → 0.2.0

data/Readme.md

@@ -1,24 +1,56 @@
 # tp [![Build Status](https://secure.travis-ci.org/JustinCampbell/tp.png)](https://secure.travis-ci.org/JustinCampbell/tp) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/JustinCampbell/tp)
 
+![Screenshot](http://f.cl.ly/items/0P0V2l2q381S3m3J0p0U/Screen%20Shot%202012-08-14%20at%207.52.52%20AM.png)
+
+## Installation and Usage
+
+```sh
+gem install tp
+tp slides.md
+```
+
+## Slide Deck
+
+```md
+# tp
+
+# tp
+
 Terminal Presenter
 
-## Installation
+# tp
 
-Add this line to your application's Gemfile:
+Presents Markdown in your terminal
 
-    gem 'tp'
+# Installation
 
-And then execute:
+gem install tp
 
-    $ bundle
+# Usage
 
-Or install it yourself as:
+tp slides.md
 
-    $ gem install tp
+# Navigation
 
-## Usage
+* Arrow keys
+* Space/Enter/Backspace
+* H,J,K,L (VIM)
+* Q to quit
 
-```sh
-tp presentation.md
+# Paragraphs
+
+Short paragraphs are centered
+
+# Paragraphs
+
+Sometimes paragraphs are really really long and might wrap a few lines. It does it's best to wrap them logically. Also, they stay left-aligned.
+
+# Contribute
+
+JustinCampbell/tp
+
+# Thanks!
+
+@JustinCampbell
 ```
 

data/lib/tp/presenter.rb

@@ -11,18 +11,18 @@ module TP
       Keyboard.wait_for_return
 
       loop do
-        Screen.clear!
-
-        show_slide slide_deck.current or break
+        Renderer.new(slide_deck.current_slide).render
 
         case Keyboard.read
-        when :right, :down, :space, :return, 'l', 'k'
+        when :right, :down, :space, :return, 'l', 'k', 'd', 's'
           slide_deck.next
-        when :left, :up, :backspace, 'h', 'j'
+        when :left, :up, :backspace, 'h', 'j', 'a', 'w'
           slide_deck.previous
         when 'q'
           break
         end
+
+        break if slide_deck.ended?
       end
 
       Screen.clear!
@@ -39,33 +39,6 @@ module TP
     def slide_deck
       @slide_deck ||= SlideDeck.new slides
     end
-
-    def show_slide(slide)
-      return unless slide
-
-      buffer = slide.header.center Screen.width
-
-      if slide.body
-        buffer << "\n\n"
-
-        if slide.paragraph
-          paragraph = slide.paragraph.wrap Screen.width
-          paragraph = paragraph.center Screen.width if paragraph.lines.one?
-
-          buffer << paragraph
-        else
-          slide.bullets.each { |string| buffer << "#{bullet}#{string}\n" }
-        end
-      end
-
-      print buffer
-
-      true
-    end
-
-    def bullet
-      "\u2022 "
-    end
   end
 end
 

data/lib/tp/renderer.rb

@@ -0,0 +1,36 @@
+module TP
+  class Renderer
+    BULLET = "\u2022 "
+
+    attr_accessor :slide
+
+    def initialize(slide)
+      self.slide = slide
+    end
+
+    def render
+      Screen.clear!
+
+      return unless slide
+
+      buffer = slide.header.center Screen.width
+
+      if slide.body
+        buffer << "\n\n"
+
+        if slide.paragraph
+          paragraph = slide.paragraph.wrap Screen.width
+          paragraph = paragraph.center Screen.width if paragraph.lines.one?
+
+          buffer << paragraph
+        else
+          slide.bullets.each { |string| buffer << "#{BULLET}#{string}\n" }
+        end
+      end
+
+      print buffer unless ENV['RUBY_ENV'] == 'test'
+
+      true
+    end
+  end
+end

data/lib/tp/slide.rb

@@ -7,15 +7,14 @@ module TP
     end
 
     def header
-      match = markdown.match /^#\s*(.+)(?:\n)*/
-
-      match[1] if match
+      line = lines.first
+      line[1, line.length - 1].to_s.strip
     end
 
     def body
-      match = markdown.match /^#\s*.+\n\n(.*)/m
+      result = lines[2, lines.count - 2]
 
-      match[1] if match
+      result.join "" if result
     end
 
     def bullets
@@ -29,5 +28,11 @@ module TP
     def paragraph
       body unless bullets
     end
+
+    private
+
+    def lines
+      markdown.lines.to_a
+    end
   end
 end

data/lib/tp/slide_deck.rb

@@ -14,6 +14,11 @@ module TP
     def current
       slides[cursor]
     end
+    alias current_slide current
+
+    def ended?
+      not current
+    end
 
     def next
       self.cursor += 1

data/lib/tp/version.rb

@@ -1,3 +1,3 @@
 module TP
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/tp.rb

@@ -3,6 +3,7 @@ require 'screen'
 require 'string'
 
 require 'tp/presenter'
+require 'tp/renderer'
 require 'tp/slide'
 require 'tp/slide_deck'
 require 'tp/version'

data/slides.md

@@ -0,0 +1,45 @@
+# tp
+
+# tp
+
+Terminal Presenter
+
+# tp
+
+Presents Markdown in your terminal
+
+# Installation
+
+gem install tp
+
+# Usage
+
+tp slides.md
+
+# Navigation
+
+* Arrow keys
+* Space/Enter/Backspace
+* H,J,K,L
+* W,A,S,D
+* Q to quit
+
+# Paragraphs
+
+Short paragraphs are centered
+
+# Paragraphs
+
+Sometimes paragraphs are really really long and might wrap a few lines. It does it's best to wrap them logically. Also, they stay left-aligned.
+
+#
+
+Headers can also be blank
+
+# Contribute
+
+JustinCampbell/tp
+
+# Thanks!
+
+@JustinCampbell

data/spec/lib/tp/presenter_spec.rb

@@ -26,9 +26,7 @@ describe TP::Presenter do
   describe "#present" do
     it "works" do
       Keyboard.should_receive(:wait_for_return).exactly(1).times
-      Screen.should_receive(:clear!).exactly(5).times
-
-      presenter.should_receive(:print).exactly(3).times
+      Screen.should_receive(:clear!).exactly(4).times
 
       presenter.present
     end

data/spec/lib/tp/slide_spec.rb

@@ -45,6 +45,18 @@ describe TP::Slide do
     its(:paragraph) { should be_nil }
   end
 
+  context "with a blank header" do
+    let(:markdown) {
+      "#\n\nFirst Slide"
+    }
+
+    its(:header) { should be_empty }
+    its(:body) { should == "First Slide" }
+
+    its(:bullets) { should be_nil }
+    its(:paragraph) { should == "First Slide" }
+  end
+
   context "with trailing newlines" do
     let(:markdown) {
       "# First Slide\n\n* Bullet 1\n* Bullet 2\n\n"

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV['RUBY_ENV'] ||= 'test'
+
 require 'support/klass'
 
 puts RUBY_DESCRIPTION

data/tp.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["justin@justincampbell.me"]
   gem.description   = "tp"
   gem.summary       = "tp"
-  gem.homepage      = "http://github.com/JustinCampbell/tp"
+  gem.homepage      = "http://github.com/justincampbell/tp"
 
   gem.files         = `git ls-files`.split $/
   gem.executables   = gem.files.grep(%r{^bin/}).map { |file| File.basename file }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
@@ -97,9 +97,11 @@ files:
 - lib/string.rb
 - lib/tp.rb
 - lib/tp/presenter.rb
+- lib/tp/renderer.rb
 - lib/tp/slide.rb
 - lib/tp/slide_deck.rb
 - lib/tp/version.rb
+- slides.md
 - spec/lib/keyboard_spec.rb
 - spec/lib/screen_spec.rb
 - spec/lib/string_spec.rb
@@ -109,7 +111,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/klass.rb
 - tp.gemspec
-homepage: http://github.com/JustinCampbell/tp
+homepage: http://github.com/justincampbell/tp
 licenses: []
 post_install_message: 
 rdoc_options: []