yap-shell 0.1.1 → 0.3.0

data/addons/prompt/Gemfile

@@ -0,0 +1 @@
+gem "chronic", "~> 0.10.2"

data/addons/prompt/right_prompt.rb

@@ -0,0 +1,17 @@
+class RightPrompt < Addon
+  def self.load_addon
+    @instance ||= new
+  end
+
+  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
+    # )
+  end
+end

data/addons/prompt_updates/prompt_updates.rb

@@ -0,0 +1,28 @@
+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
+
+  def determine_branch
+    `git branch`.scan(/\*\s*(.*)$/).flatten.first
+  end
+
+end

data/addons/tab_completion/lib/tab_completion/completer.rb

@@ -0,0 +1,62 @@
+class TabCompletion
+
+  class Completer
+    def initialize(char:, line:, completion:, completion_found:, completion_not_found:, done:)
+      @completion_char = char
+      @line = line
+      @completion_proc = completion
+      @completion_found_proc = completion_found
+      @completion_not_found_proc = completion_not_found
+      @done_proc = done
+
+      @completion_matches = HistoryBuffer.new(0) do |h|
+        h.duplicates = false
+        h.cycle = true
+      end
+      @completion_matches.empty
+
+      @first_time = true
+      @word_start = @line.word[:start]
+    end
+
+    def read_bytes(bytes)
+      return unless bytes.any?
+
+      if bytes.map(&:ord) != @completion_char
+        @done_proc.call(bytes)
+      elsif @first_time
+        matches = @completion_proc.call(sub_word) unless !@completion_proc || @completion_proc == []
+        matches = matches.to_a.compact.sort.reverse
+
+        if matches.any?
+          @completion_matches.resize(matches.length)
+          matches.each { |w| @completion_matches << w }
+
+          # Get first match
+          @completion_matches.back
+          match = @completion_matches.get
+
+          # completion matches is a history implementation and its in reverse order from what
+          # a user would expect
+          @completion_found_proc.call(completion: match, possible_completions: @completion_matches.reverse)
+        else
+          @completion_not_found_proc.call
+          @done_proc.call
+        end
+        @first_time = false
+      else
+        @completion_matches.back
+        match = @completion_matches.get
+
+        @completion_found_proc.call(completion: match, possible_completions: @completion_matches.reverse)
+      end
+    end
+
+    private
+
+    def sub_word
+      @line.text[@line.word[:start]..@line.position-1] || ""
+    end
+  end
+
+end

data/addons/tab_completion/lib/tab_completion/custom_completion.rb

@@ -0,0 +1,33 @@
+class TabCompletion
+  class CustomCompletion
+    PRIORITY = 2
+
+    attr_reader :name, :pattern, :priority
+
+    def initialize(world:, name:nil, pattern:nil, priority:PRIORITY, &blk)
+      @world = world
+      @name = name
+      @pattern = pattern
+      @priority = priority
+      @blk = blk
+    end
+
+    def new(world:)
+      @world = world
+      self
+    end
+
+    def completions_for(word, line)
+      # TODO
+      return []
+    end
+
+    private
+
+    def match_rgx
+      return // if pattern.nil?
+      return pattern if pattern.is_a?(Regexp)
+      /^#{Regexp.escape(pattern.to_s)}\s/
+    end
+  end
+end

data/addons/tab_completion/lib/tab_completion/dsl_methods.rb

@@ -0,0 +1,7 @@
+class TabCompletion
+  module DslMethods
+    def tab_completion(name, pattern, &blk)
+      self[:tab_completion].add_completion(name, pattern, &blk)
+    end
+  end
+end

data/addons/tab_completion/lib/tab_completion/file_completion.rb

@@ -0,0 +1,75 @@
+class TabCompletion
+  class FileCompletion
+    class << self
+      attr_accessor :priority
+    end
+    self.priority = 1
+
+    attr_reader :world
+
+    def initialize(world:, word_break_characters:, path:nil)
+      @world = world
+      @word_break_characters = word_break_characters
+      path ||= @world.env["PATH"]
+      @paths = path.split(":")
+    end
+
+    def completions_for(word, line)
+      completions = []
+      if looking_for_command?
+        completions.concat command_completion_matches_for(word, line)
+      end
+      completions.concat filename_completion_matches_for(word, line)
+      completions
+    end
+
+    private
+
+    def looking_for_command?
+      # TODO
+      false
+    end
+
+    def command_completion_matches_for(word, line)
+      matches = @paths.inject([]) do |matches, path|
+        glob = "#{path}*"
+        arr = Dir[glob].select { |path| File.executable?(path) && File.file?(path) }
+        arr.each { |path| matches << path }
+        matches
+      end
+
+      matches.map { |path| File.basename(path) }.sort.uniq.map do |command|
+        CompletionResult.new(type: :command, text:command)
+      end
+    end
+
+    def filename_completion_matches_for(word, line)
+      glob = "#{word}*"
+      glob.gsub!("~", world.env["HOME"])
+      Dir.glob(glob, File::FNM_CASEFOLD).map do |path|
+        text = path.gsub(filtered_work_break_characters_rgx, '\\\\\1')
+        descriptive_text = File.basename(text)
+        if File.directory?(path)
+          CompletionResult.new(type: :directory, text: text, descriptive_text: descriptive_text)
+        elsif File.symlink?(path)
+          CompletionResult.new(type: :symlink, text: text, descriptive_text: descriptive_text)
+        elsif File.file?(path) && File.executable?(path)
+          CompletionResult.new(type: :command, text: text, descriptive_text: descriptive_text)
+        else
+          CompletionResult.new(type: :file, text: text, descriptive_text: descriptive_text)
+        end
+      end
+    end
+
+    # Remove file separator and the back-slash from word break characters when determining
+    # the pre-word-context
+    def filtered_word_break_characters
+      @word_break_characters.sub(File::Separator, "").sub('\\', '')
+    end
+
+    def filtered_work_break_characters_rgx
+      /([#{Regexp.escape(filtered_word_break_characters)}])/
+    end
+
+  end
+end

data/addons/tab_completion/tab_completion.rb

@@ -0,0 +1,157 @@
+require 'term/ansicolor'
+
+class TabCompletion < Addon
+  require 'tab_completion/completer'
+  require 'tab_completion/dsl_methods'
+  require 'tab_completion/custom_completion'
+  require 'tab_completion/file_completion'
+
+  class CompletionResult
+    attr_accessor :text, :type, :descriptive_text
+
+    def initialize(text:, type:, descriptive_text: nil)
+      @descriptive_text = descriptive_text || text
+      @text = text
+      @type = type
+    end
+
+    def ==(other)
+      other.is_a?(self.class) && @text == other.text && @type == other.type
+    end
+
+    def <=>(other)
+      @text <=> other.text
+    end
+
+    def to_s
+      @text
+    end
+  end
+
+  COMPLETIONS = [ FileCompletion ]
+
+  Color = Term::ANSIColor
+
+  DISPLAY_PROCS = Hash.new{ |h,k| h[k] = ->(text){ text } }.merge(
+    directory: -> (text){ text + "/" }
+  )
+
+  STYLE_PROCS = Hash.new{ |h,k| h[k] = ->(text){ text } }.merge(
+    directory: -> (text){ Color.bold(Color.red(text)) },
+    command:   -> (text){ Color.bold(Color.green(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 + "@" }
+  )
+
+  attr_reader :editor, :world
+
+  def initialize_world(world)
+    @world = world
+    @world.extend TabCompletion::DslMethods
+    @editor = @world.editor
+    @editor.completion_proc = -> (word, line){
+      complete(word, line)
+    }
+    @editor.bind(:tab){ @editor.complete }
+    @completions = COMPLETIONS.dup
+
+    @style_procs = STYLE_PROCS.dup
+    @decoration_procs = DECORATION_PROCS.dup
+    @display_procs = DISPLAY_PROCS.dup
+
+    editor.on_word_complete do |event|
+      sub_word = event[:payload][:sub_word]
+      word = event[:payload][:word]
+      actual_completion = event[:payload][:completion]
+      possible_completions = event[:payload][:possible_completions]
+
+      semi_formatted_possibilities = possible_completions.map.with_index do |completion, i|
+        if completion == actual_completion
+          style_text_for_selected_match(completion) + "\e[0m"
+        else
+          style_text_for_nonselected_match(completion) + "\e[0m"
+        end
+      end
+
+      max_width = @editor.terminal_width
+      max_item_width = semi_formatted_possibilities.map(&:length).max + 2
+      most_per_line = max_width / max_item_width
+      padding_at_the_end = max_width % max_item_width
+
+      formatted_possibilities = semi_formatted_possibilities.map.with_index do |completion, i|
+        spaces_to_pad = max_item_width - completion.length
+        completion + (" " * spaces_to_pad)
+      end
+
+      editor.content_box.children = formatted_possibilities.map do |str|
+        TerminalLayout::Box.new(content: str, style: { display: :float, float: :left, height: 1, width: max_item_width })
+      end
+    end
+
+    editor.on_word_complete_no_match do |event|
+      sub_word = event[:payload][:sub_word]
+      word = event[:payload][:word]
+      editor.content_box.children = []
+      # editor.content_box.content = "Failed to find a match to complete #{sub_word} portion of #{word}"
+    end
+
+    editor.on_word_complete_done do |event|
+      # TODO: add a better way to clear content
+      editor.content_box.children = []
+    end
+  end
+
+  def add_completion(name, pattern, &blk)
+    raise ArgumentError, "Must supply block!" unless block_given?
+    # @completions.push CustomCompletion.new(name:name, pattern:pattern, world:world, &blk)
+  end
+
+  def set_decoration(type, &blk)
+    raise ArgumentError, "Must supply block!" unless block_given?
+    @style_procs[type] = blk
+  end
+
+  def complete(word, line)
+    matches = @completions.sort_by(&:priority).reverse.map do |completion|
+      if completion.respond_to?(:call)
+        completion.call
+      else
+        completions = completion.new(
+          world: @world,
+          word_break_characters: editor.word_break_characters
+        ).completions_for(word, line)
+        completions.each do |completion|
+          completion.text = display_text_for_match(completion)
+        end
+      end
+    end.flatten
+
+    matches
+  end
+
+  private
+
+  def display_text_for_match(match)
+    ANSIString.new @display_procs[match.type].call(match.text.dup)
+  end
+
+  def style_text_for_selected_match(match)
+    styled_text = @style_procs[match.type].call(match.descriptive_text.dup).to_s
+    styled_text = @decoration_procs[match.type].call(styled_text).to_s
+    uncolored_text = Color.uncolored(styled_text)
+    ANSIString.new @style_procs[:selected].call(uncolored_text)
+  end
+
+  def style_text_for_nonselected_match(match)
+    str = @decoration_procs[match.type].call(
+      @style_procs[match.type].call(match.descriptive_text.dup)
+    )
+    ANSIString.new str
+  end
+
+end

data/bin/yap

@@ -1,20 +1,29 @@
 #!/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"
-ENV["GEM_HOME"] = "/Users/zdennis/.rvm/gems/ruby-2.1.5:/Users/zdennis/.rvm/gems/ruby-2.1.5@global"
-ENV["GEM_PATH"] = "/Users/zdennis/.rvm/gems/ruby-2.1.5"
+#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 << File.dirname(file) + '/../lib'
+$LOAD_PATH.unshift File.dirname(file) + '/../lib'
+# $LOAD_PATH.unshift File.dirname(file) + '/../../yap-shell-parser/lib'
 
 require "yap"
+
+$stdout.sync = true
+
 Yap.run_shell

data/lib/tasks/addons.rake

@@ -0,0 +1,51 @@
+namespace :addons do
+  namespace :update do
+    desc "Update the gemspec based on add-on specific dependnecies"
+    task :gemspec do
+      require 'bundler'
+      runtime_deps = []
+      development_deps = []
+      root_dir = File.dirname(__FILE__) + "/../.."
+      gemfiles = Dir[root_dir + "/addons/**/**/Gemfile"]
+      gemfiles.each do |gemfile|
+        bd = Bundler::Definition.build(gemfile, nil, nil)
+        runtime_deps.push *bd.dependencies.select{ |dep| dep.type == :runtime }
+        development_deps.push *bd.dependencies.select{ |dep| dep.type == :development }
+      end
+
+      runtime_h = Hash.new{ |h,name| h[name] = Gem::Dependency.new(name) }
+      runtime_deps.each { |dep| runtime_h[dep.name] = runtime_h[dep.name].merge(dep) }
+
+      dev_h = Hash.new{ |h,name| h[name] = Gem::Dependency.new(name) }
+      development_deps.each { |dep| dev_h[dep.name] = dev_h[dep.name].merge(dep) }
+
+      deps_str = ""
+      deps_str << runtime_h.map do |name, dep|
+        if dep.requirement.none?
+          %|  spec.add_dependency "#{dep.name}"|
+        else
+          %|  spec.add_dependency "#{dep.name}", "#{dep.requirement.as_list.first}"|
+        end
+      end.join("\n")
+
+      deps_str << dev_h.map do |name, dep|
+        if dep.requirement.none?
+          %|  spec.add_development_dependency "#{dep.name}"|
+        else
+          %|  spec.add_development_dependency "#{dep.name}", "#{dep.requirement.as_list.first}"|
+        end
+      end.join("\n")
+
+      gemspec = Dir[root_dir + "/*.gemspec"].first || raise("No gemspec found in directory: #{root_dir}")
+      gemspec = File.expand_path(gemspec)
+      contents = File.read(gemspec)
+      new_contents = contents.sub(/(\#--BEGIN_ADDON_GEM_DEPENDENCIES--\#)\s*.*(^.*\#--END_ADDON_GEM_DEPENDENCIES--\#)/mx) do
+        "#{$1}\n#{deps_str}\n#{$2}"
+      end
+
+      File.write(gemspec, new_contents)
+      puts "Updated #{gemspec}"
+      puts new_contents
+    end
+  end
+end