noir 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a981055827741b98263f272970c2a76ba53c2b
-  data.tar.gz: 42e09ce72746a6b8381f36bfc687cbd86a4aa19e
+  metadata.gz: 321b15d42d793bbc446da53068990490c43d1d53
+  data.tar.gz: 958e080bde8a7e4aba828cef99ad0587b774b869
 SHA512:
-  metadata.gz: 3ea4f8bd2daabba6eecde179adae24beeb81c83ce77a6b0e5df53ba2484bcc900e61d0ac05a62dde9750073994d572491397c6babf317687762874d9d8cbe0a8
-  data.tar.gz: 5413ee5c9777dd811391a4b64a959e18b9967e512a534b4dfcfe8ecd0a1f38d46d1a2fbe46f30c114be9020857ce39d25f1f0af2e20e2f124f0b8869fc371c57
+  metadata.gz: 047e554c78f92f237badf491e967d86c8a8af8edb89938f0cc9350dc1c39376f2e7d841dd6481fb648aee8107ba65f10b0c7ac6b823bbcd3e9c54e99d34477ee
+  data.tar.gz: fc30d7f7a8890a13a01fafeca7ec82e1a8984b044224c83cb003ce86136008ac9ecec46833e8898c4540574186be68eb8bb54a23f153ce286fdac7747e5bde85

data/lib/noir/executer.rb

@@ -1,33 +1,52 @@
 module Noir
   class Executer
 
+    # utils
+
+    def self.find_command command_arr, search_str
+      command = eval(command_arr.join('::'))
+
+      # finish find by terminal command
+      return nil if command.superclass == Noir::Base::TerminalCommand
+
+      commands    = command.constants(true).map(&:to_s)
+      matched_str = commands.find{|c| c.downcase == search_str.downcase}
+      matched_str = find_abbr_command(commands, search_str) if matched_str.nil?
+
+      return nil if matched_str.nil?
+      matched_arr = command_arr + [matched_str]
+      unless eval(matched_arr.join('::')).ancestors.include?(Noir::Base::Command)
+        # matched. but matched class is not inherited commmand
+        return nil
+      end
+
+      return matched_str
+    end
+
+    def self.find_abbr_command commands, search_str
+      # abbrev match
+      matched_commands = commands.select{|c| c.downcase.start_with? search_str}
+
+      return nil if matched_commands.empty?
+      unless matched_commands.size == 1
+        raise "#{search_str} is ambiguous. matched #{matched_commands}"
+      end
+
+      matched_commands.first
+    end
+
     def self.command_from_argv
       args          = ARGV.clone
-      noir_commands = Noir::Command.constants(true).map(&:to_s)
-      command_arr   = ['Noir', 'Command']   # command prefix
-
-
-      while !args.empty?
-        arg = args.shift
-
-        if matched_command = noir_commands.find{|c| c.downcase == arg.downcase}
-
-          command_arr << matched_command
-          command = eval(command_arr.join('::'))
-          if command.superclass == Noir::Base::Command
-            noir_commands = command.constants(true).map(&:to_s) # search next command in sub class
-          elsif command.superclass ==  Noir::Base::TerminalCommand
-            break                                               # search finished by terminal command
-          else
-            command_arr.pop
-            # delete last matched_command, because this class is not inherited Noir::Base::Command
-            command = eval(command_arr.join('::'))
-            break
-          end
-        end
+      command_arr   = ['Noir', 'Command']   # command prefix and default command
+
+      while true
+        break unless search_str      = args.shift
+        break unless matched_command = find_command(command_arr, search_str)
+
+        command_arr << matched_command
       end
 
-      return command || Noir::Command  # default command
+      return eval(command_arr.join('::'))
     end
 
     def self.args_from_argv
@@ -38,6 +57,8 @@ module Noir
       return argv.drop(command_size)
     end
 
+    # inherited methods
+
     def self.execute
       command_from_argv.execute *args_from_argv
     end

data/lib/noir/version.rb

@@ -1,3 +1,3 @@
 module Noir
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/noir/command/completion_spec.rb

@@ -14,6 +14,7 @@ describe 'Noir::Command::Completion' do
     it 'return all command from nil' do
       expect(Noir::Command::Completion.suggestions([])).to include('hoge')
       expect(Noir::Command::Completion.suggestions([])).to include('fuga')
+      expect(Noir::Command::Completion.suggestions([])).to include('fugafuga')
     end
 
     it 'return nil from unmatched pattern' do
@@ -24,6 +25,7 @@ describe 'Noir::Command::Completion' do
       list = ['h']
       expect(Noir::Command::Completion.suggestions(list)).to     include('hoge')
       expect(Noir::Command::Completion.suggestions(list)).to_not include('fuga')
+      expect(Noir::Command::Completion.suggestions(list)).to_not include('fugafuga')
     end
 
     it 'return command list in sub command' do

data/spec/noir/executer_spec.rb

@@ -23,15 +23,21 @@ describe 'Noir::Executer' do
       it 'return Noir::Command' do
         expect(Noir::Executer.command_from_argv).to eq(Noir::Command)
       end
-    end
+    end # in undefined ARGV
 
-    describe 'in defined argv' do
+    describe 'in defined ARGV' do
 
       it 'return command' do
         stub_const 'ARGV', ['hoge']
         expect(Noir::Executer.command_from_argv).to eq(Noir::Command::Hoge)
       end
 
+      it 'return prefix duplicated command' do
+        stub_const 'ARGV', ['fuga']
+        expect(Noir::Executer.command_from_argv).to     eq(Noir::Command::Fuga)
+        expect(Noir::Executer.command_from_argv).not_to eq(Noir::Command::FugaFuga)
+      end
+
       it 'return command if has other arguments' do
         stub_const 'ARGV', ['hoge', 'aaa']
         expect(Noir::Executer.command_from_argv).to eq(Noir::Command::Hoge)
@@ -77,8 +83,41 @@ describe 'Noir::Executer' do
         expect(Noir::Executer.command_from_argv).to eq(Noir::Command::Fuga)
       end
 
+      describe 'abbrev command' do
+
+        it 'return only matched command' do
+          stub_const 'ARGV', ['ho']
+          expect(Noir::Executer.command_from_argv).to eq(Noir::Command::Hoge)
+        end
+
+        it 'raise exception matched one more' do
+          stub_const 'ARGV', ['h']
+          expect{Noir::Executer.command_from_argv}.to raise_error
+        end
+
+        it 'support multi command abbrev' do
+          stub_const 'ARGV', ['ho', 'subcommandt']
+          expect(Noir::Executer.command_from_argv).to eq(Noir::Command::Hoge::SubCommandTwo)
+        end
+
+        it 'support multi command abbrev with args' do
+          stub_const 'ARGV', ['ho', 'subcommandt', 'piyo']
+          expect(Noir::Executer.command_from_argv).to eq(Noir::Command::Hoge::SubCommandTwo)
+        end
+
+      end
+    end # in defined ARGV
+  end # command_from_argv
+
+  describe 'find_command' do
+    it 'return perfect matched command' do
+      expect(Noir::Executer.find_command ['Noir', 'Command'], 'hoge').to eq('Hoge')
     end
-  end
+
+    it 'raise exeption in ambiguous match' do
+      expect{Noir::Executer.find_command(['Noir', 'Command'], 'f')}.to raise_error
+    end
+  end # find_command
 
   describe 'args_from_argv' do
 
@@ -88,9 +127,9 @@ describe 'Noir::Executer' do
       it 'return []' do
         expect(Noir::Executer.args_from_argv).to eq([])
       end
-    end
+    end # in undefined ARGV
 
-    describe 'in defined argv' do
+    describe 'in defined ARGV' do
 
       it 'return [] if only command' do
         stub_const 'ARGV', ['hoge']
@@ -162,6 +201,7 @@ describe 'Noir::Executer' do
         expect(Noir::Executer.args_from_argv).to eq(['aaa', 'bbb'])
       end
 
-    end
-  end
+    end # in defined argv
+
+  end # args_from_argv
 end

data/spec/spec_helper.rb

@@ -12,26 +12,30 @@ def stub_commands
   stub_const('Noir::Command::Hoge::SubCommandTwo'                , Class.new(Noir::Base::Command))
   stub_const('Noir::Command::Hoge::SubNonCommand'                , Class.new)
   stub_const('Noir::Command::Fuga'                               , Class.new(Noir::Base::TerminalCommand))
+  stub_const('Noir::Command::FugaFuga'                           , Class.new(Noir::Base::TerminalCommand))
 
+# stub_const is this structure
 =begin
-        # stub_const is this structure
-        module Noir::Command
-          class Hoge < Noir::Base::Command
-            class SubCommand < Noir::Base::Command
-              class SubSubCommand < Noir::Base::Command
-              end
-              class SubSubNonCommand
-              end
-            end
-            class SubCommandTwo < Noir::Base::Command
-            end
-
-            class SubNonCommand
-            end
+    class Noir::Command
+      class Hoge < Noir::Base::Command
+        class SubCommand < Noir::Base::Command
+          class SubSubCommand < Noir::Base::Command
           end
-          class Fuga < Noir::Base::TerminalCommand
+          class SubSubNonCommand
           end
         end
+
+        class SubCommandTwo < Noir::Base::Command
+        end
+
+        class SubNonCommand
+        end
+      end
+      class Fuga < Noir::Base::TerminalCommand
+      end
+      class Fuga < Noir::Base::TerminalCommand
+      end
+    end
 =end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noir
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - atton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler