capistrano-ops 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed2d908b8ec3ca6fc1c824ee868ac68ae9d22e123ee051fe45c27b6ad5ef8df
-  data.tar.gz: ecd05a6efb4636281983d2a2a8ea61eff0ccd98181cbd49094a70212ee0b2d3d
+  metadata.gz: e7944bee1bc903f6dc873cac78ac255e7811341c1c8bf291de8cf0c2bc2a01a4
+  data.tar.gz: 49afc833c49c3b2d01009c2a7f13fa5a59e04b70691d9baac51ac292f6101240
 SHA512:
-  metadata.gz: 229d0d86cdd193313cd869def5258f3dc8e694c6b75b3c260bdb63e0847fb3b5c102276be9c4795777bd3946ed93fb037d8d8cad97db6d5a4fbf43da5898a4de
-  data.tar.gz: 9f2c4f1fed7e7388b538d9295310529aa60643516b4ac72dbe7ac052927d162b8230ebc55d5e976ea6f289b05415cfcc4a676a0d59d76f7a36374a0fa6768b61
+  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.1'
+    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/helpers.rb

@@ -2,48 +2,50 @@
 
 module Capistrano
   module Ops
-    module Helper
-      def binary_path
-        gem_path = capture(:bundle, 'show', 'wkhtmltopdf-binary').strip
-        "#{gem_path}/bin"
-      end
+    module Wkhtmltopdf
+      module Helpers
+        def binary_path
+          gem_path = capture(:bundle, 'show', 'wkhtmltopdf-binary').strip
+          "#{gem_path}/bin"
+        end
 
-      def gem_version
-        capture(:cat, 'config/initializers/wicked_pdf.rb').scan(/wkhtmltopdf_ubuntu_(\d+\.\d+)_amd64/).flatten.first
-      end
+        def gem_version
+          capture(:cat, 'config/initializers/wicked_pdf.rb').scan(/wkhtmltopdf_ubuntu_(\d+\.\d+)_amd64/).flatten.first
+        end
 
-      def binary_path_and_version
-        [binary_path, gem_version]
-      end
+        def binary_path_and_version
+          [binary_path, gem_version]
+        end
 
-      def file_existing?(file)
-        test("[ -f #{file} ]")
-      end
+        def file_existing?(file)
+          test("[ -f #{file} ]")
+        end
 
-      def right_permissions?(file)
-        test("[ $(stat -c '%a' #{file}) = '777' ]")
-      end
+        def right_permissions?(file)
+          test("[ $(stat -c '%a' #{file}) = '777' ]")
+        end
 
-      def check_file_and_permissions(binary_path, version)
-        binary_file = "#{binary_path}/wkhtmltopdf_ubuntu_#{version}_amd64"
+        def check_file_and_permissions(binary_path, version)
+          binary_file = "#{binary_path}/wkhtmltopdf_ubuntu_#{version}_amd64"
 
-        if file_existing?(binary_file)
-          info('wkhtmltopdf binary already extracted')
+          if file_existing?(binary_file)
+            info('wkhtmltopdf binary already extracted')
 
-          if right_permissions?(binary_file)
-            info('wkhtmltopdf binary has already the right permissions')
+            if right_permissions?(binary_file)
+              info('wkhtmltopdf binary has already the right permissions')
+            else
+              info('adding right permissions to wkhtmltopdf binary')
+              execute("chmod 777 #{binary_file}")
+            end
           else
-            info('adding right permissions to wkhtmltopdf binary')
+            info('extracting wkhtmltopdf binary')
+            # extract the binary but keep the gzip file
+            execute("cd #{binary_path} && gzip -dk  wkhtmltopdf_ubuntu_#{version}_amd64.gz")
+            # add execute permission to the binary
             execute("chmod 777 #{binary_file}")
           end
-        else
-          info('extracting wkhtmltopdf binary')
-          # extract the binary but keep the gzip file
-          execute("cd #{binary_path} && gzip -dk  wkhtmltopdf_ubuntu_#{version}_amd64.gz")
-          # add execute permission to the binary
-          execute("chmod 777 #{binary_file}")
+          info('wkhtmltopdf setup finished')
         end
-        info('wkhtmltopdf setup finished')
       end
     end
   end

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.1
+  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