modulorails 1.0.0 → 1.1.0

data/lib/modulorails.rb

@@ -17,11 +17,13 @@ require 'modulorails/services/services'
 # The entry point of the gem. It exposes the configurator, the gathered data and the method to
 # send those data to the intranet.
 module Modulorails
+
   # Author: Matthieu 'ciappa_m' Ciappara
   # The error class of the gem. Allow to identify all functional errors raised by the gem.
   class Error < StandardError; end
 
   class << self
+
     # Useful to update the configuration
     attr_writer :configuration
 
@@ -73,38 +75,38 @@ module Modulorails
       # If no endpoint and/or no API key is configured, it is impossible to send the data to the
       # intranet and thus we raise an error: it is the only error we want to raise since it goes
       # against one of the main goals of the gem and the gem's user is responsible.
-      if configuration.endpoint && configuration.api_key
-        # Define the headers of the request ; sending JSON and API key to authenticate the gem on
-        # the intranet
-        headers = {
-          'Content-Type' => 'application/json', 'X-MODULORAILS-TOKEN' => configuration.api_key
-        }
-
-        # Define the JSON body of the request
-        body = data.to_params.to_json
-
-        # Prevent HTTParty to raise error and crash the server in dev
-        begin
-          # Post to the configured endpoint on the Intranet
-          response = HTTParty.post(configuration.endpoint, headers: headers, body: body)
-
-          # According to the API specification, on a "Bad request" response, the server explicits what
-          # went wrong with an `errors` field. We do not want to raise since the gem's user is not
-          # (necessarily) responsible for the error but we still need to display it somewhere to warn
-          # the user something went wrong.
-          puts("[Modulorails] Error: #{response['errors'].join(', ')}") if response.code == 400
-
-          # Return the response to allow users to do some more
-          response
-        rescue StandardError => e
-          # Still need to notify the user
-          puts("[Modulorails] Error: Could not post to #{configuration.endpoint}")
-          puts e.message
-          nil
-        end
-      else
+      unless configuration.endpoint && configuration.api_key
         raise Error.new('No endpoint or api key')
       end
+
+      # Define the headers of the request ; sending JSON and API key to authenticate the gem on
+      # the intranet
+      headers = {
+        'Content-Type' => 'application/json', 'X-MODULORAILS-TOKEN' => configuration.api_key
+      }
+
+      # Define the JSON body of the request
+      body = data.to_params.to_json
+
+      # Prevent HTTParty to raise error and crash the server in dev
+      begin
+        # Post to the configured endpoint on the Intranet
+        response = HTTParty.post(configuration.endpoint, headers: headers, body: body)
+
+        # According to the API specification, on a "Bad request" response, the server explicits what
+        # went wrong with an `errors` field. We do not want to raise since the gem's user is not
+        # (necessarily) responsible for the error but we still need to display it somewhere to warn
+        # the user something went wrong.
+        puts("[Modulorails] Error: #{response['errors'].join(', ')}") if response.code == 400
+
+        # Return the response to allow users to do some more
+        response
+      rescue StandardError => e
+        # Still need to notify the user
+        puts("[Modulorails] Error: Could not post to #{configuration.endpoint}")
+        puts e.message
+        nil
+      end
     end
 
     # @author Matthieu 'ciappa_m' Ciappara
@@ -112,7 +114,7 @@ module Modulorails
     # Generate a CI/CD template unless it was already done.
     # The check is done using a 'keepfile'.
     def generate_ci_template
-      return if File.exists?(Rails.root.join('.modulorails-gitlab-ci'))
+      return if File.exist?(Rails.root.join('.modulorails-gitlab-ci'))
 
       Modulorails::GitlabciGenerator.new([], {}, {}).invoke_all
     end
@@ -138,7 +140,10 @@ module Modulorails
     # Check the last version of Modulorails available on rubygems and update if there was a
     # publication
     def self_update
-      Modulorails::SelfUpdateGenerator.new([], {}, {}).invoke_all unless configuration.no_auto_update
+      unless configuration.no_auto_update
+        Modulorails::SelfUpdateGenerator.new([], {},
+                                             {}).invoke_all
+      end
     rescue StandardError => e
       puts("[Modulorails] An error occured: #{e.class} - #{e.message}")
     end
@@ -148,7 +153,7 @@ module Modulorails
     # Generate a health_check configuration unless it was already done.
     # The check is done using a 'keepfile'.
     def generate_healthcheck_template
-      return if File.exists?(Rails.root.join('.modulorails-health_check'))
+      return if File.exist?(Rails.root.join('.modulorails-health_check'))
 
       Modulorails::HealthCheckGenerator.new([], {}, {}).invoke_all
     end
@@ -159,5 +164,7 @@ module Modulorails
     def generate_rubocop_template
       Modulorails::RubocopGenerator.new([], {}, {}).invoke_all
     end
+
   end
+
 end

data/modulorails.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['ciappa_m@modulotech.fr']
 
   spec.summary       = 'Common base for Ruby on Rails projects at Modulotech'
-  spec.description   =<<~END_OF_TEXT
+  spec.description = <<~END_OF_TEXT
     Modulorails is the common base for the Ruby on Rails project at Modulotech
     (https://www.modulotech.fr/).
 
@@ -24,19 +24,20 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'railties', '>= 4.2.0'
   spec.add_runtime_dependency 'git', '~> 1.7', '>= 1.7.0'
-  spec.add_runtime_dependency 'httparty'
-  spec.add_runtime_dependency 'i18n'
   spec.add_runtime_dependency 'health_check', '~> 3.1'
-  spec.add_runtime_dependency 'rubocop', '= 1.25.1'
-  spec.add_runtime_dependency 'rubocop-rails', '= 2.13.2'
+  spec.add_runtime_dependency 'httparty', '>= 0.13.3'
+  spec.add_runtime_dependency 'i18n', '>= 0.9.5'
+  spec.add_runtime_dependency 'railties', '>= 4.2.0'
+  spec.add_runtime_dependency 'rubocop', '>= 1.28.2'
+  spec.add_runtime_dependency 'rubocop-rails', '>= 2.14.2'
 
   spec.add_development_dependency 'activerecord', '>= 4.2.0'
   spec.add_development_dependency 'appraisal'
+  # spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,119 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: modulorails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthieu Ciappara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: health_check
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: health_check
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 1.28.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,6 @@ files:
 - lib/generators/modulorails/gitlabci/gitlabci_generator.rb
 - lib/generators/modulorails/gitlabci/templates/.gitlab-ci.yml.tt
 - lib/generators/modulorails/gitlabci/templates/.modulorails-gitlab-ci
-- lib/generators/modulorails/gitlabci/templates/config/database-ci.yml.tt
 - lib/generators/modulorails/healthcheck/health_check_generator.rb
 - lib/generators/modulorails/healthcheck/templates/.modulorails-health_check
 - lib/generators/modulorails/healthcheck/templates/config/initializers/health_check.rb.tt
@@ -242,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Common base for Ruby on Rails projects at Modulotech

data/lib/generators/modulorails/gitlabci/templates/config/database-ci.yml.tt

@@ -1,8 +0,0 @@
-<%- adapter = Modulorails.data.adapter -%>
-test:
-  host: <%= adapter =~ /mysql/ ? 'mysql' : 'postgres' %>
-  adapter: <%= adapter %>
-  database: test
-  username: root
-  password: password
-  encoding: utf8