kruby 1.36.0.2 → 1.36.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0339eb1cc8a6f1d7402b0f089dca4cdd7fd20c0b0f0a049cec2b3fcd0a78276
-  data.tar.gz: 3416b24a60f29e7715a9ff45a1f542dbc83c325c988c51e9c288e6a618403f85
+  metadata.gz: 2368426a514cb2faa1a955a344c27535fd8a5e0ed658daa220ac3670b500a7dc
+  data.tar.gz: 5df9b8da264349a436a6b57568f165608c2a2630475ed27280f1c5b3c8fdfd5f
 SHA512:
-  metadata.gz: 4d3b65bb69cb397cb29704318d5359d570aa55113c7e45e99930b11606628c301e08404671373f35bdb0bfb9e64e67399ea682f770f4900fb73e82c559c41b98
-  data.tar.gz: bc2755b8608df879b0b5abffafb0255096abdde11d2a37d3e689e97d1113fa4c12818016c617b74308f3953f38aac989e2bae3cd6a732c9d59a11b5d3a100e3a
+  metadata.gz: 40a65006935258583abbe2b9111a43f6f5fa9022a7783a24c9166e0e03e9983b1243303e00d0903b893e99de105464c48b52f3040244c6cc8b02c0cab46f8c82
+  data.tar.gz: 7a8d5684829a67ece0845578f14c2caee7f92df7a4360dc6afeb265a35ddff1803d3741f811530a8f314f59b8fac2d632ff8760cd80db855f89d8aa2a7f89fc8

data/lib/kubernetes/config/incluster_config.rb

@@ -90,13 +90,13 @@ module Kubernetes
       Configuration.instance_variable_set(:@in_cluster_config, self)
       Configuration.prepend(Module.new do
         # rubocop:disable Metrics/LineLength
-        def api_key_with_prefix(identifier)
+        def api_key_with_prefix(identifier, param_alias = nil)
           in_cluster_config = self.class.instance_variable_get(:@in_cluster_config)
           if identifier == 'authorization' && @api_key.key?(identifier) && in_cluster_config.token_expires_at <= Time.now
             in_cluster_config.load_token
             @api_key[identifier] = 'Bearer ' + in_cluster_config.token
           end
-          super identifier
+          super identifier, param_alias
         end
         # rubocop:enable Metrics/LineLength
       end)

data/lib/kubernetes/config/kube_config.rb

@@ -49,6 +49,13 @@ module Kubernetes
       File.dirname(path)
     end
 
+    def resolve_path(file_path)
+      return file_path unless file_path
+      file_path = file_path.to_s
+      return file_path if file_path.start_with?('/')
+      File.expand_path(file_path, File.expand_path(base_path))
+    end
+
     def config
       @config ||= File.open(path) do |io|
         ::YAML.safe_load(io.read)
@@ -86,8 +93,8 @@ module Kubernetes
 
     def setup_ssl(cluster, user, config)
       # rubocop:disable DoubleNegation
-      config.verify_ssl = !!cluster['verify-ssl']
-      config.verify_ssl_host = !!cluster['verify-ssl']
+      config.verify_ssl = !!cluster['verify_ssl']
+      config.verify_ssl_host = !!cluster['verify_ssl']
       # rubocop:enable DoubleNegation
 
       config.ssl_ca_cert = cluster['certificate-authority']
@@ -98,6 +105,7 @@ module Kubernetes
     def find_cluster(name)
       find_by_name(config['clusters'], 'cluster', name).tap do |cluster|
         Kubernetes.create_temp_file_and_set(cluster, 'certificate-authority')
+        cluster['certificate-authority'] = resolve_path(cluster['certificate-authority'])
         cluster['verify_ssl'] = !cluster['insecure-skip-tls-verify']
       end
     end
@@ -108,6 +116,8 @@ module Kubernetes
 
         Kubernetes.create_temp_file_and_set(user, 'client-certificate')
         Kubernetes.create_temp_file_and_set(user, 'client-key')
+        user['client-certificate'] = resolve_path(user['client-certificate'])
+        user['client-key'] = resolve_path(user['client-key'])
         load_token_file(user)
         setup_auth(user)
       end
@@ -117,6 +127,7 @@ module Kubernetes
       # If tokenFile is specified, then set token
       return unless !user['token'] && user['tokenFile']
 
+      user['tokenFile'] = resolve_path(user['tokenFile'])
       File.open(user['tokenFile']) do |io|
         user['token'] = io.read.chomp
       end

data/lib/kubernetes/configuration.rb

@@ -260,21 +260,30 @@ module Kubernetes
       end
 
       server = servers[index]
-      url = server[:url]
+      url = server[:url].dup
 
       return url unless server.key? :variables
 
       # go through variable and assign a value
       server[:variables].each do |name, variable|
-        if variables.key?(name)
-          if (!server[:variables][name].key?(:enum_values) || server[:variables][name][:enum_values].include?(variables[name]))
-            url.gsub! "{" + name.to_s + "}", variables[name]
+        variable_key = if variables.key?(name)
+                         name
+                       elsif variables.key?(name.to_s)
+                         name.to_s
+                       elsif name.respond_to?(:to_sym) && variables.key?(name.to_sym)
+                         name.to_sym
+                       end
+
+        if variable_key
+          variable_value = variables[variable_key]
+          if (!variable.key?(:enum_values) || variable[:enum_values].include?(variable_value))
+            url.gsub! "{" + name.to_s + "}", variable_value
           else
-            fail ArgumentError, "The variable `#{name}` in the server URL has invalid value #{variables[name]}. Must be #{server[:variables][name][:enum_values]}."
+            fail ArgumentError, "The variable `#{name}` in the server URL has invalid value #{variable_value}. Must be #{variable[:enum_values]}."
           end
         else
           # use default value
-          url.gsub! "{" + name.to_s + "}", server[:variables][name][:default_value]
+          url.gsub! "{" + name.to_s + "}", variable[:default_value]
         end
       end
 

data/lib/kubernetes/release/publish_guard.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require "open3"
+require "rubygems/specification"
+require "shellwords"
+require "kubernetes/release/changelog"
+
+module Kubernetes
+  module Release
+    module PublishGuard
+      module_function
+
+      def gemspec_files(gemspec_path)
+        spec = Gem::Specification.load(gemspec_path)
+        raise Changelog::Error, "failed to load gemspec #{gemspec_path}" unless spec
+
+        spec.files
+      rescue Gem::InvalidSpecificationException => e
+        raise Changelog::Error, e.message
+      end
+
+      def untracked_package_files(repo_root:, package_root:, package_files:)
+        repo_paths = package_files.map do |path|
+          package_file_repo_path(repo_root: repo_root, package_root: package_root, package_path: path)
+        end.uniq.sort
+        return [] if repo_paths.empty?
+
+        tracked_paths = capture_command("git", "-C", repo_root, "ls-files", "--", *repo_paths).lines.map(&:chomp)
+        repo_paths - tracked_paths
+      end
+
+      def untracked_gemspec_files(repo_root:, package_root:, gemspec_path:)
+        untracked_package_files(
+          repo_root: repo_root,
+          package_root: package_root,
+          package_files: gemspec_files(gemspec_path)
+        )
+      end
+
+      def package_file_repo_path(repo_root:, package_root:, package_path:)
+        repo_root = File.expand_path(repo_root)
+        repo_prefix = "#{repo_root}#{File::SEPARATOR}"
+        full_path = File.expand_path(package_path, package_root)
+
+        unless full_path.start_with?(repo_prefix)
+          raise Changelog::Error, "gem package file #{package_path} resolves outside #{repo_root}"
+        end
+
+        full_path.delete_prefix(repo_prefix)
+      end
+
+      def capture_command(*command)
+        output, status = Open3.capture2e(*command)
+        return output if status.success?
+
+        message = "command failed: #{Shellwords.join(command)}"
+        details = output.strip
+        message = "#{message}\n#{details}" unless details.empty?
+        raise Changelog::Error, message
+      end
+    end
+  end
+end

data/lib/kubernetes/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 5.1.0
 =end
 
 module Kubernetes
-  VERSION = '1.36.0.2'
+  VERSION = '1.36.0.3'
 end

data/lib/kubernetes/watch.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'json'
+require 'uri'
 
 # The Kubernetes module encapsulates the Kubernetes client for Ruby
 module Kubernetes
@@ -24,9 +25,12 @@ module Kubernetes
     end
 
     def make_url(path, resource_version)
-      query = '?watch=true'
-      query += "&resourceVersion=#{resource_version}" if resource_version
-      path + query
+      uri = URI.parse(path)
+      query = URI.decode_www_form(uri.query || '').to_h
+      query['watch'] = 'true'
+      query['resourceVersion'] = resource_version if resource_version
+      query_string = query.map { |k, v| "#{URI.encode_www_form_component(k).gsub('+', '%20')}=#{URI.encode_www_form_component(v).gsub('+', '%20')}" }.join('&')
+      "#{uri.path}?#{query_string}"
     end
 
     def connect(path, resource_version = nil, &_block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kruby
 version: !ruby/object:Gem::Version
-  version: 1.36.0.2
+  version: 1.36.0.3
 platform: ruby
 authors:
 - doridoridoriand
@@ -903,6 +903,7 @@ files:
 - lib/kubernetes/models/v2_resource_metric_status.rb
 - lib/kubernetes/models/version_info.rb
 - lib/kubernetes/release/changelog.rb
+- lib/kubernetes/release/publish_guard.rb
 - lib/kubernetes/utils.rb
 - lib/kubernetes/version.rb
 - lib/kubernetes/watch.rb