chores_kit 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f8d0d9332511a0b3ea54f12041a0d4817480a5241555171a4f4e04d52844b3c
-  data.tar.gz: 021ca51509f4f48b92ab4f9464078e336526358d8d23d1574c68137cf1fa7afe
+  metadata.gz: 19ec873d34bb484993376797e28863ff73d6c94cb05620dfcc30cc4e0d87b0cc
+  data.tar.gz: b62cf334ae1f2bbe2b67c545ebda1a58c780a9c2796db50b76f17d4e470956c0
 SHA512:
-  metadata.gz: 71262510387093914fef6573c7dc562711f0be156ddaf8f720e50a72fd49f7fd694af63f3918a5fa93ba3cdcec9bc01eb30dff78658fbb70d68c8817741cb255
-  data.tar.gz: b1c5acbe208b916732fb12a1162895fda63f7c3decb6941daa5a1ab0d80b619e71421c2424632cb26d4546cba3e84a2e949962f6d18cec2667a49e8a88395a7b
+  metadata.gz: 4b487d0884cabbb4d686dbc8728bb7b4bfb87035c6493daad774322d158b6bf4595f30e20de0087b817a994430eef84a1f20ab58308e712233b831611c5253bc
+  data.tar.gz: 8751c3ad24e492571dec91d7300c6b5799aa8168e0b915f61d2aab005c4191ea2d42c439e43ebcf468ccef6beb126a4d987f984c152bdebb86da4eec637df377

data/.rubocop.yml

@@ -1,6 +1,9 @@
 AllCops:
   Exclude:
     - 'bin/*'
+    - 'examples/*'
+    - 'spec/*'
+    - 'chores_kit.gemspec'
     - 'Rakefile'
 
 Style/Documentation:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chores_kit (0.2.3)
+    chores_kit (0.2.4)
       as-duration (~> 0.1.1)
       dag (~> 0.0.9)
 
@@ -9,9 +9,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     as-duration (0.1.1)
+    ast (2.4.0)
     byebug (10.0.0)
     dag (0.0.9)
     diff-lcs (1.3)
+    parallel (1.12.1)
+    parser (2.5.0.4)
+      ast (~> 2.4.0)
+    powerpack (0.1.1)
+    rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -26,6 +32,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    rubocop (0.53.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    unicode-display_width (1.3.0)
 
 PLATFORMS
   ruby
@@ -36,6 +51,7 @@ DEPENDENCIES
   chores_kit!
   rake (~> 10.0)
   rspec (~> 3.0)
+  rubocop (~> 0.53.0)
 
 BUNDLED WITH
    1.16.1

data/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/chores_kit.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'byebug', '~> 10.0.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 0.53.0'
 end

data/lib/chores_kit/chore/embedded_task.rb

@@ -0,0 +1,29 @@
+module ChoresKit
+  module EmbeddedTask
+    def name
+      task.name
+    end
+
+    def run
+      puts "Running task #{name}"
+      task.run
+
+      return unless successors
+
+      Thread.abort_on_exception = true
+      threads = []
+
+      threads << Thread.new do
+        successors.map(&:run)
+      end
+
+      threads.map(&:join)
+    end
+
+    private
+
+    def task
+      self[:task]
+    end
+  end
+end

data/lib/chores_kit/chore/notification.rb

@@ -4,6 +4,8 @@ class Notification
     @commands = []
   end
 
+  # rubocop:disable Style/MethodMissing
   def method_missing(name, *args)
   end
+  # rubocop:enable Style/MethodMissing
 end

data/lib/chores_kit/chore/task.rb

@@ -2,13 +2,14 @@ module ChoresKit
   class Task
     attr_reader :name
 
-    def initialize(name, args, &block)
+    def initialize(name, *args)
       @name = name
       @args = args
-      @command = block
     end
 
+    # rubocop:disable Style/MethodMissing
     def method_missing(name, *args)
     end
+    # rubocop:enable Style/MethodMissing
   end
 end

data/lib/chores_kit/chore.rb

@@ -5,15 +5,15 @@ require 'as-duration'
 
 module ChoresKit
   class Chore
-    attr_reader :name, :tasks
+    attr_reader :name
 
-    DEFAULT_NOTIFICATIONS = [:failed, :successful].freeze
+    DEFAULT_NOTIFICATIONS = %i[successful failed].freeze
 
     def initialize(name)
       @name = name
       @metadata = {}
 
-      @dag = DAG.new
+      @dag = DAG.new(mixin: EmbeddedTask)
       @tasks = @dag.vertices
 
       @notifications = {}
@@ -24,6 +24,7 @@ module ChoresKit
       @metadata[:description] = string
     end
 
+    # rubocop:disable Metrics/AbcSize
     def schedule(options)
       raise "Couldn't parse start time from attributes" if options[:at].nil?
       raise "Couldn't parse interval from attributes" unless options[:every].nil? || options[:every].is_a?(AS::Duration)
@@ -36,6 +37,7 @@ module ChoresKit
         every: options[:every]
       }
     end
+    # rubocop:enable Metrics/AbcSize
 
     def retry_failed(options)
       raise "Couldn't parse retry interval from attributes" unless options[:wait].nil? || options[:wait].is_a?(AS::Duration)
@@ -56,9 +58,13 @@ 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(name: name, task: Task.new(name, params, &block))
+      task = Task.new(name, params)
+      task.instance_eval(&block)
+
+      @dag.add_vertex(name: name, task: task)
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
     def run(task, options = {})
       from = options[:triggered_by] || options[:upstream] || task
       to = options[:triggers] || options[:downstream] || task
@@ -74,14 +80,20 @@ module ChoresKit
       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?
+      # Set explicit root task and skip further processing if the Chore has
+      # just one task defined or if only one of its tasks is set to run
+      if tasks.one? || from == to
+        @dag.root = @dag.find_by(name: from)
+        return
+      end
 
       v1 = @dag.vertices.detect { |vertex| vertex[:name] == from }
       v2 = @dag.vertices.detect { |vertex| vertex[:name] == to }
 
       @dag.add_edge(from: v1, to: v2)
+      @dag.root = v1
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     # After-run callbacks
     def notify(*options, &block)

data/lib/chores_kit/dag/dag.rb

@@ -3,11 +3,15 @@ require 'dag'
 module ChoresKit
   class DAG < ::DAG
     def root
-      @vertices.detect { |v| v.ancestors.empty? }
+      @root ||= @vertices.detect { |v| v.ancestors.empty? }
     end
 
-    def add_vertex(payload = {})
-      @vertices << Vertex.new(self, payload)
+    def find_by(name:)
+      @vertices.detect { |v| v.name == name }
+    end
+
+    def root=(vertex)
+      @root = vertex
     end
   end
 end

data/lib/chores_kit/definition_proxy.rb

@@ -6,6 +6,7 @@ module ChoresKit
       @chore = Chore.new(name)
     end
 
+    # rubocop:disable Style/MethodMissing
     def method_missing(name, *args, &block)
       args = {} if args.empty?
 
@@ -15,5 +16,6 @@ module ChoresKit
         @chore.send(name, *args)
       end
     end
+    # rubocop:enable Style/MethodMissing
   end
 end

data/lib/chores_kit/version.rb

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

data/lib/chores_kit.rb

@@ -1,9 +1,9 @@
 require 'chores_kit/dag/dag'
-require 'chores_kit/dag/vertex'
 
 require 'chores_kit/chore'
-require 'chores_kit/chore/task'
+require 'chores_kit/chore/embedded_task'
 require 'chores_kit/chore/notification'
+require 'chores_kit/chore/task'
 require 'chores_kit/definition_proxy'
 require 'chores_kit/chores'
 require 'chores_kit/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chores_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Lennard Timm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: as-duration
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.53.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.53.0
 description: 
 email:
 - hi@lenn4rd.io
@@ -113,15 +127,16 @@ files:
 - bin/console
 - bin/rake
 - bin/rspec
+- bin/rubocop
 - bin/setup
 - chores_kit.gemspec
 - lib/chores_kit.rb
 - lib/chores_kit/chore.rb
+- lib/chores_kit/chore/embedded_task.rb
 - lib/chores_kit/chore/notification.rb
 - lib/chores_kit/chore/task.rb
 - lib/chores_kit/chores.rb
 - lib/chores_kit/dag/dag.rb
-- lib/chores_kit/dag/vertex.rb
 - lib/chores_kit/definition_proxy.rb
 - lib/chores_kit/version.rb
 homepage: https://github.com/lenn4rd/chores_kit

data/lib/chores_kit/dag/vertex.rb

@@ -1,15 +0,0 @@
-module ChoresKit
-  class DAG
-    class Vertex < ::DAG::Vertex
-      def name
-        task.name
-      end
-
-      private
-
-      def task
-        self[:task]
-      end
-    end
-  end
-end