fittings 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b679fb549952c6427c53415d90f4e0c2d4acd07483062ff3b7b78fa0c4fec455
-  data.tar.gz: 1718401ee1f52d5da4a52add3fdb1a002ffeb68b469e318604dd3971040dd667
+  metadata.gz: caecbb60f8fcd01f6487054124746dab9891db42699a575112fb641c3fbbbbd4
+  data.tar.gz: eefb06bd4cc4f11384582ee87c6b48870300ca28e9c39cfb51be25b4c8df2fe0
 SHA512:
-  metadata.gz: 94f30339ca45d20fa0ce9cf9c5aa7bef61c5af8e1e679f057be084f0bb1f36771461f4601366efacbbfca7fe414c9d670dc83af8c9d15d8440312021e461b39b
-  data.tar.gz: 34d94ac4bdd9d6b462423620b0e321b3cfc4ed18380611c99355e81c78c2ffc2b2b68a1a7c50cc24854411d3ea504b80c0faa5cdf3bfa7636e9bedb84dc8e414
+  metadata.gz: e9d4ee552dbe4e19299c57cd70973755203573d0851f0c48af37532c9b97715835fc0a981fa0a9a90fed745c520279a146d5e6761b1bc7beeacced4d024510de
+  data.tar.gz: 2639d507e51bd6b4b13b3d5730e711cb9fc38267c0d811c996f666ffc98ab3cd2a5ebc6a7b5c1d1007fa17cc6d897e4051620877d5fe71db0b301047855f1543

data/.circleci/config.yml

@@ -1,11 +1,30 @@
 # DO NOT MODIFY - this is managed by Git Reduce in goro and generated from build-matrix.json
 #
 ---
-version: 2
+version: 2.1
+
+############
+## Github Actions Pipeline Params
+############
+
+parameters:
+  GHA_Event:
+    type: string
+    default: ""
+  GHA_Actor:
+    type: string
+    default: ""
+  GHA_Action:
+    type: string
+    default: ""
+  GHA_Meta:
+    type: string
+    default: ""
+
 jobs:
   generate-and-push-docs:
     docker:
-    - image: cimg/ruby:3.1.2
+    - image: cimg/ruby:3.1.3
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -26,7 +45,7 @@ jobs:
           docs:push; fi
   release:
     docker:
-    - image: cimg/ruby:3.1.2
+    - image: cimg/ruby:3.1.3
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -41,9 +60,9 @@ jobs:
     - run:
         name: Build/release gem to artifactory
         command: bundle exec rake push_artifactory
-  ruby-3.1.2:
+  ruby-3_1_3:
     docker:
-    - image: cimg/ruby:3.1.2
+    - image: cimg/ruby:3.1.3
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -69,9 +88,9 @@ jobs:
         when: on_fail
     - store_test_results:
         path: "/tmp/test-results"
-  ruby-3.0.4:
+  ruby-3_0_5:
     docker:
-    - image: cimg/ruby:3.0.4
+    - image: cimg/ruby:3.0.5
       auth:
         username: "$DOCKERHUB_USERNAME"
         password: "$DOCKERHUB_PASSWORD"
@@ -104,11 +123,11 @@ workflows:
     - release:
         context: org-global
         requires:
-        - ruby-3.1.2
-        - ruby-3.0.4
+        - ruby-3_1_3
+        - ruby-3_0_5
         filters:
           tags:
-            only: /^[0-9]+\.[0-9]+\.[0-9]+((-|\.)?(RC|rc)[-\.]?\w*)?$/
+            only: /^[0-9]+\.[0-9]+\.[0-9]+((-|\.)?(RC|rc)[-.]?\w*)?$/
           branches:
             ignore: /.*/
     - generate-and-push-docs:
@@ -117,29 +136,24 @@ workflows:
         - release
         filters:
           tags:
-            only: /^[0-9]+\.[0-9]+\.[0-9]+((-|\.)?(RC|rc)[-\.]?\w*)?$/
+            only: /^[0-9]+\.[0-9]+\.[0-9]+((-|\.)?(RC|rc)[-.]?\w*)?$/
           branches:
             ignore: /.*/
-    - ruby-3.1.2:
+    - ruby-3_1_3:
         context: org-global
         filters:
           tags:
             only: &1 /.*/
-    - ruby-3.0.4:
+    - ruby-3_0_5:
         context: org-global
         filters:
           tags:
             only: *1
   scheduled:
-    triggers:
-    - schedule:
-        cron: 26 18 * * 1,2,3,4,5
-        filters:
-          branches:
-            only:
-            - main
+    when:
+       equal: [ "schedule", << pipeline.parameters.GHA_Event >> ]
     jobs:
-    - ruby-3.1.2:
+    - ruby-3_1_3:
         context: org-global
-    - ruby-3.0.4:
+    - ruby-3_0_5:
         context: org-global

data/.github/workflows/scheduled_cci.yml

@@ -0,0 +1,14 @@
+on:
+  schedule:
+    - cron: '26 18 * * 1,2,3,4,5'
+  workflow_dispatch:
+
+jobs:
+  trigger-circleci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: CircleCI trigger on schedule
+        id: step1
+        uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.0.5
+        env:
+          CCI_TOKEN: ${{ secrets.CCI_TOKEN || secrets.CCI_TOKEN_FOR_PUBLIC_REPOS }}

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+ruby-3.0.4

data/fittings.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "fittings"
-  s.version = "1.0.0"
+  s.version = "2.0.0"
 
   s.authors = ["Edwin Cruz", "Colin Shield"]
   s.date = %q{2011-09-06}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = ">= 2.4.0"
   s.add_dependency "hashie"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rake"

data/lib/setting.rb

@@ -8,12 +8,13 @@ class Setting
   class FileError < RuntimeError; end
   class AlreadyLoaded < RuntimeError; end
 
+  class SettingHash < Hash
+    include Hashie::Extensions::IndifferentAccess
+    include Hashie::Extensions::KeyConversion
+    include Hashie::Extensions::DeepMerge
+  end
+
   include Singleton
-  NUM_KLASS = if RUBY_VERSION.split(/\./)[0].to_i == 2 && RUBY_VERSION.split(/\./)[1].to_i >= 4
-                Integer
-              else
-                Fixnum
-              end
 
   attr_reader :available_settings
 
@@ -87,7 +88,7 @@ class Setting
   #=================================================================
 
   def initialize
-    @available_settings ||= Hashie::Mash.new
+    @available_settings ||= SettingHash.new
   end
 
   def has_key?(key)
@@ -105,12 +106,15 @@ class Setting
     end
 
     v = @available_settings[name]
+    if v.is_a?(Hash)
+      v = SettingHash[v]
+    end
     if block_given?
       v = yield(v, args)
     end
 
 
-    if v.is_a?(NUM_KLASS) && bool
+    if v.is_a?(Integer) && bool
       v.to_i > 0
     else
       v
@@ -151,7 +155,7 @@ class Setting
 
   def load(params)
     # reset settings hash
-    @available_settings = Hashie::Mash.new
+    @available_settings = SettingHash.new
     @loaded = false
 
     files = []
@@ -170,9 +174,9 @@ class Setting
         # `load` is the behavior we want (in later versions, `load` uses `safe_load`, which doesn't support aliases and
         # requires allowlisting classes used in files.
         if Psych::VERSION < '3.3.2'
-          @available_settings.deep_merge!(YAML::load(ERB.new(IO.read(file)).result) || {}) if File.exists?(file)
+          @available_settings.deep_merge!(YAML::load(ERB.new(IO.read(file)).result) || {}) if File.exist?(file)
         else
-          @available_settings.deep_merge!(YAML::unsafe_load(ERB.new(IO.read(file)).result) || {}) if File.exists?(file)
+          @available_settings.deep_merge!(YAML::unsafe_load(ERB.new(IO.read(file)).result) || {}) if File.exist?(file)
         end
       rescue Exception => e
         raise FileError.new("Error parsing file #{file}, with: #{e.message}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fittings
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Edwin Cruz
@@ -92,11 +92,11 @@ files:
 - ".circleci/config.yml"
 - ".github/CODEOWNERS"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/scheduled_cci.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
-- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -122,14 +122,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Manage settings per environment

data/CHANGELOG.md

@@ -1,12 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [1.0.0]
-
-### Added
-
-- Switched to using `Hashie::Mash` for YAML parsing. This provides behavior that is more consistent, while remaining similar. It did not cause any tests to fail, but may be a breaking change depending on how you are using the gem.