chores_kit 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e00f3e3593a294b34065a8b782ce8b372b731c2144f1bde908b6b09045dcb7
-  data.tar.gz: 23f17d66edd7779450dbcc775bc62690efde2ae323b4f8ad5bca317e59cd72c9
+  metadata.gz: 8f8d0d9332511a0b3ea54f12041a0d4817480a5241555171a4f4e04d52844b3c
+  data.tar.gz: 021ca51509f4f48b92ab4f9464078e336526358d8d23d1574c68137cf1fa7afe
 SHA512:
-  metadata.gz: 6a0b9107cb1cbc7ef7027d2ab85c5f7f3903c7050267b471e790a2e263ba3ebfa528ca83c6be9de5fb72f750b136021cd6f1bd723263a35af72723d1c4dc15d7
-  data.tar.gz: 1aaca6ff7a5a524af95fe57298130f520362d40cab85f7db08e6206cd9d00f712e03ffb8bd6afb40e1e789953c2cef096b6b624c6d1feef92a2eb31b0667418a
+  metadata.gz: 71262510387093914fef6573c7dc562711f0be156ddaf8f720e50a72fd49f7fd694af63f3918a5fa93ba3cdcec9bc01eb30dff78658fbb70d68c8817741cb255
+  data.tar.gz: b1c5acbe208b916732fb12a1162895fda63f7c3decb6941daa5a1ab0d80b619e71421c2424632cb26d4546cba3e84a2e949962f6d18cec2667a49e8a88395a7b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chores_kit (0.2.2)
+    chores_kit (0.2.3)
       as-duration (~> 0.1.1)
       dag (~> 0.0.9)
 

data/lib/chores_kit/chore.rb

@@ -56,12 +56,31 @@ module ChoresKit
       raise "Couldn't create task without a name" if name.nil?
       raise "Couldn't create task without a block" unless block_given?
 
-      @dag.add_vertex(task: Task.new(name, params, &block))
+      @dag.add_vertex(name: name, task: Task.new(name, params, &block))
     end
 
-    def run(task, options)
+    def run(task, options = {})
       from = options[:triggered_by] || options[:upstream] || task
       to = options[:triggers] || options[:downstream] || task
+
+      tasks = @tasks.map(&:name)
+      direction = options[:upstream] || options[:triggered_by] ? 'upstream' : 'downstream'
+
+      # Throw an error if either up- or downstream task doesn't exist
+      non_existing_tasks = ([from, to] - tasks).uniq
+      raise "Couldn't set #{direction} dependency for non-existing task #{non_existing_tasks.first}" if non_existing_tasks.any?
+
+      # Throw an error if unsupported dependencies are set
+      raise "Multiple upstream tasks aren't supported" if from.is_a?(Array)
+      raise "Multiple downstream tasks aren't supported" if to.is_a?(Array)
+
+      # Skip any processing if there is just one task
+      return if tasks.one?
+
+      v1 = @dag.vertices.detect { |vertex| vertex[:name] == from }
+      v2 = @dag.vertices.detect { |vertex| vertex[:name] == to }
+
+      @dag.add_edge(from: v1, to: v2)
     end
 
     # After-run callbacks

data/lib/chores_kit/dag/vertex.rb

@@ -1,8 +1,6 @@
 module ChoresKit
   class DAG
     class Vertex < ::DAG::Vertex
-      attr_reader :task
-
       def name
         task.name
       end

data/lib/chores_kit/version.rb

@@ -1,3 +1,3 @@
 module ChoresKit
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chores_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Lennard Timm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: as-duration