foreplay 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723f0071cd06023ca4d21388cffe21b6bb4751ee
-  data.tar.gz: ee924c943327303248273170e5e75bd526dcb8be
+  metadata.gz: 8ab23846c6c02261278f387250802bc2bdcb9dd5
+  data.tar.gz: 3326086f37c06810bbf1909da7ce47ed13471cb6
 SHA512:
-  metadata.gz: 0c563791606c25ff157f2fb44c1498d63105992d5a687ae85363af8907dfdf1f8bef603d10b9fb93eca64ed58cf930f6cf88d852bd8d2faef17f7a85f210171b
-  data.tar.gz: a7932fd647001d10f04f3dc002d819a9646d41621317bd8fb451da756de4c4356937b78d3c7fdd2f882b3f0aaa26a9c4b684364f29db7fb2afd99680d6b46668
+  metadata.gz: 4f2a587e2cf402c56bbb9a622b891a65d0925950a5a0f2ed5458df08ca1217c35e7ec02bbae071bae30450d91784e93b544747cf1c05e8bcfa10ec730fd37519
+  data.tar.gz: 2f813c354fa2024b25428403dc8d873c68fd7dce368d96c6bf5cac88e1a711af807d5c47264b29ff04b6c7f3648fd66daea708e64126d66a2a576a750d801f16

data/.hound.yml

@@ -1,43 +1,4 @@
 ---
-StringLiterals:
-  EnforcedStyle: single_quotes
-  Enabled: true
-
-DotPosition:
-  Description: 'Checks the position of the dot in multi-line method calls.'
-  EnforcedStyle: leading
-  # EnforcedStyle: trailing
-  Enabled: true
-
-LineLength:
-  Description: 'Limit lines to 137 characters.'
-  Max: 137
-  Enabled: true
-
-FileName:
-  Description: 'Use snake_case for source file names.'
-  Enabled: false
-
-MethodLength:
-  Description: 'Avoid methods longer than 10 lines of code.'
-  Enabled: false
-
-Documentation:
-  Description: 'Document classes and non-namespace modules.'
-  Enabled: false
-
-CyclomaticComplexity:
-  Description: 'Avoid complex methods.'
-  Max: 13
-
-PerceivedComplexity:
-  Max: 17
-
-ClassLength:
-  Description: 'Avoid classes longer than 100 lines of code.'
-  CountComments: false  # count full line comments?
-  Max: 290
-
-Output:
-  Description: 'Checks for calls to puts, print, etc.'
-  Enabled: false
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -1 +1,49 @@
-inherit_from: .hound.yml
+---
+StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true
+
+DotPosition:
+  Description: 'Checks the position of the dot in multi-line method calls.'
+  EnforcedStyle: leading
+  # EnforcedStyle: trailing
+  Enabled: true
+
+LineLength:
+  Description: 'Limit lines to 137 characters.'
+  Max: 137
+  Enabled: true
+
+FileName:
+  Description: 'Use snake_case for source file names.'
+  Enabled: false
+
+MethodLength:
+  Description: 'Avoid methods longer than 10 lines of code.'
+  Enabled: false
+
+Documentation:
+  Description: 'Document classes and non-namespace modules.'
+  Enabled: false
+
+CyclomaticComplexity:
+  Description: 'Avoid complex methods.'
+  Max: 13
+
+PerceivedComplexity:
+  Max: 17
+
+ClassLength:
+  Description: 'Avoid classes longer than 100 lines of code.'
+  CountComments: false  # count full line comments?
+  Max: 290
+
+Output:
+  Description: 'Checks for calls to puts, print, etc.'
+  Enabled: false
+
+AbcSize:
+  Max: 60
+
+ExtraSpacing:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.2.0

data/foreplay.gemspec

@@ -17,18 +17,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features|coverage)\//)
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '> 3.2'
-  spec.add_runtime_dependency 'colorize', '~> 0.7'
-  spec.add_runtime_dependency 'foreman', '~> 0.67'
-  spec.add_runtime_dependency 'ssh-shell', '~> 0.4'
+  spec.add_runtime_dependency 'activesupport', '>= 3.2'
+  spec.add_runtime_dependency 'colorize', '>= 0.7'
+  spec.add_runtime_dependency 'foreman', '>= 0.76'
+  spec.add_runtime_dependency 'ssh-shell', '>= 0.4'
   # spec.add_runtime_dependency 'thor', '~> 0.19' # Dependency of foreman anyway
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.3'
-  spec.add_development_dependency 'rspec', '~> 2.14'
-  spec.add_development_dependency 'cucumber', '~> 1.3'
-  spec.add_development_dependency 'aruba', '~> 0.5'
-  spec.add_development_dependency 'gem-release', '~> 0.7'
-  spec.add_development_dependency 'simplecov', '~> 0.7', '>= 0.7.1' # https://github.com/colszowka/simplecov/issues/281
-  spec.add_development_dependency 'coveralls', '~> 0'
+  spec.add_development_dependency 'bundler', '>= 1.6'
+  spec.add_development_dependency 'rake', '>= 10.3'
+  spec.add_development_dependency 'rspec', '>= 3.2'
+  spec.add_development_dependency 'cucumber', '>= 1.3'
+  spec.add_development_dependency 'aruba', '>= 0.5'
+  spec.add_development_dependency 'gem-release', '>= 0.7'
+  spec.add_development_dependency 'simplecov', '>= 0.7', '>= 0.7.1' # https://github.com/colszowka/simplecov/issues/281
+  spec.add_development_dependency 'coveralls', '>= 0.7'
+  spec.add_development_dependency 'rubocop', '> 0.29'
 end

data/foreplay.rake

@@ -17,12 +17,12 @@
 
 namespace :foreplay do
   desc 'Push app to deployment targets'
-  task :push => :environment do
-    Foreplay::push
+  task push: :environment do
+    Foreplay.push
   end
 
   desc 'Check deployment configuration'
-  task :check => :environment do
-    Foreplay::push true
+  task check: :environment do
+    Foreplay.push true
   end
 end

data/lib/foreplay/deploy.rb

@@ -77,7 +77,7 @@ module Foreplay
         threads.concat deploy_role(instructions)
       end
 
-      threads.each { |thread| thread.join }
+      threads.each(&:join)
 
       puts mode == :deploy ? 'Finished deployment' : 'Deployment configuration check was successful'
     end
@@ -166,7 +166,7 @@ module Foreplay
            commentary:   'Trusting the .rvmrc file for the new instance' },
         {  command:      "rvm rvmrc warning ignore #{current_port}",
            commentary:   'Ignoring the .rvmrc warning for the new instance' },
-        {  command:      'gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3',
+        {  command:      'gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys D39DC0E3',
            commentary:   "Trusting RVM's public key" },
         {  command:      "cd #{current_port} && mkdir -p tmp doc log config",
            commentary:   'If you have a .rvmrc file there may be a delay now while we install a new ruby' },
@@ -280,39 +280,37 @@ module Foreplay
         puts "#{server}#{INDENT}Connecting to #{server} on port #{port}"
 
         # SSH connection
-        begin
-          Net::SSH.start(server, user, options) do |session|
-            puts "#{server}#{INDENT}Successfully connected to #{server} on port #{port}"
-
-            session.shell do |sh|
-              steps.each do |step|
-                # Output from this step
-                output    = ''
-                previous  = '' # We don't need or want the final CRLF
-                commands  = build_step server, step, instructions
-
-                commands.each do |command|
-                  process = sh.execute command
-
-                  process.on_output do |_, o|
-                    previous  = o
-                    output    += previous
-                  end
-
-                  sh.wait!
-
-                  if step[:ignore_error] == true || process.exit_status == 0
-                    print output.gsub!(/^/, "#{server}#{INDENT * 2}") unless step[:silent] == true || output.blank?
-                  else
-                    terminate(output)
-                  end
-                end
+        session = start_session(server, server_port, user, options)
+
+        puts "#{server}#{INDENT}Successfully connected to #{server} on port #{port}"
+
+        session.shell do |sh|
+          steps.each do |step|
+            # Output from this step
+            output    = ''
+            previous  = '' # We don't need or want the final CRLF
+            commands  = build_step server, step, instructions
+
+            commands.each do |command|
+              process = sh.execute command
+
+              process.on_output do |_, o|
+                previous  = o
+                output    += previous
+              end
+
+              sh.wait!
+
+              if step[:ignore_error] == true || process.exit_status == 0
+                print output.gsub!(/^/, "#{server}#{INDENT * 2}") unless step[:silent] == true || output.blank?
+              else
+                terminate(output)
               end
             end
           end
-        rescue SocketError => e
-          terminate "#{server}#{INDENT}There was a problem starting an ssh session on #{server_port}:\n#{e.message}"
         end
+
+        session.close
       else
         # Deployment check: just say what we would have done
         steps.each do |step|
@@ -325,6 +323,12 @@ module Foreplay
       output
     end
 
+    def start_session(server, server_port, user, options)
+      Net::SSH.start(server, user, options)
+    rescue SocketError => e
+      terminate "#{server}#{INDENT}There was a problem starting an ssh session on #{server_port}:\n#{e.message}"
+    end
+
     def build_step(server, step, instructions)
       puts "#{server}#{INDENT}#{(step[:commentary] || step[:command]).yellow}" unless step[:silent] == true
 

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -3,10 +3,9 @@ require 'foreplay'
 require 'net/ssh/shell'
 
 describe Foreplay::Deploy do
-  let(:ssh)      { double(Net::SSH) }
-  let(:session)  { double(Net::SSH::Connection::Session) }
-  let(:shell)    { double(Net::SSH::Shell) }
-  let(:process)  { double(Net::SSH::Shell::Process) }
+  let(:session) { double(Net::SSH::Connection::Session) }
+  let(:shell)   { double(Net::SSH::Shell) }
+  let(:process) { double(Net::SSH::Shell::Process) }
 
   before :each do
     # Setup foreplay
@@ -14,12 +13,13 @@ describe Foreplay::Deploy do
     `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web1.example.com web2.example.com -f apps/%a -u fred --password trollope`
 
     # Stub all the things
-    Net::SSH.stub(:start).and_yield(session)
-    session.stub(:shell).and_yield(shell)
-    shell.stub(:execute).and_return(process)
-    shell.stub(:wait!).and_return(false)
-    process.stub(:on_output).and_yield(process, "output message\n")
-    process.stub(:exit_status).and_return(0)
+    allow(Net::SSH).to receive(:start).and_return(session)
+    allow(session).to receive(:close)
+    allow(session).to receive(:shell).and_yield(shell)
+    allow(shell).to receive(:execute).and_return(process)
+    allow(shell).to receive(:wait!).and_return(false)
+    allow(process).to receive(:on_output).and_yield(process, "output message\n")
+    allow(process).to receive(:exit_status).and_return(0)
   end
 
   it "should complain on check if there's no config file" do
@@ -70,27 +70,27 @@ describe Foreplay::Deploy do
   end
 
   it 'should terminate if a remote process exits with a non-zero status' do
-    process.stub(:exit_status).and_return(1)
+    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
-    Net::SSH.unstub(:start)
+    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
-    $stdout.should_receive(:puts).at_least(:once)
+    expect($stdout).to receive(:puts).at_least(:once)
     Foreplay::Deploy.start [:check, 'production', '']
   end
 
   it 'should deploy to the environment' do
-    Net::SSH
-      .should_receive(:start)
+    expect(Net::SSH)
+      .to(receive(:start))
       .with(/web[12].example.com/, 'fred',  verbose: :warn, port: 22, password: 'trollope')
       .exactly(4).times
-      .and_yield(session)
+      .and_return(session)
 
     [
       'mkdir -p apps/foreplay && cd apps/foreplay && rm -rf 50000 && git clone -b master git@github.com:Xenapto/foreplay.git 50000',
@@ -132,25 +132,25 @@ describe Foreplay::Deploy do
       'sudo iptables-save -c | egrep REDIRECT --color=never',
       'sudo stop foreplay-51000 || echo \'No previous instance running\''
     ].each do |command|
-      shell.should_receive(:execute).with(command).and_return(process)
+      expect(shell).to receive(:execute).with(command).and_return(process)
     end
 
     Foreplay::Deploy.start [:deploy, 'production', '']
   end
 
-  it "should use another port if there's already an installed instance" do
-    process.stub(:on_output).and_yield(process, "50000\n")
-    shell.should_receive(:execute).with('echo 51000 > $HOME/.foreplay/foreplay/current_port').and_return(process)
+  it "uses another port if there's already an installed instance" do
+    allow(process).to receive(:on_output).and_yield(process, "50000\n")
+    expect(shell).to receive(:execute).with('echo 51000 > $HOME/.foreplay/foreplay/current_port').and_return(process)
     Foreplay::Deploy.start [:deploy, 'production', '']
   end
 
-  it 'should use the private key provided in the config file' do
+  it 'uses the private key provided 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 -k "top secret private key"`
     Foreplay::Deploy.start([:deploy, 'production', ''])
   end
 
-  it 'should add Redis details for Resque' do
+  it 'adds Redis details for Resque' do
     `rm -f config/foreplay.yml`
     `foreplay setup -r git@github.com:Xenapto/foreplay.git -s web.example.com -f apps/%a -u fred --resque-redis "redis://localhost:6379"`
     Foreplay::Deploy.start([:deploy, 'production', ''])

data/spec/lib/foreplay/utility_spec.rb

@@ -7,22 +7,22 @@ describe Foreplay::Utility do
   end
 
   it 'should merge two simple hashes' do
-    expect(Foreplay::Utility.supermerge({ a: 'x' }, { b: 'y' })).to eq('a' => 'x', 'b' => 'y')
+    expect(Foreplay::Utility.supermerge({ a: 'x' }, b: 'y')).to eq('a' => 'x', 'b' => 'y')
   end
 
   it 'should merge two hashes both with arrays at the same key' do
-    expect(Foreplay::Utility.supermerge({ a: ['x'] }, { a: ['y'] })).to eq('a' => %w(x y))
+    expect(Foreplay::Utility.supermerge({ a: ['x'] }, a: ['y'])).to eq('a' => %w(x y))
   end
 
   it 'should merge an array and a value at the same key' do
-    expect(Foreplay::Utility.supermerge({ a: 'x' }, { a: ['y'] })).to eq('a' => %w(x y))
+    expect(Foreplay::Utility.supermerge({ a: 'x' }, a: ['y'])).to eq('a' => %w(x y))
   end
 
   it 'should replace a value at the same key' do
-    expect(Foreplay::Utility.supermerge({ a: 'x' }, { a: 'y' })).to eq('a' => 'y')
+    expect(Foreplay::Utility.supermerge({ a: 'x' }, a: 'y')).to eq('a' => 'y')
   end
 
   it 'should merge two subhashes at the same key' do
-    expect(Foreplay::Utility.supermerge({ a: { b: 'x' } }, { a: { c: 'y' } })).to eq('a' => { 'b' => 'x', 'c' => 'y' })
+    expect(Foreplay::Utility.supermerge({ a: { b: 'x' } }, a: { c: 'y' })).to eq('a' => { 'b' => 'x', 'c' => 'y' })
   end
 end

metadata

@@ -1,160 +1,160 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.76'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.76'
 - !ruby/object:Gem::Dependency
   name: ssh-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cucumber
   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: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
     - - ">="
@@ -164,7 +164,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
     - - ">="
@@ -174,16 +174,30 @@ dependencies:
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.29'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.29'
 description: Deploying Rails projects to Ubuntu using Foreman
 email:
 - developers@xenapto.com
@@ -238,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: 'Example: foreplay push to production'