masamune 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78cc6a05c7d3d967eb2f5f66a89c9b2eb4d22bca
-  data.tar.gz: 7c2ae67465453c5064819aa16338ed2b1b73a656
+  metadata.gz: 00d8f2eadd5197f9d6bc29ea6ad781184a0e6cc0
+  data.tar.gz: 2916c960c93dba409c0f8cf5f9dc0aab40362c93
 SHA512:
-  metadata.gz: 1b4b73612c75ca6e73f4ecc49b68d034cae34acbfa4359f5588ab51dcfea2878e7890988fa5abca21d515b90d048005ec4a5282c6f306117c2e430e44b2061a8
-  data.tar.gz: a5d0c3525357265e77f5fdc09bcf6a0f2af9e9c81262d4bfed1bb1d809c7fb407704c7f68db2ad9ccb281d5c58ba075aa38c2c4f31fc45f3c6ed4def9cdf63e7
+  metadata.gz: 1f214ac8bc7f480c60308ca49c856df221f344b77231cff5b0983ad9b55079c4c3c1ccf8bc2179355b87c2c1626641a76a6138e95489cd858f7e7eb6b919f187
+  data.tar.gz: b63e53edf5bcd55c059ad38f302baec66c6f0ab7595e216a978888d31c4532cf694e1595f752b55a5d224264cb25d7e507d4f46c1db204a0373d447e70d10883

data/lib/masamune/actions/data_flow.rb

@@ -50,6 +50,13 @@ module Masamune::Actions
       sources.first
     end
 
+    def reset_module!
+      ClassMethods.reset_module!
+    end
+    module_function :reset_module!
+
+    private
+
     # TODO: sources from file or input array
     def parse_file_type(key)
       return Set.new unless key
@@ -58,7 +65,7 @@ module Masamune::Actions
       Set.new File.read(value).split(/\s+/)
     end
 
-    def execute(options = {})
+    def prepare_and_execute(options = {})
       raise Thor::RequiredArgumentMissingError, "No value provided for required options '--start' or '--at'" unless options[:start] || options[:at] || options[:sources] || options[:targets]
       raise Thor::MalformattedArgumentError, "Cannot specify both option '--sources' and option '--targets'" if options[:sources] && options[:targets]
 
@@ -73,11 +80,6 @@ module Masamune::Actions
       engine.execute(current_command_name, options)
     end
 
-    def reset_module!
-      ClassMethods.reset_module!
-    end
-    module_function :reset_module!
-
     included do |base|
       base.extend ClassMethods
       base.class_eval do
@@ -90,7 +92,7 @@ module Masamune::Actions
         thor.engine.environment = thor.environment
         thor.engine.filesystem.environment = thor.environment
         thor.environment.with_process_lock(:data_flow_after_initialize) do
-          thor.execute(options)
+          thor.send(:prepare_and_execute, options)
         end
         exit 0 if thor.top_level?
       end if defined?(base.after_initialize)

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.18.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor