terminal-layout 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65b1156a204469a85174ffa2bb761a1f4f15593
-  data.tar.gz: 70c589abe13e269025404af7efe2555c2567e906
+  metadata.gz: 2b5943e939a5e3ba0dca04844bbea647acc52b05
+  data.tar.gz: 805918708734666de21d1298a74a245aa517eb86
 SHA512:
-  metadata.gz: 85ba780f984691a236879b5fc8754e0cf490f7df4d5b9288aa03411c735f985d335a5a454bbb72de72a16fe93b69458acf6c8dc8b2d1c2323d3eb9bc91857abc
-  data.tar.gz: 47c7317c78a4d5814682665fa77e27e9782b07c5af658eb8a60e73c78bb65ba90ccf490f3284240f08448a54bb38599ddb70d2e4d170574aac489e9e7620da69
+  metadata.gz: b87d75ee8483d361a9268fe65514bc61500590d427aab37c68b1b3c8f7ac70af11e5461e600e1629664046c4df8be33f0b8cf3add4734be0d7f1649b349f5ea2
+  data.tar.gz: c0cb7f37b2b2e0ea59cf3bcfa024c18f50f6f0aa572c740abc978d6ed4ca1263bf15914dc8ec5c2cdac985a1bf747f2df5a2eb2c100d8308752b7ebe2e77aec7

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    terminal-layout (0.2.0)
-      highline
+    terminal-layout (0.3.0)
+      highline (~> 1.7, >= 1.7.8)
       ruby-terminfo (~> 0.1.1)
       ruby-termios (~> 0.9.6)
 
@@ -49,7 +49,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.7)
-  pry
   pry-byebug
   rake (~> 10.0)
   rspec

data/Rakefile

@@ -0,0 +1,3 @@
+require "bundler/gem_tasks"
+
+Dir[File.join(File.dirname(__FILE__), 'lib/tasks/**/*.rake')].each {|f| load f }

data/lib/ansi_string.rb

@@ -24,6 +24,14 @@ class ANSIString
     self
   end
 
+  def insert(position, string)
+    if position < 0
+      position = @without_ansi.length + position + 1
+    end
+    self[position...position] = string
+    self
+  end
+
   def empty?
     length == 0
   end
@@ -33,14 +41,19 @@ class ANSIString
     range = (range..range) if range.is_a?(Integer)
 
     range_begin = range.begin
-    range_end = range.exclude_end? ? range.end - 1 : range.end
+    range_end = range.end
+    if range.end != range.begin
+      range_end = range.exclude_end? ? range.end - 1 : range.end
+    end
 
     range_begin = @without_ansi.length - range.begin.abs if range.begin < 0
     range_end = @without_ansi.length - range.end.abs if range.end < 0
 
-    str = build_string_with_ansi_for(range_begin..range_end)
-    if str
-      ANSIString.new str
+    if range_begin == 0 && range_end == 0 && range.exclude_end?
+      return ""
+    else
+      str = build_string_with_ansi_for(range_begin..range_end)
+      ANSIString.new str if str
     end
   end
 
@@ -83,22 +96,23 @@ class ANSIString
       if md.captures.any?
         results << md.captures.map.with_index do |_, i|
           # captures use 1-based indexing
-          self[md.begin(i+1)...md.end(i+1)]
+          self[md.begin(i+1)..md.end(i+1)-1]
         end
       else
-        results << self[md.begin(0)...md.end(0)]
+        results << self[md.begin(0)..md.end(0)-1]
       end
     end
     results
   end
 
   def slice(index, length=nil)
+    return ANSIString.new("") if length == 0
     range = nil
     index = index.without_ansi if index.is_a?(ANSIString)
     index = Regexp.new Regexp.escape(index) if index.is_a?(String)
     if index.is_a?(Integer)
-      length = index unless length
-      range = (index...index+length)
+      length ||= 1
+      range = (index..index+length-1)
     elsif index.is_a?(Range)
       range = index
     elsif index.is_a?(Regexp)
@@ -106,7 +120,7 @@ class ANSIString
       capture_group_index = length || 0
       if md
         capture_group = md.offset(capture_group_index)
-        range = (capture_group.first...capture_group.last)
+        range = (capture_group.first..capture_group.last-1)
       end
     else
       raise(ArgumentError, "Must pass in at least an index or a range.")

data/lib/tasks/gem.rake

@@ -0,0 +1,62 @@
+namespace :bump do
+  namespace :version do
+    class ProjectVersion
+      FILE = File.dirname(__FILE__) + '/../terminal_layout/version.rb'
+      PATTERN = /VERSION\s*=\s*"(\d+)\.(\d+)\.(\d+)"/m
+
+      def initialize(file=FILE, pattern=PATTERN)
+        @file = file
+        @pattern = pattern
+      end
+
+      def bump(major:nil, minor:nil, patch:nil)
+        version = nil
+        contents.sub!(@pattern) do
+          _major = major.call($1) if major
+          _minor = minor.call($2) if minor
+          _patch = patch.call($3) if patch
+          version = "#{_major}.#{_minor}.#{_patch}"
+          results = %|VERSION = "#{version}"|
+        end
+        File.write(@file, contents)
+        system "bundle"
+        system "git add #{ProjectVersion::FILE} && git commit -m 'Bumping version to #{version}'"
+        system "git tag v#{version}"
+      end
+
+      private
+
+      def contents
+        @contents ||= File.read(@file)
+      end
+    end
+
+    desc "Increments the patch number by 1 for the project"
+    task :patch do
+      ProjectVersion.new.bump(
+        major: ->(major){ major },
+        minor: ->(minor){ minor },
+        patch: ->(patch){ patch.succ }
+      )
+    end
+
+    desc "Increments the minor number by 1 for the project"
+    task :minor do
+      ProjectVersion.new.bump(
+        major: ->(major){ major },
+        minor: ->(minor){ minor.succ },
+        patch: ->(patch){ 0 }
+      )
+    end
+
+    desc "Increments the major number by 1 for the project"
+    task :major do
+      ProjectVersion.new.bump(
+        major: ->(major){ major.succ },
+        minor: ->(minor){ 0 },
+        patch: ->(patch){ 0 }
+      )
+    end
+
+  end
+end

data/lib/terminal_layout.rb

@@ -335,8 +335,8 @@ module TerminalLayout
            emit :child_changed
          end
 
-         child.on(:cursor_position_changed) do |*args|
-           emit :cursor_position_changed
+         child.on(:position_changed) do |*args|
+           emit :position_changed
          end
        end
     end
@@ -402,12 +402,17 @@ module TerminalLayout
 
 
   class InputBox < Box
+    # cursor_position is the actual coordinates on the screen of where then
+    # cursor is rendered
     attr_accessor :cursor_position
 
+    # position is the desired X-position of the cursor if everything was
+    # displayed on a single line
+    attr_accessor :position
+
     def initialize(*args)
       super
       @computed = { x: 0, y: 0 }
-      @cursor_offset_x = 0
       @cursor_position = OpenStruct.new(x: 0, y: 0)
       @position = 0
     end
@@ -429,20 +434,21 @@ module TerminalLayout
       end
     end
 
-    def position=(position)
-      @cursor_offset_x = position
-      @cursor_position.x = @cursor_offset_x + @computed[:x]
-      emit :cursor_position_changed, nil, @cursor_position.x
+    def position=(new_position)
+      old_position = @position
+      @position = new_position
+      emit :position_changed, old_position, @position
     end
 
     def update_computed(style)
-      @computed.merge!(style)
-      if style[:y] > 0
-        @cursor_position.x = @computed[:width] #@computed[:width] - (style[:x] + @cursor_offset_x)
-      else
-        @cursor_position.x = style[:x] + @cursor_offset_x
+      # if the style being updated has a y greater than 0
+      # then it's because the renderable content for the input box
+      # spans multiple lines. We do not want to update the x/y position(s)
+      # in this instance. We want to keep the original starting x/y.
+      if style[:y] && style[:y] > 0
+        style = style.dup.delete_if { |k,_| [:x, :y].include?(k) }
       end
-      @cursor_position.y = style[:y]
+      @computed.merge!(style)
     end
   end
 
@@ -466,17 +472,32 @@ module TerminalLayout
       move_up_n_rows @y
       move_to_beginning_of_row
 
+      position = input_box.position
+
       cursor_position = input_box.cursor_position
       cursor_x = cursor_position.x
       cursor_y = cursor_position.y
 
-      # TODO: make this work when lines wrap
-      if cursor_x < 0 && cursor_y == 0
-        cursor_x = terminal_width
-        cursor_y -= 1
-      elsif cursor_x >= terminal_width
-        cursor_y  = cursor_x / terminal_width
-        cursor_x -= terminal_width
+      relative_position_on_row = position
+      initial_offset_x = input_box.computed[:x] + (input_box.computed[:y] * terminal_width)
+      cursor_x = 0
+      cursor_y = 0
+
+      absolute_position_on_row = relative_position_on_row + initial_offset_x
+      loop do
+        if absolute_position_on_row >= terminal_width
+          # reset offset
+          initial_offset_x = 0
+
+          absolute_position_on_row -= terminal_width
+
+          # move down a line
+          cursor_y += 1
+        else
+          # we fit on the current line
+          cursor_x = absolute_position_on_row
+          break
+        end
       end
 
       if @y < cursor_y

data/lib/terminal_layout/version.rb

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

data/spec/ansi_string_spec.rb

@@ -105,6 +105,32 @@ describe 'ANSIString' do
     end
   end
 
+  describe "#insert (see Ruby's String#insert for intent)" do
+    it "insert a string into the ANSIString" do
+      ansi_string = ANSIString.new "az"
+      ansi_string.insert 1, "thru"
+      expect(ansi_string).to eq ANSIString.new("athruz")
+
+      ansi_string.insert 0, "_"
+      expect(ansi_string).to eq ANSIString.new("_athruz")
+
+      ansi_string.insert ansi_string.length, "_"
+      expect(ansi_string).to eq ANSIString.new("_athruz_")
+    end
+
+    it "insert an ANSIString into an ANSIString" do
+      ansi_string = ANSIString.new blue("az")
+      ansi_string.insert 1, yellow("thru")
+      expect(ansi_string).to eq ANSIString.new("\e[34ma\e[33mthru\e[0mz\e[0m")
+    end
+
+    it "inserts from the end with a negative position" do
+      ansi_string = ANSIString.new blue("az")
+      ansi_string.insert -2, yellow("thru")
+      expect(ansi_string).to eq ANSIString.new("\e[34ma\e[33mthru\e[0mz\e[0m")
+    end
+  end
+
   describe "#length" do
     subject(:ansi_string){ ANSIString.new blue(string) }
     let(:string){ "this is blue" }
@@ -540,6 +566,7 @@ describe 'ANSIString' do
 
     it "returns a substring of characters of N length given a start index and max length N" do
       ansi_string = ANSIString.new("a#{blue('b')}c")
+      expect(ansi_string.slice(0, 0)).to eq ANSIString.new("")
       expect(ansi_string.slice(0, 2)).to eq ANSIString.new("a#{blue('b')}")
       expect(ansi_string.slice(1, 2)).to eq ANSIString.new("#{blue('b')}c")
 

data/terminal-layout.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'terminal_layout/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "terminal-layout"
-  spec.version       = "0.2.0"
+  spec.version       = TerminalLayout::VERSION
   spec.authors       = ["Zach Dennis"]
   spec.email         = ["zach.dennis@gmail.com"]
   spec.summary       = %q{A terminal layout manager}
@@ -17,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency  "ruby-terminfo", "~> 0.1.1"
-  spec.add_dependency  "ruby-termios", "~> 0.9.6"
-  spec.add_dependency "highline"
+  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_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-layout
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
@@ -42,16 +42,22 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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'
 description: A terminal layout manager
 email:
 - zach.dennis@gmail.com
@@ -116,13 +108,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - block-flow.rb
 - lib/ansi_string.rb
+- lib/tasks/gem.rake
 - lib/terminal_layout.rb
+- lib/terminal_layout/version.rb
 - spec/ansi_string_spec.rb
 - spec/spec_helper.rb
 - spec/terminal_layout_spec.rb