capistrano-ops 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7944bee1bc903f6dc873cac78ac255e7811341c1c8bf291de8cf0c2bc2a01a4
-  data.tar.gz: 49afc833c49c3b2d01009c2a7f13fa5a59e04b70691d9baac51ac292f6101240
+  metadata.gz: 6028f991e964a7ce6f029c3878b1c36b322802df80013019de85c1f9f9220f9f
+  data.tar.gz: 1664aea997e5db3daa236ea04758cb68bd3b34262e29faa90fa41564b2e88aeb
 SHA512:
-  metadata.gz: b02060e7adb1a90050839b35cb86e3e19d1b5a32b09b723ce9f10933afb99a347b9a83ed0cea99e344c972262ba01db9f455f668385c493f2cf919e29bd9a5ab
-  data.tar.gz: d2e61ed960c9a4c37411b23e63f4e05faeb9047c613a1038ac38bf5eab5a5ae50d220dabec34c6f2bca539f9190180fc3d426e248273ecf27655dc5eb36bee4a
+  metadata.gz: 99aba98f09eee78b13851eec6ad35dd142fe1252903af6f3c5faf36260c02c693ef6245eddef8dfdefaac9965c9836b08de2620bf449716e47ad096380e26d3b
+  data.tar.gz: 69d303c90aad93e679ac797d90bf759f615e82431ef9a39008fad8c430aa66938cf1fd2b14dfb4249bc9c17bd8fbdf76786c00d0a1b226b3c588fe650024b1e8

data/lib/capistrano/ops/figaro_yml/helpers.rb

@@ -56,20 +56,10 @@ module Capistrano
           end
         end
 
-        def local_figaro_yml(env)
+        def local_figaro_yml(_env)
           @local_figaro_yml ||= YAML.load(ERB.new(File.read(figaro_yml_local_path)).result)
-          local_figaro = {}
-          deployment_env = fetch(:rails_env, env).to_s
-
-          @local_figaro_yml.each do |key, value|
-            if key == env
-              local_figaro[deployment_env] = @local_figaro_yml[key]
-            elsif !value.is_a?(Hash)
-              local_figaro[key] = @local_figaro_yml[key]
-            end
-          end
 
-          local_figaro
+          @local_figaro_yml || {}
         end
 
         def local_yaml
@@ -85,9 +75,18 @@ module Capistrano
         end
 
         def configs(yaml, env)
-          stage_yml = yaml[env.to_s]&.sort.to_h
+          env_str = env.to_s
+          stage_yml = yaml[env_str]&.sort.to_h
           global_yml = remove_nested(yaml)&.sort.to_h
-          [global_yml, stage_yml]
+
+          other_stages_yml = stages.each_with_object({}) do |f, hash|
+            f_str = f.to_s
+            next if f_str == env_str
+
+            hash[f_str] = yaml[f_str]&.sort.to_h
+          end.compact
+
+          [global_yml, stage_yml, other_stages_yml]
         end
 
         def remove_nested(hash)

data/lib/capistrano/ops/figaro_yml/tasks/compare.rake

@@ -10,12 +10,12 @@ namespace :figaro_yml do
     local = local_figaro_yml(figaro_yml_env)
 
     # Split into stage-specific and global configurations
-    local_global_env, local_stage_env = configs(local, figaro_yml_env)
+    local_global_env, local_stage_env, _local_rest = configs(local, figaro_yml_env)
 
     on release_roles :all do
       # Read and parse remote application.yml
       remote = YAML.safe_load(capture("cat #{figaro_yml_remote_path}"))
-      remote_global_env, remote_stage_env = configs(remote, figaro_yml_env)
+      remote_global_env, remote_stage_env, _remote_rest = configs(remote, figaro_yml_env)
 
       # Compare hashes and handle nil results with empty hashes
       differences_global = compare_hashes(local_global_env, remote_global_env)

data/lib/capistrano/ops/figaro_yml/tasks/get.rake

@@ -8,11 +8,11 @@ namespace :figaro_yml do
       invoke 'figaro_yml:create_local'
     else
       local_yml = local_figaro_yml(figaro_yml_env)
-      local_global, local_stage = configs(local_yml, figaro_yml_env)
+      local_global, local_stage, local_rest = configs(local_yml, figaro_yml_env)
       on release_roles :all do
         remote = capture "cat #{figaro_yml_remote_path}"
         remote_yml = YAML.safe_load(remote).sort.to_h
-        remote_global, remote_stage = configs(remote_yml, figaro_yml_env)
+        remote_global, remote_stage, _remote_rest = configs(remote_yml, figaro_yml_env)
         differences_global = compare_hashes(remote_global, local_global || {})
         differences_stage = compare_hashes(remote_stage, local_stage || {})
 
@@ -29,10 +29,10 @@ namespace :figaro_yml do
         global_overwrite = ask_to_overwrite('Overwrite local application.yml globals') if differences_global
         puts 'Nothing written to local application.yml' unless stage_overwrite || global_overwrite
         exit unless stage_overwrite || global_overwrite
-
         # compose new yml
+
         composed_yml = {}
-        composed_yml.merge!(local_yml) # local yml is always included to avoid losing any data
+        composed_yml.merge!(local_rest) # local yml is always included to avoid losing any data
         composed_yml.merge!(local_global) unless global_overwrite
         composed_yml.merge!(remote_global) if global_overwrite
         composed_yml[figaro_yml_env.to_s] = stage_overwrite ? remote_stage : local_stage

data/lib/capistrano/ops/version.rb

@@ -2,6 +2,6 @@
 
 module Capistrano
   module Ops
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ops
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Florian Crusius
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3