knife-push 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae06685f29fb7f0a741d56dc0f4d035e5868fe4b
-  data.tar.gz: 580f66d1514d0ed2ebf45feb8e68726079029a68
+  metadata.gz: 038f57928247aec7d8738ba995ef7c55c0aad8df
+  data.tar.gz: c4a210015c78ef8ffb3c744cf0a3e177c5e1ce39
 SHA512:
-  metadata.gz: b4a6d017bee2e73cfc05ba2d27ce5928da1074bc1ba3d40abc48742822f779cd6fcdccd2fb6634d8ed7545bbde4852dbd28177eb31aa6ff147b839a75cdc7e3a
-  data.tar.gz: feb7b3f5a253a520a72501417f3d719e2be7ba38768e9efb325cad5e69ed5975bcae265af4476ceeb12d40073ce1ed2af01f42def985faf0c365afbd4a59e7f9
+  metadata.gz: bab6b08e47fabe72250eb77e928c9ff8da38abb9000553c145c80ac8672d6cc3c6db847edc45f950f7a7c8fab9fe14ac61efedebed44a3cc9e65834adb4756f1
+  data.tar.gz: d1312745ef63c28bca515568a0d1f19d246bc52ea10e8483c7e14ff1ac5e2361e941435f8040c16ad174227903303b69664a617f2e3ac162b0ffd2ae9f534622

data/lib/chef/knife/job_helpers.rb

@@ -101,7 +101,7 @@ class Chef
           sleep(config[:poll_interval].to_f)
           putc(".")
           job = rest.get_rest(job_uri)
-          finished, state = JobHelpers.status_string(job)
+          finished, state = status_string(job)
           if state != previous_state
             puts state
             previous_state = state

data/lib/chef/knife/job_start.rb

@@ -98,16 +98,41 @@ class Chef
         job_json = {
           'command' => job_name,
           'nodes' => @node_names,
-          'capture_output' => config[:capture_output]
         }
-        job_json['file'] = "raw:" + file_helper(config[:send_file]) if config[:send_file]
+
         job_json['quorum'] = get_quorum(config[:quorum], @node_names.length)
-        env = get_env(config)
-        job_json['env'] = env if env
-        job_json['dir'] = config[:in_dir] if config[:in_dir]
-        job_json['user'] = config[:as_user] if config[:as_user]
 
-        job = run_helper(config, job_json)
+        v2_json = job_json.dup
+
+        v2_json['file'] = "raw:" + file_helper(config[:send_file]) if config[:send_file]
+
+        v2_json['capture_output'] = config[:capture_output]
+        env = get_env(config)
+        v2_json['env'] = env if env
+        v2_json['dir'] = config[:in_dir] if config[:in_dir]
+        v2_json['user'] = config[:as_user] if config[:as_user]
+
+        begin
+          job = run_helper(config, v2_json)
+        rescue Net::HTTPServerException => e
+          raise e if e.response.code != "400"
+
+          ui.warn "Falling back to Push Jobs v1 mode."
+
+          unless env.empty?
+            ui.error "Sending Environment attributes isn't possible for Push Jobs 1.0"
+            exit 1
+          end
+
+          %i{ send_file dir user }.each do |feature|
+            if config[feature]
+              ui.error "Can't use a 2.0 feature (#{feature.to_s}) with a 1.0 server"
+              exit 1
+            end
+          end
+
+          job = run_helper(config, job_json)
+        end
 
         output(job)
 

data/lib/knife-push/version.rb

@@ -1,7 +1,7 @@
 
 module Knife
   module Push
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-push
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Knife plugin for chef push
 email: jkeiser@opscode.com
 executables: []
@@ -75,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Knife plugin for chef push
 test_files: []
-has_rdoc: true