harp 0.2.6 → 0.2.7

data/examples/usage.rb

@@ -1,3 +1,4 @@
+$:.unshift "#{File.expand_path(File.dirname(__FILE__))}/../lib"
 require "harp"
 
 class UsefulThing
@@ -12,32 +13,26 @@ class UsefulThing
 
   # Set it up
   setup_harp do |harp|
+    command_names = harp.command_names.select {|name| name.size > 1 }
 
-    command("help") do
-      commands = harp.command_names
-      puts "* Available commands: " << commands.sort.join(" ")
+    command("help", :alias => "h") do
+      puts "* Available commands: " << command_names.sort.join(", ")
       puts "* Tab completion works for commands."
     end
 
-    # Harp provides a "quit" command by default, but you can
+    # Harp's repl provides a "quit" command by default, but you can
     # override it to add value.
-    command("quit") do
+    command("quit", :alias => "q") do
       puts "Farewell to the girl with the sun in her eyes."
       exit
     end
 
-    ## Set up a handler for a command where the first token is "!"
-    ## I.e., shell out like Vim does.
-    #on_bang do |args|
-      #system args.first
-    #end
-
     # define a command that calls an instance method of your class.
     # The block parameter is always an array, even if your regex
     # had only one match group.
     # This command will only accept a single-word argument (no
     # whitespace allowed).
-    command("use", :adverb) do |args|
+    command("use", :adverb, :alias => "abuse") do |args|
       self.use(args.first)
     end
 
@@ -45,5 +40,5 @@ class UsefulThing
 
 end
 
-UsefulThing.new.repl
+#UsefulThing.new.repl
 

data/lib/harp.rb

@@ -1,119 +1,37 @@
-# stdlib
-require "set"
-require "readline"
-
-Readline.completion_append_character = nil
-#Readline.basic_word_break_characters = ""
-
-require "harp/dispatcher"
+require "harp/command_manager"
+require "harp/repl"
+require "harp/cli"
 
 module Harp
   def self.included(mod)
     mod.module_eval do
-      @dispatcher = Dispatcher.new
+      @command_manager = CommandManager.new
 
       def self.setup_harp(&block)
-        dispatcher = @dispatcher
+        command_manager = @command_manager
         # This should either be baked in to REPL, or non-existent.
-        @dispatcher.command("quit") do
+        @command_manager.command("quit") do
           exit
         end
-        @dispatcher.instance_exec(dispatcher, &block)
+        @command_manager.instance_exec(command_manager, &block)
       end
 
       def self.repl
-        REPL.new(@dispatcher)
+        REPL.new(@command_manager)
       end
 
       def repl
         self.class.repl.run(self)
       end
-    end
-  end
-
-  class REPL
-
-    attr_reader :store, :commands
-    def initialize(dispatcher)
-      @dispatcher = dispatcher
-      @commands = dispatcher.commands.keys
-      Readline.completion_proc = self.method(:complete)
-    end
-
-    def complete(str)
-      case Readline.line_buffer
-      when /^\s*!/
-        # if we're in the middle of a bang-exec command, completion
-        # should look at the file system.
-        self.complete_path(str)
-      else
-        # otherwise use the internal dict.
-        self.complete_term(str)
-      end
-    end
-
-    def complete_path(str)
-      Dir.glob("#{str}*")
-    end
 
-    def complete_term(str)
-      # Terms can be either commands or indexes into the configuration
-      # data structure.  No command contains a ".", so that's the test
-      # we use to distinguish.
-      bits = str.split(".")
-      if bits.size > 1
-        # An attempt to allow completion of either full configuration index
-        # strings, or of component parts.  E.g., if the configuration contains
-        # foo.bar.baz, this code will offer both "foo" and "foo.bar.baz"
-        # as completions for "fo".
-        v1 = @completions.grep(/^#{Regexp.escape(str)}/)
-        v2 = @completions.grep(/^#{Regexp.escape(bits.last)}/)
-        (v1 + v2.map {|x| (bits.slice(0..-2) << x).join(".") }).uniq
-      else
-        self.command_complete(str) +
-          @completions.grep(/^#{Regexp.escape(str)}/)
+      def self.cli
+        CLI.new(@command_manager)
       end
-    end
-
-    def command_complete(str)
-      @commands.grep(/^#{Regexp.escape(str)}/) 
-    end
-
-    def sanitize(str)
-      # ANSI code stripper regex cargo culted from
-      # http://www.commandlinefu.com/commands/view/3584/remove-color-codes-special-characters-with-sed
-      str.gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/, "")
-    end
-
-    def run(context)
-      @completions = context.completions rescue Set.new
-      @run = true
-      puts
-      while @run && (line = Readline.readline("<3: ", true).strip)
-        if line[0] == "!"
-          system(line.slice(1..-1))
-          next
-        end
-
-        if line.empty?
-          next
-        end
 
-        name, *args = line.split(/\s+/)
-
-        # TODO: check for bang command
-        if command = @dispatcher.commands[name]
-          if block = command.block_for(args)
-            context.instance_exec(args, &block)
-          else
-            puts "invalid arguments for command"
-          end
-        else
-          puts "command not found"
-        end
+      def cli
+        self.class.cli.run(self)
       end
     end
-
   end
 
 end

data/lib/harp/cli.rb

@@ -0,0 +1,24 @@
+
+module Harp
+
+  class CLI
+
+    def initialize(command_manager)
+      @command_manager = command_manager
+      @commands = command_manager.commands.keys
+    end
+
+    def run(context)
+      name, *args = parse(ARGV)
+      @command_manager.handle(name, args, context)
+    end
+
+    def parse(array)
+      array
+    end
+
+  end
+
+end
+
+

data/lib/harp/command_manager.rb

@@ -0,0 +1,74 @@
+module Harp
+
+  class CommandManager
+
+    attr_reader :commands
+    def initialize
+      @commands = {}
+    end
+
+    def handle(name, args, context)
+      block = find_command(name, args)
+      context.instance_exec(args, &block)
+    end
+
+    def find_command(name, args)
+      if command = @commands[name]
+        if block = command.block_for(args)
+          return block
+        else
+          raise ArgumentError, "Invalid arguments for command."
+        end
+      else
+        raise ArgumentError, "Command not found: '#{name}'."
+      end
+    end
+
+    def command(command_name, *spec, &block)
+      names = [command_name]
+      if spec.last.is_a?(Hash)
+        options = spec.pop
+        if command_alias = options[:alias]
+          names << command_alias
+        end
+      end
+      names.each do |name|
+        command = @commands[name] ||= Command.new(name)
+        command.add_spec(spec, block)
+      end
+    end
+
+    def command_names
+      @commands.keys.sort
+    end
+
+  end
+
+  class Command
+    def initialize(name)
+      @name = name
+      @blocks = {}
+    end
+
+    def add_spec(spec, block)
+      # TODO validate block and arity
+      @blocks[spec]= block
+    end
+
+    def block_for(args)
+      @blocks.each do |spec, block|
+        if match(spec, args)
+          return block
+        end
+      end
+      return nil
+    end
+
+    def match(spec, args)
+      spec.size == args.size
+    end
+
+  end
+
+end
+

data/lib/harp/repl.rb

@@ -0,0 +1,94 @@
+# stdlib
+require "set"
+require "readline"
+
+Readline.completion_append_character = nil
+#Readline.basic_word_break_characters = ""
+
+module Harp
+
+  class REPL
+
+    def initialize(command_manager)
+      @command_manager = command_manager
+      Readline.completion_proc = self.method(:complete)
+    end
+
+    def commands
+      @command_manager.commands.keys
+    end
+
+    def complete(str)
+      case Readline.line_buffer
+      when /^\s*!/
+        # if we're in the middle of a bang-exec command, completion
+        # should look at the file system.
+        self.complete_path(str)
+      else
+        # otherwise use the internal dict.
+        self.complete_term(str)
+      end
+    end
+
+    def complete_path(str)
+      Dir.glob("#{str}*")
+    end
+
+    def complete_term(str)
+      # Terms can be either commands or indexes into the configuration
+      # data structure.  No command contains a ".", so that's the test
+      # we use to distinguish.
+      bits = str.split(".")
+      if bits.size > 1
+        # An attempt to allow completion of either full configuration index
+        # strings, or of component parts.  E.g., if the configuration contains
+        # foo.bar.baz, this code will offer both "foo" and "foo.bar.baz"
+        # as completions for "fo".
+        v1 = @completions.grep(/^#{Regexp.escape(str)}/)
+        v2 = @completions.grep(/^#{Regexp.escape(bits.last)}/)
+        (v1 + v2.map {|x| (bits.slice(0..-2) << x).join(".") }).uniq
+      else
+        self.command_complete(str) +
+          @completions.grep(/^#{Regexp.escape(str)}/)
+      end
+    end
+
+    def command_complete(str)
+      commands.grep(/^#{Regexp.escape(str)}/) 
+    end
+
+    def sanitize(str)
+      # ANSI code stripper regex cargo culted from
+      # http://www.commandlinefu.com/commands/view/3584/remove-color-codes-special-characters-with-sed
+      str.gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/, "")
+    end
+
+    def run(context)
+      @completions = context.completions rescue Set.new
+      @run = true
+      puts
+      while @run && (line = Readline.readline("<3: ", true).strip)
+        # Treat ! as the shell out command
+        if line[0] == "!"
+          system(line.slice(1..-1))
+          next
+        end
+
+        if line.empty?
+          next
+        end
+
+        name, *args = line.split(/\s+/)
+
+        begin
+          @command_manager.handle(name, args, context)
+        rescue ArgumentError => e
+          puts e.message
+        end
+      end
+    end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harp
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: starter
@@ -35,8 +35,11 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
-- lib/harp.rb
 - examples/usage.rb
+- lib/harp/cli.rb
+- lib/harp/command_manager.rb
+- lib/harp/repl.rb
+- lib/harp.rb
 homepage: https://github.com/automatthew/harp
 licenses: []
 post_install_message: