gitlab-license 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15aba535f2359601fa9cf8e50b45e1a5e7671717c08845f047b0eae35fb69a3
-  data.tar.gz: e44fb5a0cc537fb0c12fd49c82f72ca7092d6f04d42c76bd7ef57803c87ea345
+  metadata.gz: 22b0a5d5cec617462fad10a954e69a8ab0cbf2234c4c666b2bce3962387627b4
+  data.tar.gz: 5c74cb614cca7a0501188c219fa4dd716d6158fd79cae2a9aeef698d08d90ff9
 SHA512:
-  metadata.gz: b43de2bf8c651358b253ab5dfb86d71349a56344adb2129bdb8fbd33bf9d202bc079d1b0054144b59a472e3e350a88b4aabb53f12850b6778f79acaad2eb9a52
-  data.tar.gz: 570d1d302a389fb4c34071d29161fdc9e3a2122813610af1e0da9e573b49db8e5342c931584f74508896e0517d082174dbb5316a5dc7d1eaaeda528a8cc6cc6b
+  metadata.gz: 8cbae440edf6fa10bb5944b63957e204e3fe6213d66d338b1cb7ce0428e2bdfc65a56b634a16c5832cd0039c568108a34c9f9c8b2da1f15e1427332355a2535a
+  data.tar.gz: ee7e2deda0d8f42d5453455a9d9d6d88f1b3a53d908f87323928151587a3640bdf3ad4fa7cb9d792639f88df00c0b934491d54e20233d0513b884135ea789ef1

data/README.md

@@ -27,7 +27,9 @@ To release a new version of this gem, follow these steps:
 1. [Build the gem](https://guides.rubygems.org/command-reference/#gem-build) to be published: `gem build gitlab-license.gemspec`
 1. [Publish the gem](https://guides.rubygems.org/publishing) to Rubygems: `gem push gitlab-license-2.1.0.gem`
    - Note you will need to be added as an owner in Rubygems in order to publish.
-   - Once this is published, the new version of the gem can be installed in other projects like CustomersDot or GitLab via bundler or using `gem install` directly.
+1. Once published, the new version of the gem can be installed in projects that depend on `gitlab-license` like [CustomersDot](https://gitlab.com/gitlab-org/customers-gitlab-com) and [GitLab](https://gitlab.com/gitlab-org/gitlab).
+   - It is recommended to install the new version in both GitLab and CustomersDot to keep the versions aligned.
+   - This can be installed via bundler or using `gem install` directly.
 
 ## Usage
 

data/lib/gitlab/license/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   class License
-    VERSION = '2.4.0'.freeze
+    VERSION = '2.6.0'.freeze
   end
 end

data/lib/gitlab/license.rb

@@ -8,7 +8,7 @@ require 'gitlab/license/encryptor'
 require 'gitlab/license/boundary'
 
 module Gitlab
-  class License
+  class License # rubocop:disable Metrics/ClassLength
     class Error < StandardError; end
     class ImportError < Error; end
     class ValidationError < Error; end
@@ -79,7 +79,7 @@ module Gitlab
                   :activated_at, :restrictions, :cloud_licensing_enabled,
                   :offline_cloud_licensing_enabled, :auto_renew_enabled, :seat_reconciliation_enabled,
                   :operational_metrics_enabled, :generated_from_customers_dot,
-                  :generated_from_cancellation
+                  :generated_from_cancellation, :temporary_extension, :contract_overages_allowed
 
     alias_method :issued_at, :starts_at
     alias_method :issued_at=, :starts_at=
@@ -170,6 +170,10 @@ module Gitlab
       offline_cloud_licensing_enabled == true
     end
 
+    def contract_overages_allowed?
+      contract_overages_allowed == true
+    end
+
     def auto_renew?
       auto_renew_enabled == true
     end
@@ -198,6 +202,10 @@ module Gitlab
       licensee['Company'].to_s.match?(/GitLab/i) && licensee['Email'].to_s.end_with?('@jihulab.com')
     end
 
+    def temporary_extension?
+      temporary_extension == true
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)
@@ -230,10 +238,13 @@ module Gitlab
       hash['auto_renew_enabled'] = auto_renew?
       hash['seat_reconciliation_enabled'] = seat_reconciliation?
       hash['operational_metrics_enabled'] = operational_metrics?
+      hash['contract_overages_allowed'] = contract_overages_allowed?
 
       hash['generated_from_customers_dot'] = generated_from_customers_dot?
       hash['generated_from_cancellation'] = generated_from_cancellation?
 
+      hash['temporary_extension'] = temporary_extension?
+
       hash['restrictions'] = restrictions if restricted?
 
       hash
@@ -283,10 +294,13 @@ module Gitlab
         operational_metrics_enabled
         generated_from_customers_dot
         generated_from_cancellation
+        temporary_extension
       ].each do |attr_name|
         public_send("#{attr_name}=", attributes[attr_name] == true)
       end
 
+      @contract_overages_allowed = attributes['contract_overages_allowed'] != false
+
       restrictions = attributes['restrictions']
       if restrictions&.is_a?(Hash)
         restrictions = restrictions.transform_keys(&:to_sym)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: gitlab-license helps you generate, verify and enforce software licenses.