adama 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231eccdac40bdcb313b25f45d9469321fcb38175
-  data.tar.gz: 12d424db073534825bbfc568a31a8f197231e42b
+  metadata.gz: d32465d56c5a8f938f26e1732fb75a786e22940d
+  data.tar.gz: fa589325c1a750016e692f0b73452b12f0b12250
 SHA512:
-  metadata.gz: a29a64eb30a328191db5b99f1448fb6b92a290259380e6769bfe7a7adf49129cc8ee9a5ace4ba6f9ddd29c941fec9b27defef6170b5cdf3ed4c014b4bb7d66f4
-  data.tar.gz: '02790d2adefc53c5cfcf2bd7eaf1e3dfec95a680b84cd0a865352e3e69a85e5bf1f6f92c08232605e9aff350b78d32b78b496fc8ced0b5ec0444208073fa43e1'
+  metadata.gz: 8c670d242b889c5ddc751e5fe9e7827401587d92c2fc50a01b3d3ef86f19b7af38aaae7c6795658bec8a051bdd45c086f3f5a7e02e3b8e5e67cbcf0ac74c0c01
+  data.tar.gz: 39cf0f7723a3005112c68ccb4a0ffc2b106d8a2448a426cf03f853ee002926b11623b878eab75ff3fead81a9b1c88b115d6adf469557a41c2392c2f6b91bb894

data/README.md

@@ -1,5 +1,7 @@
 # Commander Adama
 
+![Adama](https://raw.githubusercontent.com/wiki/bugcrowd/adama/images/adama.jpg)
+
 Adama is a bare bones command pattern library inspired by Collective Idea's [Interactor](https://github.com/collectiveidea/interactor) gem.
 
 Commands are small classes that represent individual units of work. Each command is executed by a client "calling" it. An invoker is a class responsible for the execution of one or more commands.
@@ -86,6 +88,26 @@ Now, when you run `RebuildHumanRace.call(captain: :apollo, president: :laura)` i
 
 If there is an error in any of those commands, the invoker will call `FindEarth.rollback`, then `DestroyCylons.rollback`, then `GetArrowOfApollo.rollback` leaving everything just as it was in the beginning.
 
+#### Instance Invoker List
+
+Typically your Invoker class takes responsibility for an immutable set of actions, however sometimes it's handy to be able to adjust the invoked commands on the fly while keeping the error handling and rollback functionality of the invoker.
+
+e.g.
+
+```ruby
+class FightCylons
+  include Adama::Invoker
+end
+
+attack1 = Invoker.new(captain: :apollo, lieutenant:  :starbuck).invoke(Advance, Strafe, Fire)
+attack2 = Invoker.new(captain: :apollo, lieutenant:  :starbuck).invoke(Advance, Fire)
+
+attack1.run
+attack2.run
+```
+
+It's important to see that we're using the `#run` instance method on the Invoker instance (as the `.call` class method would). This ensures we execute the invoker in the error / rollback handler. Calling the `#call` instance method directly would simply execute each command, without any Invoker level error handling.
+
 ### Errors
 
 `Adama::Command#call` or `Adama::Invoker#call` will *always* raise an error of type `Adama::Errors::BaseError`.

data/adama.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"

data/lib/adama/command.rb

@@ -36,13 +36,12 @@ module Adama
     # Internal instance method. Called by both the call class method, and by
     # the call method in the invoker. If it fails it raises a CommandError.
     def run
-      command_caller = caller
-      call
+      tap(&:call)
     rescue => error
       raise Errors::CommandError.new(
         error: error,
         command: self,
-        backtrace: error.backtrace + ['Adama Command backtrace:'] + command_caller
+        backtrace: error.backtrace
       )
     end
 

data/lib/adama/invoker.rb

@@ -22,7 +22,7 @@ module Adama
         include Command
 
         # Our new class methods enable us to set the command list
-        extend ClassMethods
+        extend InvokeMethods
 
         # We override the Command class instance methods:
         #
@@ -30,11 +30,12 @@ module Adama
         #   call
         #   rollback
         include InstanceMethods
+        include InvokeMethods
       end
     end
 
     # Our new class methods enable us to set the command list
-    module ClassMethods
+    module InvokeMethods
 
       # Public class method. Call invoke in your class definition to
       # specify which commands will be executed.
@@ -49,6 +50,10 @@ module Adama
       #   )
       # end
       def invoke(*command_list)
+        if is_a?(Invoker) && self.class.commands.any?
+          raise(StandardError, 'Can\'t call invoke on an Invoker instance \
+                               with a class invocation list.')
+        end
         @commands = command_list.flatten
       end
 
@@ -69,15 +74,14 @@ module Adama
       # invoker "call" instance method, we won't have access to error's
       # command so need to test for it's existence.
       def run
-        command_caller = caller
-        call
+        tap(&:call)
       rescue => error
         rollback
         raise Errors::InvokerError.new(
           error: error,
           command: error.respond_to?(:command) ? error.command : nil,
           invoker: self,
-          backtrace: error.backtrace + ['Adama Invoker backtrace:'] + command_caller
+          backtrace: error.backtrace
         )
       end
 
@@ -103,7 +107,8 @@ module Adama
       # Iterate over the commands array, instantiate each command, run it,
       # and add it to the called list.
       def call
-        self.class.commands.each do |command_klass|
+        commands = self.commands.any? ? self.commands : self.class.commands
+        commands.each do |command_klass|
           command = command_klass.new(kwargs)
           command.run
           _called << command

data/lib/adama/version.rb

@@ -1,3 +1,3 @@
 module Adama
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adama
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - dradford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement