capistrano-ops 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11e337322ee460de5e0abca9879513190ccb1eaf57ebf338b5575efcd4f7eb33
-  data.tar.gz: 59f16b666897fdd8f93f21d0d7d91590e394fdfa4f9c942accb84be8720c94d7
+  metadata.gz: e7944bee1bc903f6dc873cac78ac255e7811341c1c8bf291de8cf0c2bc2a01a4
+  data.tar.gz: 49afc833c49c3b2d01009c2a7f13fa5a59e04b70691d9baac51ac292f6101240
 SHA512:
-  metadata.gz: aafa5d8ed0745ac496462fb42840381dd3104478b77eac904b19b1959f94ea14d3d06fc7cccc62cbfa072aa0a7a36c945d49acd4eef6e23322a12a2e45b55247
-  data.tar.gz: b1c212fcf862c2635b9a079cf3c2eb72095b2f6a4c26d918dd971db550e7a2f5f2a55a27495042b66622a64931dab6059038bba66011dfa50bc82f4f532ddf80
+  metadata.gz: b02060e7adb1a90050839b35cb86e3e19d1b5a32b09b723ce9f10933afb99a347b9a83ed0cea99e344c972262ba01db9f455f668385c493f2cf919e29bd9a5ab
+  data.tar.gz: d2e61ed960c9a4c37411b23e63f4e05faeb9047c613a1038ac38bf5eab5a5ae50d220dabec34c6f2bca539f9190180fc3d426e248273ecf27655dc5eb36bee4a

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.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.3'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ops
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Florian Crusius
@@ -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