gitlab-license 1.0.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 383fa8e8886da54f66d4e605027ff68ce9b32427d9924d659e58c3c5035e6338
-  data.tar.gz: 502a4ea974f4299d9cd2d1a0c0a02780a79d15f56bdc8332806181227b3ef072
+  metadata.gz: 8e2099828f195390b3feec3baff3129202e17b50d2ef98e9db12a5627e149f9c
+  data.tar.gz: 50d9e48ca255e0b4cf1e6155fc8eeffaaa25c8b1682c8c04f9910135bb16fa68
 SHA512:
-  metadata.gz: a4a4f59660c0aed25f811fa584a281dac4f14cd60ebbec4fdb6ecc47e6ec31f4e35ba5ac0000b20b418761dbdaf20f1a3a2b7a221a2b91480d94f87a57a97862
-  data.tar.gz: 29b852faadaf76f0d9064c414e954f425290b83618882a7a3bfd47b10babcd8ce7a8a76ebe8990a35688d24a3a9314f69f9a1faec1179d0c5490fde09370de01
+  metadata.gz: 27d52f399c1640c873c34158daf4fc07a60c63df0bc1937e7559ffab7b1ebd3e2f590c98c47bde5e5855dc736d2b51efa35c1a4172a5dcde58fc7f50c8681b00
+  data.tar.gz: c583ecccdbb22b0849e2101e4ddba8974ba078bf4f7ecda243d2ef529f5903ddce0e3a6c78376f77bf1b2933a6e5894b0da82bee5a05dcd00cad84f7cfb36304

data/lib/gitlab/license.rb

@@ -50,9 +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 :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, :usage_ping_required_metrics_enabled,
+                  :generated_from_customers_dot
 
     alias_method :issued_at, :starts_at
     alias_method :issued_at=, :starts_at=
@@ -62,15 +64,29 @@ module Gitlab
     end
 
     def valid?
-      return false if !licensee         || !licensee.is_a?(Hash) || licensee.empty?
-      return false if !starts_at        || !starts_at.is_a?(Date)
-      return false if expires_at        && !expires_at.is_a?(Date)
-      return false if notify_admins_at  && !notify_admins_at.is_a?(Date)
-      return false if notify_users_at   && !notify_users_at.is_a?(Date)
-      return false if block_changes_at  && !block_changes_at.is_a?(Date)
-      return false if restrictions      && !restrictions.is_a?(Hash)
-
-      true
+      if !licensee || !licensee.is_a?(Hash) || licensee.empty?
+        false
+      elsif !starts_at || !starts_at.is_a?(Date)
+        false
+      elsif expires_at && !expires_at.is_a?(Date)
+        false
+      elsif notify_admins_at && !notify_admins_at.is_a?(Date)
+        false
+      elsif notify_users_at && !notify_users_at.is_a?(Date)
+        false
+      elsif block_changes_at && !block_changes_at.is_a?(Date)
+        false
+      elsif last_synced_at && !last_synced_at.is_a?(DateTime)
+        false
+      elsif next_sync_at && !next_sync_at.is_a?(DateTime)
+        false
+      elsif activated_at && !activated_at.is_a?(DateTime)
+        false
+      elsif restrictions && !restrictions.is_a?(Hash)
+        false
+      else
+        true
+      end
     end
 
     def validate!
@@ -93,6 +109,14 @@ module Gitlab
       block_changes_at
     end
 
+    def will_sync?
+      next_sync_at
+    end
+
+    def activated?
+      activated_at
+    end
+
     def expired?
       will_expire? && Date.today >= expires_at
     end
@@ -109,6 +133,26 @@ module Gitlab
       will_block_changes? && Date.today >= block_changes_at
     end
 
+    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 usage_ping_required_metrics?
+      usage_ping_required_metrics_enabled == true
+    end
+
+    def generated_from_customers_dot?
+      generated_from_customers_dot == true
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)
@@ -120,19 +164,30 @@ module Gitlab
     def attributes
       hash = {}
 
-      hash['version']          = version
-      hash['licensee']         = licensee
+      hash['version'] = version
+      hash['licensee'] = licensee
 
       # `issued_at` is the legacy name for starts_at.
       # TODO: Move to starts_at in a next version.
-      hash['issued_at']        = starts_at
-      hash['expires_at']       = expires_at       if will_expire?
+      hash['issued_at'] = starts_at
+      hash['expires_at'] = expires_at if will_expire?
 
       hash['notify_admins_at'] = notify_admins_at if will_notify_admins?
-      hash['notify_users_at']  = notify_users_at  if will_notify_users?
+      hash['notify_users_at'] = notify_users_at if will_notify_users?
       hash['block_changes_at'] = block_changes_at if will_block_changes?
 
-      hash['restrictions']     = restrictions     if restricted?
+      hash['next_sync_at'] = next_sync_at if will_sync?
+      hash['last_synced_at'] = last_synced_at if will_sync?
+      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['usage_ping_required_metrics_enabled'] = usage_ping_required_metrics?
+
+      hash['generated_from_customers_dot'] = generated_from_customers_dot?
+
+      hash['restrictions'] = restrictions if restricted?
 
       hash
     end
@@ -165,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
+        usage_ping_required_metrics_enabled
+        generated_from_customers_dot
+      ].each do |attr_name|
+        public_send("#{attr_name}=", attributes[attr_name] == true)
       end
 
       restrictions = attributes['restrictions']
@@ -180,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.0.1'.freeze
+    VERSION = '1.5.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-license
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Douwe Maan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler