shelldon 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0b0a7f5f6649588679a69a1173b3fbb8908cc7
-  data.tar.gz: b71f5389f97fd747ed80973fbf14993ffc88cc4d
+  metadata.gz: a46d790507da9bae22ff058b3b331394779c4184
+  data.tar.gz: 53f2fbfe3332fe588fbbb1a51d98ac51ba742114
 SHA512:
-  metadata.gz: 23f12ce391adccd268f03d11fbcf48496956b9f4428f95cf31591e3456c111edd9c72f3330c724f48e1c253e0c5a4a09b29a45295453797524ae4d821ae119b4
-  data.tar.gz: c22ce281321e342ae0345a051eadd38cb2d0563f3e1bcc240321ec3de3262bbf95bd411bef116f6931586cbb619ab9997bda8f7c8e219c42b0b7092313987e63
+  metadata.gz: ea7efdbb08074d45e324af4ab2476b9a43eee619d59458730eae86c49d14f6384d8a66fecf4602494c7a2e71b1cd67600c177c13da325dc987b97b00ba0f2f92
+  data.tar.gz: 0e4ea217d63327d68e94d63ea4107553200b7e4d2997b7ca382d16a8765df88b78f2803df5cd68265fcf35782904dc0cc9a2c4290100b9e9c4f892bbca51c3e4

data/lib/auto_complete.rb

@@ -7,9 +7,9 @@ module Shelldon
     end
 
     def set_proc
-      @comp                                    = proc { |s| auto_comp.grep(/^#{Regexp.escape(s)}/) }
-      Readline.completion_append_character     = ' '
-      Readline.completion_proc                 = @comp
+      @comp                                = proc { |s| auto_comp.grep(/^#{Regexp.escape(s)}/) }
+      Readline.completion_append_character = ' '
+      Readline.completion_proc             = @comp
     end
 
     def buf
@@ -18,17 +18,15 @@ module Shelldon
 
     def auto_comp
       Readline.completion_append_character = ' '
-      @commands = @shell.command_list.commands.map(&:to_s)
-      length = buf.split(' ').length
+      @commands                            = @shell.command_list.commands.map(&:to_s)
+      last_command                         = Command.tokenize(buf)
+      last_command                         = last_command.last if last_command.last.is_a?(Array)
+      length                               = last_command.length
       return @commands if length <= 1 && !buf.end_with?(' ')
-      cmd, = @shell.command_list.find(buf)
+      cmd, = @shell.command_list.find(last_command)
       return [] unless cmd
-      remainder = buf.gsub("#{cmd.christian_name} ", '')
+      remainder = last_command.join(' ').gsub("#{cmd.christian_name} ", '')
       cmd.complete(remainder)
     end
-
-    def tokenize(str)
-      str.split(' ')
-    end
   end
 end

data/lib/command/command.rb

@@ -3,6 +3,8 @@ require 'timeout'
 module Shelldon
   class Command
     attr_reader :name, :aliases, :subcommands, :parent, :autocomplete, :times_out
+    SINGLE_QUOTE = "'"
+    DOUBLE_QUOTE = '"'
 
     def initialize(name, parent, &block)
       @name        = name
@@ -41,9 +43,9 @@ module Shelldon
     end
 
     def run(tokens = [])
-      tokens         = [tokens] unless tokens.is_a?(Array)
+      tokens = [tokens] unless tokens.is_a?(Array)
       Timeout.timeout(timeout_length, Shelldon::TimeoutError) do
-        instance_exec(tokens.join(' '), &@action)
+        instance_exec(tokens, &@action)
       end
     end
 
@@ -122,7 +124,7 @@ module Shelldon
     def complete(buf)
       length = buf.split(' ').length
       res    = (length <= 1 && !buf.end_with?(' ')) ? subcommand_list : []
-      res += instance_exec(buf, &@autocomplete) if @autocomplete
+      res    += instance_exec(buf, &@autocomplete) if @autocomplete
       res
     end
 
@@ -180,9 +182,23 @@ module Shelldon
       if block_given?
         @autocomplete = block.to_proc
       else
-        arr ||= []
+        arr           ||= []
         @autocomplete = proc { arr }
       end
     end
+
+    def self.tokenize(str)
+      statements = str.split(/;(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/).map(&:strip)
+      statements.map do |statement|
+        statement.split(/\s(?=(?:[^"]|"[^"]*")*$)/).map do |token|
+          if token.start_and_end_with?(DOUBLE_QUOTE) ||
+            token.start_and_end_with?(SINGLE_QUOTE)
+
+            token = token[1..-2]
+          end
+          token
+        end
+      end
+    end
   end
 end

data/lib/command/command_list.rb

@@ -21,14 +21,13 @@ module Shelldon
       @default_command = cmd
     end
 
-    def run(str)
-      cmd, tokens = find(str)
+    def run(tokens)
+      cmd, tokens = find(tokens)
       cmd.run(tokens)
     end
 
-    def find(str)
-      tokens = str.split(' ')
-      key    = tokens.first.to_sym
+    def find(tokens)
+      key = tokens.first.to_sym
       if @commands.key?(key)
         @commands[key].find(tokens[1..-1])
       else
@@ -42,7 +41,7 @@ module Shelldon
     end
 
     def compile_help(cmd)
-      res               = { command: cmd.christian_name }
+      res               = {command: cmd.christian_name}
       res[:help]        = cmd.help if cmd.help
       res[:usage]       = "\"#{cmd.usage}\"" if cmd.usage
       res[:examples]    = cmd.examples if cmd.examples
@@ -57,7 +56,7 @@ module Shelldon
         cmd = find(str).first
         if cmd.show && !is_default?(cmd)
           subcommands = cmd.sub_to_a
-          res = [compile_help(cmd).values]
+          res         = [compile_help(cmd).values]
           res << subcommands unless subcommands.empty?
           res
         else

data/lib/patches/string_patches.rb

@@ -0,0 +1,5 @@
+class String
+  def start_and_end_with?(str)
+    self.start_with?(str) && self.end_with?(str)
+  end
+end

data/lib/shell/shell.rb

@@ -149,11 +149,12 @@ module Shelldon
     end
 
     def run_commands(commands)
-      commands.split(';').each { |cmd| run_command(cmd) }
+      @history_helper << commands if @history_helper
+      commands = Command.tokenize(commands)
+      commands.each { |cmd| run_command(cmd) }
     end
 
     def run_command(cmd)
-      @history_helper << cmd if @history_helper
       run_precommand(cmd)
       @command_list.run(cmd)
       run_postcommand(cmd)
@@ -193,7 +194,7 @@ module Shelldon
 
     def log_file(filepath, freq = 'daily')
       filepath = Pathname.new(filepath).expand_path.to_s
-      @logger = Logger.new(filepath, freq)
+      @logger  = Logger.new(filepath, freq)
     end
 
     def prompt(str = '> ', &block)
@@ -225,10 +226,10 @@ module Shelldon
     end
 
     def errors(&block)
-      error_factory = Shelldon::ErrorFactory.new(&block)
+      error_factory                  = Shelldon::ErrorFactory.new(&block)
       @accept_errors, @reject_errors = error_factory.get
-      @on_accept_error = error_factory.on_accept_error
-      @on_reject_error = error_factory.on_reject_error
+      @on_accept_error               = error_factory.on_accept_error
+      @on_reject_error               = error_factory.on_reject_error
     end
 
     def autocomplete(&block)

data/lib/shelldon.rb

@@ -5,6 +5,7 @@ require 'getopt/long'
 require 'yaml'
 require 'fuzzy_match'
 require 'index'
+require 'patches/string_patches'
 require 'shell/shell_index'
 require 'shell/shell_factory_index'
 require 'dsl'

data/lib/shelldon/version.rb

@@ -1,3 +1,3 @@
 module Shelldon
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelldon
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Wesley Boynton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: getopt
@@ -127,6 +127,7 @@ files:
 - lib/module/module_index.rb
 - lib/opts/opt_factory.rb
 - lib/opts/opts.rb
+- lib/patches/string_patches.rb
 - lib/shell/shell.rb
 - lib/shell/shell_factory.rb
 - lib/shell/shell_factory_index.rb