pulsar 0.3.4 → 0.3.5

data/lib/pulsar/helpers/path.rb

@@ -2,11 +2,11 @@ module Pulsar
   module Helpers
     module Path
       def capfile_path
-        "#{tmp_dir}/capfile-#{deploy_time}"
+        "#{tmp_path}/capfile-#{deploy_time}"
       end
 
       def config_path
-        "#{tmp_dir}/conf-repo-#{setup_time}"
+        "#{tmp_path}/conf-repo-#{setup_time}"
       end
 
       def config_app_path(app)
@@ -41,7 +41,20 @@ module Pulsar
         clear_deploy_time
       end
 
+      def home_path
+        home_dir
+      end
+
+      def bundle_path
+        File.join(home_path, 'bundle')
+      end
+
+      def tmp_path
+        File.join(home_path, 'tmp')
+      end
+
       private
+
       def clear_deploy_time
         @deploy = nil
       end

data/lib/pulsar/helpers/shell.rb

@@ -1,11 +1,11 @@
-require "fileutils"
+require 'fileutils'
 
 module Pulsar
   module Helpers
     module Shell
       include FileUtils
 
-      def cd(path, opts, &block)
+      def cd(path, opts)
         puts "Directory: #{path.white}".yellow if opts[:verbose]
         FileUtils.cd(path) { yield }
       end
@@ -19,7 +19,7 @@ module Pulsar
         puts "Command: #{cmd.white}".yellow if opts[:verbose]
         system(cmd)
 
-        raise "Command #{cmd} Failed" if $? != 0
+        fail "Command #{cmd} Failed" if $? != 0
       end
 
       def touch(file, opts)

data/lib/pulsar/options/all.rb

@@ -1,4 +1,6 @@
-module Pulsar::Options
-  autoload :ConfRepo, "pulsar/options/conf_repo"
-  autoload :Shared, "pulsar/options/shared"
+module Pulsar
+  module Options
+    autoload :ConfRepo, 'pulsar/options/conf_repo'
+    autoload :Shared,   'pulsar/options/shared'
+  end
 end

data/lib/pulsar/options/conf_repo.rb

@@ -2,26 +2,27 @@ module Pulsar
   module Options
     module ConfRepo
       def self.included(base)
-        base.option [ "-c", "--conf-repo" ], "REPO URL",
-                                             "a git repository with deploy configurations, mainly apps and recipes",
-                                             :environment_variable => "PULSAR_CONF_REPO",
-                                             :required => true
+        base.option ['-c', '--conf-repo'], 'REPO URL',
+                    'a git repository with deploy configurations, mainly apps and recipes',
+                    environment_variable: 'PULSAR_CONF_REPO',
+                    required: true
 
-        base.option [ "-k", "--keep-capfile" ], :flag,
-                                                "don't remove the generated capfile in the TMP DIR directory",
-                                                :default => false
+        base.option ['-k', '--keep-capfile'], :flag,
+                    'don\'t remove the generated capfile in the TMP DIR directory',
+                    default: false
 
-        base.option [ "-r", "--keep-repo" ], :flag,
-                                             "don't remove the downloaded configuration repository from the TMP DIR directory",
-                                             :default => false
+        base.option ['-r', '--keep-repo'], :flag,
+                    'don\'t remove the downloaded configuration repository from the TMP DIR directory',
+                    default: false
 
-        base.option [ "-b", "--conf-branch" ], "REPO BRANCH",
-                                               "specify a branch for the configuration repository",
-                                               :default => "master"
+        base.option ['-b', '--conf-branch'], 'REPO BRANCH',
+                    'specify a branch for the configuration repository',
+                    default: 'master'
 
-        base.option [ "-d", "--tmp-dir" ], "TMP DIR",
-                                           "a directory where to put the configuration repo to build capfile with",
-                                           :default => "/tmp/pulsar"
+        base.option ['-h', '--home-dir'], 'HOME DIR',
+                    'a directory to store per-user state',
+                    environment_variable: 'PULSAR_HOME',
+                    default: File.join(Dir.home, '.pulsar')
       end
 
       #

data/lib/pulsar/options/shared.rb

@@ -2,12 +2,13 @@ module Pulsar
   module Options
     module Shared
       def self.included(base)
-        base.option [ "-V", "--version" ], :flag, "print out pulsar version" do
+        base.option ['-V', '--version'], :flag, 'print out pulsar version' do
           puts(VERSION)
           exit(0)
         end
 
-        base.option [ "-v", "--verbose" ], :flag, "print out what pulsar is doing", :default => false
+        base.option ['-v', '--verbose'], :flag,
+                    'print out what pulsar is doing', default: false
       end
     end
   end

data/lib/pulsar/version.rb

@@ -1,3 +1,3 @@
 module Pulsar
-  VERSION = "0.3.4"
+  VERSION = '0.3.5'
 end

data/pulsar.gemspec

@@ -4,29 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pulsar/version'
 
 Gem::Specification.new do |gem|
-  gem.name           = "pulsar"
+  gem.name           = 'pulsar'
   gem.version        = Pulsar::VERSION
-  gem.authors        = ["Alberto Vena", "Matteo Latini"]
-  gem.email          = ["info@nebulab.it"]
-  gem.description    = %q{Manage your Capistrano deployments with ease}
-  gem.summary        = %q{
+  gem.authors        = ['Alberto Vena', 'Matteo Latini']
+  gem.email          = ['info@nebulab.it']
+  gem.homepage       = 'http://pulsar.nebulab.it'
+  gem.description    = 'Manage your Capistrano deployments with ease'
+  gem.summary        = '
     Pulsar helps with Capistrano configuration management. It uses a repository
     to store all your precious configurations and recipes to build Capistrano
     deploys on it.
-  }
-  gem.homepage       = "http://pulsar.nebulab.it"
+  '
 
   gem.files          = `git ls-files`.split($/)
-  gem.executables    = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files     = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths  = ["lib"]
+  gem.executables    = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files     = gem.files.grep(/^(test|spec|features)\//)
+  gem.require_paths  = ['lib']
 
-  gem.add_dependency "clamp", "~> 0.5"
-  gem.add_dependency "bundler", "~> 1.2"
-  gem.add_dependency "colored", "~> 1.2"
+  gem.add_dependency 'clamp', '~> 0.5'
+  gem.add_dependency 'bundler', '~> 1.2'
+  gem.add_dependency 'colored', '~> 1.2'
 
-  gem.add_development_dependency "rake", "10.0.4"
-  gem.add_development_dependency "rspec", "2.12.0"
-  gem.add_development_dependency "rr", "1.0.4"
-  gem.add_development_dependency "coveralls", "0.6.3"
+  gem.add_development_dependency 'rake', '10.3.2'
+  gem.add_development_dependency 'rspec', '3.1.0'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.6'
+  gem.add_development_dependency 'rubocop', '~> 0.29.1'
 end

data/spec/pulsar/commands/init_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 describe Pulsar::InitCommand do
-  let(:pulsar) { Pulsar::InitCommand.new("init") }
+  let(:pulsar) { Pulsar::InitCommand.new('init') }
 
-  it "copies over the configuration repo" do
-    expect { pulsar.run(["#{tmp_path}/new-conf-repo"]) }.to change{ Dir.glob("#{tmp_path}/new-conf-repo").length }.by(1)
+  it 'copies over the configuration repo' do
+    expect { pulsar.run(["#{spec_tmp_path}/new-conf-repo"]) }
+      .to change { Dir.glob("#{spec_tmp_path}/new-conf-repo").length }.by(1)
   end
 end

data/spec/pulsar/commands/list_spec.rb

@@ -1,74 +1,86 @@
 require 'spec_helper'
 
 describe Pulsar::ListCommand do
-  let(:pulsar) { Pulsar::ListCommand.new("list") }
+  let(:pulsar) { Pulsar::ListCommand.new('list') }
 
-  it "copies a the repo over to temp directory" do
-    expect { pulsar.run(full_list_args + %w(--keep-repo)) }.to change{ Dir.glob("#{tmp_path}/conf-repo*").length }.by(1)
+  it 'copies a the repo over to temp directory' do
+    expect { pulsar.run(full_list_args + %w(--keep-repo)) }
+      .to change { Dir.glob("#{spec_tmp_path}/tmp/conf-repo*").length }.by(1)
   end
 
-  it "copies a the repo when there is a dir with same name" do
-    system("mkdir #{tmp_path}/conf-repo")
-    expect { pulsar.run(full_list_args + %w(--keep-repo)) }.to change{ Dir.glob("#{tmp_path}/conf-repo*").length }.by(1)
+  it 'copies a the repo when there is a dir with same name' do
+    system("mkdir -p #{spec_tmp_path}/conf-repo")
+
+    expect { pulsar.run(full_list_args + %w(--keep-repo)) }
+      .to change { Dir.glob("#{spec_tmp_path}/tmp/conf-repo*").length }.by(1)
   end
 
-  it "removes the temp directory even if it's raised an error" do
-    Pulsar::ListCommand.any_instance.stub(:list_apps) { raise 'error' }
-    pulsar.run(full_list_args) rescue nil
+  it 'removes the temp directory even if it\'s raised an error' do
+    allow_any_instance_of(Pulsar::ListCommand)
+      .to receive(:list_apps) { fail('error') }
 
-    Dir.glob("#{tmp_path}/conf-repo*").should be_empty
+    begin
+      pulsar.run(full_list_args)
+    rescue
+      nil
+    end
+
+    expect(Dir.glob("#{spec_tmp_path}/tmp/conf-repo*")).to be_empty
   end
 
-  it "lists configured apps and stages" do
-    app_one = Regexp.escape("dummy_app".cyan)
-    app_two = Regexp.escape("other_dummy_app".cyan)
+  it 'lists configured apps and stages' do
+    app_one = Regexp.escape('dummy_app'.cyan)
+    app_two = Regexp.escape('other_dummy_app'.cyan)
 
-    stages = [ "custom_stage".magenta, "production".magenta, "staging".magenta ]
+    stages = ['custom_stage'.magenta, 'production'.magenta, 'staging'.magenta]
     escaped_stages = Regexp.escape(stages.join(', '))
 
     pulsar.run(full_list_args)
 
-    stdout.should match(/#{app_one}: #{escaped_stages}/)
-    stdout.should match(/#{app_two}: #{escaped_stages}/)
+    expect(stdout).to match(/#{app_one}: #{escaped_stages}/)
+    expect(stdout).to match(/#{app_two}: #{escaped_stages}/)
   end
 
-  context "dotfile options" do
-    it "reads configuration variables from .pulsar file in home" do
-      stub_dotfile(Dir.home, dummy_dotfile_options)
+  context 'dotfile options' do
+    it 'reads configuration variables from config file in home' do
+      stub_config(File.join(pulsar.home_path, 'config'), dummy_dotfile_options)
 
       pulsar.run(full_list_args)
 
-      ENV.to_hash.should include(dummy_dotfile_options)
+      expect(ENV.to_hash).to include(dummy_dotfile_options)
     end
 
-    it "reads configuration variables from .pulsar file in rack app directory" do
-      stub_dotfile(dummy_rack_app_path, dummy_dotfile_options)
+    it 'reads configurations from .pulsar file in rack app directory' do
+      stub_config(File.join(dummy_app_path, '.pulsar'), dummy_dotfile_options)
 
-      FileUtils.cd(dummy_rack_app_path) do
+      FileUtils.cd(dummy_app_path) do
         reload_main_command
 
         pulsar.run(full_list_args)
       end
 
-      ENV.to_hash.should include(dummy_dotfile_options)
+      expect(ENV.to_hash).to include(dummy_dotfile_options)
     end
 
-    it "skips lines which cannot parse when reading .pulsar file" do
-      stub_dotfile(dummy_rack_app_path, [ "wrong_line", "# comment" ])
+    it 'skips lines which cannot parse when reading .pulsar file' do
+      stub_config(
+        File.join(dummy_app_path, '.pulsar'), ['wrong_line', '# comment'])
 
-      FileUtils.cd(dummy_rack_app_path) do
+      FileUtils.cd(dummy_app_path) do
         reload_main_command
 
         expect { pulsar.run(full_list_args) }.not_to raise_error
       end
     end
 
-    it "falls back to .pulsar file in home directory if it's not in the rack app directory" do
-      stub_dotfile(Dir.home, dummy_dotfile_options)
+    it 'falls back to default config file if it\'s not in the app directory' do
+      stub_config(File.join(pulsar.home_path, 'config'), dummy_dotfile_options)
 
-      File.stub(:file?).with("#{File.expand_path(dummy_rack_app_path)}/.pulsar").and_return(false)
+      allow(File)
+        .to receive(:file?)
+        .with("#{File.expand_path(dummy_app_path)}/.pulsar").and_return(false)
 
-      FileUtils.cd(dummy_rack_app_path) do
+      FileUtils.cd(dummy_app_path) do
         reload_main_command
 
         pulsar.run(full_list_args)
@@ -76,36 +88,40 @@ describe Pulsar::ListCommand do
     end
   end
 
-  context "--conf-repo option" do
-    it "is required" do
+  context '--conf-repo option' do
+    it 'is required' do
       expect { pulsar.parse([]) }.to raise_error(Clamp::UsageError)
     end
 
-    it "supports environment variable" do
-      ENV["PULSAR_CONF_REPO"] = dummy_conf_path
-      expect { pulsar.parse([]) }.not_to raise_error(Clamp::UsageError)
+    it 'supports environment variable' do
+      ENV['PULSAR_CONF_REPO'] = dummy_conf_path
+      expect { pulsar.parse([]) }.not_to raise_error
     end
 
-    it "supports directories" do
-      expect { pulsar.run(full_list_args) }.not_to raise_error(Errno::ENOENT)
+    it 'supports directories' do
+      expect { pulsar.run(full_list_args) }.not_to raise_error
     end
   end
 
-  context "--tmp-dir option" do
-    it "is supported" do
-      expect { pulsar.parse(base_args + %w(--tmp-dir dummy_tmp)) }.to_not raise_error(Clamp::UsageError)
+  context '--home-dir option' do
+    it 'is supported' do
+      expect { pulsar.parse(base_args + %w(--home-dir dummy_tmp)) }
+        .not_to raise_error
     end
 
-    it "creates the tmp directory if it doesn't exist" do
-      run_options = base_args + [ "--tmp-dir", tmp_path("tmp/non_existent") ]
+    it 'creates the tmp directory if it doesn\'t exist' do
+      Dir.mktmpdir do |dir|
+        run_options = base_args + ['--home-dir', dir]
 
-      expect { pulsar.run(run_options) }.not_to raise_error
+        expect { pulsar.run(run_options) }.not_to raise_error
+        expect(File.directory?(pulsar.tmp_path)).to be(true)
+      end
     end
   end
 
-  context "--keep-capfile option" do
-    it "is supported" do
-      expect { pulsar.parse(base_args + %w(--keep-capfile)) }.to_not raise_error(Clamp::UsageError)
+  context '--keep-capfile option' do
+    it 'is supported' do
+      expect { pulsar.parse(base_args + %w(--keep-capfile)) }.not_to raise_error
     end
   end
 end

data/spec/pulsar/commands/main_spec.rb

@@ -1,310 +1,360 @@
 require 'spec_helper'
 
 describe Pulsar::MainCommand do
-  let(:pulsar) { Pulsar::MainCommand.new("") }
+  let(:pulsar) { Pulsar::MainCommand.new('') }
 
   before(:each) { reload_main_command }
 
-  it "builds a Capfile file in tmp dir" do
-    expect { pulsar.run(full_cap_args + dummy_app) }.to change{ capfile_count }.by(1)
+  it 'builds a Capfile file in tmp dir' do
+    expect { pulsar.run(full_cap_args + dummy_app) }
+      .to change { capfile_count }.by(1)
   end
 
-  it "copies a the repo over to temp directory" do
-    expect { pulsar.run(full_cap_args + %w(--keep-repo) + dummy_app) }.to change{ capfile_count }.by(1)
+  it 'copies a the repo over to temp directory' do
+    expect { pulsar.run(full_cap_args + %w(--keep-repo) + dummy_app) }
+      .to change { capfile_count }.by(1)
   end
 
-  it "removes the temp directory even if it's raised an error" do
-    Pulsar::MainCommand.any_instance.stub(:run_capistrano) { raise 'error' }
-    pulsar.run(base_args + [ "--tmp-dir", tmp_path, "--keep-capfile" ] + dummy_app) rescue nil
+  it 'removes the temp directory even if it\'s raised an error' do
+    allow_any_instance_of(Pulsar::MainCommand)
+      .to receive(:run_capistrano) { fail('error') }
 
-    Dir.glob("#{tmp_path}/conf-repo*").should be_empty
+    begin
+      pulsar.run(
+        base_args + ['--home-dir', spec_tmp_path, '--keep-capfile'] + dummy_app)
+    rescue
+      nil
+    end
+
+    expect(Dir.glob("#{spec_tmp_path}/tmp/conf-repo*")).to be_empty
   end
 
-  it "copies a the repo when there is a dir with same name" do
-    system("mkdir #{tmp_path}/conf-repo")
-    expect { pulsar.run(full_cap_args + %w(--keep-repo) + dummy_app) }.to change{ Dir.glob("#{tmp_path}/conf-repo*").length }.by(1)
+  it 'copies a the repo when there is a dir with same name' do
+    system("mkdir -p #{spec_tmp_path}/tmp/conf-repo")
+
+    expect { pulsar.run(full_cap_args + %w(--keep-repo) + dummy_app) }
+      .to change { Dir.glob("#{spec_tmp_path}/tmp/conf-repo*").length }.by(1)
   end
 
-  it "uses dirname when inside a rack app directory" do
-    FileUtils.cd(dummy_rack_app_path) do
+  it 'uses dirname when inside a rack app directory' do
+    FileUtils.cd(dummy_app_path) do
       reload_main_command
 
-      expect { pulsar.run(full_cap_args + %w(production)) }.to change{ capfile_count }.by(1)
+      expect { pulsar.run(full_cap_args + %w(production)) }
+        .to change { capfile_count }.by(1)
     end
   end
 
-  context "Multiple applications" do
+  context 'Multiple applications' do
     let :stage do
-      "production"
+      'production'
     end
 
     let :comma_separated_list do
-      [ 'dummy_app,other_dummy_app', stage ]
+      ['dummy_app,other_dummy_app', stage]
     end
 
     let :pattern_list do
-      [ 'dummy*', stage ]
+      ['dummy*', stage]
     end
 
     let :pattern_match_all do
-      [ '*', stage ]
+      ['*', stage]
     end
 
     let :double_pattern do
-      [ 'dummy*,*app', stage ]
+      ['dummy*,*app', stage]
     end
 
-    it "supports multiple apps via comma separated argument" do
-      expect { pulsar.run(full_cap_args + comma_separated_list) }.to change{ capfile_count }.by(2)
+    it 'supports multiple apps via comma separated argument' do
+      expect { pulsar.run(full_cap_args + comma_separated_list) }
+        .to change { capfile_count }.by(2)
     end
 
-    it "supports pattern matching on app names" do
-      expect { pulsar.run(full_cap_args + pattern_list) }.to change{ capfile_count }.by(1)
+    it 'supports pattern matching on app names' do
+      expect { pulsar.run(full_cap_args + pattern_list) }
+        .to change { capfile_count }.by(1)
     end
 
-    it "matches all apps with *" do
-      expect { pulsar.run(full_cap_args + pattern_match_all) }.to change { capfile_count }.by(2)
+    it 'matches all apps with *' do
+      expect { pulsar.run(full_cap_args + pattern_match_all) }
+        .to change { capfile_count }.by(2)
     end
 
-    it "matches application only once" do
-      expect { pulsar.run(full_cap_args + double_pattern) }.to change { capfile_count }.by(2)
+    it 'matches application only once' do
+      expect { pulsar.run(full_cap_args + double_pattern) }
+        .to change { capfile_count }.by(2)
     end
   end
 
-  context "dotfile options" do
-    it "reads configuration variables from .pulsar file in home" do
-      stub_dotfile(Dir.home, dummy_dotfile_options)
+  context 'dotfile options' do
+    it 'reads configuration variables from config file in home' do
+      stub_config(File.join(pulsar.home_path, 'config'), dummy_dotfile_options)
 
       pulsar.run(full_cap_args + dummy_app)
 
-      ENV.to_hash.should include(dummy_dotfile_options)
+      expect(ENV.to_hash).to include(dummy_dotfile_options)
     end
 
-    it "reads configuration variables from .pulsar file in rack app directory" do
-      stub_dotfile(dummy_rack_app_path, dummy_dotfile_options)
+    it 'reads configurations from .pulsar file in rack app directory' do
+      stub_config(File.join(dummy_app_path, '.pulsar'), dummy_dotfile_options)
 
-      FileUtils.cd(dummy_rack_app_path) do
+      FileUtils.cd(dummy_app_path) do
         reload_main_command
 
         pulsar.run(full_cap_args + %w(production))
       end
 
-      ENV.to_hash.should include(dummy_dotfile_options)
+      expect(ENV.to_hash).to include(dummy_dotfile_options)
     end
 
-    it "skips lines which cannot parse when reading .pulsar file" do
-      stub_dotfile(dummy_rack_app_path, [ "wrong_line", "# comment"])
+    it 'skips lines which cannot parse when reading .pulsar file' do
+      stub_config(
+        File.join(dummy_app_path, '.pulsar'), ['wrong_line', '# comment'])
 
-      FileUtils.cd(dummy_rack_app_path) do
+      FileUtils.cd(dummy_app_path) do
         reload_main_command
 
         expect { pulsar.run(full_cap_args + %w(production)) }.not_to raise_error
       end
     end
 
-    it "falls back to .pulsar file in home directory if it's not in the rack app directory" do
-      stub_dotfile(Dir.home, dummy_dotfile_options)
+    it 'falls back to default config file if it\'s not in the app directory' do
+      stub_config(File.join(spec_tmp_path, 'config'), dummy_dotfile_options)
 
-      File.stub(:file?).with("#{File.expand_path(dummy_rack_app_path)}/.pulsar").and_return(false)
+      allow(File)
+        .to receive(:file?)
+        .with("#{File.expand_path(dummy_app_path)}/.pulsar").and_return(false)
 
-      FileUtils.cd(dummy_rack_app_path) do
+      FileUtils.cd(dummy_app_path) do
         reload_main_command
 
-        pulsar.run(full_cap_args + %w(production))
+        expect { pulsar.run(full_cap_args + %w(production)) }.not_to raise_error
       end
     end
   end
 
-  it "errors out if application does not exist in configuration repository" do
-    expect { pulsar.run(full_cap_args + %w(non_existent_app production)) }.to raise_error(ArgumentError)
+  it 'errors out if application does not exist in configuration repository' do
+    expect { pulsar.run(full_cap_args + %w(non_existent_app production)) }
+      .to raise_error(ArgumentError)
   end
 
-  it "errors out if stage does not exist in configuration repository" do
-    expect { pulsar.run(full_cap_args + dummy_app(:non_existent_stage)) }.to raise_error(ArgumentError)
+  it 'errors out if stage does not exist in configuration repository' do
+    expect { pulsar.run(full_cap_args + dummy_app(:non_existent_stage)) }
+      .to raise_error(ArgumentError)
   end
 
-  context "Capfile" do
-    it "uses base.rb in staging stage" do
+  context 'Capfile' do
+    it 'uses base.rb in staging stage' do
       pulsar.run(full_cap_args + dummy_app(:staging))
 
-      latest_capfile.should include("# This is apps/base.rb")
+      expect(latest_capfile).to include('# This is apps/base.rb')
     end
 
-    it "uses base.rb in production stage" do
+    it 'uses base.rb in production stage' do
       pulsar.run(full_cap_args + dummy_app)
 
-      latest_capfile.should include("# This is apps/base.rb")
+      expect(latest_capfile).to include('# This is apps/base.rb')
     end
 
-    it "uses defaults.rb in staging stage" do
+    it 'uses defaults.rb in staging stage' do
       pulsar.run(full_cap_args + dummy_app(:staging))
 
-      latest_capfile.should include("# This is apps/dummy_app/defaults.rb")
+      expect(latest_capfile).to include('# This is apps/dummy_app/defaults.rb')
     end
 
-    it "uses defaults.rb in production stage" do
+    it 'uses defaults.rb in production stage' do
       pulsar.run(full_cap_args + dummy_app)
 
-      latest_capfile.should include("# This is apps/dummy_app/defaults.rb")
+      expect(latest_capfile).to include('# This is apps/dummy_app/defaults.rb')
     end
 
-    it "uses defaults.rb in staging stage only" do
+    it 'uses defaults.rb in staging stage only' do
       pulsar.run(full_cap_args + dummy_app(:staging))
 
-      latest_capfile.should include("# This is apps/dummy_app/staging.rb")
-      latest_capfile.should_not include("# This is apps/dummy_app/production.rb")
+      expect(latest_capfile)
+        .to include('# This is apps/dummy_app/staging.rb')
+      expect(latest_capfile)
+        .not_to include('# This is apps/dummy_app/production.rb')
     end
 
-    it "uses defaults.rb in production stage only" do
+    it 'uses defaults.rb in production stage only' do
       pulsar.run(full_cap_args + dummy_app)
 
-      latest_capfile.should include("# This is apps/dummy_app/production.rb")
-      latest_capfile.should_not include("# This is apps/dummy_app/staging.rb")
+      expect(latest_capfile)
+        .to include('# This is apps/dummy_app/production.rb')
+      expect(latest_capfile)
+        .not_to include('# This is apps/dummy_app/staging.rb')
     end
 
-    it "uses custom recipes in staging stage" do
+    it 'uses custom recipes in staging stage' do
       pulsar.run(full_cap_args + dummy_app(:staging))
 
-      latest_capfile.should include("# This is apps/dummy_app/recipes/custom_recipe.rb")
+      expect(latest_capfile)
+        .to include('# This is apps/dummy_app/recipes/custom_recipe.rb')
     end
 
-    it "uses custom recipes in production stage" do
+    it 'uses custom recipes in production stage' do
       pulsar.run(full_cap_args + dummy_app)
 
-      latest_capfile.should include("# This is apps/dummy_app/recipes/custom_recipe.rb")
+      expect(latest_capfile)
+        .to include('# This is apps/dummy_app/recipes/custom_recipe.rb')
     end
 
-    it "uses custom staging recipes in staging stage only" do
+    it 'uses custom staging recipes in staging stage only' do
       pulsar.run(full_cap_args + dummy_app(:staging))
 
-      latest_capfile.should include("# This is apps/dummy_app/recipes/staging/custom_recipe.rb")
-      latest_capfile.should_not include("# This is apps/dummy_app/recipes/production/custom_recipe.rb")
+      expect(latest_capfile)
+        .to include('# This is apps/dummy_app/recipes/staging/custom_recipe.rb')
+      expect(latest_capfile)
+        .not_to include(
+          '# This is apps/dummy_app/recipes/production/custom_recipe.rb')
     end
 
-    it "uses custom production recipes in production stage only" do
+    it 'uses custom production recipes in production stage only' do
       pulsar.run(full_cap_args + dummy_app)
 
-      latest_capfile.should include("# This is apps/dummy_app/recipes/production/custom_recipe.rb")
-      latest_capfile.should_not include("# This is apps/dummy_app/recipes/staging/custom_recipe.rb")
+      expect(latest_capfile)
+        .to include(
+          '# This is apps/dummy_app/recipes/production/custom_recipe.rb')
+      expect(latest_capfile)
+        .not_to include(
+          '# This is apps/dummy_app/recipes/staging/custom_recipe.rb')
     end
 
-    it "uses dirname from PULSAR_APP_NAME when inside a rack app directory" do
-      ENV["PULSAR_APP_NAME"] = "other_dummy_app"
+    it 'uses dirname from PULSAR_APP_NAME when inside a rack app directory' do
+      ENV['PULSAR_APP_NAME'] = 'other_dummy_app'
 
-      FileUtils.cd(dummy_rack_app_path) do
+      FileUtils.cd(dummy_app_path) do
         reload_main_command
         pulsar.run(full_cap_args + %w(production))
       end
 
-      latest_capfile.should include("# This is apps/other_dummy_app/defaults.rb")
-      latest_capfile.should include("# This is apps/other_dummy_app/production.rb")
+      expect(latest_capfile)
+        .to include('# This is apps/other_dummy_app/defaults.rb')
+      expect(latest_capfile)
+        .to include('# This is apps/other_dummy_app/production.rb')
     end
   end
 
-  context "--version option" do
+  context '--version option' do
     before do
       begin
-        pulsar.parse(["--version"])
+        pulsar.parse(['--version'])
       rescue SystemExit => e
         @system_exit = e
       end
     end
 
-    it "shows version" do
-      stdout.should include(Pulsar::VERSION)
+    it 'shows version' do
+      expect(stdout).to include(Pulsar::VERSION)
     end
 
-    it "exits with a zero status" do
-      @system_exit.should_not be_nil
-      @system_exit.status.should == 0
+    it 'exits with a zero status' do
+      expect(@system_exit).not_to be_nil
+      expect(@system_exit.status).to be 0
     end
   end
 
-  context "--conf-repo option" do
-    it "is required" do
+  context '--conf-repo option' do
+    it 'is required' do
       expect { pulsar.parse([]) }.to raise_error(Clamp::UsageError)
     end
 
-    it "supports environment variable" do
-      ENV["PULSAR_CONF_REPO"] = dummy_conf_path
-      expect { pulsar.parse(dummy_app) }.not_to raise_error(Clamp::UsageError)
+    it 'supports environment variable' do
+      ENV['PULSAR_CONF_REPO'] = dummy_conf_path
+      expect { pulsar.parse(dummy_app) }.not_to raise_error
     end
 
-    it "supports directories" do
-      expect { pulsar.run(full_cap_args + dummy_app) }.not_to raise_error(Errno::ENOENT)
+    it 'supports directories' do
+      expect { pulsar.run(full_cap_args + dummy_app) }.not_to raise_error
     end
   end
 
-  context "--tmp-dir option" do
-    it "is supported" do
-      expect { pulsar.parse(base_args + %w(--tmp-dir dummy_tmp) + dummy_app) }.to_not raise_error(Clamp::UsageError)
+  context '--home-dir option' do
+    it 'is supported' do
+      expect { pulsar.parse(base_args + %w(--home-dir dummy_tmp) + dummy_app) }
+        .not_to raise_error
     end
 
-    it "creates the tmp directory if it doesn't exist" do
-      run_options = base_args + [ "--tmp-dir", tmp_path("tmp/non_existent"), "--skip-cap-run" ] + dummy_app
+    it 'creates the tmp directory if it doesn\'t exist' do
+      Dir.mktmpdir do |dir|
+        run_options = base_args +
+                      ['--home-dir', dir, '--skip-cap-run'] +
+                      dummy_app
 
-      expect { pulsar.run(run_options) }.not_to raise_error
+        expect { pulsar.run(run_options) }.not_to raise_error
+        expect(File.directory?(pulsar.tmp_path)).to be(true)
+      end
     end
   end
 
-  context "--keep-capfile option" do
-    it "is supported" do
-      expect { pulsar.parse(base_args + %w(--keep-capfile) + dummy_app) }.to_not raise_error(Clamp::UsageError)
+  context '--keep-capfile option' do
+    it 'is supported' do
+      expect { pulsar.parse(base_args + %w(--keep-capfile) + dummy_app) }
+        .not_to raise_error
     end
   end
 
-  context "--skip-cap-run option" do
-    it "is supported" do
-      expect { pulsar.parse(base_args + %w(--skip-cap-run) + dummy_app) }.to_not raise_error(Clamp::UsageError)
+  context '--skip-cap-run option' do
+    it 'is supported' do
+      expect { pulsar.parse(base_args + %w(--skip-cap-run) + dummy_app) }
+        .not_to raise_error
     end
   end
 
-  context "--keep-repo option" do
-    it "is supported" do
-      expect { pulsar.parse(base_args + %w(--keep-repo) + dummy_app) }.to_not raise_error(Clamp::UsageError)
+  context '--keep-repo option' do
+    it 'is supported' do
+      expect { pulsar.parse(base_args + %w(--keep-repo) + dummy_app) }
+        .not_to raise_error
     end
   end
 
-  context "--log-level option" do
-    it "is supported" do
-      expect { pulsar.parse(base_args + %w(--log-level debug) + dummy_app) }.to_not raise_error(Clamp::UsageError)
+  context '--log-level option' do
+    it 'is supported' do
+      expect { pulsar.parse(base_args + %w(--log-level debug) + dummy_app) }
+        .not_to raise_error
     end
 
-    it "supports Capistrano IMPORTANT" do
+    it 'supports Capistrano IMPORTANT' do
       pulsar.run(full_cap_args + %w(--log-level important) + dummy_app)
 
-      latest_capfile.should include("logger.level = logger.level = Capistrano::Logger::IMPORTANT")
+      expect(latest_capfile).to include(
+        'logger.level = logger.level = Capistrano::Logger::IMPORTANT')
     end
 
-    it "supports Capistrano INFO" do
+    it 'supports Capistrano INFO' do
       pulsar.run(full_cap_args + %w(--log-level info) + dummy_app)
 
-      latest_capfile.should include("logger.level = logger.level = Capistrano::Logger::INFO")
+      expect(latest_capfile)
+        .to include('logger.level = logger.level = Capistrano::Logger::INFO')
     end
 
-    it "supports Capistrano DEBUG" do
+    it 'supports Capistrano DEBUG' do
       pulsar.run(full_cap_args + %w(--log-level debug) + dummy_app)
 
-      latest_capfile.should include("logger.level = logger.level = Capistrano::Logger::DEBUG")
+      expect(latest_capfile)
+        .to include('logger.level = logger.level = Capistrano::Logger::DEBUG')
     end
 
-    it "supports Capistrano TRACE" do
+    it 'supports Capistrano TRACE' do
       pulsar.run(full_cap_args + %w(--log-level trace) + dummy_app)
 
-      latest_capfile.should include("logger.level = logger.level = Capistrano::Logger::TRACE")
+      expect(latest_capfile)
+        .to include('logger.level = logger.level = Capistrano::Logger::TRACE')
     end
   end
 
-  context "TASKS parameter" do
-    it "defaults to deploy" do
-      pulsar.tasks_list.should == "deploy"
+  context 'TASKS parameter' do
+    it 'defaults to deploy' do
+      expect(pulsar.tasks_list).to eq 'deploy'
     end
 
-    it "supports environment variable" do
-      ENV["PULSAR_DEFAULT_TASK"] = "custom:task"
+    it 'supports environment variable' do
+      ENV['PULSAR_DEFAULT_TASK'] = 'custom:task'
       pulsar.run(full_cap_args + dummy_app)
 
-      pulsar.tasks_list.should == [ "custom:task" ]
+      expect(pulsar.tasks_list).to eq ['custom:task']
     end
   end
 end