gitlab-license 2.0.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517b48dd59c73e6c06a3141dbbff736b6ac5aec0db0575e81e8eaa9efca214c3
-  data.tar.gz: a3ae2f4b90f8ab04f042e420e81b268bd0250ff76234d29424fa22badd127ff9
+  metadata.gz: e97f77de6b6b6e0b4910b0b892cc038dcf0c9103b65fc80a2fb27298a6be1140
+  data.tar.gz: 5c2a31361536c8a6eb4b87511ed41bdd889bf56239f28cdee43d2287c924b41e
 SHA512:
-  metadata.gz: 7c0b2e7c189d8abad15856eea602aefa67eb772a44609278a7600365389c706aa7b0594a51fed2ea7ade3307162ecbe053d5b17ca3bc7ed0054a104988e1d88d
-  data.tar.gz: 4dbaf5ea37ae26de84edd087269b10676879164abc0bee0578c3a6b6af88c832fe0aba70f22ee489de46eeeea2023b33c997ae999b51deeffbb0b05939662d04
+  metadata.gz: f4724c22299fcfd99440b0f653db6cf58e884bdf52335733136793e716aaa830cc2c25a393d4d809af46e5f098c02b3432afaa4407180b523f9e8f2f400f35dc
+  data.tar.gz: 99989f3f28e4fd3c04b866780c5565458620dd9bb15ba6407cd41f586dae70b198271f66f7cb40853b026d8a02ca68c4db1f2a32eac14eb1e919a7c20fb0b5a8

data/README.md

@@ -18,6 +18,17 @@ Or install it yourself as:
 
     $ gem install gitlab-license
 
+## Release
+
+To release a new version of this gem, follow these steps:
+
+1. Bump the `VERSION` constant in [`lib/gitlab/license/version.rb`](https://dev.gitlab.org/gitlab/gitlab-license/-/blob/master/lib/gitlab/license/version.rb#L3).  This is typically merged as part of the feature MR.
+1. Create a [new release](https://dev.gitlab.org/gitlab/gitlab-license/-/releases) in the project (e.g. `v2.1.0`). For more details on creating a new release, refer to the [documentation](https://dev.gitlab.org/help/user/project/releases/index.md#create-a-release).
+1. [Build the gem](https://guides.rubygems.org/command-reference/#gem-build) to be published: `gem build gitlab-license.gemspec`
+1. [Publish the gem](https://guides.rubygems.org/publishing) to Rubygems: `gem push gitlab-license-2.1.0.gem`
+   - Note you will need to be added as an owner in Rubygems in order to publish.
+   - Once this is published, the new version of the gem can be installed in other projects like CustomersDot or GitLab via bundler or using `gem install` directly.
+
 ## Usage
 
 ```ruby
@@ -48,17 +59,17 @@ license.licensee = {
   "Email"   => "douwe@gitlab.com"
 }
 
-# The date the license starts. 
+# The date the license starts.
 # Required.
 license.starts_at         = Date.new(2015, 4, 24)
-# The date the license expires. 
+# The date the license expires.
 # Not required, to allow lifetime licenses.
 license.expires_at        = Date.new(2016, 4, 23)
 
 # The below dates are hardcoded in the license so that you can play with the
 # period after which there are "repercussions" to license expiration.
 
-# The date admins will be notified about the license's pending expiration. 
+# The date admins will be notified about the license's pending expiration.
 # Not required.
 license.notify_admins_at  = Date.new(2016, 4, 19)
 
@@ -66,7 +77,7 @@ license.notify_admins_at  = Date.new(2016, 4, 19)
 # Not required.
 license.notify_users_at   = Date.new(2016, 4, 23)
 
-# The date "changes" like code pushes, issue or merge request creation 
+# The date "changes" like code pushes, issue or merge request creation
 # or modification and project creation will be blocked.
 # Not required.
 license.block_changes_at  = Date.new(2016, 5, 7)

data/lib/gitlab/license/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   class License
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.2.1'.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, :operational_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? && !jh_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
@@ -153,6 +161,14 @@ module Gitlab
       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 jh_team_license?
+      licensee['Company'].to_s.match?(/GitLab/i) && licensee['Email'].to_s.end_with?('@jihulab.com')
+    end
+
     def restricted?(key = nil)
       if key
         restricted? && restrictions.has_key?(key)
@@ -181,6 +197,7 @@ 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['operational_metrics_enabled'] = operational_metrics?
@@ -209,7 +226,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,6 +247,7 @@ module Gitlab
 
       %w[
         cloud_licensing_enabled
+        offline_cloud_licensing_enabled
         auto_renew_enabled
         seat_reconciliation_enabled
         operational_metrics_enabled
@@ -240,7 +258,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: 2.0.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Douwe Maan
 - Stan Hu
 - Tyler Amos
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-08-04 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: []