➕ version_gem

- switch to require_relative

Author: pboling

Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    masq2 (0.3.4)
+    masq2 (1.0.0.pre.beta.1)
       erb
       i18n_data
-      rails (~> 5.2.0)
+      rails (>= 5.2.8.1)
       rails-controller-testing
       ruby-openid2 (~> 3.1)
       ruby-yadis
+      version_gem (~> 1.1, >= 1.1.6)
       yubikey
 
 GEM
@@ -163,7 +164,7 @@ GEM
     timeout (0.4.3)
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    version_gem (1.1.4)
+    version_gem (1.1.6)
     websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)

lib/masq.rb

@@ -1,6 +1,21 @@
-require "masq/engine"
-require "masq/authenticated_system"
-require "masq/openid_server_system"
-require "masq/active_record_openid_store/association"
-require "masq/active_record_openid_store/nonce"
-require "masq/active_record_openid_store/openid_ar_store"
+# external gems
+require "version_gem"
+
+# this library's version
+require_relative "masq/version"
+
+require_relative "masq/engine"
+require_relative "masq/authenticated_system"
+require_relative "masq/openid_server_system"
+require_relative "masq/active_record_openid_store/association"
+require_relative "masq/active_record_openid_store/nonce"
+require_relative "masq/active_record_openid_store/openid_ar_store"
+
+module Masq
+  # Namespace for this library
+end
+
+# Ensure version is configured before loading the rest of the library
+Masq::Version.class_eval do
+  extend VersionGem::Basic
+end

lib/masq/version.rb

@@ -1,3 +1,5 @@
 module Masq
-  VERSION = "0.3.4"
+  module Version
+    VERSION = "1.0.0-beta.1"
+  end
 end

masq.gemspec

@@ -1,22 +1,25 @@
-$:.push File.expand_path("../lib", __FILE__)
-
-# Maintain your gem's version:
-require "masq/version"
+# Get the GEMFILE_VERSION without *require* "my_gem/version", for code coverage accuracy
+# See: https://github.com/simplecov-ruby/simplecov/issues/557#issuecomment-2630782358
+# Kernel.load because load is overloaded in RubyGems during gemspec evaluation
+Kernel.load("lib/masq/version.rb")
+gem_version = Masq::Version::VERSION
+Masq::Version.send(:remove_const, :VERSION)
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "masq2"
-  s.version     = Masq::VERSION
+  s.version     = gem_version
   s.authors     = ["Peter Boling", "Dennis Reimann", "Bardoe Besselaar","Nikita Vasiliev"]
   s.email       = ["[email protected]"]
   s.homepage    = "https://github.com/oauth-xx/masq2"
-  s.summary     = "Mountable Rails engine that provides OpenID server/identity provider functionality"
-  s.description = "Masq2 supports the current OpenID specifications (OpenID 2.0) and supports SReg, AX (fetch and store requests) and PAPE as well as some custom additions like multi-factor authentication using a yubikey"
+  s.summary     = "Mountable Rails engine that provides OpenID 2.0 server/identity provider functionality"
+  s.description = "Masq2 supports OpenID 2.0 and supports SReg, AX (fetch and store requests) and PAPE as well as some custom additions like multi-factor authentication using a yubikey"
 
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", "~> 5.2.0"
+  s.add_dependency "version_gem", "~> 1.1", ">= 1.1.6"
+  s.add_dependency "rails", ">= 5.2.8.1"
   s.add_dependency "erb"
   s.add_dependency "rails-controller-testing"
   s.add_dependency "ruby-openid2", "~> 3.1"