masamune 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a23e580b78e0dfde266cffddec00f2442bc1da
-  data.tar.gz: 175e664d4f3262bb3d302a1a789912130e71c693
+  metadata.gz: e5057258a406f7f889d685a6060ca42ecd5e39ab
+  data.tar.gz: c4fa4ad80317574acaeebbe8017fc4d4ed3ff20b
 SHA512:
-  metadata.gz: 2422f0c4406e4543a1f88f0843b4579c945861766a684c942d5dac09ab1f88ff42f85547b1f93937f8976e1a038ece71ec43a735c0246c745b7c8b13ed2315f7
-  data.tar.gz: b23f898f4883cc7704b81c324751d017894acc1e6f5ce5e3f4e8285084ac812b160a0a41e894875f91f97ae8521437897c327f1f3130377c2dfbec1a411b61a1
+  metadata.gz: fcac62a5623326ed3a090de28f7355b9e6bc77a36b9959483bf53214c579ab2bffcb3cdfda3c1710b44b7fbfcb026720e7bdbc34877201bfaa3c1f06f20f5b44
+  data.tar.gz: c69d42b73d6aeb0bb7c6d0cdfcdae0330e31fc8e29192dc36143c3606f085d162a7c37fbcc2b6d631fc3d2d6dab7cf565ee9a1655afc2692c9c707fd35312291

data/lib/masamune/actions/data_flow.rb

@@ -73,6 +73,11 @@ module Masamune::Actions
       engine.execute(current_command_name, options)
     end
 
+    def reset_module!
+      ClassMethods.reset_module!
+    end
+    module_function :reset_module!
+
     private
 
     included do |base|
@@ -94,27 +99,26 @@ module Masamune::Actions
     end
 
     module ClassMethods
-      @@namespaces = []
-      @@commands = []
-      @@sources = []
-      @@targets = []
-
       def skip
+        initialize_module!
         @@namespaces << namespace
         @@sources << {skip: true}
         @@targets << {skip: true}
       end
 
       def source(source_options = {})
+        initialize_module!
         @@namespaces << namespace
         @@sources << source_options
       end
 
       def target(target_options = {})
+        initialize_module!
         @@targets << target_options
       end
 
       def create_command(*a)
+        initialize_module!
         super.tap do
           @@commands += a
         end
@@ -126,6 +130,22 @@ module Masamune::Actions
 
       private
 
+      def reset_module!
+        @@namespaces = []
+        @@targets = []
+        @@sources = []
+        @@commands = []
+        @@engine = nil
+      end
+      module_function :reset_module!
+
+      def initialize_module!
+        @@namespaces ||= []
+        @@targets ||= []
+        @@sources ||= []
+        @@commands ||= []
+      end
+
       # If internal call to Thor::Base.start fails, exit
       def exit_on_failure?
         true

data/lib/masamune/tasks/shell_thor.rb

@@ -27,7 +27,7 @@ require 'pry'
 module Masamune::Tasks
   class ShellThor < Thor
     include Masamune::Thor
-    include Masamune::Actions::DateParse
+    include Masamune::Actions::DataFlow
 
     # FIXME need to add an unnecessary namespace until this issue is fixed:
     # https://github.com/wycats/thor/pull/247
@@ -35,6 +35,7 @@ module Masamune::Tasks
     skip_lock!
 
     desc 'shell', 'Launch an interactive shell'
+    skip
     method_option :prompt, :desc => 'Set shell prompt', :default => 'masamune'
     class_option :start, :aliases => '-a', :desc => 'Start time', default: '1 month ago'
     def shell_exec

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.15.4'
+  VERSION = '0.15.5'
 end

data/spec/masamune/tasks/shell_thor_spec.rb

@@ -34,4 +34,8 @@ describe Masamune::Tasks::ShellThor do
       cli_invocation
     end
   end
+
+  context 'includes reference to engine' do
+    it { expect(described_class.engine).to_not be_nil }
+  end
 end

data/spec/support/rspec/example/task_example_group.rb

@@ -72,6 +72,7 @@ module TaskExampleGroup
   def self.included(base)
     base.before :all do
       ENV['THOR_DEBUG'] = '1'
+      Masamune::Actions::DataFlow.reset_module!
     end
 
     base.let(:thor_class) { described_class }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor