gitlab-license 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 383fa8e8886da54f66d4e605027ff68ce9b32427d9924d659e58c3c5035e6338
-  data.tar.gz: 502a4ea974f4299d9cd2d1a0c0a02780a79d15f56bdc8332806181227b3ef072
+  metadata.gz: e6aecf2ddad9be921880a1603714f79947534ede972c8f47f8b5121c96d912c1
+  data.tar.gz: 66b55835b29c3c9c2fdd175b31113523d616802e6a8cfa6898a98f080039760b
 SHA512:
-  metadata.gz: a4a4f59660c0aed25f811fa584a281dac4f14cd60ebbec4fdb6ecc47e6ec31f4e35ba5ac0000b20b418761dbdaf20f1a3a2b7a221a2b91480d94f87a57a97862
-  data.tar.gz: 29b852faadaf76f0d9064c414e954f425290b83618882a7a3bfd47b10babcd8ce7a8a76ebe8990a35688d24a3a9314f69f9a1faec1179d0c5490fde09370de01
+  metadata.gz: 1ca37a34899d853c22871e36f70aac9196e127ea92b6c7ef1cdda167eab9e595c9e092ae072857c343158881dad8961b2430150b3e730d2408facac6b94b1c1e
+  data.tar.gz: 5d77bbd654db4ad8e4e4458748d15720a3092d6085e73e06ac717b4f5fe6594f52ed517dedcc6e4c33398f3a1f419b7573578d37dae61a0f84b3543e2557383d

data/lib/gitlab/license.rb

@@ -52,6 +52,7 @@ module Gitlab
     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
 
     alias_method :issued_at, :starts_at
@@ -62,15 +63,31 @@ 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 block_changes_without_sync_at && !block_changes_without_sync_at.is_a?(Date)
+        false
+      elsif type && type != 'sync'
+        false
+      elsif restrictions && !restrictions.is_a?(Hash)
+        false
+      else
+        true
+      end
     end
 
     def validate!
@@ -93,6 +110,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 expired?
       will_expire? && Date.today >= expires_at
     end
@@ -109,6 +134,10 @@ 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
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)
@@ -120,19 +149,24 @@ 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['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['restrictions'] = restrictions if restricted?
 
       hash
     end

data/lib/gitlab/license/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   class License
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.2.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.2.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: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler