pulsar 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65bfc17e611312457af55a59e849357acf7fc6e5
-  data.tar.gz: 4af24027523427551bc5bcdc26dd00134abb3bdd
+  metadata.gz: 85ff94bd2e09cdb4b78e52f893e1325e57040096
+  data.tar.gz: 6a9555c19b9dd1a2fac4da55d898cc508ef802c3
 SHA512:
-  metadata.gz: cf819b8a1a90e5b9c45c453eea30d1d4b1c7d52edc9bc661200daed1ecb5ef88394306d033a3a49e2609d560c545554c534aaf67c4f8ebd2edffd6d9a6186e8d
-  data.tar.gz: cd80a5a0bbd1d325eb9fd8586dc21434c0ef104aa3f5801c0aee494f4c9945c36e3ca758240f5d9ec3f59a7fba5dad6c69c41dd04921b5ec59c288adb8470236
+  metadata.gz: b192211345aeee06d45a10c4123e5294af7baf776bdde2c0a1772f7dc6fc41060c8592671cf10b400d9bee79a4876a61f616252a55ee08400b6a318ee9260086
+  data.tar.gz: a3acf3cea61a0431d419cc92781515695ed92d183cb1f3bef408ff46268e982bc6122f11b2e29b0e5429a9e6562c053a8a152788de153f9a0409a9ac1507fac2

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,5 @@
+Style/Documentation:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.0

data/.travis.yml

@@ -8,7 +8,10 @@ notifications:
 branches:
   only:
     - master
+env:
+  - CODECLIMATE_REPO_TOKEN=e2ce951cfe49257f658e6bd61d1cabe61648328c87a3f1a0908c4e4b3d9b2e7e
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.3
+  - 2.2.0

data/README.md

@@ -1,4 +1,4 @@
-# Pulsar [![Gem Version](https://badge.fury.io/rb/pulsar.png)](http://badge.fury.io/rb/pulsar) [![Build Status](https://secure.travis-ci.org/nebulab/pulsar.png?branch=master)](http://travis-ci.org/nebulab/pulsar) [![Coverage Status](https://coveralls.io/repos/nebulab/pulsar/badge.png?branch=master)](https://coveralls.io/r/nebulab/pulsar) [![Code Climate](https://codeclimate.com/github/nebulab/pulsar.png)](https://codeclimate.com/github/nebulab/pulsar)
+# Pulsar [![Gem Version](https://badge.fury.io/rb/pulsar.svg)](http://badge.fury.io/rb/pulsar) [![Build Status](https://travis-ci.org/nebulab/pulsar.svg?branch=master)](https://travis-ci.org/nebulab/pulsar) [![Test Coverage](https://codeclimate.com/github/nebulab/pulsar/badges/coverage.svg)](https://codeclimate.com/github/nebulab/pulsar) [![Code Climate](https://codeclimate.com/github/nebulab/pulsar/badges/gpa.svg)](https://codeclimate.com/github/nebulab/pulsar)
 
 The easy [Capistrano](https://rubygems.org/gems/capistrano) deploy and configuration manager.
 
@@ -164,13 +164,13 @@ You have three possibilities:
 
 * `-c` command line option
 * `PULSAR_CONF_REPO` environment variable
-* `~/.pulsar` configuration file
+* `~/.pulsar/config` configuration file
 
-The fastest way is probably the `.pulsar` hidden file inside your home directory:
+The fastest way is probably the `.pulsar/config` file inside your home directory:
 
 ```bash
 #
-# Inside ~/.pulsar
+# Inside ~/.pulsar/config
 #
 PULSAR_CONF_REPO="gh-user/pulsar-conf"
 

data/Rakefile

@@ -1,7 +1,7 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-task "default" => "spec"
+task 'default' => 'spec'
 
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'

data/lib/pulsar.rb

@@ -1,11 +1,12 @@
-require "pulsar/version"
+require 'pulsar/version'
 
 module Pulsar
-  require "clamp"
-  require "bundler"
-  require "colored"
-  require "shellwords"
-  require "pulsar/helpers/all"
-  require "pulsar/options/all"
-  require "pulsar/commands/all"
+  require 'clamp'
+  require 'bundler'
+  require 'colored'
+  require 'shellwords'
+  require 'tmpdir'
+  require 'pulsar/helpers/all'
+  require 'pulsar/options/all'
+  require 'pulsar/commands/all'
 end

data/lib/pulsar/commands/all.rb

@@ -1,6 +1,6 @@
 module Pulsar
-  autoload :MainCommand, "pulsar/commands/main"
-  autoload :UtilsCommand, "pulsar/commands/utils"
-  autoload :ListCommand, "pulsar/commands/list"
-  autoload :InitCommand, "pulsar/commands/init"
+  autoload :MainCommand,  'pulsar/commands/main'
+  autoload :UtilsCommand, 'pulsar/commands/utils'
+  autoload :ListCommand,  'pulsar/commands/list'
+  autoload :InitCommand,  'pulsar/commands/init'
 end

data/lib/pulsar/commands/init.rb

@@ -1,6 +1,7 @@
 module Pulsar
   class InitCommand < UtilsCommand
-    parameter "CONFIGURATION_PATH", "where to generate your configuration repository"
+    parameter 'CONFIGURATION_PATH',
+              'where to generate your configuration repository'
 
     def execute
       with_clean_env_and_supported_vars do
@@ -9,12 +10,13 @@ module Pulsar
         pulsar_cmd_path = File.expand_path(File.dirname(__FILE__))
         init_repo_path = "#{pulsar_cmd_path}/../generators/init_repo"
 
-        init_repo_path += "/*" if File.directory?(destination_path)
+        init_repo_path += '/*' if File.directory?(destination_path)
 
-        run_cmd("cp -r #{init_repo_path} #{destination_path}", :verbose => verbose?)
+        run_cmd(
+          "cp -r #{init_repo_path} #{destination_path}", verbose: verbose?)
 
-        puts "Your starter configuration repo is in #{destination_path.yellow}."
-        puts "Remember to run #{ "bundle install".red } to add the needed Gemfile.lock."
+        puts 'Your starter configuration repo is in #{destination_path.yellow}.'
+        puts "Remember to run #{'bundle install'.red} to add a Gemfile.lock."
       end
     end
   end

data/lib/pulsar/commands/main.rb

@@ -4,50 +4,61 @@ module Pulsar
     include Pulsar::Options::Shared
     include Pulsar::Options::ConfRepo
 
-    option [ "-l", "--log-level" ], "LOG LEVEL",
-                                    "how much output will Capistrano print out. Can be any of: important, info, debug, trace",
-                                    :default => "important"
+    option ['-l', '--log-level'], 'LOG LEVEL',
+           'how much output will Capistrano print out. Can be any of: important, info, debug, trace',
+           default: 'important'
 
-    option [ "-s", "--skip-cap-run" ], :flag,
-                                       "do everything pulsar does (build a Capfile) but don't run the cap command",
-                                       :default => false
+    option ['-s', '--skip-cap-run'], :flag,
+           'do everything pulsar does (build a Capfile) but don\'t run the cap command',
+           default: false
 
-    if !from_application_path?
-      parameter "APPLICATIONS", "the applications which you would like to deploy. You can pass just one or a comma separated list to deploy multiple applications at once. It supports globbing too."
+    unless from_application_path?
+      parameter 'APPLICATIONS', 'the applications which you would like to deploy. You can pass just one or a comma separated list to deploy multiple applications at once. It supports globbing too.'
     end
 
-    parameter "STAGE", "the stage on which you would like to deploy"
+    parameter 'STAGE', 'the stage on which you would like to deploy'
 
-    parameter "[TASKS] ...",
-              "the arguments and/or options that will be passed to capistrano",
-              :environment_variable => "PULSAR_DEFAULT_TASK",
-              :default => "deploy"
+    parameter '[TASKS] ...',
+              'the arguments and/or options that will be passed to capistrano',
+              environment_variable: 'PULSAR_DEFAULT_TASK',
+              default: 'deploy'
 
     def execute
       with_clean_env_and_supported_vars do
         begin
-          create_tmp_dir
-          fetch_repo
-          bundle_install
-
-          expand_applications.each do |app|
-            validate(app, stage)
-            create_capfile
-            build_capfile(app, stage)
-
-            unless skip_cap_run?
-              cap_args = [ tasks_list ].flatten.shelljoin
-              run_capistrano(cap_args)
-            end
-
-            remove_capfile unless keep_capfile?
-            reset_capfile_path!
-          end
+          fetch_repo_and_bundle
+          expand_applications.each { |app| validate_and_run_capistrano(app) }
         ensure
-          remove_capfile unless keep_capfile?
-          remove_repo unless keep_repo?
+          cleanup
         end
       end
     end
+
+    private
+
+    def cleanup(opts = { full: true })
+      remove_capfile unless keep_capfile?
+      reset_capfile_path!
+      remove_repo if opts[:full] && !keep_repo?
+    end
+
+    def fetch_repo_and_bundle
+      create_tmp_dir
+      fetch_repo
+      bundle_install
+    end
+
+    def validate_and_run_capistrano(app)
+      validate(app, stage)
+      create_capfile
+      build_capfile(app, stage)
+
+      unless skip_cap_run?
+        cap_args = [tasks_list].flatten.shelljoin
+        run_capistrano(cap_args)
+      end
+
+      cleanup(full: false)
+    end
   end
 end

data/lib/pulsar/commands/utils.rb

@@ -3,8 +3,12 @@ module Pulsar
     include Pulsar::Helpers::Clamp
     include Pulsar::Options::Shared
 
-    subcommand "list", "list all available apps and stages which you can deploy", ListCommand
-    subcommand "init", "generate a new configuration repo with some basic recipes to use with pulsar", InitCommand
+    subcommand 'list',
+               'list all available apps and stages which you can deploy',
+                ListCommand
+
+    subcommand 'init',
+               'generate a new configuration repo with some basic recipes to use with pulsar',
+               InitCommand
   end
 end
-

data/lib/pulsar/generators/init_repo/apps/your_app/defaults.rb

@@ -1,4 +1,4 @@
-set :application, "your_app"
+set :application, 'your_app'
 
 load_recipes do
   #

data/lib/pulsar/generators/init_repo/apps/your_app/production.rb

@@ -1,6 +1,6 @@
-server "your_app.com", :db, :web, :app, :primary => true
+server 'your_app.com', :db, :web, :app, primary: true
 
-set :stage, "production"
+set :stage, 'production'
 
 load_recipes do
   #

data/lib/pulsar/generators/init_repo/apps/your_app/staging.rb

@@ -1,6 +1,6 @@
-server "staging.your_app.com", :db, :web, :app, :primary => true
+server 'staging.your_app.com', :db, :web, :app, primary: true
 
-set :stage, "staging"
+set :stage, 'staging'
 
 load_recipes do
   #

data/lib/pulsar/generators/init_repo/recipes/generic/cleanup.rb

@@ -1,50 +1,50 @@
 if logger.level == Capistrano::Logger::IMPORTANT
-  arrow = "→".yellow.bold
-  ok = "✓".green
+  arrow = '→'.yellow.bold
+  ok = '✓'.green
 
-  before "deploy:update_code" do
+  before 'deploy:update_code' do
     SpinningCursor.start do
       banner "#{arrow} Updating Code"
       message "#{arrow} Updating Code #{ok}"
     end
   end
 
-  before "bundle:install" do
+  before 'bundle:install' do
     SpinningCursor.start do
       banner "#{arrow} Installing Gems"
       message "#{arrow} Installing Gems #{ok}"
     end
   end
 
-  before "deploy:assets:symlink" do
+  before 'deploy:assets:symlink' do
     SpinningCursor.start do
       banner "#{arrow} Symlinking Assets"
       message "#{arrow} Symlinking Assets #{ok}"
     end
   end
 
-  before "deploy:assets:precompile" do
+  before 'deploy:assets:precompile' do
     SpinningCursor.start do
       banner "#{arrow} Compiling Assets"
       message "#{arrow} Compiling Assets #{ok}"
     end
   end
 
-  before "deploy:create_symlink" do
+  before 'deploy:create_symlink' do
     SpinningCursor.start do
       banner "#{arrow} Symlinking Application"
       message "#{arrow} Symlinking Application #{ok}"
     end
   end
 
-  before "deploy:restart" do
+  before 'deploy:restart' do
     SpinningCursor.start do
       banner "#{arrow} Restarting Webserver"
       message "#{arrow} Restarting Webserver #{ok}"
     end
   end
 
-  after "deploy" do
+  after 'deploy' do
     SpinningCursor.stop
   end
 end

data/lib/pulsar/generators/init_repo/recipes/generic/utils.rb

@@ -1,6 +1,9 @@
 namespace :utils do
-  desc "Invoke your awesome rake tasks!"
-  task :invoke_rake, :roles => :web do
-    run("cd #{deploy_to}/current && RAILS_ENV=#{rails_env} #{rake} #{ENV['ARGS']}")
+  desc 'Invoke your awesome rake tasks!'
+  task :invoke_rake, roles: :web do
+    cd  = "cd #{deploy_to}/current"
+    cmd = "RAILS_ENV=#{rails_env} #{rake} #{ENV['ARGS']}"
+
+    run("#{cd} && #{cmd}")
   end
 end

data/lib/pulsar/helpers/all.rb

@@ -1,6 +1,8 @@
-module Pulsar::Helpers
-  autoload :Capistrano, "pulsar/helpers/capistrano"
-  autoload :Clamp, "pulsar/helpers/clamp"
-  autoload :Path, "pulsar/helpers/path"
-  autoload :Shell, "pulsar/helpers/shell"
+module Pulsar
+  module Helpers
+    autoload :Capistrano, 'pulsar/helpers/capistrano'
+    autoload :Clamp,      'pulsar/helpers/clamp'
+    autoload :Path,       'pulsar/helpers/path'
+    autoload :Shell,      'pulsar/helpers/shell'
+  end
 end

data/lib/pulsar/helpers/capistrano.rb

@@ -10,16 +10,16 @@ module Pulsar
           instance_eval(&dsl_code)
         end
 
-        def method_missing(meth, *args, &block)
+        def method_missing(meth, *args)
           return if !@capistrano.from_application_path? && @options[:app_only]
 
           recipes = "#{ENV['CONFIG_PATH']}/recipes/#{meth}"
 
-          File.directory?(recipes) || raise("There are no recipes of type #{meth}")
+          File.directory?(recipes) || fail("There are no recipes of type #{meth}")
 
           args.each do |arg|
             recipe = "#{recipes}/#{arg}.rb"
-            File.exists?(recipe) || raise("There is no #{arg} recipe")
+            File.exist?(recipe) || fail("There is no #{arg} recipe")
 
             @capistrano.send(:load, recipe)
           end
@@ -36,7 +36,7 @@ module Pulsar
       # as a variable and error out
       #
       def from_application_path?
-        ENV.has_key?('APP_PATH')
+        ENV.key?('APP_PATH')
       end
 
       def load_recipes(opts = {}, &block)

data/lib/pulsar/helpers/clamp.rb

@@ -11,7 +11,7 @@ module Pulsar
 
       module InstanceAndClassMethods
         def from_application_path?
-          File.exists?("#{Dir.pwd}/config.ru")
+          File.exist?("#{Dir.pwd}/config.ru")
         end
       end
 
@@ -33,17 +33,17 @@ module Pulsar
         end
 
         def bundle_install
-          cd(config_path, :verbose => verbose?) do
-            run_cmd("bundle install --quiet", :verbose => verbose?)
+          cd(config_path, verbose: verbose?) do
+            run_cmd("bundle install --quiet --path=#{bundle_path.shellescape}", verbose: verbose?)
           end
         end
 
         def create_capfile
-          touch(capfile_path, :verbose => verbose?)
+          touch(capfile_path, verbose: verbose?)
         end
 
         def create_tmp_dir
-          run_cmd("mkdir -p #{tmp_dir}", :verbose => verbose?)
+          run_cmd("mkdir -p #{tmp_path.shellescape}", verbose: verbose?)
         end
 
         def each_app
@@ -54,7 +54,7 @@ module Pulsar
 
         def expand_applications
           if from_application_path?
-            [ ENV['PULSAR_APP_NAME'] || File.basename(application_path) ]
+            [ENV['PULSAR_APP_NAME'] || File.basename(application_path)]
           else
             #
             # Given following applications:
@@ -86,14 +86,14 @@ module Pulsar
         end
 
         def fetch_directory_repo(repo)
-          run_cmd("cp -rp #{repo} #{config_path}", :verbose => verbose?)
+          run_cmd("cp -rp #{repo} #{config_path}", verbose: verbose?)
         end
 
-        def fetch_git_repo(repo, local=false)
+        def fetch_git_repo(repo, local = false)
           git_options = "--quiet --branch #{conf_branch}"
           git_options = "#{git_options} --depth=1" unless local
 
-          run_cmd("git clone #{git_options} #{repo} #{config_path}", :verbose => verbose?)
+          run_cmd("git clone #{git_options} #{repo} #{config_path}", verbose: verbose?)
         end
 
         def find_apps_from_pattern(glob)
@@ -111,12 +111,12 @@ module Pulsar
           app_file = config_app_defaults_path(app)
           stage_file = config_stage_path(app, stage)
 
-          if File.exists?(app_file)
-            run_cmd("cat #{app_file} >> #{capfile_path}", :verbose => verbose?)
+          if File.exist?(app_file)
+            run_cmd("cat #{app_file} >> #{capfile_path}", verbose: verbose?)
           end
 
-          if File.exists?(stage_file)
-            run_cmd("cat #{stage_file} >> #{capfile_path}", :verbose => verbose?)
+          if File.exist?(stage_file)
+            run_cmd("cat #{stage_file} >> #{capfile_path}", verbose: verbose?)
           end
         end
 
@@ -125,12 +125,12 @@ module Pulsar
           stage_recipes_dir = config_app_stage_recipes_path(app, stage)
 
           Dir["#{recipes_dir}/*.rb", "#{stage_recipes_dir}/*.rb"].each do |recipe|
-            run_cmd("cat #{recipe} >> #{capfile_path}", :verbose => verbose?)
+            run_cmd("cat #{recipe} >> #{capfile_path}", verbose: verbose?)
           end
         end
 
         def include_base_conf
-          run_cmd("cat #{config_base_path} >> #{capfile_path}", :verbose => verbose?)
+          run_cmd("cat #{config_base_path} >> #{capfile_path}", verbose: verbose?)
         end
 
         def list_apps
@@ -140,41 +140,40 @@ module Pulsar
         end
 
         def load_configuration
-          unless pulsar_configuration.nil?
-            File.readlines(pulsar_configuration).each do |line|
-              conf, value = line.split("=")
+          return if pulsar_configuration.nil?
 
-              ENV[conf] = value.chomp.gsub('"', '') if !conf.nil? && !value.nil?
-            end
+          File.readlines(pulsar_configuration).each do |line|
+            conf, value = line.split('=')
+
+            ENV[conf] = value.chomp.gsub('"', '') if !conf.nil? && !value.nil?
           end
         end
 
         def pulsar_configuration
-          conf_file = ".pulsar"
-          inside_app = File.join(application_path, conf_file) rescue nil
-          inside_home = File.join(Dir.home, conf_file) rescue nil
+          path_list = []
+          path_list << File.join(application_path, '.pulsar')  unless application_path.nil?
+          path_list << File.join(home_path, 'config')
 
-          return inside_app if inside_app && File.file?(inside_app)
-          return inside_home if inside_home && File.file?(inside_home)
+          path_list.find { |path| File.file?(path) }
         end
 
         def remove_capfile
-          rm_rf(capfile_path, :verbose => verbose?)
+          rm_rf(capfile_path, verbose: verbose?)
         end
 
         def remove_repo
-          rm_rf(config_path, :verbose => verbose?)
+          rm_rf(config_path, verbose: verbose?)
         end
 
         def run_capistrano(args)
-          cmd = "bundle exec cap"
+          cmd = 'bundle exec cap'
           env = "CONFIG_PATH=#{config_path}"
           opts = "--file #{capfile_path}"
 
           env += " APP_PATH=#{application_path}" unless application_path.nil?
 
-          cd(config_path, :verbose => verbose?) do
-            run_cmd("#{cmd} #{env} #{opts} #{args}", :verbose => verbose?)
+          cd(config_path, verbose: verbose?) do
+            run_cmd("#{cmd} #{env} #{opts} #{args}", verbose: verbose?)
           end
         end
 
@@ -186,7 +185,7 @@ module Pulsar
 
           cmd = "echo 'logger.level = logger.level = Capistrano::Logger::#{level}' >> #{capfile_path}"
 
-          run_cmd(cmd, :verbose => verbose?)
+          run_cmd(cmd, verbose: verbose?)
         end
 
         def supported_env_vars
@@ -206,8 +205,8 @@ module Pulsar
         def validate(app, stage)
           app_path = config_app_path(app)
           stage_path = config_stage_path(app, stage)
-          valid_paths = File.exists?(app_path) && File.exists?(stage_path)
-          raise(ArgumentError, "no pulsar config available for app=#{app}, stage=#{stage}") unless valid_paths
+          valid_paths = File.exist?(app_path) && File.exist?(stage_path)
+          fail(ArgumentError, "no pulsar config available for app=#{app}, stage=#{stage}") unless valid_paths
         end
 
         def with_clean_env_and_supported_vars