capistrano-exfel 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c382e3e124886cc19f9c480a44afcd1e0275e374
-  data.tar.gz: 3cc6c89c62797dc4c990c46183995a5523d6a70a
+  metadata.gz: '0569ba176090d8b657cc3b7059eb8082da43c73f'
+  data.tar.gz: 9a2bb7195b604db0fc96609349e843ad0a1866dd
 SHA512:
-  metadata.gz: de51ee4b2892cfed2b6422632b73c2640ec998203374425bb8fb6cdfcf8471dbb9487c119850ee2d026c2434415261e38bc642cc2f729990a5aded6f44c0b926
-  data.tar.gz: 57819b8d0bc8f9a566e911e1b9da3f3e13fd34058377d6805498dc32f135158e733441dcef0667ad1e10e44aedd885bdf8ffe7db98771c2604e3d37e1d7481aa
+  metadata.gz: 76fdc51fbf356b166ba49139246e8ee75b12c87f00d1002dd417e570801553ad34b19f570418c0c0b4d4f7b6cdf2a55ce79a35054a7fe13d5c38c10c6a98d21c
+  data.tar.gz: d7c38561029507cc3c4167ff7069a19715ceda2afea9b6de631c6e307333c8721e2f0bdd9348c516fa7fa598d4acd63d24d512c663d24faacf17709d1cd57b74

data/.rubocop.yml

@@ -18,3 +18,8 @@ Style/Next:
 # Use the lambda method for multi-line lambdas.
 Style/Lambda:
   Enabled: false
+
+#
+# Block has too many lines.
+Metrics/BlockLength:
+  Max: 100 # Default 25

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 # Use Rubocop to validate ruby code syntax
-gem 'rubocop', '~> 0.30.1', require: false, group: :development
+gem 'rubocop', '~> 0.47.1', require: false, group: :development

data/README.md

@@ -12,7 +12,7 @@ Add these lines to your application's Gemfile:
     gem 'capistrano', '~> 3.4.0'
     gem 'capistrano-rails', '~> 1.1.2'
     gem 'capistrano-rvm', '~> 0.1.2'
-    gem 'capistrano-exfel', '~> 0.0.13'
+    gem 'capistrano-exfel', '~> 0.0.14'
 
 And then execute:
 
@@ -84,9 +84,6 @@ The most important configurable options and their defaults:options can be added
     # Default branch is :master
     # ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
 
-    # Default value for :scm is :git
-    # set :scm, :git
-
     # Default value for :format is :pretty
     # set :format, :pretty
 
@@ -107,6 +104,11 @@ The most important configurable options and their defaults:options can be added
     set :rvm_ruby_version, '2.1.5' # If not specified will ask for it
     # set :rvm_roles, [:app, :web]
 
+As an example, to configure GIT plugin, add the following to the Capfile:
+
+    require 'capistrano/scm/git'
+    install_plugin Capistrano::SCM::Git
+
 ## Contributing
 
 1. Fork it ( https://github.com/luismaia/capistrano-exfel/fork )

data/capistrano-exfel.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '> 10.0'
 end

data/lib/capistrano/exfel/version.rb

@@ -1,6 +1,6 @@
 module Capistrano
   # Capistrano::Exfel version information
   module Exfel
-    VERSION = '0.0.13'
+    VERSION = '0.0.14'.freeze
   end
 end

data/lib/capistrano/tasks/apache.rake

@@ -93,7 +93,7 @@ namespace :apache do
 
       set :shared_apache_conf_file, "#{fetch(:shared_apache_path)}/app_#{fetch(:app_name_uri)}.conf"
       http_file = File.expand_path('../../recipes/apache_http.conf', __FILE__)
-      upload! StringIO.new(File.read(http_file)), "#{fetch(:shared_apache_conf_file)}"
+      upload! StringIO.new(File.read(http_file)), fetch(:shared_apache_conf_file).to_s
 
       debug "chmod g+w #{fetch(:shared_apache_conf_file)}"
       execute "chmod g+w #{fetch(:shared_apache_conf_file)}"
@@ -126,7 +126,7 @@ namespace :apache do
 
       set :shared_apache_conf_ssl_file, "#{fetch(:shared_apache_path)}/app_#{fetch(:app_name_uri)}_ssl.conf"
       http_ssl_file = File.expand_path('../../recipes/apache_ssl.conf', __FILE__)
-      upload! StringIO.new(File.read(http_ssl_file)), "#{fetch(:shared_apache_conf_ssl_file)}"
+      upload! StringIO.new(File.read(http_ssl_file)), fetch(:shared_apache_conf_ssl_file).to_s
 
       debug "chmod g+w #{fetch(:shared_apache_conf_ssl_file)}"
       execute "chmod g+w #{fetch(:shared_apache_conf_ssl_file)}"
@@ -233,7 +233,7 @@ namespace :apache do
           end
         end
 
-        error 'ServerSignature was not found' if fetch(:num_replacements) == 0
+        error 'ServerSignature was not found' if fetch(:num_replacements).zero?
       end
 
       # Don't give away too much information about all the subcomponents we are running.
@@ -256,7 +256,7 @@ namespace :apache do
           set :num_replacements, fetch(:num_replacements) + 1
         end
 
-        error 'ServerTokens was not found' if fetch(:num_replacements) == 0
+        error 'ServerTokens was not found' if fetch(:num_replacements).zero?
       end
 
       # Do not allow browsing outside the document root
@@ -268,9 +268,9 @@ namespace :apache do
       #   AllowOverride None
       # </Directory>
       #
-      message_line_1 = '# Default Directory configuration changed via Capistrano.'
+      message_line1 = '# Default Directory configuration changed via Capistrano.'
 
-      set :server_dir_secure_configuration, get_num_occurrences_in_file(fetch(:httpd_conf_file), message_line_1)
+      set :server_dir_secure_configuration, get_num_occurrences_in_file(fetch(:httpd_conf_file), message_line1)
 
       if fetch(:server_token_prod) == 1
         info 'The correct directory configuration is already correctly set'
@@ -314,7 +314,7 @@ namespace :apache do
 </Directory>
 
         EOF
-        upload! StringIO.new(new_directory_configs), "#{fetch(:tmp_dir_new_config)}"
+        upload! StringIO.new(new_directory_configs), fetch(:tmp_dir_new_config).to_s
 
         # Update the new configuration file to have the original configuration commented
         debug "cat #{fetch(:tmp_dir_new_config)} >> #{fetch(:tmp_dir_original_commented_config)}"
@@ -326,7 +326,7 @@ namespace :apache do
         debug "Special sed parameter is: ''#{special_sed_param}''"
 
         # Replace the old original directory configuration for a specific message (in the temporary file)
-        message_complete = "#{message_line_1}\\n#\\n"
+        message_complete = "#{message_line1}\\n#\\n"
         command_to_replace = "out=$(sed -e :a -e '$!N;s/\\n/.*/;ta' #{fetch(:tmp_dir_original_config)} | "\
                              "sed -e :a -e '$!N;s/\//./;ta'); sed -i '/<Directory .>.*/ {#{special_sed_param} "\
                              "s/'$out'/#{message_complete}/g}' #{fetch(:tmp_httpd_file)}"
@@ -334,7 +334,7 @@ namespace :apache do
         execute command_to_replace
 
         # Search for the line where the message was inserted
-        command = "grep -n '#{message_line_1}' #{fetch(:tmp_httpd_file)} | cut -d':' -f 1"
+        command = "grep -n '#{message_line1}' #{fetch(:tmp_httpd_file)} | cut -d':' -f 1"
         debug command
         line_with_match = get_command_output(command).to_i
         next_line = line_with_match + 1

data/lib/capistrano/tasks/application.rake

@@ -69,7 +69,6 @@ namespace :application do
       info "shared_path => #{fetch(:shared_path)}"
       info "repo_url => #{fetch(:repo_url)}"
       info "branch => #{fetch(:branch)}"
-      info "scm => #{fetch(:scm)}"
       info "format => #{fetch(:format)}"
       info "log_level => #{fetch(:log_level)}"
       info "pty => #{fetch(:pty)}"
@@ -122,9 +121,6 @@ namespace :load do
     # Default branch is :master
     ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
 
-    # Default value for :scm is :git
-    set :scm, -> { :git }
-
     # Default value for :format is :pretty
     set :format, -> { :pretty }
 

data/lib/capistrano/tasks/database.rake

@@ -58,7 +58,7 @@ namespace :database do
       set :database_username, ask('Database Username:', default_username)
       set :database_password, ask('Database Password:', default_password)
 
-      upload! StringIO.new(File.read("#{fetch(:db_orig_file_path)}")), "#{fetch(:database_file_path)}"
+      upload! StringIO.new(File.read(fetch(:db_orig_file_path).to_s)), fetch(:database_file_path).to_s
 
       execute "sed -i 's/<<database_name>>/#{fetch(:database_name)}/g' #{fetch(:database_file_path)}"
       execute "sed -i 's/<<database_username>>/#{fetch(:database_username)}/g' #{fetch(:database_file_path)}"

data/lib/capistrano/tasks/secrets.rake

@@ -27,12 +27,12 @@ namespace :secrets do
     on roles(:app) do
       debug '#' * 50
       debug 'Create and configure secrets.yml file'
-      secrets_file_path = "#{fetch(:secrets_file_path)}"
+      secrets_file_path = fetch(:secrets_file_path).to_s
 
       set :secrets_original_file_path, File.expand_path('../../recipes/config/secrets_example.yml', __FILE__)
 
       unless remote_file_exists?(secrets_file_path)
-        upload! StringIO.new(File.read("#{fetch(:secrets_original_file_path)}")), "#{fetch(:secrets_file_path)}"
+        upload! StringIO.new(File.read(fetch(:secrets_original_file_path).to_s)), fetch(:secrets_file_path).to_s
       end
 
       execute "sed -i 's|<<APP_NAME>>|#{fetch(:app_name)}|g' #{fetch(:secrets_file_path)}"
@@ -51,12 +51,12 @@ namespace :secrets do
 
       pattern = 'secret_key_base:.*'
       new_secret = "secret_key_base: '#{SecureRandom.hex(64)}'"
-      secrets_file_path = "#{fetch(:secrets_file_path)}"
+      secrets_file_path = fetch(:secrets_file_path).to_s
 
       if remote_file_exists?(secrets_file_path)
         num_occurrences = get_num_occurrences_in_file(secrets_file_path, pattern)
 
-        if num_occurrences == 0
+        if num_occurrences.zero?
           error "no secret token found in #{secrets_file_path}"
           exit 1
         end

data/lib/capistrano/tasks/util.rake

@@ -7,16 +7,16 @@ def get_num_occurrences_in_file(file_path, string)
 end
 
 def get_command_output(command)
-  capture("#{command}").strip
+  capture(command.to_s).strip
 end
 
 def rails_default_app_name
-  return "#{fetch(:app_name)}" if get_rails_env_abbr == 'prod'
+  return fetch(:app_name).to_s if get_rails_env_abbr == 'prod'
   "#{get_rails_env_abbr}_#{fetch(:app_name)}"
 end
 
 def rails_default_db_name
-  return "#{fetch(:app_name)}" if get_rails_env_abbr == 'prod'
+  return fetch(:app_name).to_s if get_rails_env_abbr == 'prod'
   "#{fetch(:app_name)}_#{get_rails_env_abbr}"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exfel
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Luis Maia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Deployment of Ruby on Rails 4 Applications in EXFEL Virtual Machines
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Deploy Ruby on Rails 4 Applications in EXFEL Virtual Machines