rubysdk 0.0.1.pre5 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1f3ca13463948e53df0160b0564d0e94db8cdce16b49a9d0981f4c8f7b40b4
-  data.tar.gz: bcd44d408657979cb8124d73b0d08abe5b13d7c684ff76f43676c43fc630262c
+  metadata.gz: 5e359c2b1c028748e828f91fb7e152f31045d796b55c7003381398fcc872b51c
+  data.tar.gz: df272ba0b3512d992c15c6131e2943a5e94a386d06f4d09b4b31383bd7326898
 SHA512:
-  metadata.gz: d66e79ad9faadac21dcc94eee9955e24049bbb9cee038c0f926cbc7441533f6fa73778c24e1da6df16d476ab373030f52cc229e8d225a0bff227ba71f339aff6
-  data.tar.gz: a6dc88a4a699520f455b2b10b3a5a3cb3781679d385ebe9ec0e38eb9f89bdef619d5a0fcbd240b11522ad808c6c8517c4c2663410b7450088123f56f5e6aaf42
+  metadata.gz: b9b1e46917ad9b81e97551dd950c58f4d889a7aaa1ab49ff8a6cea1ba9be5ce9b3953a68c451c73aa1b8c287cefd52b70bd55bba4a95227c7ce9991b83931781
+  data.tar.gz: aea4b478c9b968c94b7ce636558ed45c595c20e426653564e23a7c6762ac708334771af0efd98bae92bbcb74fab100ddcb18bef063eb32dba1f540ad18ed9c78

data/lib/interface/interface.rb

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
 
 module Interface
+  # Constants
+  TextFieldInput = "textfield"
+  TextAreaInput  = "textarea"
+  BoolInput      = "boolean"
+  VaultInput     = "vault"
+
   class Job
     attr_accessor :handler, :title, :desc, :dependson, :args, :interaction
     

data/lib/rubysdk.rb

@@ -3,6 +3,7 @@ proto_dir = File.join(this_dir, 'proto')
 interface_dir = File.join(this_dir, 'interface')
 $LOAD_PATH.unshift(proto_dir) unless $LOAD_PATH.include?(proto_dir)
 $LOAD_PATH.unshift(interface_dir) unless $LOAD_PATH.include?(interface_dir)
+STDOUT.sync = true
 
 require 'grpc'
 require 'grpc/health/checker'
@@ -28,7 +29,7 @@ module RubySDK
     def execute_job(job, _call)
       cjob = nil
       @cached_jobs.each do |cached_job|
-        cjob = cached_job unless cached_job.unique_id == job.unique_id
+        cjob = cached_job if cached_job.job.unique_id == job.unique_id
       end
       if cjob == nil
         Proto::JobResult.new(failed: true,
@@ -39,26 +40,35 @@ module RubySDK
 
       # Transform arguments
       args = []
-      job.args.each do |arg|
-        new_arg = Proto::Argument.new(key: arg.key,
+      if !job.args.empty?
+        job.args.each do |arg|
+          new_arg = Proto::Argument.new(key: arg.key,
                                value: arg.value)
-        args.push new_arg
+          args.push new_arg
+        end
       end
 
       # Execute job
-      job_result = Proto::JobResult.new
+      job_failed = false
+      exit_pipeline = false
+      message = ""
+      unique_id = 0
       begin
-        job.handler.call(args)
+        cjob.handler.call(args)
       rescue => e
         # Check if job wants to force exit pipeline.
         # We will exit the pipeline but not mark it as 'failed'.
-        job_result.failed = true unless e == ErrorExitPipeline
+        job_failed = true if e == ErrorExitPipeline
 
         # Set log message and job id
-        job_result.exit_pipeline = true
-        job_result.message = e.message
-        job_result.unique_id = job.job.unique_id
+        exit_pipeline = true
+        message = e.message
+        unique_id = job.job.unique_id
       end
+      Proto::JobResult.new(unique_id: unique_id,
+                           failed: job_failed,
+                           exit_pipeline: exit_pipeline,
+                           message: message)
     end
   end
 
@@ -81,6 +91,11 @@ module RubySDK
       args = []
       if job.args != nil
         job.args.each do |arg|
+          # Description and Value are optional.
+          # Set default values for those.
+          arg.desc = "" if arg.desc == nil
+          arg.value = "" if arg.value == nil
+            
           trans_arg = Proto::Argument.new(description: arg.desc,
                                           type: arg.type,
                                           key: arg.key,
@@ -104,7 +119,7 @@ module RubySDK
           dep_found = false
           jobs.each do |curr_job|
             if curr_job.title.casecmp(dep_job) == 0
-              proto_job.dependson += FNV.new.fnv1a_32(curr_job.title)
+              proto_job.dependson.push FNV.new.fnv1a_32(curr_job.title)
               dep_found = true
               break
             end
@@ -159,7 +174,7 @@ module RubySDK
     )
 
     # Register gRPC server and handle.
-    host = 'localhost'
+    host = '127.0.0.1'
     s = GRPC::RpcServer.new
     port = s.add_http2_port(host+':0', credentials)
     s.handle(GRPCServer.new(cached_jobs))
@@ -167,9 +182,7 @@ module RubySDK
 
     # Output the address and service name to stdout.
     # hashicorp go-plugin will use that to establish a connection.
-    puts "1|2|tcp|#{host}:#{port}|grpc"
-    GRPC.logger.info("1|2|tcp|#{host}:#{port}|grpc")
-    STDOUT.sync = true
+    STDOUT.puts "1|2|tcp|#{host}:#{port}|grpc"
 
     s.run_till_terminated
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysdk
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre5
+  version: 0.0.1
 platform: ruby
 authors:
 - Michel Vocks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -77,9 +77,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6