easy_app_helper 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434a85f02a1eaf504c9ed65adf914a645078642a
-  data.tar.gz: 21f6e3d42db143603287c979a90dc8c0c7824e85
+  metadata.gz: a8ad72833020b17d6a18aa5d80a3ec6b39752f1d
+  data.tar.gz: 27b76179f874b068bce02b666b9877096f67db44
 SHA512:
-  metadata.gz: 8ab470b01821537d0a0afb568f2a0549ec726a311b18675a9de899243a4a895b7d71b88fdadb51bc5f8ac555102c989474a1f2b8f84b7030fb2b6e4da3b4959c
-  data.tar.gz: 9455efe10be024aa836d62bdaab32a8b776461d6d3332c8f889696197d577fdbc752762a19128ae2b2436f2acb81000f566b3aeac4e896ef3815c98fff928afc
+  metadata.gz: ffee1008b3e25274dc63b75946723f24d28f9a8b0f26c510c04b8741b7c783d4d0093b5c4cecafb8499a1c6a41f8eaaa67cbe3712a414a3e45174df0a97aefb6
+  data.tar.gz: 011cd2a385b3a3e3548df86174f876c05ff5c1e8b26df392a43e4498fdbddacdb5674c69d6ba8feb28dce601f33b2dde4dbd88fe817bf5912eacae651ae41bb1

data/lib/easy_app_helper/scripts/sub_command_base.rb

@@ -40,6 +40,9 @@ module EasyAppHelper
           unless self::ALIASES.nil? or self::ALIASES.empty?
             line += ' (aliases: %s).' % [ self::ALIASES.join(', ') ]
           end
+          unless self::PROVIDER == EasyAppHelper::Scripts::SubCommandBase::PROVIDER
+            line += ' Provided by %s plugin.' % [ self::PROVIDER ]
+          end
           line
         end
 

data/lib/easy_app_helper/scripts/sub_command_manager.rb

@@ -35,21 +35,24 @@ module EasyAppHelper
         @by_name ||= {}
       end
 
-      def self.sub_command_class(command_name_or_alias, provider=EasyAppHelper::Scripts::SubCommandBase::PROVIDER)
-        candidates = by_provider[provider]
-        raise "There is no provider declared for command '#{command_name_or_alias}'" if candidates.nil?
-        candidates.select! do |sub_command_class|
+      def self.sub_command_class(command_name_or_alias, preferred_provider=EasyAppHelper::Scripts::SubCommandBase::PROVIDER)
+        candidates = by_name[command_name_or_alias].select do |sub_command_class|
           command_classes_for_command = by_name[command_name_or_alias]
           raise "There is no provider declared for command '#{command_name_or_alias}'" if command_classes_for_command.nil?
           command_classes_for_command.include? sub_command_class
         end
-        raise "Cannot determine provider to use for '#{command_name_or_alias}'. Multiple providers exist !" unless candidates.size == 1
+        if candidates.size > 1
+          candidates.select! do |sub_command_class|
+            sub_command_class::PROVIDER == preferred_provider
+          end
+          raise "Cannot determine provider to use for '#{command_name_or_alias}'. Multiple providers exist !"
+        end
         candidates.first
       end
 
-      def delegate_to_sub_command(provider = EasyAppHelper::Scripts::SubCommandBase::PROVIDER)
+      def delegate_to_sub_command(preferred_provider=EasyAppHelper::Scripts::SubCommandBase::PROVIDER)
         sub_command_name = extra_parameters.shift
-        sub_command = EasyAppHelper::Scripts::SubCommandManager.sub_command_class(sub_command_name, provider).new
+        sub_command = EasyAppHelper::Scripts::SubCommandManager.sub_command_class(sub_command_name, preferred_provider).new
         sub_command.pre_process
         raise 'You have to implement \'do_process\'' unless sub_command.respond_to? :do_process
         sub_command.do_process

data/lib/easy_app_helper/version.rb

@@ -1,3 +1,3 @@
 module EasyAppHelper
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_app_helper
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - L.Briais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler