foreplay 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5fde18a560cd383a096e3f80085ac3b2963b8f5
-  data.tar.gz: 2d0a573b5c91a21f02098cd9f681db9a3e0375c6
+  metadata.gz: 2c3e2f8cd2782d6841948aa40004fcb67b5ef8d9
+  data.tar.gz: d19106d2b46fb6ee029218f83cebbecb8ebba241
 SHA512:
-  metadata.gz: aa6bf4946d19cbbd8ec88744d0db21721846c1df46e00b3adf528552a596cbb3f56e4dcfec4a830b3c4090bed9b4441029fa0b5b9ecade0787f6236f43ae9983
-  data.tar.gz: 8ca3fbe259c8e052cebd6e78c1ccc7aa6120ca4c0ab38ebda955b941947e4894ebad69bb5cc0f8818bdb91654320a46eacbe99694145041ad854930b084ab3e6
+  metadata.gz: 73737f31d440c221d87f1faafe4ff4a90bc816275142610111bd4f8eba0aafacd863e0a54c5c91ce7055c281ef8130c54de2745dd42888b0a7e44ccbbd15d66e
+  data.tar.gz: 34b56f5bf72f7c6f523f41d8951a075491cda0d669a59ba06756508f3b60cb17469a71f707656b4453285352661248ade925f0d4fc6d361fe68adb3982950212

data/.rubocop.yml

@@ -36,14 +36,14 @@ PerceivedComplexity:
 ClassLength:
   Description: 'Avoid classes longer than 100 lines of code.'
   CountComments: false  # count full line comments?
-  Max: 290
+  Max: 295
 
 Output:
   Description: 'Checks for calls to puts, print, etc.'
   Enabled: false
 
 AbcSize:
-  Max: 60
+  Max: 62
 
 ExtraSpacing:
   Enabled: false

data/lib/foreplay/deploy.rb

@@ -205,7 +205,7 @@ module Foreplay
            commentary:   'Setting the current version of bundle to be the default' },
         {  command:      'bundle install --deployment --clean --jobs 2 --without development test',
            commentary:   'Using bundler to install the required gems in deployment mode' },
-        {  command:      'mkdir -p ../cache/vendor && rsync -aW --no-compress --delete --info=STATS3'\
+        {  command:      'mkdir -p ../cache/vendor && rsync -aW --no-compress --delete --info=STATS1'\
                          ' vendor/bundle/ ../cache/vendor/bundle',
            commentary:   'Caching bundle' },
         {  command:      'if [ -f public/assets/manifest.yml ] ; then echo "Not precompiling assets"'\
@@ -314,9 +314,13 @@ module Foreplay
         session.close
       else
         # Deployment check: just say what we would have done
+        puts "#{server}#{INDENT * 2}Connection options:"
+        options.each { |k, v| puts "#{server}#{INDENT * 2}#{k}: #{v}" }
+
+        puts "#{server}#{INDENT * 2}"
+        puts "#{server}#{INDENT * 2}Deployment instructions:"
         steps.each do |step|
           commands = build_step server, step, instructions
-
           commands.each { |command| puts "#{server}#{INDENT * 2}#{command}" unless step[:silent] }
         end
       end

data/lib/foreplay/setup.rb

@@ -15,7 +15,7 @@ module Foreplay
     class_option :servers,      aliases: '-s', type: :array
     class_option :db_adapter,   aliases: '-a', default: 'postgresql'
     class_option :db_encoding,  aliases: '-e', default: 'utf8'
-    class_option :db_pool,                        default: 5
+    class_option :db_pool,                     default: 5
     class_option :db_name,      aliases: '-d'
     class_option :db_host,      aliases: '-h'
     class_option :db_user

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -22,19 +22,19 @@ describe Foreplay::Deploy do
     allow(process).to receive(:exit_status).and_return(0)
   end
 
-  it "should complain on check if there's no config file" do
+  it "complains on check if there's no config file" do
     `rm -f config/foreplay.yml`
     expect { Foreplay::Deploy.start([:check, 'production', '']) }
       .to raise_error(RuntimeError, /.*Please run foreplay setup or create the file manually.*/)
   end
 
-  it "should complain on deploy if there's no config file" do
+  it "complains on deploy if there's no config file" do
     `rm -f config/foreplay.yml`
     expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
       .to raise_error(RuntimeError, /.*Please run foreplay setup or create the file manually.*/)
   end
 
-  it 'should complain if there are no authentication methods defined in the config file' do
+  it 'complains if there are no authentication methods defined in the config file' do
     `rm -f config/foreplay.yml`
     `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --password ""`
     expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
@@ -44,7 +44,7 @@ describe Foreplay::Deploy do
       )
   end
 
-  it "should complain if the private keyfile defined in the config file doesn't exist" do
+  it "complains if the private keyfile defined in the config file doesn't exist" do
     `rm -f config/foreplay.yml`
     `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --keyfile "/home/fred/no-such-file"`
     expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
@@ -69,23 +69,23 @@ describe Foreplay::Deploy do
       )
   end
 
-  it 'should terminate if a remote process exits with a non-zero status' do
+  it 'terminates if a remote process exits with a non-zero status' do
     allow(process).to receive(:exit_status).and_return(1)
     expect { Foreplay::Deploy.start([:deploy, 'production', '']) }.to raise_error(RuntimeError, /.*output message.*/)
   end
 
-  it "should terminate if a connection can't be established with the remote server" do
+  it "terminates if a connection can't be established with the remote server" do
     allow(Net::SSH).to receive(:start).and_call_original
     expect { Foreplay::Deploy.start([:deploy, 'production', '']) }
       .to raise_error(RuntimeError, /.*There was a problem starting an ssh session on web1.example.com.*/)
   end
 
-  it 'should check the config' do
+  it 'checks the config' do
     expect($stdout).to receive(:puts).at_least(:once)
     Foreplay::Deploy.start [:check, 'production', '']
   end
 
-  it 'should deploy to the environment' do
+  it 'deploys to the environment' do
     expect(Net::SSH)
       .to(receive(:start))
       .with(/web[12].example.com/, 'fred',  verbose: :warn, port: 22, password: 'trollope')
@@ -117,7 +117,7 @@ describe Foreplay::Deploy do
       ' ; else echo No bundle to restore ; fi',
       'sudo ln -f `which bundle` /usr/bin/bundle || echo Using default version of bundle',
       'bundle install --deployment --clean --jobs 2 --without development test',
-      'mkdir -p ../cache/vendor && rsync -aW --no-compress --delete --info=STATS3 vendor/bundle/ ../cache/vendor/bundle',
+      'mkdir -p ../cache/vendor && rsync -aW --no-compress --delete --info=STATS1 vendor/bundle/ ../cache/vendor/bundle',
       'if [ -f public/assets/manifest.yml ] ; then echo "Not precompiling assets"'\
       ' ; else RAILS_ENV=production bundle exec foreman run rake assets:precompile ; fi',
       'sudo bundle exec foreman export upstart /etc/init',

data/spec/lib/foreplay/setup_spec.rb

@@ -7,7 +7,7 @@ describe Foreplay::Setup do
   end
 
   it 'should create a config file' do
-    File.should_receive(:open)
+    expect(File).to receive(:open)
     Foreplay::Setup.start
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport