yap-shell 0.1.1 → 0.3.0

data/test.rb

@@ -0,0 +1,206 @@
+require 'terminfo'
+require 'io/console'
+require 'term/ansicolor'
+
+$z = File.open("/tmp/z.log", "w+")
+$z.sync = true
+
+module EventEmitter
+  def _callbacks
+    @_callbacks ||= Hash.new { |h, k| h[k] = [] }
+  end
+
+  def on(type, *args, &blk)
+    _callbacks[type] << blk
+    self
+  end
+
+  def emit(type, *args)
+    _callbacks[type].each do |blk|
+      blk.call(*args)
+    end
+  end
+end
+
+class TerminalRenderer
+  def initialize(layout_manager)
+    @output = $stdout
+    @terminfo = TermInfo.new ENV["TERM"], @output
+    @layout_manager = layout_manager
+    @layout_manager.on(:laid_out_content) do |content|
+      display(content)
+    end
+  end
+
+  def display(content)
+    @output.print(
+      @terminfo.control_string("clear"),  # clear screen
+      @terminfo.control_string("hpa", 0), # go to column 0 (assuming we're on row 0)
+      @terminfo.control_string("sc"), # save cursor
+      content,
+      @terminfo.control_string("rc") # restore cursor
+    )
+  end
+end
+
+class LayoutManager
+  include EventEmitter
+
+  def initialize
+    @renderers = []
+    @mutex = Mutex.new
+  end
+
+  def add(renderer)
+    @renderers << renderer
+    renderer.on(:content_changed) do
+      layout
+    end
+  end
+
+  def layout(width:nil, height:nil)
+    @mutex.synchronize { _layout(width, height) }
+  end
+
+  def _layout(width, height)
+    width ||= $stdout.winsize.last
+    height ||= $stdout.winsize.first
+    results_arr = []
+    column = 0
+    row = 0
+    @renderers.each do |renderer|
+      $z.puts "", "rendering #{renderer.id}"
+      $z.puts "Column: #{column} at row: #{row}"
+      $z.puts "Term width: #{width} height: #{height}"
+      $z.flush
+      text = renderer.render(width)
+
+      if renderer.anchor == :right
+        start_column = width - text.length
+        if start_column <= column || row > 0 # don't render the right prompt anywhere but the first line
+          next # we've already rendered content here, so skip
+        else
+          column = start_column
+        end
+      end
+
+      text.each_char do |ch|
+        queued_text = results_arr.fetch(row){ " " * width }
+        queued_text[column] = ch
+        column += 1
+
+        results_arr[row] = queued_text
+
+        if queued_text.length > width
+          row += 1
+          column = 0
+        end
+      end
+
+    end
+
+    # puts "-"*40
+    # puts results_arr.length
+    # puts results_arr.inspect
+    # puts results_arr#.join("\n")
+    emit :laid_out_content, results_arr.join("\n")
+    results_arr#.join("\n")
+  end
+end
+
+class ContentRenderer
+  include EventEmitter
+
+  attr_reader :display, :anchor
+
+  def id
+    @content.id
+  end
+
+  def initialize(content, display:nil, anchor:nil)
+    @display = display
+    @anchor = anchor
+    @last_width_rendered = nil
+    @content = content
+    @content.on(:content_changed) do |content, from:, to:|
+      @dirty = true
+      emit :content_changed
+    end
+  end
+
+  def render(width)
+    @content.text
+    # @content.text.split(//).each_slice(width).map do |chars|
+    #   chars.join
+    # end
+  end
+end
+
+class Content
+  include EventEmitter
+
+  attr_accessor :id, :text
+
+  def initialize(id:, text:"")
+    @id = id
+    @text = text
+  end
+
+  def text=(str)
+    old_str = @text
+    @text = str
+    emit :content_changed, self, from:old_str, to:@text
+  end
+end
+
+anchor_left = Content.new id:"anchor-left", text:""
+prompt = Content.new id:"prompt", text:"> "
+input = Content.new id:"input"
+right_prompt = Content.new id:"right-prompt"
+
+anchor_left_renderer = ContentRenderer.new anchor_left
+prompt_renderer = ContentRenderer.new(prompt, display: :inline)
+input_renderer = ContentRenderer.new(input)
+right_prompt_renderer = ContentRenderer.new(right_prompt, anchor: :right)
+
+layout_manager = LayoutManager.new
+layout_manager.add anchor_left_renderer
+layout_manager.add prompt_renderer
+layout_manager.add input_renderer
+layout_manager.add right_prompt_renderer
+
+terminal = TerminalRenderer.new(layout_manager)
+
+prompt.text = "> "
+sleep 1
+input.text = "ls a b c d e f g h i j k l m"
+# sleep 1
+# prompt.text = "abcdefghijklmnopqrstuvwxyz1234567890abcdefghijklmnopqrstuvwxyz1234567890> "
+# sleep 1
+anchor_left.text = "£ "
+sleep 1
+prompt.text = "#{Dir.pwd}> "
+sleep 1
+
+Thread.new do
+  loop do
+    ["ls a b c", "echo hello world, goodbye world", "cat foo"].each do |str|
+      input.text = str
+      sleep 0.75
+    end
+  end
+end
+
+Thread.new do
+  loop do
+    %w(apples oranges bananas grapefruits pears cherries).each do |fruit|
+      anchor_left.text = "(#{fruit}) "
+      sleep 0.5
+    end
+  end
+end
+
+loop do
+  right_prompt.text = "#{Time.now.to_s}"
+  sleep 1
+end

data/update-rawline.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+pushd ../../opensource_projects/rawline/
+gem build *.gemspec
+popd
+gem install ../../opensource_projects/rawline/*.gem

data/yap-shell.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Zach Dennis"]
   spec.email         = ["zach.dennis@gmail.com"]
   spec.summary       = %q{The Lagniappe "Yap" shell.}
-  spec.description   = %q{The Lagniappe "Yap" shell.}
+  spec.description   = %q{The Lagniappe "Yap" shell description.}
   spec.homepage      = "https://github.com/zdennis/yap-shell"
   spec.license       = "MIT"
 
@@ -18,11 +18,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yap-shell-parser", "~> 0.1.0"
+  spec.add_dependency "yap-shell-parser", "~> 0.4.0"
   spec.add_dependency "term-ansicolor", "~> 1.3"
   spec.add_dependency "ruby-termios", "~> 0.9.6"
-  spec.add_dependency "chronic", "~> 0.10"
+  spec.add_dependency "ruby-terminfo", "~> 0.1.1"
+  spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.4'
+  spec.add_dependency "yap-rawline", "~> 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency 'pry-byebug', '~> 3.3', '>= 3.3.0'
+
+  #--BEGIN_ADDON_GEM_DEPENDENCIES--#
+  spec.add_dependency "chronic", "~> 0.10.2"
+  # spec.add_dependency "term-ansicolor", "~> 1.3.2"
+  #--END_ADDON_GEM_DEPENDENCIES--#
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yap-shell-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.6
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: ruby-terminfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+- !ruby/object:Gem::Dependency
+  name: yap-rawline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +128,41 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
-description: The Lagniappe "Yap" shell.
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+description: The Lagniappe "Yap" shell description.
 email:
 - zach.dennis@gmail.com
 executables:
@@ -103,14 +171,29 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - DESIGN.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - WISHLIST.md
-- addons/history.rb
+- addons/history/Gemfile
+- addons/history/history.rb
+- addons/history/lib/history/buffer.rb
+- addons/history/lib/history/events.rb
+- addons/keyboard_macros/keyboard_macros.rb
+- addons/prompt/Gemfile
+- addons/prompt/right_prompt.rb
+- addons/prompt_updates/prompt_updates.rb
+- addons/tab_completion/Gemfile
+- addons/tab_completion/lib/tab_completion/completer.rb
+- addons/tab_completion/lib/tab_completion/custom_completion.rb
+- addons/tab_completion/lib/tab_completion/dsl_methods.rb
+- addons/tab_completion/lib/tab_completion/file_completion.rb
+- addons/tab_completion/tab_completion.rb
 - bin/yap
+- lib/tasks/addons.rake
 - lib/tasks/gem.rake
 - lib/yap.rb
 - lib/yap/shell.rb
@@ -118,8 +201,11 @@ files:
 - lib/yap/shell/builtins.rb
 - lib/yap/shell/builtins/alias.rb
 - lib/yap/shell/builtins/cd.rb
+- lib/yap/shell/builtins/env.rb
 - lib/yap/shell/commands.rb
 - lib/yap/shell/evaluation.rb
+- lib/yap/shell/evaluation/shell_expansions.rb
+- lib/yap/shell/event_emitter.rb
 - lib/yap/shell/execution.rb
 - lib/yap/shell/execution/builtin_command_execution.rb
 - lib/yap/shell/execution/command_execution.rb
@@ -128,9 +214,11 @@ files:
 - lib/yap/shell/execution/result.rb
 - lib/yap/shell/execution/ruby_command_execution.rb
 - lib/yap/shell/execution/shell_command_execution.rb
+- lib/yap/shell/prompt.rb
 - lib/yap/shell/repl.rb
 - lib/yap/shell/version.rb
 - lib/yap/world.rb
+- lib/yap/world/addons.rb
 - rcfiles/.yaprc
 - scripts/4
 - scripts/bg-vim
@@ -141,6 +229,8 @@ files:
 - scripts/simulate-long-running
 - scripts/write-to-stderr.rb
 - scripts/write-to-stdout.rb
+- test.rb
+- update-rawline.sh
 - yap-shell.gemspec
 homepage: https://github.com/zdennis/yap-shell
 licenses:
@@ -162,8 +252,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The Lagniappe "Yap" shell.
 test_files: []
+has_rdoc: