yap-shell 0.4.11 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee4c5a9db5dfeed5f41bd1290156f31f8ca44e4b
-  data.tar.gz: 1ed5589d2dcdca412258a4f6fdda94a0fdb07d5c
+  metadata.gz: 0dd93a58914bed99609652e05c82c3f90fb11af3
+  data.tar.gz: 685276b3f2f829e8252c82490c30cb443bde61b9
 SHA512:
-  metadata.gz: 169bcecab87f1ad1f7e96faa6609659272952d08e75a055ad207bd7bf806b85a0607115800733b2ee8ddb9a3271b550b363b1c1f4a7036969d41dd6447cb0a28
-  data.tar.gz: 6204437dd12169220a819d23528f8f0b77eb87133157da2211a5a65af9514230913b66e6f2d9ef0d6bed14db64542fdba567e82a694523bd88e228c7bd9f0a6a
+  metadata.gz: 580220fe950fbc8cb393f1b783315a2af677177907951851b0d9c44ef7d9e7dd05f6dc0fea2aec3b436e2f187d0e27ca96a3b28449781c99a92689d405b90108
+  data.tar.gz: d037e820050e596a596891133b1bf18736ea9953850978d736505f6f32eee67e1b6e017d529a2dd9860ca69373b7b4006faa09aa953c18fd72816a4d80b4265e

data/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in yap.gemspec
 gemspec
+# gem 'terminal-layout', path: "../terminal-layout"
 # gem 'yap-shell-parser', path: "../yap-shell-parser"
 # gem 'yap-shell-parser', git: 'git@github.com:zdennis/yap-shell-parser.git'
-# gem "rawline", git: 'git@github.com:zdennis/rawline.git', branch: 'issues/input-issues'
-# gem "rawline", path: '/Users/zdennis/source/opensource_projects/rawline'
+# gem "yap-rawline", path: '/Users/zdennis/source/opensource_projects/rawline'
+# gem "terminal-layout", path: '/Users/zdennis/source/playground/terminal-layout'

data/addons/history_search/history_search.rb

@@ -0,0 +1,193 @@
+class HistorySearch < Addon
+  attr_reader :editor
+
+  def initialize_world(world)
+    @editor = world.editor
+  end
+
+  def prompt_user_to_search
+    label_text = "(reverse-search): "
+    search_label = ::TerminalLayout::Box.new(
+      content: label_text,
+      style: {
+        display: :inline,
+        height: 1
+      }
+    )
+    search_box = ::TerminalLayout::InputBox.new(
+      content: "",
+      style: {
+        display: :inline,
+        height: 1
+      }
+    )
+    search_box.name = "focused-input-box"
+
+    Treefell['shell'].puts "editor.content_box.children: #{editor.content_box.children.inspect}"
+    history_search_env = editor.new_env
+    history_search = Search.new(editor.history,
+      line: ::RawLine::LineEditor.new(::RawLine::Line.new, sync_with: -> { search_box }),
+      keys: history_search_env.keys,
+      search: -> (term:, result:){
+        # when there is no match, result will be nil, #to_s clears out the content
+        editor.input_box.content = result.to_s
+      },
+      done: -> (execute:, result:){
+        editor.content_box.children = []
+        editor.pop_env
+        editor.focus_input_box(editor.input_box)
+        editor.overwrite_line(result.to_s)
+        editor.process_line if execute
+      }
+    )
+
+    editor.push_env history_search_env
+    editor.push_keyboard_input_processor(history_search)
+
+    editor.content_box.children = [search_label, search_box]
+    editor.focus_input_box(search_box)
+  end
+
+  class Search
+    attr_reader :keys
+
+    def initialize(history, keys:, line:, search:, done:)
+      @history = history
+      @keys = keys
+      @line = line
+      @search_proc = search || -> {}
+      @done_proc = done || -> {}
+
+      initialize_key_bindings
+    end
+
+    def initialize_key_bindings
+      @keys.bind(:return){ execute }
+      @keys.bind(:ctrl_j){ accept }
+      @keys.bind(:ctrl_r){ search_again_backward }
+      @keys.bind(:ctrl_n){ search_again_forward }
+      @keys.bind(:ctrl_a){ @line.move_to_beginning_of_input }
+      @keys.bind(:ctrl_e){ @line.move_to_end_of_input }
+      @keys.bind(:backspace) do
+        @line.delete_left_character
+        perform_search(type: @last_search_was)
+      end
+      @keys.bind(:escape){ cancel }
+      @keys.bind(:ctrl_c){ cancel }
+    end
+
+    def read_bytes(bytes)
+      if bytes.any?
+        Treefell['shell'].puts "history search found bytes: #{bytes.inspect}"
+
+        # [1,2,3] => try 1,2,3 first ,then 1,2, then 1, then move on
+        nbytes = bytes.dup
+        search_bytes = []
+        loop do
+          if nbytes.empty?
+            break
+          elsif @keys[nbytes]
+            Treefell['shell'].puts "history search found key-binding for bytes=#{nbytes.inspect}"
+            @keys[nbytes].call
+            nbytes = search_bytes
+            search_bytes = []
+          else
+            search_bytes.unshift nbytes[-1]
+            nbytes = nbytes[0..-2]
+          end
+        end
+
+        if search_bytes.any?
+          Treefell['shell'].puts "history searching with bytes=#{bytes.inspect}"
+          search_with_bytes(bytes)
+        end
+      end
+    end
+
+    private
+
+    def accept
+      @done_proc.call(execute: false, result: result)
+    end
+
+    def cancel
+      @done_proc.call(execute: false, result: result)
+    end
+
+    def execute
+      @done_proc.call(execute: true, result: result)
+    end
+
+    def found_match(result:)
+      @search_proc.call(term: @line.text, result: result)
+    end
+
+    def no_match_found
+      @last_match_index = nil
+      @search_proc.call(term: @line.text, result: result)
+    end
+
+    def result
+      @history2search[@last_match_index] if @last_match_index
+    end
+
+    def search_again_backward
+      Treefell['shell'].puts "history searching again backward"
+      if @last_search_was == :forward
+        @last_match_index = @history.length - @last_match_index - 1
+        @history2search = @history.reverse
+      end
+      perform_search(starting_index: @last_match_index, type: :backward)
+    end
+
+    def search_again_forward
+      Treefell['shell'].puts "history searching again forward"
+      if @last_search_was == :backward
+        @last_match_index = @history.length - @last_match_index - 1
+        @history2search = @history
+      end
+      perform_search(starting_index: @last_match_index, type: :forward)
+    end
+
+    def search_with_bytes(bytes)
+      part = bytes.map(&:chr).join
+      @line.write(part.scan(/[[:print:]]/).join)
+      @history2search = @history.reverse
+      perform_search(type: :backward)
+    end
+
+    def perform_search(starting_index: -1, type:)
+      if @line.text.empty?
+        no_match_found
+        return
+      end
+
+      # fuzzy search
+      characters = @line.text.split('').map { |ch| Regexp.escape(ch) }
+      fuzzy_search_regex = /#{characters.join('.*?')}/
+
+      # non-fuzzy-search
+      # fuzzy_search_regex = /#{Regexp.escape(@line.text)}/
+
+      Treefell['shell'].puts "history search matching on regex=#{fuzzy_search_regex.inspect} starting_index=#{starting_index}"
+      @last_search_was = type
+
+      match = @history2search.detect.with_index do |item, i|
+        next if i <= starting_index
+
+        # Treefell['shell'].puts "history search matching #{(item + @line.text).inspect} =~ #{fuzzy_search_regex}"
+        md = (item + @line.text).match(fuzzy_search_regex)
+        if md && md.end(0) <= item.length
+          # Treefell['shell'].puts "history search match #{item} at #{i}"
+          @last_match_index = i
+        end
+      end
+
+      if match
+        found_match(result: match)
+      else
+        no_match_found
+      end
+    end
+  end
+end

data/addons/keyboard_macros/keyboard_macros.rb

@@ -89,7 +89,7 @@ class KeyboardMacros < Addon
         configuration.start.call if configuration.start
 
         debug_log "taking over keyboard input processing from editor"
-        world.editor.keyboard_input_processors.push(self)
+        world.editor.push_keyboard_input_processor(self)
 
         wait_timeout_in_seconds = 0.1
         world.editor.input.wait_timeout_in_seconds = wait_timeout_in_seconds
@@ -195,9 +195,9 @@ class KeyboardMacros < Addon
       definition.configuration.stop.call if definition.configuration.stop
     end
     @stack.clear
-    if world.editor.keyboard_input_processors.last == self
+    if world.editor.keyboard_input_processor == self
       debug_log "giving keyboard input processing control back"
-      world.editor.keyboard_input_processors.pop
+      world.editor.pop_keyboard_input_processor
 
       debug_log "restoring default editor input timeout"
       world.editor.input.restore_default_timeout

data/addons/prompt/right_prompt.rb

@@ -6,12 +6,14 @@ class RightPrompt < Addon
   def initialize_world(world)
     @world = world
 
-    # @world.subscribe(:refresh_right_prompt) do |event|
-    #   @world.right_prompt_text = Time.now.strftime("%H:%M:%S")
-    # end
-    #
-    # @world.events.recur(
-    #   name: "refresh_right_prompt", source: self, interval_in_ms: 1_000
-    # )
+    @world.subscribe(:refresh_right_prompt) do |event|
+      @world.right_prompt_text = Time.now.strftime("%H:%M:%S")
+    end
+
+    @world.events.recur(
+      name: "refresh_right_prompt",
+      interval_in_ms: 1_000,
+      source: self
+    )
   end
 end

data/addons/prompt_updates/prompt_updates.rb

@@ -1,28 +1,29 @@
-class PromptUpdates < Addon
-  attr_reader :world
-
-  def initialize_world(world)
-    current_branch = determine_branch
-
-    @world = world
-    @world.events.recur(
-      name: 'prompt_updates',
-      source: self,
-      interval_in_ms: 100
-    ) do
-      new_branch = determine_branch
-      if current_branch != new_branch
-        current_branch = new_branch
-        @world.refresh_prompt
-      end
-    end
 
-  end
 
-  private
+    class PromptUpdates < Addon
+      def initialize_world(world)
+        @world = world
+
+        current_branch = determine_branch
 
-  def determine_branch
-    `git branch 2>/dev/null`.scan(/\*\s*(.*)$/).flatten.first
-  end
+        @world.events.recur(
+          name: 'prompt_updates',
+          source: self,
+          interval_in_ms: 100
+        ) do
+          new_branch = determine_branch
+          if current_branch != new_branch
+            current_branch = new_branch
+            @world.refresh_prompt
+          end
+        end
+
+      end
 
-end
+      private
+
+      def determine_branch
+        `git branch 2>/dev/null`.scan(/\*\s*(.*)$/).flatten.first
+      end
+
+    end

data/bin/yap

@@ -1,20 +1,35 @@
 #!/usr/bin/env ruby
 
-if ENV["YAP_SHELL"].nil?
+if ENV['YAP_SHELL'] != 'active'
   # Start YAP with a pristine environment
   env2keep = {
-    'PATH' => ENV['PATH'],
+    # DISPLAY needs to be inherited in order to launch GUI apps
+    'DISPLAY' => ENV['DISPLAY'],
     'HOME' => ENV['HOME'],
+    'PATH' => ENV['PATH'],
+
+    # For Yap's sanity
     'RUBYOPT' => '-rubygems -EUTF-8',
-    'TREEFELL_OUT' => ENV['TREEFELL_OUT'],
+    'YAP_SHELL' => 'active',
+
+    # Inherit the user's preferred shell
+    'SHELL' => ENV['SHELL'],
+
+    # Necessary for ssh-agent
+    'SSH_AUTH_SOCK' => ENV['SSH_AUTH_SOCK'],
+
+    # DEBUG/TREEFELL_OUT are for debuging yap itself
     'DEBUG' => ENV['DEBUG'],
-    'YAP_SHELL' => 'active'
+    'TREEFELL_OUT' => ENV['TREEFELL_OUT']
   }
+
+  ENV.clear
   env_params = env2keep.each_with_object([]) do |(key,value),arr|
     next if value.nil?
     arr << %|#{key}="#{value}"|
   end.join(' ')
-  cmd = %|env -i #{env_params} #{$0}|
+
+  cmd = %|env -i #{env_params} #{File.expand_path(__FILE__)}|
   exec cmd
 else
   file = __FILE__
@@ -30,18 +45,10 @@ else
   $LOAD_PATH.unshift File.dirname(file) + '/../lib'
 
   ENV['TERM'] ||= 'linux'
-
-  # Delete all RBENV/RVM environment variables
-  # Once we're booted, we don't want them being inherited
-  # by other child processes since those children cannot
-  # modify Yap's ENV, only their own child env.
-  ENV.keys.each do |key|
-    if key =~ /^(rbenv_|rvm_)/i
-      ENV.delete(key)
-    end
-  end
+  ENV['YAP_SHELL'] = 'active'
 
   require "term/ansicolor"
+  require "tins"
   require "byebug"
   require "pry"
   require "yap"

data/lib/tasks/addons.rake

@@ -1,4 +1,50 @@
 namespace :addons do
+  task :new do
+    require 'highline'
+    require 'term/ansicolor'
+    require 'pathname'
+
+    extend Term::ANSIColor
+
+    yap_path = Pathname.new(File.dirname(__FILE__)).join('../..')
+    yap_lib_path = yap_path.join('lib')
+    yap_addons_path = yap_path.join('addons')
+
+    $LOAD_PATH.unshift yap_lib_path
+    require 'yap'
+
+    cli = HighLine.new
+    answer = cli.ask("Name for the addon? ")
+
+    addon_name = answer.downcase.gsub(/\W+/, '_')
+    addon_class_name = addon_name.split('_').map(&:capitalize).join
+    addon_path = yap_addons_path.join(addon_name)
+
+    loop do
+      answer = cli.ask("Create #{addon_class_name} addon in #{addon_path}? [Yn] ")
+      break if answer =~ /y/i
+      exit 1 if answer =~ /n/i
+    end
+    puts "Generating #{addon_class_name}"
+    puts
+
+    print "  Creating #{addon_path} "
+    FileUtils.mkdir_p addon_path
+    puts green('done')
+
+    addon_file = addon_path.join("#{addon_name}.rb")
+    print "  Creating #{addon_file} "
+    File.write addon_file, <<-FILE.gsub(/^\s*\|/, '')
+      |class #{addon_class_name} < Addon
+      |  def initialize_world(world)
+      |    # initialization code here
+      |  end
+      |end
+    FILE
+    puts green('done')
+    puts
+  end
+
   namespace :update do
     desc "Update the gemspec based on add-on specific dependnecies"
     task :gemspec do

data/lib/yap/shell/evaluation.rb

@@ -172,6 +172,7 @@ module Yap::Shell
         }
 
         if node.params.any?
+          Treefell['shell'].puts "block node params: #{node.params.inspect}"
           values.each_slice(node.params.length).each do |_slice|
             with_env do
               Hash[ node.params.zip(_slice) ].each_pair do |k,v|

data/lib/yap/shell/execution/file_system_command_execution.rb

@@ -44,6 +44,16 @@ module Yap::Shell::Execution
           begin
             before = ENV.to_h.dup
             ENV.replace(@world.env)
+            Treefell['shell'].puts <<-MSG.gsub(/^\s*\|/, '')
+              |forked child process
+              |  pid=#{Process.pid} #{command.to_executable_str}
+              |  stdin=#{stdin.inspect}
+              |  stdout=#{stdout.inspect}
+              |  stderr=#{stderr.inspect}
+              |  $stdin=#{$stdin.inspect}
+              |  $stdout=#{$stdout.inspect}
+              |  $stderr=#{$stderr.inspect}
+            MSG
             Kernel.exec command.to_executable_str
           ensure
             ENV.replace(before)

data/lib/yap/shell/execution/shell_command_execution.rb

@@ -6,7 +6,7 @@ module Yap::Shell::Execution
       possible_parameters = {
         command: command.str,
         args: command.args,
-        stdin: @stdin,
+        stdin: (@stdin != $stdin ? @stdin : StringIO.new),
         stdout: @stdout,
         stderr: @stderr,
         world: @world,
@@ -19,10 +19,12 @@ module Yap::Shell::Execution
         h
       end
 
-      Treefell['shell'].puts "shell command executing with params: #{params.inspect}"
-      command_result = func.call(**params)
+      Treefell['shell'].puts "shell command executing with params: #{params.inspect} $stdout=#{$stdout.inspect} $stderr=#{$stderr.inspect}"
+      func.call(**params)
+
       @stdout.close if @stdout != $stdout && !@stdout.closed?
       @stderr.close if @stderr != $stderr && !@stderr.closed?
+      @stdin.close if @stdin != $stdin && !@stdin.closed?
     end
   end
 end

data/lib/yap/shell/repl.rb

@@ -30,7 +30,6 @@ module Yap::Shell
         line = line_read << "\n"
         begin
           @blk.call(line)
-          @world.editor.redraw_prompt
         rescue Yap::Shell::Parser::Lexer::NonterminatedString,
           Yap::Shell::Parser::Lexer::LineContinuationFound => ex
           Treefell['shell'].puts "rescued #{ex}, asking user for more input"

data/lib/yap/shell/version.rb

@@ -1,5 +1,5 @@
 module Yap
   module Shell
-    VERSION = "0.4.11"
+    VERSION = "0.5.1"
   end
 end

data/lib/yap/world/addons.rb

@@ -98,12 +98,12 @@ module Yap
         attr_reader :file
 
         def initialize(file)
-          @file = file
+          @file = File.expand_path(file)
         end
 
         def initialize_world(world)
           Treefell['shell'].puts "initializing rcfile: #{file}"
-          world.instance_eval File.read(@file)
+          world.instance_eval File.read(@file), @file
         end
       end
 

data/lib/yap/world.rb

@@ -129,7 +129,17 @@ module Yap
         evaluation.evaluate(statement) do |command, stdin, stdout, stderr, wait|
           context.clear_commands
           context.add_command_to_run command, stdin:stdin, stdout:stdout, stderr:stderr, wait:wait
-          @last_result = context.execute(world:self)
+          @last_result = context.execute(world:self) || 0
+          if @last_result.is_a?(Integer)
+            Yap::Shell::Execution::Result.new(
+              status_code: @last_result,
+              directory: Dir.pwd,
+              n: 1,
+              of: 1
+            )
+          else
+            @last_result
+          end
         end
       end
 
@@ -224,6 +234,9 @@ module Yap
         dom.prompt_box = @prompt_box
         dom.input_box = @input_box
         dom.content_box = @content_box
+        @prompt_box.name = "prompt-box"
+        @input_box.name = "input-box"
+        @content_box.name = "content-box"
       end
     end
   end

data/rcfiles/yaprc

@@ -155,6 +155,10 @@ world.editor.bind(:alt_down_arrow) do
   keyboard_macros.cycle(:recent_git_branches).previous
 end
 
+world.editor.bind(:ctrl_r) do
+  world.addons[:history_search].prompt_user_to_search
+end
+
 # Or, you can set the trigger key for a particular set of macros
 # by specifying it when you call .configure(...).
 world.addons[:keyboard_macros].configure(trigger_key: ?\C-g) do |macro|

data/yap-shell.gemspec

@@ -65,11 +65,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "pry-byebug", "~> 3.3.0"
-  spec.add_dependency "yap-shell-parser", "~> 0.6.1"
+  spec.add_dependency "yap-shell-parser", "~> 0.6.2"
   spec.add_dependency "term-ansicolor", "~> 1.3"
   spec.add_dependency "ruby-termios", "~> 0.9.6"
   spec.add_dependency "ruby-terminfo", "~> 0.1.1"
-  spec.add_dependency "yap-rawline", "~> 0.3.5"
+  spec.add_dependency "yap-rawline", "~> 0.4.0"
   spec.add_dependency "treefell", "~> 0.2.3"
 
   spec.add_development_dependency "bundler", "~> 1.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.5.1
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: treefell
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - WISHLIST.md
 - addons/history/README.md
 - addons/history/history.rb
+- addons/history_search/history_search.rb
 - addons/keyboard_macros/keyboard_macros.rb
 - addons/keyboard_macros/lib/keyboard_macros/cycle.rb
 - addons/prompt/Gemfile