lex-conditioner 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a9ebeed3f7daad4ca49da310545ccc0a10fccc521c40aeedc1c76827c242d4
-  data.tar.gz: 2fdfcf7cc7d4abd57dcc865f31fe06547378f02f05f1d2f48e7fa44bcf2121ad
+  metadata.gz: a3c19810b2bf041292ba076fc0a51c3a5c323f57a4c16c3eb2b14e8256846735
+  data.tar.gz: c28abda1380e331c1145ea47dc1d6dd0e37aef6a80eac7c0a52b6b857938ddc4
 SHA512:
-  metadata.gz: 9405d35955e167e61d9027155cf3f1d39aa13db967839f5df67b1070a361bd0383028e4ef028e933a29ebc77adc5d73b002d9ead1b1c7fa03cc95eff8506e5c8
-  data.tar.gz: 2037a3795580b3cf6f101e75f875cbd63890a8ebc98ab197bafe6d9e889ded5d6912166d52bf6626872dd31a811c9a1610caf5e8d354ac1433cd5b97b8b1746f
+  metadata.gz: c3d98cb4fbad0ab36ff8d2cbf9f4b630ce850b75442290388e8ed57ba641e82e0816541a12b3c2397896d908b8dc2b57f2a2f905560e67eb8c7954eba2738173
+  data.tar.gz: e7c681eb8e9a2840a8e632c98e9c1289b6b6078e8bda6b1e74a1722cca113d6fc2392d905a7f3c8f137a8fa478114023cc8b1eb7ed37893afcb084c3105ae033

data/.rubocop.yml

@@ -8,6 +8,10 @@ Metrics/BlockLength:
   Max: 50
 Metrics/AbcSize:
   Max: 20
+Metrics/CyclomaticComplexity:
+  Max: 20
+Metrics/PerceivedComplexity:
+  Max: 20
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:
@@ -20,6 +24,7 @@ Style/Documentation:
 AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
+  SuggestExtensions: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 Naming/FileName:

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.7-alpine
+LABEL maintainer="Matthew Iverson <matthewdiverson@gmail.com>"
+
+RUN mkdir /etc/legionio
+RUN apk update && apk add build-base tzdata gcc git
+
+COPY . ./
+RUN gem install legionio tzinfo-data tzinfo --no-document --no-prerelease
+RUN gem install lex-conditioner --no-document --no-prerelease
+CMD legionio

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lex-conditioner (0.2.1)
+    lex-conditioner (0.2.3)
       legion-exceptions
 
 GEM
@@ -12,110 +12,95 @@ GEM
     aws-eventstream (1.1.0)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    bunny (2.16.1)
+    bunny (2.17.0)
       amq-protocol (~> 2.3, >= 2.3.1)
     concurrent-ruby (1.1.7)
     concurrent-ruby-ext (1.1.7)
       concurrent-ruby (= 1.1.7)
     connection_pool (2.2.3)
     daemons (1.3.1)
-    dalli (2.7.10)
+    dalli (2.7.11)
     diff-lcs (1.4.4)
-    docile (1.3.2)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
-    ffi (1.13.1)
-    hashdiff (1.0.1)
-    legion-cache (1.0.0)
-      connection_pool
-      dalli
-      redis
-    legion-crypt (0.2.0)
-      rbnacl
+    docile (1.3.5)
+    json_pure (2.5.1)
+    legion-cache (1.1.1)
+      connection_pool (>= 2.2.3)
+      dalli (>= 2.7)
+      redis (>= 4.2)
+    legion-crypt (0.2.3)
       vault
-    legion-data (0.2.0)
-      legion-logging
-      legion-settings
-      mysql2
-      sequel
-    legion-exceptions (1.1.0)
-    legion-json (1.1.0)
+    legion-exceptions (1.1.5)
+    legion-json (1.1.4)
+      json_pure
+      legion-exceptions (>= 1.1.5)
       multi_json
-    legion-logging (1.1.0)
+    legion-logging (1.1.4)
       rainbow (~> 3)
-    legion-settings (1.1.1)
+    legion-settings (1.1.3)
       legion-json
       legion-logging
-    legion-transport (1.1.1)
-      bunny
-      concurrent-ruby
-    legionio (0.2.0)
-      concurrent-ruby
-      concurrent-ruby-ext
-      daemons
-      hashdiff
+    legion-transport (1.1.8)
+      bunny (>= 2.17.0)
+      concurrent-ruby (>= 1.1.7)
+      legion-json
+    legionio (0.4.0)
+      concurrent-ruby (>= 1.1.7)
+      concurrent-ruby-ext (>= 1.1.7)
+      daemons (>= 1.3.1)
       legion-cache
-      legion-crypt
-      legion-data
+      legion-crypt (>= 0.2.0)
       legion-exceptions
       legion-json
       legion-logging
       legion-settings
-      legion-transport
-      sleepiq
-      vault
+      legion-transport (>= 1.1.8)
+      lex-node
+      oj (>= 3.10)
+      thor (>= 1)
+    lex-node (0.1.3)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    mysql2 (0.5.3)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    oj (3.11.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rbnacl (7.1.1)
-      ffi
-    redis (4.2.1)
-    regexp_parser (1.7.1)
+    rake (13.0.3)
+    redis (4.2.5)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.89.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
-    sequel (5.35.0)
-    simplecov (0.19.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    sleepiq (0.2.2)
-      dalli
-      faraday
-      faraday_middleware
-      thor
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thor (1.0.1)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     vault (0.15.0)
       aws-sigv4
 

data/bitbucket-pipelines.yml

@@ -0,0 +1,19 @@
+image: ruby:2.7
+
+pipelines:
+  tags:
+    "v*":
+      - step:
+          name: Push to RubyGems
+          deployment: RubyGems
+          script:
+            - gem install gem-release
+            - (umask  077 ; echo $gem_creds | base64 --decode > ~/.gem/credentials)
+            - gem release
+          artifacts:
+            - pkg/**
+      - step:
+          name: Push to Docker
+          deployment: Docker
+          script:
+            - './docker_deploy.rb'

data/docker_deploy.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+version = Legion::Extensions::Conditioner::VERSION
+name = 'conditioner'
+
+require "./lib/legion/extensions/#{name}/version"
+puts "Building docker image for Legion v#{version}"
+system("docker build --tag legionio/lex-#{name}:v#{version} .")
+puts 'Pushing to hub.docker.com'
+system("docker push legionio/lex-#{name}:v#{version}")
+system("docker push legionio/lex-#{name}:latest")
+puts 'completed'

data/{legion-extensions-conditioner.gemspec → lex-conditioner.gemspec}

@@ -5,7 +5,7 @@ require 'legion/extensions/conditioner/version'
 Gem::Specification.new do |spec|
   spec.name          = 'lex-conditioner'
   spec.version       = Legion::Extensions::Conditioner::VERSION
-  spec.authors       = ['Miverson']
+  spec.authors       = ['Esity']
   spec.email         = ['matthewdiverson@gmail.com']
 
   spec.summary       = 'LEX-Conditioner is used to apply conditional statements to tasks'
@@ -14,16 +14,15 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
-  if spec.respond_to?(:metadata)
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = 'https://bitbucket.org/legion-io/lex-conditioner'
-    spec.metadata['changelog_uri'] = 'https://bitbucket.org/legion-io/lex-conditioner/src/master/CHANGELOG.md'
-  end
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://bitbucket.org/legion-io/lex-conditioner'
+  spec.metadata['documentation_uri'] = 'https://legionio.atlassian.net/wiki/spaces/LEX/pages/614957181'
+  spec.metadata['changelog_uri'] = 'https://legionio.atlassian.net/wiki/spaces/LEX/pages/612270436'
+  spec.metadata['bug_tracker_uri'] = 'https://bitbucket.org/legion-io/lex-conditioner/issues'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'legionio'

data/lib/legion/extensions/conditioner.rb

@@ -1,10 +1,9 @@
 require 'legion/extensions/conditioner/version'
-require 'legion/extensions'
 
 module Legion
   module Extensions
     module Conditioner
-      extend Legion::Extensions::Core
+      extend Legion::Extensions::Core if Legion::Extensions.const_defined? :Core
     end
   end
 end

data/lib/legion/extensions/conditioner/helpers/condition.rb

@@ -7,7 +7,6 @@ module Legion
         def initialize(args)
           @conditions = Legion::JSON.load(args[:conditions])
           @values = to_dotted_hash(args[:values])
-          @task_id = args[:task_id]
         end
 
         def to_dotted_hash(source, target = {}, namespace = nil)
@@ -30,13 +29,11 @@ module Legion
         def validate_vars
           raise Legion::Exception::MissingArgument, '@conditions is nil' if @conditions.nil?
           raise Legion::Exception::MissingArgument, '@values is nil' if @values.nil?
-          raise Legion::Exception::MissingArgument, '@task_id is nil' if @task_id.nil?
           raise Legion::Exception::WrongType::Hash, @values.class unless @values.is_a? Hash
-          raise Legion::Exception::WrongType::Integer, @task_id.class unless @task_id.is_a? Integer
           raise Legion::Exception::WrongType::Hash, @conditions.class unless @conditions.is_a? Hash
         end
 
-        def validate_test(conditions = @conditions) # rubocop:disable Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity,Metrics/AbcSize
+        def validate_test(conditions = @conditions) # rubocop:disable Metrics/AbcSize
           conditions.each do |condition|
             condition[1].each do |rule|
               result = validate_test('conditions' => { 'all' => rule[:all] }) if rule.include? :all

data/lib/legion/extensions/conditioner/runners/conditioner.rb

@@ -3,18 +3,22 @@ require 'legion/extensions/conditioner/helpers/condition'
 module Legion::Extensions::Conditioner
   module Runners
     module Conditioner
-      def self.check(**payload) # rubocop:disable Metrics/AbcSize
-        conditioner = Legion::Extensions::Conditioner::Condition.new(conditions: payload[:conditions],
-                                                                     task_id:    payload[:task_id],
+      def check(conditions:, **payload) # rubocop:disable Metrics/AbcSize
+        conditioner = Legion::Extensions::Conditioner::Condition.new(conditions: conditions,
                                                                      values:     payload,
                                                                      type:       payload[:type])
-        if conditioner.valid?
-          Legion::Extensions::Conditioner::Transport::Messages::Conditioner.new(**payload).publish
-          status = 'task.queued'
-        else
-          status = 'conditioner.failed'
-        end
 
+        status = if conditioner.valid? && payload.key?(:transformation)
+                   'transformation.queued'
+                 elsif conditioner.valid? && payload.key?(:runner_routing_key)
+                   'task.queued'
+                 elsif conditioner.valid?
+                   'task.exception'
+                 else
+                   'conditioner.failed'
+                 end
+
+        send_task(**payload) unless status == 'conditioner.failed'
         task_update(payload[:task_id], status, **payload) unless payload[:task_id].nil?
 
         if payload[:debug] && payload.key?(:task_id)
@@ -30,9 +34,24 @@ module Legion::Extensions::Conditioner
         Legion::Logging.error 'LEX::Conditioner::Runners::Condition had an exception'
         Legion::Logging.warn e.message
         Legion::Logging.warn e.backtrace
-        unless payload[:task_id].nil?
-          Legion::Transport::Messages::TaskUpdate.new(task_id: payload[:task_id], status: 'conditioner.failed').publish
+        task_update(payload[:task_id], 'conditioner.exception', **payload) unless payload[:task_id].nil?
+      end
+
+      def send_task(**opts)
+        subtask_hash = {}
+        %i[runner_routing_key relationship_id chain_id trigger_runner_id trigger_function_id funciton_id function runner_id runner_class transformation debug task_id results].each do |column| # rubocop:disable Layout/LineLength
+          subtask_hash[column] = opts[column] if opts.key? column
         end
+
+        subtask_hash[:routing_key] = if subtask_hash.key? :transformation
+                                       'task.subtask.transform'
+                                     elsif subtask_hash.key? :runner_routing_key
+                                       subtask_hash[:runner_routing_key]
+                                     end
+
+        raise Legion::Exception::MissingArgument 'Missing :routing_key' unless subtask_hash.key? :routing_key
+
+        Legion::Transport::Messages::SubTask.new(**subtask_hash).publish
       end
 
       include Legion::Extensions::Helpers::Lex

data/lib/legion/extensions/conditioner/version.rb

@@ -1,7 +1,7 @@
 module Legion
   module Extensions
     module Conditioner
-      VERSION = '0.2.1'.freeze
+      VERSION = '0.2.3'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lex-conditioner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
-- Miverson
-autorequire:
+- Esity
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: legionio
@@ -101,18 +101,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
-- legion-extensions-conditioner.gemspec
+- bitbucket-pipelines.yml
+- docker_deploy.rb
+- lex-conditioner.gemspec
 - lib/legion/extensions/conditioner.rb
 - lib/legion/extensions/conditioner/actors/conditioner.rb
 - lib/legion/extensions/conditioner/helpers/comparator.rb
@@ -129,8 +129,10 @@ licenses:
 metadata:
   homepage_uri: https://bitbucket.org/legion-io/lex-conditioner
   source_code_uri: https://bitbucket.org/legion-io/lex-conditioner
-  changelog_uri: https://bitbucket.org/legion-io/lex-conditioner/src/master/CHANGELOG.md
-post_install_message:
+  documentation_uri: https://legionio.atlassian.net/wiki/spaces/LEX/pages/614957181
+  changelog_uri: https://legionio.atlassian.net/wiki/spaces/LEX/pages/612270436
+  bug_tracker_uri: https://bitbucket.org/legion-io/lex-conditioner/issues
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: LEX-Conditioner is used to apply conditional statements to tasks
 test_files: []

data/.circleci/config.yml

@@ -1,61 +0,0 @@
-version: 2.1
-orbs:
-  ruby: circleci/ruby@0.2.1
-
-jobs:
-  "rubocop":
-    docker:
-      - image: circleci/ruby:2.5-node
-    steps:
-      - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - run:
-          name: Run Rubocop
-          command: bundle exec rubocop
-      - ruby/save-cache
-  "ruby-two-five":
-    docker:
-      - image: circleci/ruby:2.5
-      - image: memcached:1.5-alpine
-    steps:
-      - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
-  "ruby-two-six":
-    docker:
-      - image: circleci/ruby:2.6
-      - image: memcached:1.5-alpine
-    steps:
-      - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
-  "ruby-two-seven":
-    docker:
-      - image: circleci/ruby:2.7
-      - image: memcached:1.5-alpine
-    steps:
-      - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
-
-workflows:
-  version: 2
-  rubocop-rspec:
-    jobs:
-      - rubocop
-      - ruby-two-five:
-          requires:
-            - rubocop
-      - ruby-two-six:
-          requires:
-            - ruby-two-five
-      - ruby-two-seven:
-          requires:
-            - ruby-two-five

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'legion/extensions/conditioner'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here