capistrano-exfel 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93c7a1c63f291d582abe4f3cafc84f415ab1607
-  data.tar.gz: 4b05eff2f7548c9ff5e1f34d864c3368f72adb46
+  metadata.gz: f057b3710c0708a8e73cc930a552a4d55d213c03
+  data.tar.gz: 319c23cf4d843db2ee45343b9cc23ffc06635ba0
 SHA512:
-  metadata.gz: 98d013889bbeaf37ba85a1d6bfc015eb3dcd818c5ac1252a4fe6a45db1450c30511ce1d6c5ea449075214a58aebf09d453a7c39d02e812cf7838cd0f6d76d73a
-  data.tar.gz: 4eb5dcfb0c204617eaa8329bc5c04904e10b6677ff83f9b5ae38df460e015d718091d4f50ac53345982c1a28dfacfb038d5b1a6bf48af73d7e2adf2aea3c3370
+  metadata.gz: f5e7e3103fe2dba6b5bccc93baca2e3f21f302ef6afff067e560915f0fc39cfcd96e924131f65dcdf583dfa69767a19eb70adb3a03035a40d1425c4f4a345ba9
+  data.tar.gz: 3d758192be25dfd0f923216122bc0df70424fd936c793187e98fabcb36d944c9dc57a9e0116eb85bdac8e07d120ab8e8d199a36760e750d27e10ab480bb17009

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.6'
+    gem 'capistrano-exfel', '~> 0.0.7'
 
 And then execute:
 

data/lib/capistrano/exfel/version.rb

@@ -1,6 +1,6 @@
 module Capistrano
   # Capistrano::Exfel version information
   module Exfel
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/lib/capistrano/tasks/application.rake

@@ -36,13 +36,13 @@ namespace :application do
 
       invoke :deploy
       invoke 'app_home:correct_shared_permissions'
+      invoke 'app_home:clear_tmp_files'
       invoke 'application:restart'
     end
   end
 
   desc 'Restarts the application, including reloading server cache'
   task :restart do
-    invoke 'app_home:clear_tmp_files'
     # invoke 'app_home:restart'
     invoke 'apache:restart'
     invoke 'app_home:reload_server_cache'
@@ -103,10 +103,7 @@ namespace :load do
     end
 
     # Build default application URI
-    set :default_app_uri, -> do
-      "#{fetch(:app_name)}" if get_rails_env_abbr.blank?
-      "#{get_rails_env_abbr}_#{fetch(:app_name)}" unless get_rails_env_abbr.blank?
-    end
+    set :default_app_uri, -> { get_rails_default_app_name }
 
     set :app_name_uri, -> do
       ask("Please specify the application URI (i.e. #{fetch(:default_app_uri)})", fetch(:default_app_uri))

data/lib/capistrano/tasks/database.rake

@@ -48,8 +48,8 @@ namespace :database do
       debug 'Create and configure database.yml file'
 
       default_host = '127.0.0.1'
-      default_database = "#{fetch(:app_name)}_#{get_rails_env_abbr}"
-      default_username = "#{fetch(:app_name)}_#{get_rails_env_abbr}"
+      default_database = get_rails_default_db_name
+      default_username = get_rails_default_db_name
       default_password = ''
 
       set :db_orig_file_path, File.expand_path("../../recipes/config/#{fetch(:database_original_file_name)}", __FILE__)

data/lib/capistrano/tasks/util.rake

@@ -10,6 +10,16 @@ def get_command_output(command)
   capture("#{command}").strip
 end
 
+def get_rails_default_app_name
+  return "#{fetch(:app_name)}" if get_rails_env_abbr == 'prod'
+  "#{get_rails_env_abbr}_#{fetch(:app_name)}"
+end
+
+def get_rails_default_db_name
+  return "#{fetch(:app_name)}" if get_rails_env_abbr == 'prod'
+  "#{fetch(:app_name)}_#{get_rails_env_abbr}"
+end
+
 def get_rails_env_abbr(rails_env_abbr = nil)
   return rails_env_abbr unless rails_env_abbr.nil?
 
@@ -19,7 +29,7 @@ def get_rails_env_abbr(rails_env_abbr = nil)
   when 'test'
     'test'
   else
-    ''
+    'prod'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exfel
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Luis Maia