mascherano 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWJkM2VjYjIwZjgzOGE1M2IzODkyNDA1ZWQzMzkyNjI3ODY2YzYwZA==
-  data.tar.gz: !binary |-
-    NzJiMDllYWFkZGUyNjViMDNiNjk3OGZiNDZiNWE2ZjAzYTg4MDJlZA==
+SHA1:
+  metadata.gz: cbb4833274538eb82988367e9bcc9b0a92050954
+  data.tar.gz: fb5cbd6ccd981da7942ca4f81be6c984d2e91ecb
 SHA512:
-  metadata.gz: !binary |-
-    MmFmODVkNzQ2YWFkNGI5ZjUwY2VmYjRhNWU5YTExNTJjNTgwMGM2ZWIwNzlj
-    ZmRkM2Y1MTNiZmY0YTg2MzQ2Mzk0MmU3MTIzYzEyYTA1M2FhOWFiNGE0YjYy
-    YmU3ZGJiMzIxMzA1OTU4MTQzMmRmNGY3MDVjMjljOTYwZWExYzA=
-  data.tar.gz: !binary |-
-    NWE2NTM1M2YyZTI3ZjdmY2Y1OTQ4OTRkODdmYjgyNDZiYjJmN2ZhYWZkYTU0
-    YjQwN2E5YTI1N2EwOTdiZjU0ZDQ2NjAyZTJmYWRhOGVkMDQ2MzJlZDZkOWUz
-    ZjYzMTIxNjk1ODc0Y2YyMjlhNDU5MmU2ZWEyYWIzNjQ4NWZlMWI=
+  metadata.gz: d0af20d5ed82f15817ba5d83b057c88d1e70162b0fd197c2a6ffb25c254a6aacd7e1e079f7936ee2fc213097f2a1780e0da4f51dd90e9b3297e1ec7d11d2d2c6
+  data.tar.gz: 96570333ed18e71d7ba38ac275440ac7c674be13074d6da69a04876d6d5fec5f1115996bf1d829b9141ed0cf6f1cf1b6127c3e24b4024d5835a4202cbe6aaa70

data/lib/capistrano/tasks/noscm.cap

@@ -5,4 +5,5 @@ namespace :noscm do
       execute :mkdir, '-p', release_path
     end
   end
+  task :set_current_revision do; end
 end

data/lib/mascherano/tasks/auth_basic.cap

@@ -10,7 +10,7 @@ namespace :auth_basic do
       htpasswd.chomp!
     end
 
-    on roles(fetch(:auth_basic_roles)) do
+    on fetch(:auth_basic_servers) do
       upload! StringIO.new(htpasswd), fetch(:auth_basic_target)
       execute :chmod, 'o+r', fetch(:auth_basic_target)
     end
@@ -19,8 +19,9 @@ end
 
 namespace :load do
   task :defaults do
-    set :auth_basic_user, 'root'
-    set :auth_basic_roles, :all
-    set :auth_basic_target, -> { shared_path.join('.htpasswd') }
+    set :auth_basic_user,     'root'
+    set :auth_basic_roles,    :all
+    set :auth_basic_servers,  -> { release_roles(fetch(:auth_basic_roles)) }
+    set :auth_basic_target,   -> { shared_path.join('.htpasswd') }
   end
 end

data/lib/mascherano/tasks/env.cap

@@ -4,12 +4,13 @@ namespace :env do
 
     You can override any of these defaults by setting the variables shown below.
 
-    set :env_file, ".env"
-    set :env_roles, :all
-    set :target_file, -> { shared_path.join('.env') }
+    set :env_file,     ".env"
+    set :env_roles,    :all
+    set :env_servers,  -> { release_roles(fetch(:env_roles)) }
+    set :env_target,   -> { shared_path.join('.env') }
   DESC
   task :upload do
-    on roles(fetch(:env_roles)) do
+    on fetch(:env_servers) do
       upload! fetch(:env_file), fetch(:env_target)
     end
   end
@@ -18,7 +19,7 @@ namespace :env do
     Symlink the .env file to the release_path
   DESC
   task :symlink do
-    on roles(fetch(:env_roles)) do
+    on fetch(:env_servers) do
       execute :ln, '-sf', fetch(:env_target), release_path.join('.env')
     end
   end
@@ -26,9 +27,10 @@ end
 
 namespace :load do
   task :defaults do
-    set :env_file, ".env"
-    set :env_roles, :all
-    set :env_target, -> { shared_path.join('.env') }
+    set :env_file,     ".env"
+    set :env_roles,    :all
+    set :env_servers,  -> { release_roles(fetch(:env_roles)) }
+    set :env_target,   -> { shared_path.join('.env') }
   end
 end
 

data/lib/mascherano/tasks/figaro.cap

@@ -6,9 +6,11 @@ namespace :figaro do
 
     You can override any of these defaults by setting the variables shown below.
 
-    set :figaro_target, -> { shared_path.join('application.yml') }
-    set :figaro_config, -> { release_path.join('config', 'application.yml') }
-    set :figaro_to_env, false
+    set :figaro_target,   -> { shared_path.join('application.yml') }
+    set :figaro_config,   -> { release_path.join('config',            'application.yml') }
+    set :figaro_to_env,   false
+    set :figaro_roles,    :app
+    set :figaro_servers,  -> { release_roles(fetch(:figaro_roles)) }
   DESC
   task :upload do
     figaro_data = nil
@@ -27,7 +29,7 @@ namespace :figaro do
     end
 
     if figaro_data
-      on roles(fetch(:figaro_roles)) do
+      on fetch(:figaro_servers) do
         upload! StringIO.new(figaro_data), fetch(:figaro_target)
       end
     end
@@ -37,7 +39,7 @@ namespace :figaro do
     Symlink the application config to the release_path
   DESC
   task :symlink do
-    on roles(fetch(:figaro_roles)) do
+    on fetch(:figaro_servers) do
       execute :ln, '-sf', fetch(:figaro_target), fetch(:figaro_config)
     end
   end
@@ -45,10 +47,11 @@ end
 
 namespace :load do
   task :defaults do
-    set :figaro_target, -> { shared_path.join('application.yml') }
-    set :figaro_config, -> { release_path.join('config', 'application.yml') }
-    set :figaro_to_env, false
-    set :figaro_roles, :app
+    set :figaro_target,   -> { shared_path.join('application.yml') }
+    set :figaro_config,   -> { release_path.join('config',            'application.yml') }
+    set :figaro_to_env,   false
+    set :figaro_roles,    :app
+    set :figaro_servers,  -> { release_roles(fetch(:figaro_roles)) }
   end
 end
 

data/lib/mascherano/tasks/foreman.cap

@@ -4,65 +4,75 @@ namespace :foreman do
 
     You can override any of these defaults by setting the variables shown below.
 
-    set :foreman_cmd,         "foreman"
-    set :foreman_format,      "upstart"
-    set :foreman_location,    "/etc/init"
-    set :foreman_port,        5000
-    set :foreman_root,        -> { release_path }
-    set :foreman_procfile,    -> { release_path.join('Procfile') }
-    set :foreman_app,         -> { fetch(:application) }
-    set :foreman_user,        -> { fetch(:user) }
-    set :foreman_log,         -> { shared_path.join('log') }
-    set :foreman_pids,        false
-    set :foreman_concurrency, false
-    set :foreman_sudo,        false
-    set :foreman_roles,       :all
+    set :foreman_cmd,          "foreman"
+    set :foreman_format,       "upstart"
+    set :foreman_location,     "/etc/init"
+    set :foreman_port,         5000
+    set :foreman_root,         -> { release_path }
+    set :foreman_procfile,     -> { release_path.join('Procfile') }
+    set :foreman_app,          -> { fetch(:application) }
+    set :foreman_log,          -> { shared_path.join('log') }
+    set :foreman_pids,         false
+    set :foreman_concurrency,  false
+    set :foreman_sudo,         false
+    set :foreman_roles,        :all
+    set :foreman_servers,      -> { release_roles(fetch(:foreman_roles)) }
   DESC
 
   task :export do
-    on roles(fetch(:foreman_roles)) do
+    on fetch(:foreman_servers) do |host|
       within release_path do
-        concurrency  = fetch(:foreman_concurrency)
-        foreman_sudo = fetch(:foreman_sudo)
-        foreman_pids = fetch(:foreman_pids)
+        foreman_cmd         = fetch(:foreman_cmd)
+        foreman_concurrency = fetch(:foreman_concurrency)
+        foreman_format      = fetch(:foreman_format)
+        foreman_location    = fetch(:foreman_location)
+        foreman_pids        = fetch(:foreman_pids)
+        foreman_sudo        = fetch(:foreman_sudo)
+        foreman_user        = fetch(:foreman_user, host.user)
 
-        args  = [fetch(:foreman_format), fetch(:foreman_location)]
-        args << %Q(-f #{fetch(:foreman_procfile)})
-        args << %Q(-p #{fetch(:foreman_port)})
-        args << %Q(-d #{fetch(:foreman_root)})
-        args << %Q(-a #{fetch(:foreman_app)})
-        args << %Q(-u #{fetch(:foreman_user)})
-        args << %Q(-l #{fetch(:foreman_log)})
-        args << %Q(-r #{fetch(:foreman_pids)}) if foreman_pids
-        args << %Q(-c #{concurrency}) if concurrency
+        cmd = [foreman_cmd, 'export',  foreman_format, foreman_location]
+        cmd << %Q(-f #{fetch(:foreman_procfile)})
+        cmd << %Q(-p #{fetch(:foreman_port)})
+        cmd << %Q(-d #{fetch(:foreman_root)})
+        cmd << %Q(-a #{fetch(:foreman_app)})
+        cmd << %Q(-u #{foreman_user})
+        cmd << %Q(-l #{fetch(:foreman_log)})
+        cmd << %Q(-r #{foreman_pids}) if foreman_pids
+        cmd << %Q(-c #{foreman_concurrency}) if foreman_concurrency
 
-        cmd = "#{fetch(:foreman_cmd)} export #{args.join(' ')}"
-
-        if foreman_sudo
-          execute "sudo su - -c '#{cmd}'"
-        else
-          execute cmd
-        end
+        execute *cmd
       end
     end
   end
+
+  desc 'Prefixes the foreman command with sudo when :foreman_sudo => true'
+  task :configure_sudo do
+    if fetch(:foreman_sudo)
+      foreman_cmd = fetch(:foreman_cmd).to_s
+      SSHKit.config.command_map.prefix[foreman_cmd].push('sudo')
+    end
+  end
+end
+
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'foreman:configure_sudo'
 end
 
 namespace :load do
   task :defaults do
-    set :foreman_cmd,         "foreman"
-    set :foreman_format,      "upstart"
-    set :foreman_location,    "/etc/init"
-    set :foreman_port,        5000
-    set :foreman_root,        -> { release_path }
-    set :foreman_procfile,    -> { release_path.join('Procfile') }
-    set :foreman_app,         -> { fetch(:application) }
-    set :foreman_user,        -> { fetch(:user) }
-    set :foreman_log,         -> { shared_path.join('log') }
-    set :foreman_pids,        false
-    set :foreman_concurrency, false
-    set :foreman_sudo,        false
-    set :foreman_roles,       :all
+    set :foreman_cmd,          "foreman"
+    set :foreman_format,       "upstart"
+    set :foreman_location,     "/etc/init"
+    set :foreman_port,         5000
+    set :foreman_root,         -> { release_path }
+    set :foreman_procfile,     -> { release_path.join('Procfile') }
+    set :foreman_app,          -> { fetch(:application) }
+    set :foreman_log,          -> { shared_path.join('log') }
+    set :foreman_pids,         false
+    set :foreman_concurrency,  false
+    set :foreman_sudo,         false
+    set :foreman_roles,        :all
+    set :foreman_servers,      -> { release_roles(fetch(:foreman_roles)) }
   end
 end
 

data/lib/mascherano/tasks/go.cap

@@ -4,15 +4,16 @@ namespace :go do
 
     You can override any of these defaults by setting the variables shown below.
 
-    set :go_input,  'api.go'
-    set :go_output, 'api'
-    set :go_os,     'linux'
-    set :go_arch,   'amd64'
-    set :go_roles,  :app
-    set :go_target, -> { release_path.join(fetch(:go_output)) }
+    set :go_input,    'api.go'
+    set :go_output,   'api'
+    set :go_os,       'linux'
+    set :go_arch,     'amd64'
+    set :go_roles,    :app
+    set :go_servers,  -> { release_roles(fetch(:go_roles)) }
+    set :go_target,   -> { release_path.join(fetch(:go_output)) }
   DESC
   task :build do
-    on roles(fetch(:go_roles)) do
+    on fetch(:go_servers) do
       run_locally do
         go_flags = {
           'GOOS'   => fetch(:go_os),
@@ -28,7 +29,7 @@ namespace :go do
 
   desc 'Upload compiled application to the server'
   task :upload do
-    on roles(fetch(:go_roles)) do
+    on fetch(:go_servers) do
       upload! fetch(:go_output), fetch(:go_target)
     end
   end
@@ -36,11 +37,12 @@ end
 
 namespace :load do
   task :defaults do
-    set :go_input,  'api.go'
-    set :go_output, 'api'
-    set :go_os,     'linux'
-    set :go_arch,   'amd64'
-    set :go_roles,  :app
-    set :go_target, -> { release_path.join(fetch(:go_output)) }
+    set :go_input,    'api.go'
+    set :go_output,   'api'
+    set :go_os,       'linux'
+    set :go_arch,     'amd64'
+    set :go_roles,    :app
+    set :go_servers,  -> { release_roles(fetch(:go_roles)) }
+    set :go_target,   -> { release_path.join(fetch(:go_output)) }
   end
 end

data/lib/mascherano/tasks/supervisor.cap

@@ -31,7 +31,7 @@ namespace :supervisor do
     end
 
     if supervisor_config
-      on roles(fetch(:supervisor_roles)) do
+      on fetch(:supervisor_servers) do
         upload! StringIO.new(supervisor_config), fetch(:supervisor_target)
       end
     end
@@ -39,35 +39,35 @@ namespace :supervisor do
 
   desc 'Symlink supervisord config to the conf.d'
   task :symlink do
-    on roles(fetch(:supervisor_roles)) do
+    on fetch(:supervisor_servers) do
       execute :ln, '-sf', fetch(:supervisor_target), fetch(:supervisor_confd)
     end
   end
 
   desc 'Reread supervisord'
   task :reread do
-    on roles(fetch(:supervisor_roles)) do
+    on fetch(:supervisor_servers) do
       execute :supervisorctl, 'reread'
     end
   end
 
   desc 'Update supervisord'
   task :update do
-    on roles(fetch(:supervisor_roles)) do
+    on fetch(:supervisor_servers) do
       execute :supervisorctl, 'update'
     end
   end
 
   desc 'Restart application'
   task :restart do
-    on roles(fetch(:supervisor_roles)) do
+    on fetch(:supervisor_servers) do
       execute :supervisorctl, 'restart', "#{fetch(:supervisor_application)}:*"
     end
   end
 
   desc 'Update configuration or restart application'
   task :refresh do
-    on roles(fetch(:supervisor_roles)) do
+    on fetch(:supervisor_servers) do
       if test "supervisorctl reread | grep 'No config updates to processes'"
         execute :supervisorctl, 'restart', "#{fetch(:supervisor_application)}:*"
       else
@@ -79,12 +79,13 @@ end
 
 namespace :load do
   task :defaults do
-    set :supervisor_application, -> { fetch(:application) }
-    set :supervisor_stage,       -> { fetch(:stage) }
-    set :supervisor_template,    -> { "config/supervisor/#{fetch(:supervisor_stage)}.conf" }
-    set :supervisor_target,      -> { shared_path.join('supervisord.conf') }
-    set :supervisor_confd,       -> { "/etc/supervisor/conf.d/#{fetch(:supervisor_application)}.conf" }
-    set :supervisor_roles,       :all
+    set :supervisor_application,  -> { fetch(:application) }
+    set :supervisor_stage,        -> { fetch(:stage) }
+    set :supervisor_template,     -> { "config/supervisor/#{fetch(:supervisor_stage)}.conf" }
+    set :supervisor_target,       -> { shared_path.join('supervisord.conf') }
+    set :supervisor_confd,        -> { "/etc/supervisor/conf.d/#{fetch(:supervisor_application)}.conf" }
+    set :supervisor_roles,        :all
+    set :supervisor_servers,      -> { release_roles(fetch(:supervisor_roles)) }
   end
 end
 

data/lib/mascherano/tasks/token.cap

@@ -8,14 +8,14 @@ end
 namespace :token do
   desc 'Generate random token'
   task :generate do
-    on roles(fetch(:token_roles)) do
+    on fetch(:token_servers) do
       info generate_token(fetch(:token_length))
     end
   end
 
   desc 'Upload random token as a file on remote server'
   task :upload do
-    on roles(fetch(:token_roles)) do
+    on fetch(:token_servers) do
       token = generate_token(fetch(:token_length))
       io    = StringIO.new(token)
       upload! io, fetch(:token_target)
@@ -28,6 +28,7 @@ namespace :load do
     set :token_length, 64
     set :token_target, -> { shared_path.join('.token') }
     set :token_roles, :app
+    set :token_servers,  -> { release_roles(fetch(:token_roles)) }
   end
 end
 

data/lib/mascherano/tasks/upstart.cap

@@ -1,41 +1,47 @@
-def build_cmd(service_name, action, sudo = false)
-  cmd = "service #{service_name} #{action}"
-  cmd = "sudo " + cmd if sudo
-  cmd
-end
-
 namespace :upstart do
   desc "Start the application services"
   task :start do
-    on roles(fetch(:upstart_roles)) do
-      execute build_cmd(fetch(:upstart_service), 'start', fetch(:upstart_sudo))
+    on fetch(:upstart_servers) do
+      execute fetch(:upstart_cmd), 'start', fetch(:upstart_service)
     end
   end
 
   desc "Stop the application services"
   task :stop do
-    on roles(fetch(:upstart_roles)) do
-      execute build_cmd(fetch(:upstart_service), 'stop', fetch(:upstart_sudo))
+    on fetch(:upstart_servers) do
+      execute fetch(:upstart_cmd), 'stop', fetch(:upstart_service)
     end
   end
 
   desc "Restart the application services"
   task :restart do
-    on roles(fetch(:upstart_roles)) do
-      cmd_sq  = build_cmd(fetch(:upstart_service), 'start', fetch(:upstart_sudo))
-      cmd_sq += ' || '
-      cmd_sq += build_cmd(fetch(:upstart_service), 'restart', fetch(:upstart_sudo))
+    on fetch(:upstart_servers) do
+      unless test(fetch(:upstart_cmd), 'start', fetch(:upstart_service))
+        execute fetch(:upstart_cmd), 'restart', fetch(:upstart_service)
+      end
+    end
+  end
 
-      execute cmd_sq
+  desc "Prefixes the upstart command with sudo when :upstart_sudo => true"
+  task :configure_sudo do
+    if fetch(:upstart_sudo)
+      upstart_cmd = fetch(:upstart_cmd).to_s
+      SSHKit.config.command_map.prefix[upstart_cmd].push('sudo')
     end
   end
 end
 
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'upstart:configure_sudo'
+end
+
 namespace :load do
   task :defaults do
-    set :upstart_service, -> { fetch(:application) }
-    set :upstart_sudo, false
-    set :upstart_roles, :app
+    set :upstart_service,  -> { fetch(:application) }
+    set :upstart_sudo,     false
+    set :upstart_roles,    :app
+    set :upstart_servers,  -> { release_roles(fetch(:upstart_roles)) }
+    set :upstart_cmd,      'initctl'
   end
 end
 

data/lib/mascherano/version.rb

@@ -1,3 +1,3 @@
 module Mascherano
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mascherano
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alif Rachmawadi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Capistrano 3.x recipes
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -98,18 +98,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Capistrano 3.x recipes
 test_files: []
+has_rdoc: