rails-conflicted-credentials 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 276f84be9c79524d035e6198602bfd1dd2690cd8240cfefa0e323c6f79eec37f
+  data.tar.gz: f76789a7b44815f04881fbc81306dea9194baf11ac879785e483468fbc9035fb
+SHA512:
+  metadata.gz: ad3bc8d7bf87652ea98202c00e64bf27e843c10a4a3e9c5ef7d1f44a4e6a9ffd21535ce4b7d5b5a39a0ea18aa17abf93de913bb3fd64acf76be2398bb53366c8
+  data.tar.gz: 135d224ebb19b65d9ebfac59b3ac3c87ab95945a71b90f5873ba210d5a87035dbc35fd84fff34ed981132f00878cee04317fe24eb24838930b7559132821e28d

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,413 @@
+plugins:
+  - rubocop-minitest
+  - rubocop-packaging
+  - rubocop-performance
+  - rubocop-rails
+  - rubocop-md
+
+AllCops:
+  # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
+  # to ignore them, so only the ones explicitly set in this file are enabled.
+  DisabledByDefault: true
+  SuggestExtensions: false
+  Exclude:
+    - '**/tmp/**/*'
+    - '**/templates/**/*'
+    - '**/vendor/**/*'
+    - 'actionmailbox/test/dummy/**/*'
+    - 'activestorage/test/dummy/**/*'
+    - 'actiontext/test/dummy/**/*'
+    - 'tools/rail_inspector/test/fixtures/*'
+    - guides/source/debugging_rails_applications.md
+    - guides/source/active_support_instrumentation.md
+    - '**/node_modules/**/*'
+    - '**/CHANGELOG.md'
+    - '**/2_*_release_notes.md'
+    - '**/3_*_release_notes.md'
+    - '**/4_*_release_notes.md'
+    - '**/5_*_release_notes.md'
+    - '**/6_*_release_notes.md'
+
+
+Performance:
+  Exclude:
+    - '**/test/**/*'
+
+# Prefer assert_not over assert !
+Rails/AssertNot:
+  Include:
+    - '**/test/**/*'
+
+# Prefer assert_not_x over refute_x
+Rails/RefuteMethods:
+  Include:
+    - '**/test/**/*'
+
+Rails/IndexBy:
+  Enabled: true
+
+Rails/IndexWith:
+  Enabled: true
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+Layout/ClosingHeredocIndentation:
+  Enabled: true
+
+Layout/ClosingParenthesisIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+Layout/DefEndAlignment:
+  Enabled: true
+
+Layout/ElseAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
+
+Layout/EndOfLine:
+  Enabled: true
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: true
+  EnforcedStyle: only_before
+
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: true
+
+# In a regular class definition, no empty lines around the body.
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+
+# In a regular method definition, no empty lines around the body.
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: true
+
+# In a regular module definition, no empty lines around the body.
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+  EnforcedShorthandSyntax: either
+
+# Method definitions after `private` or `protected` isolated calls need one
+# extra level of indentation.
+Layout/IndentationConsistency:
+  Enabled: true
+  EnforcedStyle: indented_internal_methods
+  Exclude:
+    - '**/*.md'
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/LeadingCommentSpace:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAfterSemicolon:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeComma:
+  Enabled: true
+
+Layout/SpaceBeforeComment:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+
+Style/DefWithParentheses:
+  Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+Style/ExplicitBlockArgument:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+  Exclude:
+    - 'actionview/test/**/*.builder'
+    - 'actionview/test/**/*.ruby'
+    - 'actionpack/test/**/*.builder'
+    - 'actionpack/test/**/*.ruby'
+    - 'activestorage/db/migrate/**/*.rb'
+    - 'activestorage/db/update_migrate/**/*.rb'
+    - 'actionmailbox/db/migrate/**/*.rb'
+    - 'actiontext/db/migrate/**/*.rb'
+    - '**/*.md'
+
+Style/MapToHash:
+  Enabled: true
+
+Style/RedundantFreeze:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+  EnforcedStyleForEmptyBraces: space
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Check quotes usage according to lint rule below.
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+# Detect hard tabs, no hard tabs.
+Layout/IndentationStyle:
+  Enabled: true
+
+# Empty lines should not have any spaces.
+Layout/TrailingEmptyLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+# Use quotes for string literals when they are enough.
+Style/RedundantPercentQ:
+  Enabled: true
+
+Lint/NestedMethodDefinition:
+  Enabled: true
+
+Lint/AmbiguousOperator:
+  Enabled: true
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: true
+
+Lint/Debugger:
+  Enabled: true
+  DebuggerRequires:
+    - debug
+
+Lint/DuplicateRequire:
+  Enabled: true
+
+Lint/DuplicateMagicComment:
+  Enabled: true
+
+Lint/DuplicateMethods:
+  Enabled: true
+
+Lint/ErbNewArguments:
+  Enabled: true
+
+Lint/EnsureReturn:
+  Enabled: true
+
+Lint/MissingCopEnableDirective:
+  Enabled: true
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Lint/RedundantCopDisableDirective:
+  Enabled: true
+
+Lint/RedundantCopEnableDirective:
+  Enabled: true
+
+Lint/RedundantRequireStatement:
+  Enabled: true
+
+Lint/RedundantStringCoercion:
+  Enabled: true
+
+Lint/RedundantSafeNavigation:
+  Enabled: true
+
+Lint/UriEscapeUnescape:
+  Enabled: true
+
+Lint/UselessAssignment:
+  Enabled: true
+
+Lint/DeprecatedClassMethods:
+  Enabled: true
+
+Lint/InterpolationCheck:
+  Enabled: true
+  Exclude:
+    - '**/test/**/*'
+
+Lint/SafeNavigationChain:
+  Enabled: true
+
+Style/EvalWithLocation:
+  Enabled: true
+  Exclude:
+    - '**/test/**/*'
+
+Style/ParenthesesAroundCondition:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantBegin:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
+
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/TrivialAccessors:
+  Enabled: true
+
+# Prefer a = b || c over a = b ? b : c
+Style/RedundantCondition:
+  Enabled: true
+
+Style/RedundantDoubleSplatHashBraces:
+  Enabled: true
+
+Style/OpenStructUse:
+  Enabled: true
+
+Style/ArrayIntersect:
+  Enabled: true
+
+Style/KeywordArgumentsMerging:
+  Enabled: true
+
+Performance/BindCall:
+  Enabled: true
+
+Performance/FlatMap:
+  Enabled: true
+
+Performance/MapCompact:
+  Enabled: true
+
+Performance/SelectMap:
+  Enabled: true
+
+Performance/RedundantMerge:
+  Enabled: true
+
+Performance/StartWith:
+  Enabled: true
+
+Performance/EndWith:
+  Enabled: true
+
+Performance/RegexpMatch:
+  Enabled: true
+
+Performance/ReverseEach:
+  Enabled: true
+
+Performance/StringReplacement:
+  Enabled: true
+
+Performance/DeletePrefix:
+  Enabled: true
+
+Performance/DeleteSuffix:
+  Enabled: true
+
+Performance/InefficientHashSearch:
+  Enabled: true
+
+Performance/ConstantRegexp:
+  Enabled: true
+
+Performance/RedundantStringChars:
+  Enabled: true
+
+Performance/StringInclude:
+  Enabled: true
+
+Minitest/AssertNil:
+  Enabled: true
+
+Minitest/AssertRaisesWithRegexpArgument:
+  Enabled: true
+
+Minitest/AssertWithExpectedArgument:
+  Enabled: true
+
+Minitest/LiteralAsActualArgument:
+  Enabled: true
+
+Minitest/NonExecutableTestMethod:
+  Enabled: true
+
+Minitest/SkipEnsure:
+  Enabled: true
+
+Minitest/UnreachableAssertion:
+  Enabled: true
+
+Markdown:
+  # Whether to run RuboCop against non-valid snippets
+  WarnInvalid: true
+  # Whether to lint codeblocks without code attributes
+  Autodetect: false

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+## [Unreleased]
+
+## [0.1.2] - 2025-07-01
+
+* Fix edit command to work with saved internal conflicts [\#2](https://github.com/sixis/rails-conflicted-credentials/pull/2) ([SixiS](https://github.com/sixis))
+* Fix edit command to work without manual env option [\#1](https://github.com/sixis/rails-conflicted-credentials/pull/1) ([SixiS](https://github.com/sixis))
+
+## [0.1.0] - 2025-06-28
+
+* Initial release copied out of rails fork

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,132 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Matthew Hirst
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2025 Matthew Hirst
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,80 @@
+[![Gem Version](https://badge.fury.io/rb/rails-conflicted-credentials.svg)](https://badge.fury.io/rb/rails-conflicted-credentials)
+[![CI](https://github.com/SixiS/rails-conflicted-credentials/actions/workflows/ci.yml/badge.svg)](https://github.com/SixiS/rails-conflicted-credentials/actions/workflows/ci.yml)
+
+# Rails::Conflicted::Credentials
+
+A gem to help editing rails credentials files with git merge conflicts.
+
+## Pitch:
+
+Are your rails credentials stuck looking like:
+```
+<<<<<<< HEAD
+axssa4Lio6dTXKohAxnb9xGK47iD2tPguExc10WG--it7a+imKmhi2/oHn--SYem69mNPcb4PRLVghntzw==
+=======
+gg3TRVAh5NYnGx7Vwu8KpfmrspG75Oh0WSTFW9QC--3WhE+IKJeq4ZNPEv--BOT8y29V6OL9D8A4oN9FLg==
+>>>>>>> @{-1}
+```
+
+and you wish they could be edited like:
+```
+baz: foo
+<<<<<<< HEAD
+foo: bar
+=======
+foo: baz
+>>>>>>> @{-1}
+bar: baz
+```
+
+Then this is the gem for you!  
+Simply install the gem and use the new command `rails conflicted_credentials:edit`
+
+## Installation
+
+Add this line to your application's Gemfile:
+```ruby
+gem "rails-conflicted-credentials"
+```
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install rails-conflicted-credentials
+
+## Usage
+
+This gem contains one new rails command:
+
+```bash
+rails conflicted_credentials:edit
+```
+
+It works with all the same options as `rails credentials:edit`.
+```bash
+Options:
+  -e, [--environment=ENVIRONMENT]  # The environment to run `credentials` in (e.g. test / development / production).
+```
+
+More info:
+```bash
+rails credentials:help
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/sixis/rails-conflicted-credentials. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/sixis/rails-conflicted-credentials/blob/master/CODE_OF_CONDUCT.md).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Rails::Conflicted::Credentials project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/sixis/rails-conflicted-credentials/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "minitest/test_task"
+
+Minitest::TestTask.create
+
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+task default: %i[test rubocop]

data/lib/rails/commands/conflicted_credentials/conflicted_credentials_command/conflicted_credentials.rb

@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+require "tempfile"
+
+module Rails
+  module Command
+    class ConflictedCredentialsCommand
+      class ConflictedCredentials
+        GIT_CONFLICT_MARKER = /^<{7} (?:(?!={7})[\s\S])*={7}(?:(?!>{7} \w+)[\s\S])*>{7} .+/
+
+        def initialize(content_path, key_path)
+          @content_path = content_path
+          @key_path = key_path
+          return if content_path.blank? || !File.exist?(content_path)
+
+          @file_data = File.binread(content_path).strip
+        end
+
+        def conflicts?
+          return false if @file_data.nil?
+
+          @file_data.match?(GIT_CONFLICT_MARKER)
+        end
+
+        def internalise_conflicts
+          left_unencrypted_string, right_unencrypted_string = decrypt_individual_files
+          return if right_unencrypted_string.nil?
+
+          conflicted_unencrypted_string = merge_conflicted_strings(
+            left_unencrypted_string,
+            right_unencrypted_string
+          )
+
+          ActiveSupport::EncryptedFile.new(
+            content_path: @content_path,
+            key_path: @key_path,
+            env_key: "RAILS_MASTER_KEY",
+            raise_if_missing_key: true
+          ).write(conflicted_unencrypted_string)
+        end
+
+        private
+          def decrypt_individual_files
+            left_encrypted_string, right_encrypted_string = split_conflict(@file_data)
+            return nil if right_encrypted_string.nil?
+
+            left_encrypted_file = Tempfile.new("encrypted-left")
+            left_encrypted_file.write(left_encrypted_string)
+            left_encrypted_file.close
+
+            right_encrypted_file = Tempfile.new("encrypted-right")
+            right_encrypted_file.write(right_encrypted_string)
+            right_encrypted_file.close
+
+            unencrypted_left_string = ActiveSupport::EncryptedFile.new(
+              content_path: left_encrypted_file.path,
+              key_path: @key_path,
+              env_key: "RAILS_MASTER_KEY",
+              raise_if_missing_key: true
+            ).read
+
+            unencrypted_right_string = ActiveSupport::EncryptedFile.new(
+              content_path: right_encrypted_file.path,
+              key_path: @key_path,
+              env_key: "RAILS_MASTER_KEY",
+              raise_if_missing_key: true
+            ).read
+
+            [unencrypted_left_string, unencrypted_right_string]
+          ensure
+            [left_encrypted_file, right_encrypted_file].each do |f|
+              f.unlink if f&.path && File.exist?(f.path)
+            end
+          end
+
+          def split_conflict(content)
+            if content.match?(GIT_CONFLICT_MARKER)
+              @conflict_type = :git
+              split_git_conflict(content)
+            else
+              @conflict_type = :unknown
+              [content, nil]
+            end
+          end
+
+          def split_git_conflict(content)
+            left_lines = []
+            right_lines = []
+
+            state = :common
+            content.each_line do |line|
+              if line.start_with?("<<<<<<< ")
+                @head_left ||= line.split("<<<<<<< ").last.strip
+                state = :in_left
+              elsif line.start_with?("=======")
+                state = :in_right
+              elsif line.start_with?(">>>>>>> ")
+                @head_right ||= line.split(">>>>>>> ").last.strip
+                state = :common
+              elsif state == :in_left
+                left_lines << line
+              elsif state == :in_right
+                right_lines << line
+              else
+                left_lines << line
+                right_lines << line
+              end
+            end
+
+            [left_lines.join.strip, right_lines.join.strip]
+          end
+
+          def merge_conflicted_strings(left_string, right_string)
+            if @conflict_type == :git
+              git_merge_strings(left_string, right_string)
+            else
+              default_merge_strings(left_string, right_string)
+            end
+          end
+
+          def git_merge_strings(local_str, remote_str, base_str = "")
+            base_file = Tempfile.new("git-merge-base")
+            base_file.write(base_str)
+            base_file.close
+            local_file = Tempfile.new("git-merge-local")
+            local_file.write(local_str)
+            local_file.close
+            remote_file = Tempfile.new("git-merge-remote")
+            remote_file.write(remote_str)
+            remote_file.close
+
+            cmd = [
+              "git merge-file -p",
+              local_file.path,
+              base_file.path,
+              remote_file.path,
+              "2>&1"
+            ].join(" ")
+
+            merged = `#{cmd}`
+            status = $?
+
+            unless status.success? || status.exitstatus == 1
+              return default_merge_strings(local_str, remote_str)
+            end
+
+            merged.strip
+              .gsub(local_file.path, @head_left)
+              .gsub(remote_file.path, @head_right)
+          ensure
+            [base_file, local_file, remote_file].each do |f|
+              f.unlink if f&.path && File.exist?(f.path)
+            end
+          end
+
+          def default_merge_strings(local_str, remote_str)
+            [
+              "<<<<<<< #{@head_left}",
+              local_str,
+              "=======",
+              remote_str,
+              ">>>>>> #{@head_right}"
+            ].compact.join("\n")
+          end
+      end
+    end
+  end
+end

data/lib/rails/commands/conflicted_credentials/conflicted_credentials_command.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "rails/command"
+require "rails/commands/credentials/credentials_command"
+
+module Rails
+  module Command
+    class ConflictedCredentialsCommand < ::Rails::Command::CredentialsCommand
+      require_relative "conflicted_credentials_command/conflicted_credentials"
+
+      desc "edit", "Open the decrypted credentials in `$VISUAL` or `$EDITOR` for editing even if there are conflicts"
+      def edit
+        begin
+          load_environment_config!
+        rescue ActiveSupport::MessageEncryptor::InvalidMessage, ActiveSupport::EncryptedConfiguration::InvalidContentError
+          # It's ok because they were conflicted
+        end
+
+        load_generators
+
+        if environment_specified?
+          @content_path = "config/credentials/#{environment}.yml.enc" unless config.overridden?(:content_path)
+          @key_path = "config/credentials/#{environment}.key" unless config.overridden?(:key_path)
+        end
+
+        conflicted_credentials = ConflictedCredentials.new(content_path, key_path)
+        conflicted_credentials.internalise_conflicts if conflicted_credentials.conflicts?
+
+        ensure_encryption_key_has_been_added
+        ensure_credentials_have_been_added
+        ensure_diffing_driver_is_configured
+
+        change_credentials_in_system_editor
+      end
+    end
+  end
+end

data/lib/rails/conflicted/credentials/version.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Rails
+  module Conflicted
+    module Credentials
+      VERSION = "0.1.2"
+    end
+  end
+end

data/lib/rails/conflicted/credentials.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "credentials/version"
+require_relative "../commands/conflicted_credentials/conflicted_credentials_command"
+
+module Rails
+  module Conflicted
+    module Credentials
+    end
+  end
+end

data/sig/rails/conflicted/credentials.rbs

@@ -0,0 +1,8 @@
+module Rails
+  module Conflicted
+    module Credentials
+      VERSION: String
+      # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+    end
+  end
+end

metadata

@@ -0,0 +1,69 @@
+--- !ruby/object:Gem::Specification
+name: rails-conflicted-credentials
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+platform: ruby
+authors:
+- Matthew Hirst
+bindir: exe
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+email:
+- hirst.mat@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".rspec"
+- ".rubocop.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- LICENSE
+- LICENSE.txt
+- README.md
+- Rakefile
+- lib/rails/commands/conflicted_credentials/conflicted_credentials_command.rb
+- lib/rails/commands/conflicted_credentials/conflicted_credentials_command/conflicted_credentials.rb
+- lib/rails/conflicted/credentials.rb
+- lib/rails/conflicted/credentials/version.rb
+- sig/rails/conflicted/credentials.rbs
+homepage: https://github.com/SixiS/rails-conflicted-credentials
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/SixiS/rails-conflicted-credentials
+  source_code_uri: https://github.com/SixiS/rails-conflicted-credentials
+  changelog_uri: https://github.com/SixiS/rails-conflicted-credentials/blob/main/CHANGELOG.md
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 3.0.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.6.9
+specification_version: 4
+summary: A gem to help editing rails credentials files with git merge conflicts.
+test_files: []