rubycom 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZThmMjdiYjc1YjlkMDUxODYxNGQyMmI2YzYzNGI0YTQwMDQ2MGI3Mg==
+    YTY4ZmE3MjRkNWJlYmE4Yzg1NGYyOTE1NGNlODFhZWJmZDg5MDFmMg==
   data.tar.gz: !binary |-
-    OTY2ZWQzMzI1NGNhOTEyYzM5YTVhZGUwOTgyMTcxMjAyM2Y3MzliYw==
+    YjlmZTllNzllZjQ1MDM0ZGQwYzFlMjI2M2I3YjQxMGUwOWFkZjM2Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDhlMWRhMDNiODI2Y2RmMjMxNGVhZDU4NDk4YTc3MjljMmE2OWEyNWQ5YTBj
-    OWZkM2JiZjE2MThjMTRjMzE0NjM2YzI5YzliMmU3NzZjZmViZWE1ODgyODMw
-    MTM5YTYyZjYyYjcxNzkyY2ZjYWUzZDA1NWNjNjlmYjk0MzlhYzk=
+    NDQxOGU4ZTU3ZmFhZmQ3NjA2Y2QwMjIxN2Y2NTNiZjc1NzRmYjE5ZTZjMTJj
+    ZDVlYjVhZGFkNzBlMjMwZWI3YTkyN2QzZDUwNTY1NTNmODIwN2Y1OWQyMjI4
+    ZDU5NzRlODk5MDc4MzI1ODk2YzZmZmUzNWI0ZTdkYWM4NjQ4MWI=
   data.tar.gz: !binary |-
-    ZWEyZThiOGJiMzU2NDYzYzlhMmFlZTM3Yjc2YjY3YTE3YzI5MTUzMGQyYmJh
-    Yjc3ZmE2MWE0MGJiNzY0Njg5Mzc5YzUyYmNlNDZhZDRlN2IxMmM4MTNhZGFm
-    ZDI0MWYzNDE1M2IzMjJhNjQzYmI4NjEwNjUzZjYxYWQ5NjhhZDc=
+    ZDg3YTIyODAwYmFlZWFjODM0ZGI3ODNjODU5MTk5OTlkN2ZjNDMzZDFmZGNl
+    NTVjMzIwOTVlZTBlZDBkODFjOTIyZTYxOGE0MTBmMTE2NjY4OWQ5NDYwMDg3
+    ZmZmY2JkZjdiNjE5YzFkNmIwNjBhM2UzNGYwMzViMmM2ODg2NmU=

data/lib/rubycom.rb

@@ -1,3 +1,4 @@
+require "#{File.dirname(__FILE__)}/rubycom/base_inclusion_runner.rb"
 require "#{File.dirname(__FILE__)}/rubycom/completions.rb"
 require "#{File.dirname(__FILE__)}/rubycom/arg_parse.rb"
 require "#{File.dirname(__FILE__)}/rubycom/singleton_commands.rb"
@@ -31,30 +32,11 @@ module Rubycom
   class ParameterExtractError < RubycomError;
   end
 
-
-  # Determines whether the including module was executed by a gem binary
-  #
-  # @param [String] base_file_path the path to the including module's source file
-  # @return [Boolean] true|false
-  def self.is_executed_by_gem?(base_file_path)
-    Gem.loaded_specs.map { |k, s|
-      {k => {name: "#{s.name}-#{s.version}", executables: s.executables}}
-    }.reduce({}, &:merge).map { |_, s|
-      base_file_path.include?(s[:name]) && s[:executables].include?(File.basename(base_file_path))
-    }.flatten.reduce(&:|)
-  end
-
   # Detects that Rubycom was included in another module and calls Rubycom#run
   #
   # @param [Module] base the module which invoked 'include Rubycom'
   def self.included(base)
-    base_file_path = caller.first.gsub(/:\d+:.+/, '')
-    if base.class == Module && (base_file_path == $0 || self.is_executed_by_gem?(base_file_path))
-      base.module_eval {
-        Rubycom.run(base, ARGV)
-      }
-    end
-    nil
+    Rubycom::BaseInclusionRunner.run(caller, Rubycom.public_method(:run), base, ARGV)
   end
 
   # Main entry point for Rubycom. Uses #run_command to discover and run commands

data/lib/rubycom/base_inclusion_runner.rb

@@ -0,0 +1,36 @@
+module Rubycom
+  module BaseInclusionRunner
+
+    # Calls the given run_fn with the given base and args if the base was
+    # run from the command line in it's home folder or from an installed gem library
+    #
+    # @param [Array] the result from Kernel.caller as called from an included module within base
+    # if the first caller entry matches $0 then the base module was executed from it's home folder
+    # @param [Method|Proc] to be run if run criteria are satisfied
+    # @param [Module] the base Module to test against and to send to the run_fn
+    # @param [Array] args a String Array representing the arguments to be passed to run_fn
+    # @return nil
+    def self.run(caller, run_fn, base, args)
+      base_file_path = caller.first.gsub(/:\d+:.+/, '')
+      if base.class == Module && (base_file_path == $0 || self.is_executed_by_gem?(base_file_path))
+        base.module_eval {
+          run_fn.call(base, args)
+        }
+      end
+      nil
+    end
+
+    # Determines whether the including module was executed by a gem binary
+    #
+    # @param [String] base_file_path the path to the including module's source file
+    # @return [Boolean] true|false
+    def self.is_executed_by_gem?(base_file_path)
+      Gem.loaded_specs.map { |k, s|
+        {k => {name: "#{s.name}-#{s.version}", executables: s.executables}}
+      }.reduce({}, &:merge).map { |_, s|
+        base_file_path.include?(s[:name]) && s[:executables].include?(File.basename(base_file_path))
+      }.flatten.reduce(&:|)
+    end
+
+  end
+end

data/lib/rubycom/version.rb

@@ -1,3 +1,3 @@
 module Rubycom
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycom
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Danny Purcell
@@ -110,6 +110,7 @@ files:
 - Rakefile
 - lib/rubycom.rb
 - lib/rubycom/arg_parse.rb
+- lib/rubycom/base_inclusion_runner.rb
 - lib/rubycom/command_interface.rb
 - lib/rubycom/completions.rb
 - lib/rubycom/error_handler.rb