capistrano-ops 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11e337322ee460de5e0abca9879513190ccb1eaf57ebf338b5575efcd4f7eb33
-  data.tar.gz: 59f16b666897fdd8f93f21d0d7d91590e394fdfa4f9c942accb84be8720c94d7
+  metadata.gz: 6028f991e964a7ce6f029c3878b1c36b322802df80013019de85c1f9f9220f9f
+  data.tar.gz: 1664aea997e5db3daa236ea04758cb68bd3b34262e29faa90fa41564b2e88aeb
 SHA512:
-  metadata.gz: aafa5d8ed0745ac496462fb42840381dd3104478b77eac904b19b1959f94ea14d3d06fc7cccc62cbfa072aa0a7a36c945d49acd4eef6e23322a12a2e45b55247
-  data.tar.gz: b1c212fcf862c2635b9a079cf3c2eb72095b2f6a4c26d918dd971db550e7a2f5f2a55a27495042b66622a64931dab6059038bba66011dfa50bc82f4f532ddf80
+  metadata.gz: 99aba98f09eee78b13851eec6ad35dd142fe1252903af6f3c5faf36260c02c693ef6245eddef8dfdefaac9965c9836b08de2620bf449716e47ad096380e26d3b
+  data.tar.gz: 69d303c90aad93e679ac797d90bf759f615e82431ef9a39008fad8c430aa66938cf1fd2b14dfb4249bc9c17bd8fbdf76786c00d0a1b226b3c588fe650024b1e8

data/lib/capistrano/ops/backup.rb

@@ -1,18 +1,6 @@
 # frozen_string_literal: true
 
-require 'capistrano/ops/helper'
+require 'capistrano/ops/task_loader'
 require 'capistrano/ops/backup/helper'
 
-module TaskLoader
-  extend Capistrano::Ops::Helper
-
-  def self.load_tasks_if_gem_present(gem_name, task_path, warning_message)
-    if gem_in_gemfile?(gem_name)
-      Dir.glob("#{File.expand_path(__dir__)}/#{task_path}/**/*.rake").each { |f| load f }
-    else
-      puts warning_message
-    end
-  end
-end
-
 TaskLoader.load_tasks_if_gem_present('rails', 'backup/tasks', 'WARNING: Gemfile does not include rails gem which is required for backup tasks')

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/figaro_yml.rb

@@ -1,29 +1,7 @@
 # frozen_string_literal: true
 
-require 'capistrano/ops/helper'
+require 'capistrano/ops/task_loader'
 require 'capistrano/ops/figaro_yml/paths'
 require 'capistrano/ops/figaro_yml/helpers'
 
-module TaskLoader
-  extend Capistrano::Ops::Helper
-
-  def self.load_tasks_if_gem_present(gem_name, task_path, warning_message)
-    if gem_in_gemfile?(gem_name)
-      Dir.glob("#{File.expand_path(__dir__)}/#{task_path}/**/*.rake").each { |f| load f }
-    else
-      puts warning_message
-    end
-  end
-end
-
 TaskLoader.load_tasks_if_gem_present('figaro', 'figaro_yml/tasks', 'WARNING: Gemfile does not include figaro gem which is required for figaro_yml tasks')
-# include Capistrano::Ops::Helper
-
-# Dir.glob("#{File.expand_path(__dir__)}/figaro_yml/tasks/*.rake").each { |f| load f }
-
-# # gem 'figaro' is required for figaro_yml tasks
-
-# figaro_gem = gem_in_gemfile?('figaro')
-
-# # check if Gemfile environment includes figaro gem and warn user if not found
-# puts 'WARNING: Gemfile does not include figaro gem which is required for figaro_yml tasks' unless figaro_gem

data/lib/capistrano/ops/helper.rb

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module Capistrano
   module Ops
     module Helper
       def gem_in_gemfile?(gem_name)
-        if File.exist?('Gemfile')
-          File.foreach('Gemfile') do |line|
-            return true if line.include?('gem') && line.include?("'#{gem_name}'") && !line.include?('#')
-          end
-        end
-        false
+        return false unless File.exist?('Gemfile')
+
+        regex = Regexp.new("^\s*gem\s+['\"]#{gem_name}['\"].*?(?=#|$)", Regexp::MULTILINE)
+        File.read('Gemfile').match?(regex)
       end
     end
   end

data/lib/capistrano/ops/logrotate.rb

@@ -1,19 +1,7 @@
 # frozen_string_literal: true
 
-require 'capistrano/ops/helper'
+require 'capistrano/ops/task_loader'
 require 'capistrano/ops/logrotate/helpers'
 require 'capistrano/ops/logrotate/paths'
 
-module TaskLoader
-  extend Capistrano::Ops::Helper
-
-  def self.load_tasks_if_gem_present(gem_name, task_path, warning_message)
-    if gem_in_gemfile?(gem_name)
-      Dir.glob("#{File.expand_path(__dir__)}/#{task_path}/**/*.rake").each { |f| load f }
-    else
-      puts warning_message
-    end
-  end
-end
-
 TaskLoader.load_tasks_if_gem_present('whenever', 'logrotate/tasks', 'WARNING: Gemfile does not include whenever gem which is required for logrotate tasks')

data/lib/capistrano/ops/logs.rb

@@ -1,18 +1,7 @@
 # frozen_string_literal: true
 
-require 'capistrano/ops/helper'
+require 'capistrano/ops/task_loader'
 require 'capistrano/ops/logs/paths'
 require 'capistrano/ops/logs/helpers'
 
-module TaskLoader
-  extend Capistrano::Ops::Helper
-  def self.load_tasks_if_gem_present(gem_name, task_path, warning_message)
-    if gem_in_gemfile?(gem_name)
-      Dir.glob("#{File.expand_path(__dir__)}/#{task_path}/**/*.rake").each { |f| load f }
-    else
-      puts warning_message
-    end
-  end
-end
-
 TaskLoader.load_tasks_if_gem_present('rails', 'logs/tasks', 'WARNING: Gemfile does not include rails gem which is required for logs tasks')

data/lib/capistrano/ops/task_loader.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'capistrano/ops/helper'
+
+module TaskLoader
+  extend Capistrano::Ops::Helper
+
+  def self.load_tasks_if_gem_present(gem_name, task_path, warning_message)
+    unless gem_in_gemfile?(gem_name)
+      warn warning_message
+      return
+    end
+
+    base_path = File.expand_path(__dir__)
+    task_files = Dir.glob("#{base_path}/#{task_path}/**/*.rake")
+
+    task_files.each do |file|
+      load file
+    rescue StandardError => e
+      puts "Failed to load #{file}: #{e.message}"
+    end
+  end
+end

data/lib/capistrano/ops/version.rb

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

data/lib/capistrano/ops/whenever.rb

@@ -1,17 +1,5 @@
 # frozen_string_literal: true
 
-require 'capistrano/ops/helper'
+require 'capistrano/ops/task_loader'
 
-module TaskLoader
-  extend Capistrano::Ops::Helper
-
-  def self.load_tasks_if_gem_present(gem_name, task_path, warning_message)
-    if gem_in_gemfile?(gem_name)
-      Dir.glob("#{File.expand_path(__dir__)}/#{task_path}/**/*.rake").each { |f| load f }
-    else
-      puts warning_message
-    end
-  end
-end
-
-TaskLoader.load_tasks_if_gem_present('whenever', 'whenever/tasks', 'WARNING: Gemfile does not include whenever gem which is required for logrotate tasks')
+TaskLoader.load_tasks_if_gem_present('whenever', 'whenever/tasks', 'WARNING: Gemfile does not include whenever gem which is required for whenever tasks')

data/lib/capistrano/ops/wkhtmltopdf.rb

@@ -1,19 +1,7 @@
 # frozen_string_literal: true
 
-require 'capistrano/ops/helper'
+require 'capistrano/ops/task_loader'
 require 'capistrano/ops/wkhtmltopdf/helpers'
 
-module TaskLoader
-  extend Capistrano::Ops::Helper
-
-  def self.load_tasks_if_gem_present(gem_name, task_path, warning_message)
-    if gem_in_gemfile?(gem_name)
-      Dir.glob("#{File.expand_path(__dir__)}/#{task_path}/**/*.rake").each { |f| load f }
-    else
-      puts warning_message
-    end
-  end
-end
-
 TaskLoader.load_tasks_if_gem_present('wicked_pdf', 'wkhtmltopdf/tasks',
                                      'WARNING: Gemfile does not include wkhtmltopdf-binary gem which is required for wkhtmltopdf tasks')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ops
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  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
@@ -200,6 +200,7 @@ files:
 - lib/capistrano/ops/rails/lib/tasks/pg/remove_old_dumps.rake
 - lib/capistrano/ops/rails/lib/tasks/storage/backup.rake
 - lib/capistrano/ops/rails/lib/tasks/storage/remove_old_backups.rake
+- lib/capistrano/ops/task_loader.rb
 - lib/capistrano/ops/version.rb
 - lib/capistrano/ops/whenever.rb
 - lib/capistrano/ops/whenever/tasks/show_crontab.rake