gitlab-license 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6aecf2ddad9be921880a1603714f79947534ede972c8f47f8b5121c96d912c1
-  data.tar.gz: 66b55835b29c3c9c2fdd175b31113523d616802e6a8cfa6898a98f080039760b
+  metadata.gz: f525ce304f2d85f5f03f545039dccf52dea44383c11d714f1ca3c0ed78e30905
+  data.tar.gz: 7f34872e6678f0c3d9970cae4077122f96864bf9f1bec0219bae35709e538082
 SHA512:
-  metadata.gz: 1ca37a34899d853c22871e36f70aac9196e127ea92b6c7ef1cdda167eab9e595c9e092ae072857c343158881dad8961b2430150b3e730d2408facac6b94b1c1e
-  data.tar.gz: 5d77bbd654db4ad8e4e4458748d15720a3092d6085e73e06ac717b4f5fe6594f52ed517dedcc6e4c33398f3a1f419b7573578d37dae61a0f84b3543e2557383d
+  metadata.gz: ca9c47b79cfb8d3b6bbb780e565eccaf3005bb0b6f44c03fc9d5836bc18ae57a4a694958a8e7e74a71d83d7ec2c83384283aa6ba34f859b6df34142fafb4318f
+  data.tar.gz: 1c4ed9a4bb95a8094d11f3caec70aa94fae5651931546a3ef984500e8da7dd22f6c711b8ffe646f00f93283a557317ee3f415f44fe7c0fb660dffb0e16acc9d8

data/lib/gitlab/license.rb

@@ -50,10 +50,9 @@ 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, :type, :last_synced_at,
+                  :next_sync_at, :activated_at, :restrictions
 
     alias_method :issued_at, :starts_at
     alias_method :issued_at=, :starts_at=
@@ -79,9 +78,9 @@ 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)
+      elsif activated_at && !activated_at.is_a?(DateTime)
         false
-      elsif type && type != 'sync'
+      elsif type && type != 'cloud'
         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,10 +133,6 @@ 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)
@@ -161,9 +156,9 @@ 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['activated_at'] = activated_at if activated?
       hash['type'] = type
 
       hash['restrictions'] = restrictions if restricted?
@@ -196,16 +191,16 @@ module Gitlab
       @version = version
 
       @licensee = attributes['licensee']
+      @type = attributes['type']
 
       # `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)
-
-        next unless value
+      %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
 
-        send("#{attr}=", value)
+      %w[last_synced_at next_sync_at activated_at].each do |attr_name|
+        set_datetime_attribute(attr_name, attributes[attr_name])
       end
 
       restrictions = attributes['restrictions']
@@ -214,5 +209,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
+
+      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 = '1.4.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: 1.4.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-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler