orchestrator_client 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e125b670d73a1d5b36e3e76116e5efbc18032689
-  data.tar.gz: c6f9a1f1b9446392ecb09063b4ff45058064618d
+  metadata.gz: 10b4d0be20618df374b951dd50189a1fed234c74
+  data.tar.gz: 87edcc886de8c9123e1b2c46eab07141f7488613
 SHA512:
-  metadata.gz: 17453772de464fd1ff1a2fb7b420d00a8092ccd6d4597b7db2bb1e7c4b425653a31fe9cb08b9dcd862eed07db9b6dce5fb02cf090e9fe934ffaab6504cc674af
-  data.tar.gz: 24ff1604ae222e4e1532ee5b06da095c0b6c9084f0ab0214bae1aed4772c6b5cee97173c0d481a20bbe31a5d7f43e27faf2c391ea902c3d20c14c3e59271d459
+  metadata.gz: c60ec895186ff924ba2e40e934859258b150026eebce6490b08407f529d8b9158cf5ff0aeef01eed144c178d2c24298bbbc3d17bada0aee09e4fb633c69b2a79
+  data.tar.gz: 85668aafc17238328ab3021802ca680e3a1f81d222b99372b233dbee1bb39f85525a506ae9590888a589baaaf48f8474e51f5586842b6a03d0a6e4372cd48e21

data/lib/orchestrator_client.rb

@@ -55,7 +55,7 @@ class OrchestratorClient
     req.body = body.to_json
     res = https.request(req)
 
-    if res.code != "202"
+    unless Set.new(["202", "200"]).include? res.code
       raise OrchestratorClient::ApiError.make_error_from_response(res)
     end
 
@@ -75,7 +75,12 @@ class OrchestratorClient
   end
 
   def run_task(options)
-    job = OrchestratorClient::Job.new(self, options, :task)
+    if options[:plan_job] || options['plan_job']
+      type = :plan_task
+    else
+      type = :task
+    end
+    job = OrchestratorClient::Job.new(self, options, type)
     job.start
     job.wait
     job.nodes['items']

data/lib/orchestrator_client/command.rb

@@ -4,18 +4,33 @@ class OrchestratorClient::Command
     @https = https
   end
 
-  def task(options = {})
+  def deploy(options = {})
     raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
-    @https.post("command/task", options)
+    @https.post("command/deploy", options)
   end
 
-  def deploy(options = {})
+  def plan_start(options = {})
     raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
-    @https.post("command/deploy", options)
+    @https.post("command/plan_start", options)
+  end
+
+  def plan_finish(options = {})
+    raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
+    @https.post("command/plan_finish", options)
+  end
+
+  def plan_task(options = {})
+    raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
+    @https.post("command/plan_task", options)
   end
 
   def stop(job_number)
     data = {"job" => "#{job_number}"}
     @https.post("command/stop",data)
   end
+
+  def task(options = {})
+    raise ArgumentError, 'Must pass options as a hash' unless options.is_a? Hash
+    @https.post("command/task", options)
+  end
 end

data/lib/orchestrator_client/job.rb

@@ -26,6 +26,8 @@ class OrchestratorClient::Job
       result = @client.command.deploy(options)
     when :task
       result = @client.command.task(options)
+    when :plan_task
+      result = @client.command.plan_task(options)
     end
 
     @job_name = result['job']['name']

data/lib/orchestrator_client/version.rb

@@ -1,3 +1,3 @@
 class OrchestratorClient
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestrator_client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@puppetlabs.com