yap-shell 0.3.1 → 0.4.0

data/addons/tab_completion/tab_completion.rb

@@ -4,7 +4,7 @@ class TabCompletion < Addon
   require 'tab_completion/completer'
   require 'tab_completion/dsl_methods'
   require 'tab_completion/custom_completion'
-  require 'tab_completion/file_completion'
+  require 'tab_completion/basic_completion'
 
   class CompletionResult
     attr_accessor :text, :type, :descriptive_text
@@ -28,7 +28,7 @@ class TabCompletion < Addon
     end
   end
 
-  COMPLETIONS = [ FileCompletion ]
+  COMPLETIONS = [ BasicCompletion ]
 
   Color = Term::ANSIColor
 
@@ -37,15 +37,19 @@ class TabCompletion < Addon
   )
 
   STYLE_PROCS = Hash.new{ |h,k| h[k] = ->(text){ text } }.merge(
+    alias:     -> (text){ Color.bold(Color.color("#ff00d7"){ text } ) },
+    builtin:   -> (text){ Color.bold(Color.color("#d7af00"){ text } ) },
     directory: -> (text){ Color.bold(Color.red(text)) },
     command:   -> (text){ Color.bold(Color.green(text)) },
+    shell_command: -> (text){ Color.bold(Color.color("#ffafff"){ text } ) },
     symlink:   -> (text){ Color.bold(Color.cyan(text)) },
     selected:  -> (text){ Color.negative(text) }
   )
 
   DECORATION_PROCS = Hash.new{ |h,k| h[k] = ->(text){ text } }.merge(
     directory: -> (text){ text + "/" },
-    command:   -> (text){ text + "@" }
+    command:   -> (text){ text + "@" },
+    shell_command: -> (text) { text + "🐚" }
   )
 
   attr_reader :editor, :world
@@ -54,8 +58,8 @@ class TabCompletion < Addon
     @world = world
     @world.extend TabCompletion::DslMethods
     @editor = @world.editor
-    @editor.completion_proc = -> (word, line){
-      complete(word, line)
+    @editor.completion_proc = -> (word, line, word_index){
+      complete(word, line, word_index)
     }
     @editor.bind(:tab){ @editor.complete }
     @completions = COMPLETIONS.dup
@@ -116,7 +120,7 @@ class TabCompletion < Addon
     @style_procs[type] = blk
   end
 
-  def complete(word, line)
+  def complete(word, words, word_index)
     matches = @completions.sort_by(&:priority).reverse.map do |completion|
       if completion.respond_to?(:call)
         completion.call
@@ -124,7 +128,7 @@ class TabCompletion < Addon
         completions = completion.new(
           world: @world,
           word_break_characters: editor.word_break_characters
-        ).completions_for(word, line)
+        ).completions_for(word, words, word_index)
         completions.each do |completion|
           completion.text = display_text_for_match(completion)
         end

data/bin/yap

@@ -1,29 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'bundler'
-Bundler.setup
-require 'pry'
-
 file = __FILE__
 if File.symlink?(file)
   file = File.readlink(file)
 end
 
-$z = File.open("/tmp/z.log", "w+")
-$z.sync = true
-
 trap "SIGTSTP", "IGNORE"
 trap "SIGINT", "IGNORE"
 trap "SIGTTIN", "IGNORE"
 trap "SIGTTOU", "IGNORE"
 
-#ENV["PATH"] = "/Applications/Postgres.app/Contents/MacOS/bin:/usr/local/share/npm/bin/:/usr/local/heroku/bin:/Users/zdennis/.bin:/Users/zdennis/.rvm/gems/ruby-2.1.5/bin:/Users/zdennis/.rvm/gems/ruby-2.1.5@global/bin:/Users/zdennis/.rvm/rubies/ruby-2.1.5/bin:/usr/local/bin:/usr/local/sbin:/Users/zdennis/bin:/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/local/CrossPack-AVR/bin:/private/tmp/.tidbits/bin:/Users/zdennis/source/playground/AdobeAir/AdobeAIRSDK/bin:/Users/zdennis/.rvm/bin:/Users/zdennis/Downloads/adt-bundle-mac-x86_64-20130219/sdk/tools/:/Users/zdennis/.rvm/bin"
-
 $LOAD_PATH.unshift File.dirname(file) + '/../lib'
-# $LOAD_PATH.unshift File.dirname(file) + '/../../yap-shell-parser/lib'
 
 require "yap"
 
-$stdout.sync = true
-
+STDOUT.sync = true
 Yap.run_shell

data/bin/yap-dev

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'bundler'
+Bundler.setup
+require 'pry'
+
+$z = File.open("/tmp/z.log", "w+")
+$z.sync = true
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+
+load File.dirname(__FILE__) + '/yap'

data/lib/yap/configuration.rb

@@ -0,0 +1,33 @@
+require 'pathname'
+
+module Yap
+  require 'yap/world'
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  class Configuration
+    attr_accessor :addon_paths
+    attr_accessor :rcfiles
+
+    def initialize
+      @addon_paths = [
+        Dir["#{File.dirname(__FILE__)}/../../addons/*"],
+        Dir["#{ENV['HOME']}/.yap/addons/*"]
+      ].flatten
+
+      @rcfiles = [
+        Dir["#{ENV['HOME']}/.yaprc"]
+      ].flatten
+    end
+
+    def path_for(part)
+      yap_path.join(part)
+    end
+
+    def yap_path
+      Pathname.new "#{ENV['HOME']}/.yap"
+    end
+  end
+end

data/lib/yap/shell/aliases.rb

@@ -13,6 +13,10 @@ module Yap::Shell
       end
     end
 
+    def names
+      @aliases.keys
+    end
+
     def fetch_alias(name)
       @aliases[name]
     end
@@ -31,7 +35,7 @@ module Yap::Shell
     end
 
     def to_h
-      @aliases.keys.sort.inject(Hash.new) do |h,k|
+      @aliases.keys.compact.sort.inject(Hash.new) do |h,k|
         h[k] = @aliases[k]
         h
       end

data/lib/yap/shell/builtins/alias.rb

@@ -1,7 +1,8 @@
-require 'yap/shell/aliases'
 require 'shellwords'
 
 module Yap::Shell
+  require 'yap/shell/aliases'
+
   module Builtins
     builtin :alias do |args:, stdout:, **kwargs|
       output = []

data/lib/yap/shell/builtins.rb

@@ -1,6 +1,6 @@
-require 'yap/shell/commands'
-
 module Yap::Shell
+  require 'yap/shell/commands'
+
   module Builtins
     def self.builtin(name, &blk)
       Yap::Shell::BuiltinCommand.add(name, &blk)

data/lib/yap/shell/commands.rb

@@ -1,8 +1,9 @@
 require 'shellwords'
-require 'yap/shell/aliases'
-require 'yap/shell/execution/result'
 
 module Yap::Shell
+  require 'yap/shell/aliases'
+  require 'yap/shell/execution/result'
+
   class CommandError < StandardError ; end
   class CommandUnknownError < CommandError ; end
 
@@ -102,10 +103,9 @@ module Yap::Shell
       (@registered_functions ||= {}).freeze
     end
 
-    def self.define_shell_function(name_or_pattern, &blk)
+    def self.define_shell_function(name_or_pattern, name: nil, &blk)
       raise ArgumentError, "Must provide block when defining a shell function" unless blk
       name_or_pattern = name_or_pattern.to_s if name_or_pattern.is_a?(Symbol)
-      name_or_pattern = /^#{Regexp.escape(name_or_pattern)}$/ if name_or_pattern.is_a?(String)
       (@registered_functions ||= {})[name_or_pattern] = blk
     end
 

data/lib/yap/shell/evaluation.rb

@@ -1,9 +1,9 @@
-require 'yap/shell/parser'
-require 'yap/shell/commands'
-require 'yap/shell/aliases'
-require 'yap/shell/evaluation/shell_expansions'
-
 module Yap::Shell
+  require 'yap/shell/parser'
+  require 'yap/shell/commands'
+  require 'yap/shell/aliases'
+  require 'yap/shell/evaluation/shell_expansions'
+
   class Evaluation
     attr_reader :world
 
@@ -54,9 +54,7 @@ module Yap::Shell
       @aliases_expanded ||= []
       @command_node_args_stack ||= []
       with_standard_streams do |stdin, stdout, stderr|
-        args = node.args.map(&:lvalue).map do |arg|
-          shell_expand(arg, escape_directory_expansions: false)
-        end
+        args = process_ArgumentNodes(node.args)
         if !node.literal? && !@aliases_expanded.include?(node.command) && _alias=Aliases.instance.fetch_alias(node.command)
           @suppress_events = true
           @command_node_args_stack << args
@@ -197,7 +195,9 @@ module Yap::Shell
     #
     def visit_EnvWrapperNode(node)
       with_env do
-        node.env.each_pair { |env_var_name,value| world.env[env_var_name] = variable_expand(value) }
+        node.env.each_pair do |env_var_name, arg_node|
+          world.env[env_var_name] = process_ArgumentNode(arg_node)
+        end
         node.node.accept(self)
       end
     end
@@ -213,8 +213,8 @@ module Yap::Shell
     # they cleared or overridden.
     #
     def visit_EnvNode(node)
-      node.env.each_pair do |key,val|
-        world.env[key] = variable_expand(val)
+      node.env.each_pair do |key, arg_node|
+        world.env[key] = process_ArgumentNode(arg_node)
       end
       Yap::Shell::Execution::Result.new(status_code:0, directory:Dir.pwd, n:1, of:1)
     end
@@ -276,6 +276,17 @@ module Yap::Shell
     #                                                                    #
     ######################################################################
 
+    def process_ArgumentNodes(nodes)
+      nodes.map { |arg_node| process_ArgumentNode(arg_node) }
+    end
+
+    def process_ArgumentNode(node)
+      if node.quoted?
+        variable_expand(node.lvalue)
+      else
+        shell_expand(node.lvalue, escape_directory_expansions: false).first
+      end
+    end
 
     # +pipeline_stack+ is used to determine if we are about go inside of a
     # pipeline. It will be empty when we are coming out of a pipeline node.

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

@@ -1,6 +1,6 @@
-require 'yap/shell/execution/result'
-
 module Yap::Shell::Execution
+  require 'yap/shell/execution/result'
+
   class BuiltinCommandExecution < CommandExecution
     on_execute do |command:, n:, of:, wait:|
       status_code = command.execute(stdin:@stdin, stdout:@stdout, stderr:@stderr)

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

@@ -1,7 +1,8 @@
-require 'yap/shell/execution/result'
 require 'termios'
 
 module Yap::Shell::Execution
+  require 'yap/shell/execution/result'
+
   class FileSystemCommandExecution < CommandExecution
     on_execute do |command:, n:, of:, wait:, resume_blk:nil|
       stdin, stdout, stderr, world = @stdin, @stdout, @stderr, @world

data/lib/yap/shell/execution.rb

@@ -1,13 +1,13 @@
-require "yap/shell/execution/context"
-require "yap/shell/execution/command_execution"
-require "yap/shell/execution/builtin_command_execution"
-require "yap/shell/execution/file_system_command_execution"
-require "yap/shell/execution/ruby_command_execution"
-require "yap/shell/execution/shell_command_execution"
-require "yap/shell/execution/result"
-
 module Yap::Shell
   module Execution
+    require "yap/shell/execution/context"
+    require "yap/shell/execution/command_execution"
+    require "yap/shell/execution/builtin_command_execution"
+    require "yap/shell/execution/file_system_command_execution"
+    require "yap/shell/execution/ruby_command_execution"
+    require "yap/shell/execution/shell_command_execution"
+    require "yap/shell/execution/result"
+
     Context.register BuiltinCommandExecution,    command_type: :BuiltinCommand
     Context.register FileSystemCommandExecution, command_type: :FileSystemCommand
     Context.register ShellCommandExecution,      command_type: :ShellCommand

data/lib/yap/shell/repl.rb

@@ -21,12 +21,17 @@ module Yap::Shell
 
       @world.editor.on_read_line do |event|
         # editor.history = true?
-        line = event[:payload][:line]
+        line = event[:payload][:line] << "\n"
         begin
           @blk.call(line)
           @world.editor.redraw_prompt
+        rescue Yap::Shell::Parser::Lexer::NonterminatedString, Yap::Shell::Parser::Lexer::LineContinuationFound
+          line << read_another_line_of_input
+          retry
         rescue ::Yap::Shell::CommandUnknownError => ex
           puts "  CommandError: #{ex.message}"
+        rescue ::Yap::Shell::Parser::ParseError => ex
+          puts "  Parse error: #{ex.message}"
         ensure
           @world.editor.reset_line
         end
@@ -38,6 +43,11 @@ module Yap::Shell
 
     private
 
+    def read_another_line_of_input
+      print @world.secondary_prompt.update.text
+      gets
+    end
+
     def kill_ring
       @kill_ring ||= []
     end
@@ -187,7 +197,8 @@ module Yap::Shell
     # if we haven't been made the process group controlling the TTY that we
     # become so. This method intentionally blocks.
     def ensure_process_group_controls_the_tty
-      while Process.pid != Termios.tcgetpgrp(STDIN)
+      tty_pgrp = Termios.tcgetpgrp(STDIN)
+      while ![Process.pid, Process.getpgrp].include?(tty_pgrp)
         Termios.tcsetpgrp(STDIN, Process.pid)
         sleep 0.1
       end

data/lib/yap/shell/version.rb

@@ -1,5 +1,5 @@
 module Yap
   module Shell
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/yap/shell.rb

@@ -1,11 +1,12 @@
 require 'readline'
 require 'yaml'
-require 'yap/shell/version'
-require 'yap/shell/builtins'
 require 'fcntl'
 
 module Yap
   module Shell
+    require 'yap/shell/version'
+    require 'yap/shell/builtins'
+
     autoload :Aliases, "yap/shell/aliases"
 
     autoload :CommandFactory, "yap/shell/commands"

data/lib/yap/world.rb

@@ -1,13 +1,13 @@
 require 'term/ansicolor'
 require 'forwardable'
-
 require 'rawline'
-require 'yap/shell/execution'
-require 'yap/shell/prompt'
-require 'yap/world/addons'
 require 'termios'
 
 module Yap
+  require 'yap/shell/execution'
+  require 'yap/shell/prompt'
+  require 'yap/world/addons'
+
   class World
     include Term::ANSIColor
     extend Forwardable
@@ -46,10 +46,26 @@ module Yap
       addons.each { |addon| addon.initialize_world(self) }
     end
 
+    def configuration
+      ::Yap.configuration
+    end
+
     def [](addon_name)
       @addons.fetch(addon_name){ raise(ArgumentError, "No addon loaded registered as #{addon_name}") }
     end
 
+    def aliases
+      Yap::Shell::Aliases.instance
+    end
+
+    def builtins
+      Yap::Shell::BuiltinCommand.builtins.keys.map(&:to_s)
+    end
+
+    def shell_commands
+      Yap::Shell::ShellCommand.registered_functions.keys.map(&:to_s)
+    end
+
     def events
       @editor.events
     end
@@ -111,7 +127,6 @@ module Yap
     end
 
     def prompt=(prompt=nil, &blk)
-      # TODO if prompt_controller then undefine, cancel events, etc
       if prompt.is_a?(Yap::Shell::Prompt)
         @prompt = prompt
       elsif prompt.respond_to?(:call) # proc
@@ -121,6 +136,16 @@ module Yap
       end
     end
 
+    def secondary_prompt=(prompt=nil, &blk)
+      if prompt.is_a?(Yap::Shell::Prompt)
+        @secondary_prompt = prompt
+      elsif prompt.respond_to?(:call) # proc
+        @secondary_prompt = Yap::Shell::Prompt.new(text:prompt.call, &prompt)
+      else # text
+        @secondary_prompt = Yap::Shell::Prompt.new(text:prompt, &blk)
+      end
+    end
+
     def refresh_prompt
       @editor.prompt = @prompt.update.text
     end

data/lib/yap.rb

@@ -1,12 +1,14 @@
-require 'yap/shell'
-require 'yap/world'
-
 module Yap
+  require 'yap/configuration'
+  require 'yap/shell'
+  require 'yap/world'
+
   def self.run_shell
-    addons = []
-    addons.push World::Addons.load_directories Dir["#{ENV['HOME']}/.yap-addons/*"]
-    addons.push World::Addons.load_rcfiles Dir["#{ENV['HOME']}/.yaprc"]
+    addons = [
+      World::Addons.load_directories(configuration.addon_paths),
+      World::Addons.load_rcfiles(configuration.rcfiles)
+    ].flatten
 
-    Shell::Impl.new(addons: addons.flatten).repl
+    Shell::Impl.new(addons: addons).repl
   end
 end

data/rcfiles/.yaprc

@@ -29,7 +29,11 @@ require 'term/ansicolor'
 require 'terminfo'
 
 env.delete("BUNDLE_GEMFILE")
-# env.delete("BUNDLE_BIN_PATH")
+env.delete("BUNDLE_BIN_PATH")
+
+# Resize history to be infinite
+infinity = 1 / 0.0
+world.history.resize(infinity)
 
 func :reload! do |args:, stdin:, stdout:, stderr:|
   stdout.puts "Reloading shell:"
@@ -39,6 +43,7 @@ func :reload! do |args:, stdin:, stdout:, stderr:|
   exec File.expand_path($0)
 end
 
+
 completion_cache = {}
 
 # tab_completion_display do |matches|
@@ -91,6 +96,14 @@ self.prompt = -> do
   last_prompt = "#{dark(green('£'))} #{yellow(pwd)} #{git_branch}#{red(arrow)} "
 end
 
+#
+# The secondary_prompt is equivalent to the PS2 prompt in bash. It is what
+# is displayed when entering a multiline command. It can be set to a string
+# or a proc. It defaults to '> '
+#
+# To see it in action, type "echo 'foo" with no completing single quote and
+# hit enter.
+self.secondary_prompt = '> '
 
 ###############################################################################
 #                               KEYBOARD MACROS
@@ -139,6 +152,15 @@ world.addons[:keyboard_macros].timeout_in_ms = nil
 # set to false you can keep attempting to type in your macro.
 world.addons[:keyboard_macros].cancel_on_unknown_sequences = true
 
+keyboard_macros = world.addons[:keyboard_macros]
+keyboard_macros.cycle(:recent_git_branches) { `git recent`.lines.map(&:chomp) }
+world.editor.bind(:alt_up_arrow) do
+  keyboard_macros.cycle(:recent_git_branches).next
+end
+world.editor.bind(:alt_down_arrow) do
+  keyboard_macros.cycle(:recent_git_branches).previous
+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|
@@ -155,22 +177,30 @@ world.addons[:keyboard_macros].configure(trigger_key: ?\C-g) do |macro|
     world.editor.content_box.children = []
   end
 
-  macro.define 'z', 'git open-pull'
-  # macro.define 'abc', 'echo abc'
-  # macro.define 'u', -> { world.editor.undo }
-  macro.define :up_arrow, -> {   }
+  macro.define 'z', "git open-pull\n"
+  macro.define 'abc', 'echo abc'
+  macro.define 'u', -> { world.editor.undo }
+
+  macro.define 'b' do |macro|
+    macro.start { macro.cycle(:recent_git_branches).reset }
+
+    macro.cycle(:recent_git_branches) { `git recent`.lines.map(&:chomp) }
+    macro.fragment :up_arrow, -> { macro.cycle(:recent_git_branches).next }
+    macro.fragment :down_arrow, -> { macro.cycle(:recent_git_branches).previous }
+  end
 
   macro.define 'l', 'git log ' do |macro|
     macro.fragment 'n', '--name-status '
+    macro.fragment 'm', 'master..HEAD '
     macro.fragment 'o', '--oneline '
     macro.fragment /\d/, -> (a) { "-n#{a} " }
   end
 
   macro.define 'd', 'git diff ' do |macro|
-    macro.define 'n', '--name-status ' do |macro|
-      macro.define 'm', "master..HEAD"
-    end
-    macro.define 'm', "master..HEAD"
+    macro.fragment 'n', '--name-status '
+    macro.fragment 'm', 'master..HEAD '
+    macro.fragment 'o', '--oneline '
+    macro.fragment /\d/, -> (a) { "-n#{a} " }
   end
 end
 
@@ -267,7 +297,9 @@ end
 func history_matcher do |world:, args:, stdout:|
   num_commands = args.first.to_i
   num_commands = world.history.length - 1 if num_commands == 0
+  history_size = world.history.length
   world.history[-(num_commands + 1)...-1].each_with_index do |command, i|
-    stdout.puts "    #{i}   #{command}"
+    position = history_size - num_commands + i
+    stdout.puts "    #{position}   #{command}"
   end
 end

data/yap-shell.gemspec

@@ -13,21 +13,61 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/zdennis/yap-shell"
   spec.license       = "MIT"
 
+  spec.post_install_message = <<-POST_INSTALL_MESSAGE.gsub(/^\s*\|/, '')
+    |
+    |Greetings forward-thinking traveler!
+    |
+    |Let's waste no time and get right to it.
+    |
+    |\e[033mFirstly\e[0m, thank you for installing the yap shell!
+    |
+    |\e[033mSecondly\e[0m, this is my beta's beta. Yap has many cool ideas. I dare
+    |say some of those made it into this very release.
+    |
+    |\e[033mLastly\e[0m, create an alias to the yap executable using the ruby version
+    |you just installed it for. For example, with rbenv I use the below
+    |alias in my ~/.profile file:
+    |
+    |    alias yap='~/.rbenv/versions/2.2.3/bin/ruby ~/.rbenv/shims/yap'
+    |
+    |Then, `source ~/.profile` or reload your shell. Now you can finally run:
+    |
+    |    yap
+    |
+    |You know your tooling better than me. If you need things to go a little
+    |differently than above you go right ahead. If any questions arise don't
+    |hesitate to holler over at Github. I may not always be home, but there will
+    |always be a cozy textarea with dozens of emoji friends waiting to hear your
+    |thoughts. All day. All night.
+    |
+    |Until the next update: Happy coding!
+    |
+    |Sincerely,
+    |
+    |     \e[51mThe Lagniappe (Yap) Shell\e[0m
+    |
+    |\e[033mP.S.\e[0m If you have ideas for loading other than the hard-coded
+    |alias, do tell, right over here:
+    |
+    |     \e[1mhttp://github.com/zdennis/yap-shell/issues\e[0m
+    |
+    |\e[033mP.P.S.\e[0m OSX support? YES! Linux? I assume YES! Windows? Um...
+    |
+  POST_INSTALL_MESSAGE
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yap-shell-parser", "~> 0.4.0"
+  spec.add_dependency "yap-shell-parser", "~> 0.5.0"
   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_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.4'
-  spec.add_dependency "yap-rawline", "~> 0.2.0"
+  spec.add_dependency "yap-rawline", "~> 0.3.1"
 
   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"