chef-licensing 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3261fe05e89d3f85b80af5270597a662ebe84eaca761e43744afbc858582baeb
-  data.tar.gz: 7234e048b9f4ab4b303381282786a0c14aef229cb6dc73d00afb00cddc00a884
+  metadata.gz: b35b9075f13075e463a2db5db81b9d251333660b72a4f7dff2e1f00f16c1761c
+  data.tar.gz: a3e97bdd083ff58a06c0056d3d06503a79222f39e788d58a468d74a2e5492cb6
 SHA512:
-  metadata.gz: 18077438f71d4f67c706721df441df2403d6b2e257a6da1966e38dfa52cf975f69356c8b2421b947c74625a1c5c8f026b1848da6b1759a11f502835c51733021
-  data.tar.gz: 649ac4de8a6df4ef59aaf7c32c8731ea0200f4b3c22e32abfb329bfb5ba7ba1a5e3f79c7e19fdad27556772ce5ef9e22016cda5354a8709f6a99c5d21445523c
+  metadata.gz: 6ae4578953b54784282f50d2f688e3fce57b9ab07f0544620070e42ad8dee26cb71608d0a91432167ada76e1dd098e14d1a92f7148614fabc7cf837f7ced4d4d
+  data.tar.gz: 31ae1f7f4c610fb21b1be1453ddabc6a1645221ad82f6e83406619d675ebac0bf80a42991f8c0e890e2e0a52fbbe908caa35bf4405f913432e6b503a879fd676

data/chef-licensing.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   spec.files =
-  Dir.glob("{{lib,etc}/**/*,LICENSE,chef-licensing.gemspec}")
-    .reject { |f| File.directory?(f) }
+    Dir.glob("{{lib,etc}/**/*,LICENSE,chef-licensing.gemspec}")
+      .reject { |f| File.directory?(f) }
 
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -30,10 +30,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tty-prompt", "~> 0.23"
   spec.add_dependency "faraday", ">= 1", "< 2"
   spec.add_dependency "faraday-http-cache"
-  spec.add_dependency "activesupport", "~> 7.2", ">= 7.2.2.1"
+  spec.add_dependency "faraday_middleware", "~> 1.0"
   spec.add_dependency "tty-spinner", "~> 0.9.3"
   spec.add_dependency "mixlib-log", "~> 3.0"
 
   # Gem dependency needed with Ruby 3.4 upgrade
   spec.add_dependency "ostruct", "~> 0.1.0"
+  spec.add_dependency "pstore", "~> 0.1.1"
 end

data/lib/chef-licensing/api/client.rb

@@ -36,4 +36,4 @@ module ChefLicensing
       attr_reader :restful_client
     end
   end
-end
+end

data/lib/chef-licensing/api/describe.rb

@@ -59,4 +59,4 @@ module ChefLicensing
       end
     end
   end
-end
+end

data/lib/chef-licensing/api/license_feature_entitlement.rb

@@ -52,4 +52,4 @@ module ChefLicensing
       end
     end
   end
-end
+end

data/lib/chef-licensing/api/license_software_entitlement.rb

@@ -50,4 +50,4 @@ module ChefLicensing
       end
     end
   end
-end
+end

data/lib/chef-licensing/api/list_licenses.rb

@@ -27,4 +27,4 @@ module ChefLicensing
       attr_reader :restful_client
     end
   end
-end
+end

data/lib/chef-licensing/api/parser/client.rb

@@ -97,4 +97,4 @@ module ChefLicensing
       end
     end
   end
-end
+end

data/lib/chef-licensing/api/parser/describe.rb

@@ -115,4 +115,4 @@ module ChefLicensing
       end
     end
   end
-end
+end

data/lib/chef-licensing/exceptions/client_error.rb

@@ -6,4 +6,4 @@ module ChefLicensing
       super || "License Client API failure"
     end
   end
-end
+end

data/lib/chef-licensing/exceptions/describe_error.rb

@@ -6,4 +6,4 @@ module ChefLicensing
       super || "License Describe API failure"
     end
   end
-end
+end

data/lib/chef-licensing/exceptions/error.rb

@@ -1,4 +1,4 @@
 module ChefLicensing
   class Error < StandardError
   end
-end
+end

data/lib/chef-licensing/exceptions/invalid_file_format_version.rb

@@ -7,4 +7,3 @@ module ChefLicensing
     end
   end
 end
-

data/lib/chef-licensing/exceptions/invalid_license.rb

@@ -7,4 +7,3 @@ module ChefLicensing
     end
   end
 end
-

data/lib/chef-licensing/exceptions/list_licenses_error.rb

@@ -9,4 +9,4 @@ module ChefLicensing
       super(message)
     end
   end
-end
+end

data/lib/chef-licensing/exceptions/missing_api_credentials_error.rb

@@ -4,4 +4,4 @@ module ChefLicensing
       super || "Missing API credentials. Check README for more details."
     end
   end
-end
+end

data/lib/chef-licensing/exceptions/software_not_entitled.rb

@@ -6,4 +6,4 @@ module ChefLicensing
       super || "Software not entitled"
     end
   end
-end
+end

data/lib/chef-licensing/license.rb

@@ -35,10 +35,9 @@ module ChefLicensing
     def feature_entitlements
       return @feature_entitlements unless @feature_entitlements.empty?
 
-      feat_entitlements = []
       feat_entitlements_data = @parser.parse_feature_entitlements
-      feat_entitlements_data.each do |data|
-        feat_entitlements << FeatureEntitlement.new(data)
+      feat_entitlements = feat_entitlements_data.map do |data|
+        FeatureEntitlement.new(data)
       end
       @feature_entitlements = feat_entitlements
     end
@@ -46,10 +45,9 @@ module ChefLicensing
     def software_entitlements
       return @software_entitlements unless @software_entitlements.empty?
 
-      sw_entitlements = []
       sw_entitlements_data = @parser.parse_software_entitlements
-      sw_entitlements_data.each do |data|
-        sw_entitlements << SoftwareEntitlement.new(data)
+      sw_entitlements = sw_entitlements_data.map do |data|
+        SoftwareEntitlement.new(data)
       end
       @software_entitlements = sw_entitlements
     end
@@ -57,10 +55,9 @@ module ChefLicensing
     def asset_entitlements
       return @asset_entitlements unless @asset_entitlements.empty?
 
-      asset_entitlements = []
       asset_entitlements_data = @parser.parse_asset_entitlements
-      asset_entitlements_data.each do |data|
-        asset_entitlements << AssetEntitlement.new(data)
+      asset_entitlements = asset_entitlements_data.map do |data|
+        AssetEntitlement.new(data)
       end
       @asset_entitlements = asset_entitlements
     end
@@ -68,10 +65,9 @@ module ChefLicensing
     def limits
       return @limits unless @limits.empty?
 
-      limits = []
       limits_data = @parser.parse_limits
-      limits_data.each do |data|
-        limits << Limit.new(data, { product_name: @product_name })
+      limits = limits_data.map do |data|
+        Limit.new(data, { product_name: @product_name })
       end
       @limits = limits
     end

data/lib/chef-licensing/license_key_fetcher/file.rb

@@ -228,7 +228,7 @@ module ChefLicensing
         return nil unless path
 
         # only checking for major version for file format for breaking changes
-        @contents ||= YAML.load(::File.read(path))
+        @contents ||= YAML.load_file(path)
 
         # raise error if the file_format_version key is missing
         raise LicenseFileCorrupted.new("Unrecognized license file; :file_format_version missing.") unless @contents.key?(:file_format_version)

data/lib/chef-licensing/license_key_fetcher.rb

@@ -254,7 +254,7 @@ module ChefLicensing
     def validate_and_fetch_license_type(new_keys)
       unless new_keys.empty?
         is_valid = validate_license_key(new_keys.first)
-        return get_license_type(new_keys.first) if is_valid
+        get_license_type(new_keys.first) if is_valid
       end
     end
 

data/lib/chef-licensing/license_key_validator.rb

@@ -21,4 +21,4 @@ module ChefLicensing
       response.data || raise(ChefLicensing::InvalidLicense, response.message)
     end
   end
-end
+end

data/lib/chef-licensing/list_license_keys.rb

@@ -3,9 +3,11 @@ require_relative "api/describe"
 require_relative "exceptions/describe_error"
 require "pastel" unless defined?(Pastel)
 require_relative "config"
+require_relative "string_refinements"
 
 module ChefLicensing
   class ListLicenseKeys
+    using StringRefinements
     def self.display(opts = {})
       new(opts).display
     end
@@ -69,20 +71,20 @@ module ChefLicensing
                    else
                      # find the number of days left for the license to expire
                      days = (Date.parse(license.expiration_date) - Date.today).to_i
-                     "#{days > 0 ? days : 0} #{"Day".pluralize(days)}"
+                     "#{[days, 0].max} #{"Day".pluralize(days)}"
                    end
         num_of_units = license.limits&.first&.usage_limit || 0
         num_of_units = num_of_units == -1 ? "Unlimited" : num_of_units
         unit_measure = license.limits&.first&.usage_measure || "unit"
         output.puts <<~LICENSE
-            #{pastel.bold("License Details")}
-              Asset Name       : #{license.limits.first.software}
-              License ID       : #{license.id}
-              Type             : #{license_type}
-              Status           : #{license.status.capitalize}
-              Validity         : #{validity}
-              No. Of Units     : #{num_of_units} #{unit_measure.capitalize.pluralize(num_of_units)}
-            ------------------------------------------------------------
+          #{pastel.bold("License Details")}
+            Asset Name       : #{license.limits.first.software}
+            License ID       : #{license.id}
+            Type             : #{license_type}
+            Status           : #{license.status.capitalize}
+            Validity         : #{validity}
+            No. Of Units     : #{num_of_units} #{unit_measure.capitalize.pluralize(num_of_units)}
+          ------------------------------------------------------------
         LICENSE
       end
     end

data/lib/chef-licensing/pstore_adapter.rb

@@ -0,0 +1,36 @@
+require "pstore"
+
+module ChefLicensing
+  # Simple adapter to make PStore compatible with Faraday::HttpCache
+  class PStoreAdapter
+    def initialize(cache_dir)
+      @store_path = File.join(cache_dir, "chef_licensing_cache.pstore")
+      @store = PStore.new(@store_path)
+    end
+
+    # Interface methods required by faraday-http-cache
+    def read(key)
+      @store.transaction { @store[key] }
+    end
+
+    def write(key, value, options = {})
+      # PStore handles persistence, Faraday::HttpCache handles
+      # HTTP cache headers for expiration
+      @store.transaction { @store[key] = value }
+    end
+
+    def delete(key)
+      @store.transaction { @store.delete(key) }
+    end
+
+    def exist?(key)
+      @store.transaction { @store.root?(key) }
+    end
+
+    def clear
+      @store.transaction do
+        @store.roots.each { |root| @store.delete(root) }
+      end
+    end
+  end
+end

data/lib/chef-licensing/restful_client/base.rb

@@ -1,11 +1,12 @@
 require "faraday" unless defined?(Faraday)
+require "faraday_middleware"
 require "faraday/http_cache"
-require "active_support"
 require "tmpdir" unless defined?(Dir.mktmpdir)
 require_relative "../exceptions/restful_client_error"
 require_relative "../exceptions/restful_client_connection_error"
 require_relative "../exceptions/missing_api_credentials_error"
 require_relative "../config"
+require_relative "../pstore_adapter"
 require_relative "middleware/exceptions_handler"
 require_relative "middleware/content_type_validator"
 
@@ -132,7 +133,7 @@ module ChefLicensing
       end
 
       def get_connection(url = nil)
-        store = ::ActiveSupport::Cache.lookup_store(:file_store, Dir.tmpdir)
+        store = PStoreAdapter.new(Dir.tmpdir)
         Faraday.new(url: url) do |config|
           config.request :json
           config.response :json, parser_options: { object_class: OpenStruct }

data/lib/chef-licensing/restful_client/v1.rb

@@ -12,4 +12,4 @@ module ChefLicensing
       }).freeze
     end
   end
-end
+end

data/lib/chef-licensing/string_refinements.rb

@@ -0,0 +1,25 @@
+module ChefLicensing
+  # String refinements to provide pluralization functionality
+  # Replaces ActiveSupport::Inflector for our specific use case
+  module StringRefinements
+    refine String do
+      def pluralize(count = 2)
+        return self if count == 1
+
+        # Simple pluralization rules
+        case downcase
+        when /s$/, /sh$/, /ch$/, /x$/, /z$/
+          "#{self}es"
+        when /[^aeiou]y$/
+          "#{self[0..-2]}ies"
+        when /f$/
+          "#{self[0..-2]}ves"
+        when /fe$/
+          "#{self[0..-3]}ves"
+        else
+          "#{self}s"
+        end
+      end
+    end
+  end
+end

data/lib/chef-licensing/tui_engine.rb

@@ -1,2 +1,2 @@
 # This is simply a loader file.
-require_relative "tui_engine/tui_engine"
+require_relative "tui_engine/tui_engine"

data/lib/chef-licensing/version.rb

@@ -1,3 +1,3 @@
 module ChefLicensing
-  VERSION = "1.2.0".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/chef-licensing.rb

@@ -41,7 +41,7 @@ module ChefLicensing
       unless ChefLicensing::Config.make_licensing_optional
         if license_keys.empty?
           raise ChefLicensing::LicenseKeyFetcher::LicenseKeyNotFetchedError,
-                "Unable to obtain a License Key."
+            "Unable to obtain a License Key."
         end
 
         client(license_keys: license_keys)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-licensing
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Inspec Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -73,25 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.2.2.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: pstore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Ruby library to support CLI tools that use Progress Chef license storage,
   generation, and entitlement.
 email:
@@ -183,10 +191,12 @@ files:
 - lib/chef-licensing/licensing_service/local.rb
 - lib/chef-licensing/list_license_keys.rb
 - lib/chef-licensing/log.rb
+- lib/chef-licensing/pstore_adapter.rb
 - lib/chef-licensing/restful_client/base.rb
 - lib/chef-licensing/restful_client/middleware/content_type_validator.rb
 - lib/chef-licensing/restful_client/middleware/exceptions_handler.rb
 - lib/chef-licensing/restful_client/v1.rb
+- lib/chef-licensing/string_refinements.rb
 - lib/chef-licensing/tui_engine.rb
 - lib/chef-licensing/tui_engine/tui_actions.rb
 - lib/chef-licensing/tui_engine/tui_engine.rb