gitlab-license 1.5.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e2099828f195390b3feec3baff3129202e17b50d2ef98e9db12a5627e149f9c
-  data.tar.gz: 50d9e48ca255e0b4cf1e6155fc8eeffaaa25c8b1682c8c04f9910135bb16fa68
+  metadata.gz: b5090d0ea93ebe93a8ae432f94f6cafb36247511d024123140d010d241f2f133
+  data.tar.gz: 160af752702b9c305ecfe9d6405ec1dc4b1eff19e9bf3f89a8a7f79913013099
 SHA512:
-  metadata.gz: 27d52f399c1640c873c34158daf4fc07a60c63df0bc1937e7559ffab7b1ebd3e2f590c98c47bde5e5855dc736d2b51efa35c1a4172a5dcde58fc7f50c8681b00
-  data.tar.gz: c583ecccdbb22b0849e2101e4ddba8974ba078bf4f7ecda243d2ef529f5903ddce0e3a6c78376f77bf1b2933a6e5894b0da82bee5a05dcd00cad84f7cfb36304
+  metadata.gz: a6d58d7a27ff46ac88e7da9d92c7a3c5854777f8f49c7630a9b72b792b8ca75de3611893a5e9555fb45be94781d5bf760c10971e23f8916e00d0f19326a1e6ea
+  data.tar.gz: a5e5e07714819ab014a656953a99b5c8f32c4ed494c130a6b535f1810f967453aa0d71b38c28a00eb321bf0e28fe18f16bdb5fc953bd0e889025bd7ae558dc24

data/lib/gitlab/license/version.rb

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

data/lib/gitlab/license.rb

@@ -52,9 +52,9 @@ module Gitlab
     attr_reader :version
     attr_accessor :licensee, :starts_at, :expires_at, :notify_admins_at,
                   :notify_users_at, :block_changes_at, :last_synced_at, :next_sync_at,
-                  :activated_at, :restrictions, :cloud_licensing_enabled, :auto_renew_enabled,
-                  :seat_reconciliation_enabled, :usage_ping_required_metrics_enabled,
-                  :generated_from_customers_dot
+                  :activated_at, :restrictions, :cloud_licensing_enabled,
+                  :offline_cloud_licensing_enabled, :auto_renew_enabled, :seat_reconciliation_enabled,
+                  :operational_metrics_enabled, :generated_from_customers_dot
 
     alias_method :issued_at, :starts_at
     alias_method :issued_at=, :starts_at=
@@ -68,6 +68,8 @@ module Gitlab
         false
       elsif !starts_at || !starts_at.is_a?(Date)
         false
+      elsif !expires_at && !gl_team_license?
+        false
       elsif expires_at && !expires_at.is_a?(Date)
         false
       elsif notify_admins_at && !notify_admins_at.is_a?(Date)
@@ -84,6 +86,8 @@ module Gitlab
         false
       elsif restrictions && !restrictions.is_a?(Hash)
         false
+      elsif !cloud_licensing? && offline_cloud_licensing?
+        false
       else
         true
       end
@@ -137,6 +141,10 @@ module Gitlab
       cloud_licensing_enabled == true
     end
 
+    def offline_cloud_licensing?
+      offline_cloud_licensing_enabled == true
+    end
+
     def auto_renew?
       auto_renew_enabled == true
     end
@@ -145,14 +153,18 @@ module Gitlab
       seat_reconciliation_enabled == true
     end
 
-    def usage_ping_required_metrics?
-      usage_ping_required_metrics_enabled == true
+    def operational_metrics?
+      operational_metrics_enabled == true
     end
 
     def generated_from_customers_dot?
       generated_from_customers_dot == true
     end
 
+    def gl_team_license?
+      licensee['Company'].to_s.match?(/GitLab/i) && licensee['Email'].to_s.end_with?('@gitlab.com')
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)
@@ -181,9 +193,10 @@ module Gitlab
       hash['activated_at'] = activated_at if activated?
 
       hash['cloud_licensing_enabled'] = cloud_licensing?
+      hash['offline_cloud_licensing_enabled'] = offline_cloud_licensing?
       hash['auto_renew_enabled'] = auto_renew?
       hash['seat_reconciliation_enabled'] = seat_reconciliation?
-      hash['usage_ping_required_metrics_enabled'] = usage_ping_required_metrics?
+      hash['operational_metrics_enabled'] = operational_metrics?
 
       hash['generated_from_customers_dot'] = generated_from_customers_dot?
 
@@ -209,7 +222,7 @@ module Gitlab
     private
 
     def load_attributes(attributes)
-      attributes = Hash[attributes.map { |k, v| [k.to_s, v] }]
+      attributes = attributes.transform_keys(&:to_s)
 
       version = attributes['version'] || 1
       raise ArgumentError, 'Version is too new' unless version && version == 1
@@ -230,9 +243,10 @@ module Gitlab
 
       %w[
         cloud_licensing_enabled
+        offline_cloud_licensing_enabled
         auto_renew_enabled
         seat_reconciliation_enabled
-        usage_ping_required_metrics_enabled
+        operational_metrics_enabled
         generated_from_customers_dot
       ].each do |attr_name|
         public_send("#{attr_name}=", attributes[attr_name] == true)
@@ -240,7 +254,7 @@ module Gitlab
 
       restrictions = attributes['restrictions']
       if restrictions&.is_a?(Hash)
-        restrictions = Hash[restrictions.map { |k, v| [k.to_sym, v] }]
+        restrictions = restrictions.transform_keys(&:to_sym)
         @restrictions = restrictions
       end
     end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Douwe Maan
 - Stan Hu
 - Tyler Amos
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.38.1
-description: 
+description:
 email:
 - douwe@gitlab.com
 - stanhu@gitlab.com
@@ -125,7 +125,7 @@ homepage: https://dev.gitlab.org/gitlab/gitlab-license
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,8 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: gitlab-license helps you generate, verify and enforce software licenses.
 test_files: []