terminal-layout 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5943e939a5e3ba0dca04844bbea647acc52b05
-  data.tar.gz: 805918708734666de21d1298a74a245aa517eb86
+  metadata.gz: 717c542a1d6c338e54086d1a3bb5b77dd95cb035
+  data.tar.gz: 2009b46c650de33f6eb1c427acfa59896b27c608
 SHA512:
-  metadata.gz: b87d75ee8483d361a9268fe65514bc61500590d427aab37c68b1b3c8f7ac70af11e5461e600e1629664046c4df8be33f0b8cf3add4734be0d7f1649b349f5ea2
-  data.tar.gz: c0cb7f37b2b2e0ea59cf3bcfa024c18f50f6f0aa572c740abc978d6ed4ca1263bf15914dc8ec5c2cdac985a1bf747f2df5a2eb2c100d8308752b7ebe2e77aec7
+  metadata.gz: 06115b77a9a0176f96793a2a61cd9a518429a96a3583942f13789dd819db2d33e818c2aeee708a0df429ed13bd483940bf5c3d155b6a2e9a7b94f7f64a0e28f9
+  data.tar.gz: 0afcb428fcfdcdb0c2c3d739697e411f81a1e8faeb881a35698c6b338db2c3fcf0c9c54faea966b38857cbff3a6c6315d632130e02d1ef9761119d6d47def123

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    terminal-layout (0.3.0)
+    terminal-layout (0.3.1)
       highline (~> 1.7, >= 1.7.8)
       ruby-terminfo (~> 0.1.1)
       ruby-termios (~> 0.9.6)
+      treefell (~> 0.2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -43,6 +44,8 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     tins (1.3.5)
+    treefell (0.2.3)
+      term-ansicolor (~> 1.3)
 
 PLATFORMS
   ruby

data/lib/ansi_string.rb

@@ -207,6 +207,10 @@ class ANSIString
   end
   alias :to_str :to_s
 
+  def inspect
+    to_s.inspect
+  end
+
   def ==(other)
     (other.class == self.class && other.raw == @raw) || (other.kind_of?(String) && other == @raw)
   end

data/lib/terminal_layout/version.rb

@@ -1,3 +1,3 @@
 module TerminalLayout
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/terminal_layout.rb

@@ -325,20 +325,7 @@ module TerminalLayout
       @computed = {}
 
       initialize_defaults
-
-       @children.each do |child|
-         child.on(:content_changed) do |*args|
-           emit :child_changed
-         end
-
-         child.on(:child_changed) do |*args|
-           emit :child_changed
-         end
-
-         child.on(:position_changed) do |*args|
-           emit :position_changed
-         end
-       end
+      subscribe_to_events_on_children
     end
 
     %w(width height display x y float).each do |method|
@@ -356,8 +343,10 @@ module TerminalLayout
     end
 
     def children=(new_children)
+      unsubscribe_from_events_on_children
       old_children = @children
       @children = new_children
+      subscribe_to_events_on_children
       emit :child_changed, old_children, new_children
     end
 
@@ -398,6 +387,28 @@ module TerminalLayout
     def initialize_defaults
       style.has_key?(:display) || style[:display] = :block
     end
+
+    private
+
+    def unsubscribe_from_events_on_children
+      @children.each do |child|
+        child.unsubscribe
+      end
+    end
+
+    def subscribe_to_events_on_children
+      @children.each do |child|
+        child.on(:content_changed) do |*args|
+          emit :child_changed
+        end
+        child.on(:child_changed) do |*args|
+          emit :child_changed
+        end
+        child.on(:position_changed) do |*args|
+          emit :position_changed
+        end
+      end
+    end
   end
 
 
@@ -555,9 +566,13 @@ module TerminalLayout
 
       printable_lines.zip(@previously_printed_lines) do |new_line, previous_line|
         if new_line != previous_line
+          # be sure to reset the terminal at the outset of every line
+          # because we don't know what state the previous line ended in
+          line2print = "#{new_line}\e[0m"
           term_info.control "el"
           move_to_beginning_of_row
-          @output.puts new_line
+          Treefell['render'].puts "printing line=#{line2print.inspect}"
+          @output.puts line2print
         else
           move_down_n_rows 1
         end

data/spec/ansi_string_spec.rb

@@ -681,6 +681,15 @@ describe 'ANSIString' do
     end
   end
 
+  describe "#inspect" do
+    subject(:ansi_string){ ANSIString.new blue(string) }
+    let(:string){ "this is blue" }
+
+    it "returns a quoted version of the strong" do
+      expect(ansi_string.inspect).to eq "\"\\e[34mthis is blue\\e[0m\""
+    end
+  end
+
   describe "#succ" do
     it "needs to be implemented"
   end

data/terminal-layout.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-terminfo", "~> 0.1.1"
   spec.add_dependency "ruby-termios", "~> 0.9.6"
   spec.add_dependency 'highline', '~> 1.7', '>= 1.7.8'
+  spec.add_dependency "treefell", "~> 0.2.3"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-layout
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.8
+- !ruby/object:Gem::Dependency
+  name: treefell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement