tasking 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3d84bc5f691b364727b241743fb800bf6d571ac3885461124081e959fc6ac78
-  data.tar.gz: cd7411408417cd0942ba17e66ce38c3f707b4d76ca4f7171027b07bc670ce2cc
+  metadata.gz: 4981b897e547aedf77da48a0f5a2f89c5448fd299470279ffda024a5289233e4
+  data.tar.gz: d28311cbd4a57f46fe4be001db419bc292b0978d78eca671b620ab0aae2517c7
 SHA512:
-  metadata.gz: d4efa63e1c58b9dac0997f1ff46ba067bcb724c052bbba2f221fde224f12e4f83983e3b56fab1e1a4c91759cfd76d5fc64f431fb0d45c671878f01ef5b3d7404
-  data.tar.gz: 7f25bef3273737f3655809b5af02268c88dc57bbbf1f70e67deca30cf21669584ed6161e02634839f6f0b8b23cbd59975da455fca0126341cd29e144b21ce143
+  metadata.gz: c88afa523ba6e423767229752cf1c43d2b1f9712e3b6617d561525c69a9dc9e023afaaf11af7ee26939b5e21ef1878920d7817141dcd080297e17219ac612b6e
+  data.tar.gz: 493bae7a0ace2c82abe526e6b8a9f13072313a99ca15b8dc1783c321bfbbe62052844c22d23ee91b35287f5d514ac3dbad54eb9ad29c32e41cd3c9b306b32c69

data/lib/tasking.rb

@@ -130,7 +130,7 @@ module Tasking
   end
 
   def gather_options_for( full_task_name, task )
-    final_options = {}
+    final_options = Tasking::Options.new({})
 
     walk_namespace_tree_to( full_task_name, :task ) do |ns_name|
       namespace = Tasking::Namespace.find_namespace( ns_name )
@@ -159,5 +159,6 @@ module Tasking
   end
 end
 
+require_relative 'tasking/options'
 require_relative 'tasking/namespace'
 require_relative 'tasking/task'

data/lib/tasking/namespace.rb

@@ -37,7 +37,7 @@ module Tasking
     def initialize( name, options = {} )
       @tasks = {}
       @name = name
-      @options = options
+      @options = Options.build( options )
       
       self.class.add_namespace( self )
     end
@@ -54,7 +54,7 @@ module Tasking
 
     def execute( options = {}, &block )
       @options.merge!( options )
-      block.call if block
+      block&.call
     end
 
     def merge_options( options )

data/lib/tasking/options.rb

@@ -0,0 +1,48 @@
+module Tasking
+  class Options
+    attr_reader :options_hash
+
+    def self.build( options )
+      return options if options.is_a?( self )
+
+      new( options )
+    end
+
+    def initialize(hash)
+      @options_hash = hash
+    end
+
+    def [](key)
+      resolve_value( options_hash[key] )
+    end
+
+    def merge(other)
+      self.class.new( options_hash.merge( extract_options_hash( other ) ) )
+    end
+
+    def merge!(other)
+      options_hash.merge!( extract_options_hash( other ) )
+      self
+    end
+
+    def ==(other)
+      options_hash == extract_options_hash( other )
+    end
+
+    def materialized_hash
+      options_hash.map do |key, value|
+        [ key, resolve_value( value ) ]
+      end.to_h
+    end
+
+    private
+
+    def resolve_value( value )
+      value.respond_to?( :call ) ? value.call( self ) : value
+    end
+
+    def extract_options_hash(other)
+      other.is_a?( self.class ) ? other.options_hash : other
+    end
+  end
+end

data/lib/tasking/task.rb

@@ -6,7 +6,7 @@ module Tasking
     def initialize( name, parent_namespace, options = {}, &block )
       @name             = name
       @parent_namespace = parent_namespace
-      @options          = options
+      @options          = Options.build( options )
       @block            = block
       @before_filters   = []
       @after_filters    = []
@@ -23,21 +23,17 @@ module Tasking
     def execute( options = {} )
       total_options = @options.merge( options )
       execute_task_chain( before_filters, total_options, "Unknown before task '%s' for task '#{@name}'" )
-      @block.call( resolve_options( total_options ) ) if @block
+      block&.call( total_options )
       execute_task_chain( after_filters, total_options, "Unknown after task '%s' for task '#{@name}'" )
     end
 
     private
 
-    def resolve_options(options)
-      options.transform_values { |v| v.respond_to?(:call) ? v.call(options) : v }
-    end
-
     def execute_task_chain( tasks, options, fail_message )
       tasks.each do |t|
         task = task_lookup( t )
         abort( fail_message % t ) unless task
-        task.execute(options)
+        task.execute( options )
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasking
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sven Riedel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -62,6 +62,7 @@ files:
 - bin/tasking
 - lib/tasking.rb
 - lib/tasking/namespace.rb
+- lib/tasking/options.rb
 - lib/tasking/task.rb
 homepage: https://github.com/sriedel/tasking
 licenses:
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A lightweight task runner DSL