pdi 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc210f1ffd8bc1229082e29d8f2a54caea3d8e037d0b8e0e641265e171628b15
-  data.tar.gz: aae44f8e89bd3ebee8ca03164cef6b1b0ddb07af2fafa2e412e481123451bc10
+  metadata.gz: 4dc8c8b41b233e1982d4c6164318cf9b4682dfcb335699d4027372edee921f8a
+  data.tar.gz: 6f61afc314e69019464cb4722063f02513a06f493e820661e2f12128af5d6658
 SHA512:
-  metadata.gz: 99c07ce29149acef3b7dae5528a777d7e0172124fe0d987383157f3deeacfc6d3ccdb9ee2d66a20fb778b91729a083946502ffc9c4d1c2ca9e4d7c54daf591bc
-  data.tar.gz: bb1724a9dfa3999a4a66ede97246b20b6945f231b087e132b55135c299637ca79fac556f80dee0e7782e73a1485f4bc24690000e7498a5bde854edb11955d032
+  metadata.gz: a540f0ad04dc38d0155c156041e22269155aa2fcad3958ec9a874302d888af4f70afdb69cf88ecebd624457d2fa8b03bba59c9963e5772d86f679088186a59bb
+  data.tar.gz: '085f9c0f9a0e2a3d4487d63a0c3a59ab0f5757e7eace1c757abedd96faf7d9152894e9c41a5c37bafe985a64889d03d5f8de3be72960a0ed9247ced3a14adfed'

data/.rubocop.yml

@@ -1,4 +1,4 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
   Exclude:
     - pdi.gemspec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0.1 (February 19th, 2020)
+
+Fixes:
+
+* It now properly calls kitchen for jobs (it was previously calling pan.)
+
 # 1.0.0 (February 19th, 2020)
 
 Initial release.

data/README.md

@@ -46,7 +46,10 @@ All examples assume PDI has been installed to your home directory: `~/data-integ
 spoon = Pdi::Spoon.new(dir: '~/data-integration')
 ```
 
-Note: You can also override the names of the scripts using the `kitchen` and `pan` constructor keyword arguments.  The defaults are `kitchen.sh` and `pan.sh`, respectively.
+Notes:
+
+* You can also override the names of the scripts using the `kitchen` and `pan` constructor keyword arguments.  The defaults are `kitchen.sh` and `pan.sh`, respectively.
+* For other command line arguments that are not supported first-class in the Options objects below you can utilize the `args` argument when instantiating a `Spoon` instance.
 
 ### Executing a Job/Transformation
 

data/lib/pdi/spoon.rb

@@ -7,7 +7,9 @@
 # LICENSE file in the root directory of this source tree.
 #
 
+require_relative 'spoon/kitchen_error'
 require_relative 'spoon/options'
+require_relative 'spoon/pan_error'
 require_relative 'spoon/parser'
 require_relative 'spoon/result'
 
@@ -17,6 +19,11 @@ module Pdi
     DEFAULT_KITCHEN = 'kitchen.sh'
     DEFAULT_PAN     = 'pan.sh'
 
+    TYPES_TO_ERRORS = {
+      Options::Type::JOB => KitchenError,
+      Options::Type::TRANSFORMATION => PanError
+    }.freeze
+
     attr_reader :args, :dir, :kitchen, :pan
 
     def initialize(
@@ -55,11 +62,11 @@ module Pdi
     # Returns an Executor::Result instance when PDI returns error code 0 or else raises
     # a PanError (transformation) or KitchenError (job).
     def run(options)
-      options    = Options.make(options)
-      final_args = [pan_path] + args + options.to_args
+      options  = Options.make(options)
+      all_args = run_args(options)
 
-      executor.run(final_args).tap do |result|
-        raise(options.error_constant, result) if result.code != 0
+      executor.run(all_args).tap do |result|
+        raise(error_constant(options), result) if result.code != 0
       end
     end
 
@@ -67,6 +74,22 @@ module Pdi
 
     attr_reader :executor, :parser
 
+    def error_constant(options)
+      TYPES_TO_ERRORS.fetch(options.type)
+    end
+
+    def run_args(options)
+      [script_path(options.type)] + args + options.to_args
+    end
+
+    def script_path(options_type)
+      if options_type == Options::Type::JOB
+        kitchen_path
+      elsif options_type == Options::Type::TRANSFORMATION
+        pan_path
+      end
+    end
+
     def kitchen_path
       File.join(dir, kitchen)
     end

data/lib/pdi/spoon/options.rb

@@ -7,10 +7,8 @@
 # LICENSE file in the root directory of this source tree.
 #
 
-require_relative 'kitchen_error'
 require_relative 'options/level'
 require_relative 'options/param'
-require_relative 'pan_error'
 
 module Pdi
   class Spoon
@@ -23,11 +21,6 @@ module Pdi
         TRANSFORMATION = :transformation
       end
 
-      TYPES_TO_ERRORS = {
-        Type::JOB => KitchenError,
-        Type::TRANSFORMATION => PanError
-      }.freeze
-
       TYPES_TO_KEYS = {
         Type::JOB => Arg::Key::JOB,
         Type::TRANSFORMATION => Arg::Key::TRANS
@@ -63,10 +56,6 @@ module Pdi
         base_args + param_args
       end
 
-      def error_constant
-        TYPES_TO_ERRORS.fetch(type)
-      end
-
       private
 
       def key

data/lib/pdi/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Pdi
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/pdi/spoon/kitchen_error_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2018-present, Blue Marble Payroll, LLC
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+
+require 'spec_helper'
+
+describe Pdi::Spoon::KitchenError do
+  describe 'initialization' do
+    [1, 2, 7, 8, 9].each do |code|
+      specify "code #{code} should have message" do
+        result = Pdi::Executor::Result.new(
+          args: [],
+          status: {
+            code: code,
+            pid: 123
+          }
+        )
+
+        expect(described_class.new(result).message).not_to eq('Unknown')
+      end
+    end
+
+    [-1, 0, 3, 4, 5, 6, 10, 11].each do |code|
+      specify "code #{code} should not have message" do
+        result = Pdi::Executor::Result.new(
+          args: [],
+          status: {
+            code: code,
+            pid: 123
+          }
+        )
+
+        expect(described_class.new(result).message).to eq('Unknown')
+      end
+    end
+  end
+end

data/spec/pdi/spoon_spec.rb

@@ -24,6 +24,14 @@ describe Pdi::Spoon do
         }
       end
 
+      it 'will call pan script' do
+        subject = described_class.new(args: 0, dir: dir, pan: script)
+
+        result = subject.run(options)
+
+        expect(result.args.first).to include(script)
+      end
+
       context 'when code is 0' do
         it 'returns correct stdout, stderr and code' do
           subject = described_class.new(
@@ -70,6 +78,14 @@ describe Pdi::Spoon do
         }
       end
 
+      it 'will call kitchen script' do
+        subject = described_class.new(args: 0, dir: dir, kitchen: script)
+
+        result = subject.run(options)
+
+        expect(result.args.first).to include(script)
+      end
+
       context 'when code is 0' do
         it 'returns correct stdout, stderr and code' do
           subject = described_class.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_hashable
@@ -161,10 +161,11 @@ files:
 - pdi.gemspec
 - spec/mocks/spoon/return_code.sh
 - spec/mocks/spoon/version.sh
-- spec/pdi/spoon/error_spec.rb
+- spec/pdi/spoon/kitchen_error_spec.rb
 - spec/pdi/spoon/options/arg_spec.rb
 - spec/pdi/spoon/options/param_spec.rb
 - spec/pdi/spoon/options_spec.rb
+- spec/pdi/spoon/pan_error_spec.rb
 - spec/pdi/spoon_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bluemarblepayroll/pdi
@@ -193,9 +194,10 @@ summary: Ruby wrapper for invoking Pentaho Data Integration
 test_files:
 - spec/mocks/spoon/return_code.sh
 - spec/mocks/spoon/version.sh
-- spec/pdi/spoon/error_spec.rb
+- spec/pdi/spoon/kitchen_error_spec.rb
 - spec/pdi/spoon/options/arg_spec.rb
 - spec/pdi/spoon/options/param_spec.rb
 - spec/pdi/spoon/options_spec.rb
+- spec/pdi/spoon/pan_error_spec.rb
 - spec/pdi/spoon_spec.rb
 - spec/spec_helper.rb