tp 0.6.2 → 0.7.0pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 566ce5c06eba734808dcab4f4b0a48f791806fc8
-  data.tar.gz: 90d3243ec651183b1d1b913fe7e0d81acafaff4a
+  metadata.gz: 9813a862d681061c6eae802d73fa465781b9c552
+  data.tar.gz: 5e7e87045104c9d1fc27f81578428f53abc1c30a
 SHA512:
-  metadata.gz: 64a4e3916c2b247635b10c2b08f95a1810603d99d41a59d927424bcc32e1be55827de3e55d6991629734cc46d0b9b2568cb62928ceda0211daa5aaa61292a44e
-  data.tar.gz: 4373f999e8b7f0e2517cb56eeba690efc4f3a7cfcf269ddb72e4cb7aa8135a85ba4811158175178a4603aeec830ff278a63bff41ba0ca192c2444d4059a3e7ca
+  metadata.gz: ac5aeb3b0295ed94721d33e443699ced0e4dbd9f1db6832bec02203e4efe7427fafff37b2a39f0543055da71712048bac43363c9bd597b22d49e8dca884ebe54
+  data.tar.gz: 2d420ed3e99cda9fbaf6a4993977cf3777e32f0af987e8a1cf6c0f29bd2feb9046b6c43814847b03850754eba732b44f715bb9d7411a4dfee8e719e0038ee900

data/.cane

@@ -1,5 +1,4 @@
 --abc-max 10
 --color
---gte coverage/.last_run.json,100
 --no-doc
 --style-exclude spec/**/*

data/.travis.yml

@@ -1,9 +1,8 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
-

data/Gemfile

@@ -2,11 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'cane', github: 'square/cane'
-
-group :development, :test do
-  group :darwin do
-    gem 'rb-fsevent'
-    gem 'growl'
-  end
+group :development do
+  gem 'guard'
+  gem 'guard-cane'
+  gem 'guard-rspec'
 end

data/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec, env: { skip_coverage: true } do
+guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/Rakefile

@@ -6,5 +6,9 @@ task default: :ci
 
 task ci: [:spec, :cane]
 
-Cane::RakeTask.new
+Cane::RakeTask.new do |cane|
+  cane.canefile = '.cane'
+  cane.add_threshold 'coverage/.last_run.json', :>=, 100
+end
+
 RSpec::Core::RakeTask.new

data/lib/screen.rb

@@ -1,26 +1,43 @@
 module Screen
   extend self
 
+  X_GUTTER = 2
+  Y_GUTTER = 1
+
+  def add_gutter(text)
+    text = text.lines.map { |line|
+      line == "\n" ? line : " " * X_GUTTER + line
+    }.join
+    text = "\n" * Y_GUTTER + text
+    text
+  end
+
   def clear!
     print "\e[2J\e[f"
   end
 
   def hide_cursor
-    print "\e[#{height};#{width}H"
+    print "\e[#{height};#{width + X_GUTTER * 2}H"
   end
 
   def height
     `tput lines`.to_i
   end
 
+  def print(text)
+    Kernel.print text
+  end
+
   def suggest(x, y)
+    Y_GUTTER.times { print "x" * (x + X_GUTTER * 2) + "\n" }
     y.times do |n|
       print "\n" if n.nonzero?
-      print "\u2588" * x
+      print "x" * X_GUTTER + "\u2588" * x + "x" * X_GUTTER
     end
+    Y_GUTTER.times { print "\n" + "x" * (x + X_GUTTER * 2) }
   end
 
   def width
-    `tput cols`.to_i
+    `tput cols`.to_i - X_GUTTER * 2
   end
 end

data/lib/tp/presenter.rb

@@ -22,9 +22,9 @@ module TP
         Renderer.new(slide_deck.current_frame).render
 
         case Keyboard.read
-        when :right, :down, :space, :return, 'l', 'k', 'd', 's'
+        when :right, :down, :space, :return, 'l', 'j', 'd', 's'
           slide_deck.next
-        when :left, :up, :backspace, 'h', 'j', 'a', 'w'
+        when :left, :up, :backspace, 'h', 'k', 'a', 'w'
           slide_deck.previous
         when 'q'
           break

data/lib/tp/renderer.rb

@@ -11,15 +11,11 @@ module TP
 
       return unless text
 
-      print text unless testing?
+      Screen.print Screen.add_gutter(text)
 
       Screen.hide_cursor
 
       true
     end
-
-    def testing?
-      ENV['RUBY_ENV'] == 'test'
-    end
   end
 end

data/lib/tp/slide/paragraph.rb

@@ -28,7 +28,11 @@ class TP::Slide::Paragraph < TP::Slide
   end
 
   def width
-    content.length
+    [Screen.width, content.length].min
+  end
+
+  def height
+    content.wrap(Screen.width).lines.count + 2
   end
 
   def hard_width?

data/lib/tp/version.rb

@@ -1,3 +1,3 @@
 module TP
-  VERSION = "0.6.2"
+  VERSION = "0.7.0pre1"
 end

data/spec/lib/screen_spec.rb

@@ -3,10 +3,33 @@ require 'screen'
 require 'spec_helper'
 
 describe Screen do
+  describe ".add_gutter" do
+    subject(:add_gutter) { klass.add_gutter(text) }
+
+    let(:text) { "  Header  " }
+
+    before do
+      klass.stub width: 10
+    end
+
+    it "adds a gutter on the top and left" do
+      expect(add_gutter).to eq("\n    Header  ")
+    end
+
+    context "with a paragraph slide" do
+      let(:text) { "  Header  \n\nAbc" }
+      it "indents the text and leaves a space on the right" do
+        expect(add_gutter).to eq("\n    Header  \n\n  Abc")
+      end
+    end
+  end
+
   describe ".clear!" do
     subject(:clear!) { klass.clear! }
 
     it "clears the screen" do
+      Screen.unstub :clear!
+
       Screen.should_receive(:print).with("\e[2J\e[f")
 
       clear!
@@ -21,6 +44,34 @@ describe Screen do
     end
   end
 
+  describe ".hide_cursor" do
+    before do
+      klass.unstub :print
+    end
+
+    it "prints to the bottom right of the screen" do
+      expect(Kernel).to receive(:print) do |string|
+        string.match(/\\\e\[\d+;\d+/)
+      end
+
+      klass.hide_cursor
+    end
+  end
+
+  describe ".print" do
+    let(:text) { "foo" }
+
+    before do
+      klass.unstub :print
+    end
+
+    it "prints to the screen" do
+      expect(Kernel).to receive(:print).with(text)
+
+      klass.print text
+    end
+  end
+
   describe ".width" do
     subject(:width) { klass.width }
 

data/spec/lib/string_spec.rb

@@ -6,5 +6,13 @@ describe String do
 
     it { string.wrap(1).should == "One\ntwo\nthree\nfour\nfive" }
     it { string.wrap(10).should == "One two\nthree four\nfive" }
+
+    context "with multiple lines" do
+      let(:string) { "One two\nthree four\nfive" }
+
+      it { string.wrap(1).should == "One\ntwo\nthree\nfour\nfive" }
+      it { string.wrap(10).should == "One two\nthree four\nfive" }
+      it { string.wrap(100).should == string }
+    end
   end
 end

data/spec/lib/tp/renderer_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe TP::Renderer do
+  let(:renderer) { described_class.new(text) }
+  let(:text) { "foo" }
+
+  before do
+    renderer.stub :print
+    renderer.stub testing?: false
+  end
+
+  describe "#render" do
+    subject(:render) { renderer.render }
+
+    it "clears the screen" do
+      expect(Screen).to receive(:clear!)
+
+      render
+    end
+
+    it "prints the text to the screen" do
+      expect(Screen).to receive(:print).with(Screen.add_gutter(text))
+
+      render
+    end
+  end
+end

data/spec/lib/tp/slide/paragraph_spec.rb

@@ -13,6 +13,15 @@ describe TP::Slide::Paragraph do
   its(:width) { should == 15 }
   its(:height) { should == 3 }
 
+  context "when text is wrapped" do
+    before do
+      Screen.stub width: 10
+    end
+
+    its(:width) { should == 10 }
+    its(:height) { should == 4 }
+  end
+
   describe "#render_terminal" do
     subject(:lines) { slide.render_terminal.lines.to_a }
 

data/spec/spec_helper.rb

@@ -4,10 +4,8 @@ require 'support/klass'
 
 puts RUBY_DESCRIPTION
 
-unless ENV['skip_coverage']
-  require 'simplecov'
-  SimpleCov.start
-end
+require 'simplecov'
+SimpleCov.start
 
 require 'tp'
 
@@ -16,5 +14,8 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = :random
-end
 
+  config.before do
+    Screen.stub clear!: nil, print: nil
+  end
+end

data/tp.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary       = "Terminal Presenter"
   gem.description   = "Presents Markdown slides in your terminal"
   gem.homepage      = "https://github.com/justincampbell/tp"
+  gem.license       = "MIT"
 
   gem.post_install_message = File.read('WELCOME')
 
@@ -21,15 +22,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "coderay", "~> 1.0"
-  gem.add_dependency "prawn", "~> 0.12"
-  gem.add_dependency "thor", "~> 0.17"
-
-  gem.add_development_dependency "cane"
-  gem.add_development_dependency "guard"
-  gem.add_development_dependency "guard-rspec"
-  gem.add_development_dependency "guard-cane"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "simplecov" if RUBY_DESCRIPTION.start_with? "ruby"
+  gem.required_ruby_version = '>= 1.9.3'
+
+  gem.add_dependency 'coderay', '~> 1.0'
+  gem.add_dependency 'prawn', '~> 0.12'
+  gem.add_dependency 'thor', '~> 0.17'
+
+  gem.add_development_dependency 'cane'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tp
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0pre1
 platform: ruby
 authors:
 - Justin Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -66,48 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +152,7 @@ files:
 - spec/lib/tp/coderay/prawn_encoder_spec.rb
 - spec/lib/tp/presenter_spec.rb
 - spec/lib/tp/publisher/pdf_spec.rb
+- spec/lib/tp/renderer_spec.rb
 - spec/lib/tp/slide/bulleted_spec.rb
 - spec/lib/tp/slide/code_spec.rb
 - spec/lib/tp/slide/header_only_spec.rb
@@ -206,7 +165,8 @@ files:
 - spec/support/klass.rb
 - tp.gemspec
 homepage: https://github.com/justincampbell/tp
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: |2+
 
@@ -242,15 +202,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Terminal Presenter
@@ -262,6 +222,7 @@ test_files:
 - spec/lib/tp/coderay/prawn_encoder_spec.rb
 - spec/lib/tp/presenter_spec.rb
 - spec/lib/tp/publisher/pdf_spec.rb
+- spec/lib/tp/renderer_spec.rb
 - spec/lib/tp/slide/bulleted_spec.rb
 - spec/lib/tp/slide/code_spec.rb
 - spec/lib/tp/slide/header_only_spec.rb