diffcrypt 0.6.1 → 0.8.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb31613525e78d8a5f45fe9276daa26127c3f6555b69864cf6c438713c8a5385
-  data.tar.gz: f0cccb6f0706f613284e4f42e04c482dc3368c9e3b121b4d3a895c961e74383b
+  metadata.gz: f92de64774d20c0589ef9e2ae8e3734cf406638fdc60473b35afe5c6630c9253
+  data.tar.gz: eba4811ebbeeb12fa15f092f3a5a5b439747816df025e66b3e0558a605152fdd
 SHA512:
-  metadata.gz: 3d0d83aedaafe07809888c2bf7edb1100ee7b51c3d99dbf9deaa6108932a6585246e7b1d0f917f403f5a765e4421a73804465afacb6bd1c942c4a2befee1ecec
-  data.tar.gz: d40a2bfb110cae3f2961c5ca57f5de5e5250d54354b9470b1ffa140bf88717970cb9d067f65a4f03576e26b7b2372c88b5294eb22158bbfcc51bb8aa749cb07a
+  metadata.gz: 9765122e959807815c3a658a64cff0f4395b1fc79772a6a59949a60e16f8952c1982a0f61f73f922753e349773238b42f98ffa35b76b4659737ae4ae74f022ef
+  data.tar.gz: a953814419b665b42ec5e079a4d9ca2671f3681533fb715259497c3555a431ac176a1566242bf8d4350c6d83c6837ab8b3729608f542ecab9546c210370af224

data/.github/workflows/test.yml

@@ -7,15 +7,39 @@ on:
   pull_request:
 
 jobs:
-  rspec:
+  tests:
+    name: "RSpec @ Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}"
     runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
     strategy:
       matrix:
         ruby:
-          - "2.7.5"
-          - "3.0.3"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          - "3.4"
+          - "head"
+        rails:
+          - "6.1"
+          - "7.2"
+          - "8.0"
+        exclude:
+            - ruby: "3.2"
+              rails: "6.1"
+            - ruby: "3.3"
+              rails: "6.1"
+            - ruby: "3.4"
+              rails: "6.1"
+            - ruby: "head"
+              rails: "6.1"
+            - ruby: "3.1"
+              rails: "7.2"
+            - ruby: "3.1"
+              rails: "8.0"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -23,14 +47,21 @@ jobs:
         bundler-cache: true
     - name: Run rspec
       run: bundle exec rake test
-  rubocop:
+
+  linters:
+    name: "Rubocop @ Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}"
     runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
     strategy:
       matrix:
         ruby:
-          - "2.7.5"
+          - "3.4"
+        rails:
+          - "7.2"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -8,3 +8,5 @@
 /tmp/
 Gemfile.lock
 *.gem
+.ruby-version
+gemfiles/*.lock

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
 
 Style/ClassAndModuleChildren:
   Exclude:
@@ -23,10 +23,6 @@ Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Style/AccessorGrouping:
   EnforcedStyle: separated
-Style/OpenStructUse:
-  Exclude:
-    - test/*_test.rb
-    - test/**/*_test.rb
 
 Layout/LineLength:
   Exclude:

data/Appraisals

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+SUPPORTED_RAILS_VERSIONS = %w[
+  6.1
+  7.1
+  7.2
+  8.0
+].freeze
+
+SUPPORTED_RAILS_VERSIONS.each do |version|
+  appraise "rails-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
+end

data/CHANGELOG.md

@@ -7,7 +7,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
-## Unreleased
+## [0.8.0.rc1]
+
+### Added
+
+- Extended ruby 3.x support
+- Added Rails 8 support
+
+### Changed
+
+- Improved testing against multiple ruby/rails versions
+- Improved support for nested arrays and hashes in YAML files
+
+### Removed
+
+- Removed code coverage reporting
+
+
+
+## [0.7.0] - 2024-05-26
+
+### Added
+
+- Added ruby 3.1. support
+- Added rails 7.1 support
+
+### Changed
+
+- Updated all dependencies
+
+### Removed
+
+- Dropped ruby 2.x support
+
+
+
+## [0.6.1] - 2022-02-06
 
 ### Fixed
 

data/Gemfile

@@ -5,9 +5,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in diffcrypt.gemspec
 gemspec
 
+gem 'appraisal'
 gem 'minitest', '~> 5.0'
-gem 'minitest-reporters', '~> 1.5.0'
-gem 'rake', '~> 13.0'
+gem 'minitest-reporters', '~> 1.6.0'
+gem 'rake', '~> 13.2'
 gem 'rubocop', '~> 1.25.1'
-gem 'simplecov', '~> 0.21.2', require: false # CodeClimate not compatible with 0.18+ yet - https://github.com/codeclimate/test-reporter/issues/413
-gem 'simplecov-lcov', '< 0.9'

data/Rakefile

@@ -11,4 +11,4 @@ end
 task default: :test
 
 path = File.expand_path(__dir__)
-Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").sort.each { |f| load f }
+Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { load(_1) }

data/SECURITY.md

@@ -8,8 +8,8 @@ Since the internal APIs may change dramatically until v1.0, here is a list of th
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.5.1   | :white_check_mark: |
-| 0.6.x   | :white_check_mark: |
+| 0.7.0   | :x:                |
+| 0.8.x   | :white_check_mark: |
 
 
 

data/diffcrypt.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Diffable encrypted configuration files that can be safely committed into a git repository'
   spec.homepage      = 'https://github.com/diffcrypt/diffcrypt-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = %w[diffcrypt]
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.1'
+  spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 9.0'
   spec.add_runtime_dependency 'thor', '>= 0.20', '< 2'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'appraisal'
+gem 'concurrent-ruby', '1.3.4' # 1.3.5. breaks with Rails < 7, see https://github.com/ruby-concurrency/concurrent-ruby/commit/d7ce956dacd0b772273d39b8ed31a30cff7ecf38
+gem 'minitest', '~> 5.0'
+gem 'minitest-reporters', '~> 1.6.0'
+gem 'rails', '~> 6.1'
+gem 'rake', '~> 13.2'
+gem 'rubocop', '~> 1.25.1'
+
+gemspec path: '../'

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'appraisal'
+gem 'minitest', '~> 5.0'
+gem 'minitest-reporters', '~> 1.6.0'
+gem 'rails', '~> 7.2'
+gem 'rake', '~> 13.2'
+gem 'rubocop', '~> 1.25.1'
+
+gemspec path: '../'

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'appraisal'
+gem 'minitest', '~> 5.0'
+gem 'minitest-reporters', '~> 1.6.0'
+gem 'rails', '~> 8.0'
+gem 'rake', '~> 13.2'
+gem 'rubocop', '~> 1.25.1'
+
+gemspec path: '../'

data/lib/diffcrypt/encryptor.rb

@@ -6,6 +6,7 @@ require 'tmpdir'
 require 'securerandom'
 require 'yaml'
 
+require 'active_support' # NOTE: This is required because of a bug in 7.1 which needs deprecation libs
 require 'active_support/message_encryptor'
 
 require_relative './version'
@@ -33,16 +34,21 @@ module Diffcrypt
 
     # @param [Hash] data
     # @return [Hash]
+    # rubocop:disable Metrics/MethodLength
     def decrypt_hash(data)
       data.each do |key, value|
-        data[key] = if value.is_a?(Hash) || value.is_a?(Array)
+        data[key] = case value
+                    when Hash
                       decrypt_hash(value)
+                    when Array
+                      value.map { |v| decrypt_hash(v) }
                     else
                       decrypt_string value
                     end
       end
       data
     end
+    # rubocop:enable Metrics/MethodLength
 
     # @param [String] contents The raw YAML string to be encrypted
     # @param [String, nil] original_encrypted_contents The original (encrypted) content to determine which keys have changed
@@ -72,14 +78,18 @@ module Diffcrypt
     end
 
     # TODO: Fix the complexity of this method
-    # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
     # @param [Hash] keys
     # @return [Hash]
     def encrypt_values(data, original_data = nil)
       data.each do |key, value|
-        original_encrypted_value = original_data ? original_data[key] : nil
-        data[key] = if value.is_a?(Hash) || value.is_a?(Array)
+        original_encrypted_value = original_data&.dig(key)
+
+        data[key] = case value
+                    when Hash
                       encrypt_values(value, original_encrypted_value)
+                    when Array
+                      value.map.with_index { |v, i| encrypt_values(v, original_encrypted_value&.dig(i)) }
                     else
                       original_decrypted_value = original_encrypted_value ? decrypt_string(original_encrypted_value) : nil
                       key_changed = original_decrypted_value.nil? || original_decrypted_value != value
@@ -88,7 +98,7 @@ module Diffcrypt
       end
       data.sort.to_h
     end
-    # rubocop:enable Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
 
     # @param [String] value The encrypted value that needs decrypting
     # @return [String]

data/lib/diffcrypt/rails/encrypted_configuration.rb

@@ -68,6 +68,14 @@ module Diffcrypt
         read_env_key || read_key_file || handle_missing_key
       end
 
+      # It's required since the commit https://github.com/rails/rails/commit/1740b1f2cb8104435b6041ec6bfaabe58a6d74e6
+      # Returns truthy if #key is truthy. Returns falsy otherwise. Unlike #key,
+      # does not raise MissingKeyError when +raise_if_missing_key+ is true.
+      # @return [Boolean]
+      def key?
+        !!(read_env_key || read_key_file)
+      end
+
       def change(&block)
         writing read, &block
       end

data/lib/diffcrypt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diffcrypt
-  VERSION = '0.6.1'
+  VERSION = '0.8.0.rc1'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: diffcrypt
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0.rc1
 platform: ruby
 authors:
 - Marc Qualie
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +18,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +28,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +62,7 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -73,6 +73,9 @@ files:
 - bin/diffcrypt
 - bin/setup
 - diffcrypt.gemspec
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.2.gemfile
+- gemfiles/rails_8.0.gemfile
 - lib/diffcrypt.rb
 - lib/diffcrypt/cli.rb
 - lib/diffcrypt/encryptor.rb
@@ -90,7 +93,6 @@ metadata:
   homepage_uri: https://github.com/diffcrypt/diffcrypt-ruby
   source_code_uri: https://github.com/diffcrypt/diffcrypt-ruby
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,15 +100,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Diffable encrypted configuration files
 test_files: []