tp 0.7.0pre2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dce4ec0c53ab2d9dbbb1b484e65da65b3a2dc391
-  data.tar.gz: f216644030d74c7cbcb3c901ff1f3203de968561
+  metadata.gz: ed793c40721ed87cad0fbff8368009598296fc4f
+  data.tar.gz: 6bf5ad7637f5433d61d9f4daf476e37665385d7d
 SHA512:
-  metadata.gz: cf0ce4dc392ba6077d19e5f57c58f53ff3a2dc09b757a57b31d221dd119a2543cfc14c6e1d17a5ffd09cf13c566ad6ba7687b01f60b35019fac4d27f7bbc8e3b
-  data.tar.gz: 448769e2bfdb35e292e5d4f3582919b1a8f99cb66fa7b2e59f5cdea51808045bae65daeaeb284f9062c084c0b33888c5063d43a972ce7ad67500610e3d35db25
+  metadata.gz: 2ef9a9b36badf129ba59597d38026bc4a45d1b0ef85b2986670f63812d9bf3c4d14311bf0bd5260b183b4bb7180b46d377cc0b0e1fc334defd346ba39c73acbb
+  data.tar.gz: 8c27564718c1cf4607d118eb3fdba73e1a896b441b6d9c0e9f00fe89773eb220b3eff879bcdbf0f405acdbf82dfbe2db3761ac971072d590464ba2559dea0f4b

data/Readme.md

@@ -21,6 +21,9 @@ tp slides.md
 
 Terminal Presenter
 
+> These are presenter notes
+> They are hidden when presenting
+
 # tp
 
 Presents Markdown slides in your terminal

data/lib/screen.rb

@@ -1,25 +1,12 @@
 module Screen
   extend self
 
-  X_GUTTER = 2
-  Y_GUTTER = 1
-  GUTTER_CHAR = "\u2591"
-  SUGGEST_CHAR = "\u2588"
-
-  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 + X_GUTTER * 2}H"
+    print "\e[#{height};#{width}H"
   end
 
   def height
@@ -31,15 +18,13 @@ module Screen
   end
 
   def suggest(x, y)
-    Y_GUTTER.times { print GUTTER_CHAR * (x + X_GUTTER * 2) + "\n" }
     y.times do |n|
       print "\n" if n.nonzero?
-      print GUTTER_CHAR * X_GUTTER + SUGGEST_CHAR * x + GUTTER_CHAR * X_GUTTER
+      print "\u2588" * x
     end
-    Y_GUTTER.times { print "\n" + GUTTER_CHAR * (x + X_GUTTER * 2) }
   end
 
   def width
-    `tput cols`.to_i - X_GUTTER * 2
+    `tput cols`.to_i
   end
 end

data/lib/tp/renderer.rb

@@ -11,7 +11,7 @@ module TP
 
       return unless text
 
-      Screen.print Screen.add_gutter(text)
+      Screen.print text
 
       Screen.hide_cursor
 

data/lib/tp/slide.rb

@@ -16,7 +16,9 @@ module TP
     end
 
     def content
-      Array(lines[2, lines.count - 2]).join
+      Array(lines[2, lines.count - 2]).reject { |line|
+        line.start_with?("> ")
+      }.join
     end
 
     def frames

data/lib/tp/slide/paragraph.rb

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

data/lib/tp/version.rb

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

data/slides.md

@@ -4,6 +4,9 @@
 
 Terminal Presenter
 
+> These are presenter notes
+> They are hidden when presenting
+
 # tp
 
 Presents Markdown slides in your terminal

data/spec/lib/screen_spec.rb

@@ -3,27 +3,6 @@ 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! }
 
@@ -39,8 +18,6 @@ describe Screen do
   describe ".height" do
     subject(:height) { klass.height }
 
-    before { klass.unstub :height }
-
     it "returns the height" do
       height.should be_nonzero
     end
@@ -74,17 +51,9 @@ describe Screen do
     end
   end
 
-  describe ".suggest" do
-    it "prints the slide size with gutter" do
-
-    end
-  end
-
   describe ".width" do
     subject(:width) { klass.width }
 
-    before { klass.unstub :width }
-
     it "returns the width" do
       width.should be_nonzero
     end

data/spec/lib/string_spec.rb

@@ -6,13 +6,5 @@ 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

@@ -19,7 +19,7 @@ describe TP::Renderer do
     end
 
     it "prints the text to the screen" do
-      expect(Screen).to receive(:print).with(Screen.add_gutter(text))
+      expect(Screen).to receive(:print).with(text)
 
       render
     end

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

@@ -13,15 +13,6 @@ 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/lib/tp/slide_spec.rb

@@ -17,4 +17,12 @@ describe TP::Slide do
 
     its(:content) { should eq("") }
   end
+
+  context "with presenter notes" do
+    let(:markdown) { "# Header\n\nContent\n\n> Secrets" }
+
+    it "does not include presenter notes in the content" do
+      expect(slide.content).to_not include("Secrets")
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -17,6 +17,5 @@ RSpec.configure do |config|
 
   config.before do
     Screen.stub clear!: nil, print: nil
-    Screen.stub height: 34, width: 80
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tp
 version: !ruby/object:Gem::Version
-  version: 0.7.0pre2
+  version: 0.7.0
 platform: ruby
 authors:
 - Justin Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -205,9 +205,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14