capistrano-exfel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac8d8376221fd414caea1a171e504075556f32cc
-  data.tar.gz: d9429c9efd767346e59382e5d8148d1f5cbd43a5
+  metadata.gz: 7d4b2db13e0647bc4d83d0c8d96a17bcc3f32815
+  data.tar.gz: b2623f8c30b472fe140f90b0fe059dbad62c8487
 SHA512:
-  metadata.gz: 59c1cfb6de84e62176ad49aa96146da98047248d526238226b107ad4b735571e84f794b78dd2894da66cd1d17418d9269ee60b5b040dee8bf0f9a3ea39ab8d00
-  data.tar.gz: f46b46e8aaee29436f38bdc6e10052bb4cd4d234ecd9cd14c6febb585265d30c4042f6aee6f86b0e35522f22500c4c1a8f49fb5f512baf2f99009955babf859a
+  metadata.gz: 10f1b98400d54c171216746efe087043c32a742416b82634063fff7df10ec50047ed64cb9975fc3289f1ebb8d5ffac36935dc9cb7e63cc39b634db3d8a95a979
+  data.tar.gz: 471e7b436d7d2d444056227f0ee01119199fce74991c9b416355ebbba194cf6571342e20c1eee703343649d7ddafd312aa946c6c6c0112873ec280602cba8a7d

data/README.md

@@ -1,6 +1,6 @@
 # Capistrano::Exfel
 
-Deploys Ruby on Rails 4 Applications in EXFEL VMs using Capistrano3 throw username/password authentication.
+Deploys Ruby on Rails Applications in EXFEL VMs using Capistrano3 throw username/password authentication.
 The standard EXFEL VMs consist of Scientific Linux 6 with Apache.
 Installation of Phusion Passenger and RVM are also required to this gem.
 
@@ -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.1'
+    gem 'capistrano-exfel', '~> 0.0.3'
 
 And then execute:
 
@@ -31,33 +31,44 @@ Add this line to your `Capfile`:
 
 This gem will reuse `capistrano-rails` and `capistrano-rvm` tasks to build the following tasks:
 
+Task **application:deploy_first_time**:
+
     # Task 'application:deploy_first_time' deploys an application for the first time in the configured server(s).
     # This task besides deploying the application also make all the necessary configurations
-    # Description: Re-deploys existent Application in the configured server(s):
-    cap application:deploy
-
-    # Task 'application:deploy' deploys a new version of the application in the configured server(s)
     # Description: Configures Apache and deploys the Application for the first time in the configured server(s)
     # with the right permissions:
     cap application:deploy_first_time
 
+Task **application:deploy**:
+
+    # Task 'application:deploy' deploys a new version of the application in the configured server(s)
+    # Description: Re-deploys existent Application in the configured server(s):
+    cap application:deploy
+
+Task **application:restart**:
+
     # Description: 'Restarts the application, including reloading server cache'
     cap application:restart
 
+Task **application:reconfigure_apache**:
+
     # Description: 'Re-deploys apache configuration files and restart it'
     cap application:reconfigure_apache
 
+Task **application:show_variables**:
+
     # Description: 'Shows variables values generated without deploying anything'
     cap application:show_variables
 
-    #
+Additional Tasks:
+
     # See all the additional available tasks using the command:
     cap -T
 
 The most important configurable options and their defaults:options can be added to the `deploy.rb` file:
 
     # Set username and password
-    set :username, ask('username', 'maial') # If not specified will present current user
+    set :username, ask('username', 'maial') # If not specified will ask for it proposing the current user
     set :password, ask('password', nil, echo: false) # If not specified will ask for it
 
     # Application Name

data/capistrano-exfel.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Luis Maia']
   spec.email         = ['luisgoncalo.maia@gmail.com']
   spec.summary       = 'Deploy Ruby on Rails 4 Applications in EXFEL VMs (Scientific Linux using Apache and Passenger)'
-  spec.description   = 'Deployment of Ruby on Rails 4 Applications in EXFEL VMs gem '\
+  spec.description   = 'Deployment of Ruby on Rails 4 Applications in EXFEL VMs gem ' \
                         '(Scientific Linux + Apache + RVM + Phusion Passenger) using Capistrano3'
   spec.homepage      = ''
   spec.license       = 'MIT'

data/lib/capistrano/exfel/version.rb

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

data/lib/capistrano/tasks/apache.rake

@@ -50,6 +50,8 @@ namespace :apache do
   desc 'Configure Apache configuration files'
   task :configure do
     on roles(:app) do
+      sudo_cmd = "echo #{fetch(:password)} | sudo -S"
+
       set :shared_path, "#{fetch(:deploy_to)}/shared"
       set :shared_apache_path, "#{fetch(:shared_path)}/apache"
 
@@ -90,8 +92,9 @@ namespace :apache do
       debug 'Configure (HTTP) Apache Application configuration files'
 
       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('config/recipes/apache_http.conf')), "#{fetch(:shared_apache_conf_file)}"
       debug "chmod g+w #{fetch(:shared_apache_conf_file)}"
       execute "chmod g+w #{fetch(:shared_apache_conf_file)}"
 
@@ -122,8 +125,9 @@ namespace :apache do
       debug 'Configure (HTTPS) Apache Application configuration files'
 
       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('config/recipes/apache_ssl.conf')), "#{fetch(:shared_apache_conf_ssl_file)}"
       debug "chmod g+w #{fetch(:shared_apache_conf_ssl_file)}"
       execute "chmod g+w #{fetch(:shared_apache_conf_ssl_file)}"
 

data/lib/capistrano/tasks/application.rake

@@ -2,8 +2,8 @@
 namespace :application do
   # Task 'application:deploy_first_time' deploys an application for the first time in the configured server(s).
   # This task besides deploying the application also make all the necessary configurations
-  desc 'Configures Apache and deploys the Application for the first time in the configured server(s) '/
-         'with the right permissions'
+  desc 'Configures Apache and deploys the Application for the first time in the configured server(s) ' \
+       'with the right permissions'
   task :deploy_first_time do
     on roles(:app, :web) do
       info '#' * 100
@@ -95,23 +95,14 @@ namespace :load do
     # Application Name
     set :app_name, -> { ask('Please specify the application name (i.e. my_app)', 'my_app') }
 
-    # Build default application URI
-    set :default_app_uri, -> do
-      case fetch(:rails_env).to_s
-      when 'development'
-        "dev_#{fetch(:app_name)}"
-      when 'test'
-        "test_#{fetch(:app_name)}"
-      else
-        "#{fetch(:app_name)}"
-      end
-    end
-
     # Set application related information
     set :app_domain, -> do
       ask('Please specify the application domain (i.e. https://in.xfel.eu/)', 'https://in.xfel.eu/')
     end
 
+    # Build default application URI
+    set :default_app_uri, -> { "#{get_rails_env_abbr}_#{fetch(:app_name)}" }
+
     set :app_name_uri, -> do
       ask("Please specify the application URI (i.e. #{fetch(:default_app_uri)})", fetch(:default_app_uri))
     end

data/lib/capistrano/tasks/database.rake

@@ -33,7 +33,6 @@ namespace :database do
   # desc 'Configure database.yml in the shared path'
   task :configure_database_file do
     on roles(:app) do
-      set :database_original_file_path, "config/recipes/config/#{fetch(:database_original_file_name)}"
       set :database_file_path, "#{fetch(:shared_path)}/config/database.yml"
 
       invoke 'database:set_permissions_pre_update'
@@ -49,16 +48,17 @@ namespace :database do
       debug 'Create and configure database.yml file'
 
       default_host = '127.0.0.1'
-      default_database = "#{fetch(:app_name)}_dev"
-      default_username = "#{fetch(:app_name)}_dev"
+      default_database = "#{fetch(:app_name)}_#{get_rails_env_abbr}"
+      default_username = "#{fetch(:app_name)}_#{get_rails_env_abbr}"
       default_password = ''
 
+      set :db_orig_file_path, File.expand_path("../../recipes/config/#{fetch(:database_original_file_name)}", __FILE__)
       set :database_host, ask('Database host:', default_host)
       set :database_name, ask('Database Name:', default_database)
       set :database_username, ask('Database Username:', default_username)
       set :database_password, ask('Database Password:', default_password)
 
-      upload! StringIO.new(File.read("#{fetch(:database_original_file_path)}")), "#{fetch(:database_file_path)}"
+      upload! StringIO.new(File.read("#{fetch(:db_orig_file_path)}")), "#{fetch(:database_file_path)}"
 
       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

@@ -29,7 +29,7 @@ namespace :secrets do
       debug 'Create and configure secrets.yml file'
       secrets_file_path = "#{fetch(:secrets_file_path)}"
 
-      set :secrets_original_file_path, 'config/recipes/config/secrets_example.yml'
+      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)}"

data/lib/capistrano/tasks/util.rake

@@ -10,6 +10,19 @@ def get_command_output(command)
   capture("#{command}").strip
 end
 
+def get_rails_env_abbr(rails_env_abbr = nil)
+  return rails_env_abbr unless rails_env_abbr.nil?
+
+  case fetch(:rails_env).to_s
+  when 'development'
+    'dev'
+  when 'test'
+    'test'
+  else
+    ''
+  end
+end
+
 def execute_rake_command(task)
   within release_path do
     execute :rake, task, "RAILS_ENV=#{fetch(:environment)}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exfel
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Luis Maia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,15 +53,15 @@ files:
 - README.md
 - Rakefile
 - capistrano-exfel.gemspec
-- config/recipes/apache_http.conf
-- config/recipes/apache_ssl.conf
-- config/recipes/config/database_mysql.yml
-- config/recipes/config/database_postgresql.yml
-- config/recipes/config/database_sqlite.yml
-- config/recipes/config/secrets_example.yml
 - lib/capistrano/exfel.rb
 - lib/capistrano/exfel/sl6.rb
 - lib/capistrano/exfel/version.rb
+- lib/capistrano/recipes/apache_http.conf
+- lib/capistrano/recipes/apache_ssl.conf
+- lib/capistrano/recipes/config/database_mysql.yml
+- lib/capistrano/recipes/config/database_postgresql.yml
+- lib/capistrano/recipes/config/database_sqlite.yml
+- lib/capistrano/recipes/config/secrets_example.yml
 - lib/capistrano/tasks/apache.rake
 - lib/capistrano/tasks/app_home.rake
 - lib/capistrano/tasks/application.rake