gitlab-license 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6aecf2ddad9be921880a1603714f79947534ede972c8f47f8b5121c96d912c1
-  data.tar.gz: 66b55835b29c3c9c2fdd175b31113523d616802e6a8cfa6898a98f080039760b
+  metadata.gz: 517b48dd59c73e6c06a3141dbbff736b6ac5aec0db0575e81e8eaa9efca214c3
+  data.tar.gz: a3ae2f4b90f8ab04f042e420e81b268bd0250ff76234d29424fa22badd127ff9
 SHA512:
-  metadata.gz: 1ca37a34899d853c22871e36f70aac9196e127ea92b6c7ef1cdda167eab9e595c9e092ae072857c343158881dad8961b2430150b3e730d2408facac6b94b1c1e
-  data.tar.gz: 5d77bbd654db4ad8e4e4458748d15720a3092d6085e73e06ac717b4f5fe6594f52ed517dedcc6e4c33398f3a1f419b7573578d37dae61a0f84b3543e2557383d
+  metadata.gz: 7c0b2e7c189d8abad15856eea602aefa67eb772a44609278a7600365389c706aa7b0594a51fed2ea7ade3307162ecbe053d5b17ca3bc7ed0054a104988e1d88d
+  data.tar.gz: 4dbaf5ea37ae26de84edd087269b10676879164abc0bee0578c3a6b6af88c832fe0aba70f22ee489de46eeeea2023b33c997ae999b51deeffbb0b05939662d04

data/lib/gitlab/license.rb

@@ -50,10 +50,11 @@ module Gitlab
     end
 
     attr_reader :version
-    attr_accessor :licensee, :starts_at, :expires_at
-    attr_accessor :notify_admins_at, :notify_users_at, :block_changes_at
-    attr_accessor :type, :last_synced_at, :next_sync_at, :block_changes_without_sync_at
-    attr_accessor :restrictions
+    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, :operational_metrics_enabled,
+                  :generated_from_customers_dot
 
     alias_method :issued_at, :starts_at
     alias_method :issued_at=, :starts_at=
@@ -79,9 +80,7 @@ module Gitlab
         false
       elsif next_sync_at && !next_sync_at.is_a?(DateTime)
         false
-      elsif block_changes_without_sync_at && !block_changes_without_sync_at.is_a?(Date)
-        false
-      elsif type && type != 'sync'
+      elsif activated_at && !activated_at.is_a?(DateTime)
         false
       elsif restrictions && !restrictions.is_a?(Hash)
         false
@@ -110,14 +109,14 @@ module Gitlab
       block_changes_at
     end
 
-    def will_block_changes_without_sync?
-      block_changes_without_sync_at
-    end
-
     def will_sync?
       next_sync_at
     end
 
+    def activated?
+      activated_at
+    end
+
     def expired?
       will_expire? && Date.today >= expires_at
     end
@@ -134,8 +133,24 @@ module Gitlab
       will_block_changes? && Date.today >= block_changes_at
     end
 
-    def block_changes_without_sync?
-      will_block_changes_without_sync? && Date.today >= block_changes_without_sync_at
+    def cloud_licensing?
+      cloud_licensing_enabled == true
+    end
+
+    def auto_renew?
+      auto_renew_enabled == true
+    end
+
+    def seat_reconciliation?
+      seat_reconciliation_enabled == true
+    end
+
+    def operational_metrics?
+      operational_metrics_enabled == true
+    end
+
+    def generated_from_customers_dot?
+      generated_from_customers_dot == true
     end
 
     def restricted?(key = nil)
@@ -161,10 +176,16 @@ module Gitlab
       hash['notify_users_at'] = notify_users_at if will_notify_users?
       hash['block_changes_at'] = block_changes_at if will_block_changes?
 
-      hash['block_changes_without_sync_at'] = block_changes_without_sync_at if will_block_changes_without_sync?
       hash['next_sync_at'] = next_sync_at if will_sync?
       hash['last_synced_at'] = last_synced_at if will_sync?
-      hash['type'] = type
+      hash['activated_at'] = activated_at if activated?
+
+      hash['cloud_licensing_enabled'] = cloud_licensing?
+      hash['auto_renew_enabled'] = auto_renew?
+      hash['seat_reconciliation_enabled'] = seat_reconciliation?
+      hash['operational_metrics_enabled'] = operational_metrics?
+
+      hash['generated_from_customers_dot'] = generated_from_customers_dot?
 
       hash['restrictions'] = restrictions if restricted?
 
@@ -199,13 +220,22 @@ module Gitlab
 
       # `issued_at` is the legacy name for starts_at.
       # TODO: Move to starts_at in a next version.
-      %w[issued_at expires_at notify_admins_at notify_users_at block_changes_at].each do |attr|
-        value = attributes[attr]
-        value = Date.parse(value) rescue nil if value.is_a?(String)
+      %w[issued_at expires_at notify_admins_at notify_users_at block_changes_at].each do |attr_name|
+        set_date_attribute(attr_name, attributes[attr_name])
+      end
 
-        next unless value
+      %w[last_synced_at next_sync_at activated_at].each do |attr_name|
+        set_datetime_attribute(attr_name, attributes[attr_name])
+      end
 
-        send("#{attr}=", value)
+      %w[
+        cloud_licensing_enabled
+        auto_renew_enabled
+        seat_reconciliation_enabled
+        operational_metrics_enabled
+        generated_from_customers_dot
+      ].each do |attr_name|
+        public_send("#{attr_name}=", attributes[attr_name] == true)
       end
 
       restrictions = attributes['restrictions']
@@ -214,5 +244,17 @@ module Gitlab
         @restrictions = restrictions
       end
     end
+
+    def set_date_attribute(attr_name, value, date_class = Date)
+      value = date_class.parse(value) rescue nil if value.is_a?(String)
+
+      return unless value
+
+      public_send("#{attr_name}=", value)
+    end
+
+    def set_datetime_attribute(attr_name, value)
+      set_date_attribute(attr_name, value, DateTime)
+    end
   end
 end

data/lib/gitlab/license/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler