knife-push 1.1.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 388b9c9ebbbc83270b7329c93b7d57b1fa5c03649f05f6f84cada273e0c56a58
-  data.tar.gz: 242ffdba74fb0d386fb0388f7697b1664b049631d70c2d670bf45e793805237b
+  metadata.gz: 636e6fa1d65f445cf9f4981f3d75b857854b756f507468f6950a4234e3b6f980
+  data.tar.gz: 11b1c0bbec31bb8a6e69469cafd3d385458d3f3f8f21e42b9afae6bd673c971f
 SHA512:
-  metadata.gz: 6a7a37b6b8efdaf066d6829a905d719b921a4298a1bd2f083fd018000bd3a19a3a480d750218cbeea0a0dc45c7bad766f03624ab6b01d1886ee3a483702485fe
-  data.tar.gz: 8ba046a4b3e3de9658286eac24a31804502d4e08e7d7438df860cfccdd53dbe7e1e74af4c0729e5c6c96bd0fa351168cb2534a2e6ed9bac37d0de6ffb0bb7e78
+  metadata.gz: 4ed039e98ff4e483ac41f03c2f17b7b58e344236d1e92954e3850ca947fef6a48c3333cb10cc75f7dad56868d27010f2a41439542160a3d4682011fb63844601
+  data.tar.gz: 25f6b27f874f515b06857c57c450652c824a6471dcba8114c9a92255e9eeffd591c935a5b7d2d026edb22090a2bd52dbaa804d766a382fd10120dfdac1f252ba

data/lib/chef/knife/job_helpers.rb

@@ -15,6 +15,8 @@
 # under the License.
 #
 
+require "addressable/uri"
+
 class Chef
   class Knife
     module JobHelpers
@@ -22,11 +24,10 @@ class Chef
         node_names = []
         if search
           q = Chef::Search::Query.new
-          escaped_query = URI.escape(search,
-            Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+          escaped_query = Addressable::URI.encode_component(search, Addressable::URI::CharacterClasses::QUERY)
           begin
             nodes = q.search(:node, escaped_query).first
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             msg Chef::JSONCompat.from_json(e.response.body)["error"].first
             ui.error("knife search failed: #{msg}")
             exit 1

data/lib/chef/knife/job_output.rb

@@ -39,16 +39,10 @@ class Chef
 
       def get_channel(channel)
         channel ||= "stdout"
-        case channel
-        when "stdout"
-          return channel
-        when "stderr"
-          return channel
-        else
-          raise "Invalid Format please enter stdout or stderr"
-        end
-      end
+        return channel if channel == "stdout" || channel == "stderr"
 
+        raise "Invalid Format please enter stdout or stderr"
+      end
     end
   end
 end

data/lib/chef/knife/job_start.rb

@@ -113,7 +113,7 @@ class Chef
 
         begin
           job = run_helper(config, v2_json)
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           raise e if e.response.code != "400"
 
           ui.warn "Falling back to Push Jobs v1 mode."

data/lib/knife-push/version.rb

@@ -1,7 +1,7 @@
 
 module Knife
   module Push
-    VERSION = "1.1.5".freeze
+    VERSION = "2.0.0".freeze
     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.1.5
+  version: 2.0.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '15.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Knife plugin for Chef Push Jobs
 email: jkeiser@chef.io
 executables: []
@@ -50,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="