foreplay 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee88ad42e587a894fb2ab1f98bcb38a8f5758d7b
-  data.tar.gz: e551d3e61d6789701d0d1efdd5445dc63b37e622
+  metadata.gz: 62fed4f278257118a74f5de5caa3c7dd40e3b387
+  data.tar.gz: d147a749c74122ae09916f049a5f55a2959546d2
 SHA512:
-  metadata.gz: ae3da7389f217524a5cfb0b93a5e87bcd04d233c0957335f71be86b8c39dc7042bd182cb5f8dae078c196cf497a9b6a643a4cfb5acb90d9ba55921b107828b8b
-  data.tar.gz: dec9d24d0f366b77e5c04aa941827e60a06b8c37cd92e2e32b6a88562ef105023d0b8ac2ea46525ff3dd97c8d8caed4dad4cbdd63fbefecd98f21a720441f013
+  metadata.gz: 2cdd91eeadc8bef6324281617806068871c3a188b803d7e72f340d6e3a16aefb26c639c5b63e4ae0162183bcb4e2c2547dc0d26626ae6a469a30868bb0459aa0
+  data.tar.gz: aa4ab625feac4dd5adfaf2d02319f55d2087da680aa63c7641b57c7b1293621e00a74e81603382803b771881cdbdabb088b98590c4e14cf6026663b19e8a5b7e

data/.hound.yml

@@ -33,4 +33,8 @@ CyclomaticComplexity:
 ClassLength:
   Description: 'Avoid classes longer than 100 lines of code.'
   CountComments: false  # count full line comments?
-  Max: 278
+  Max: 281
+
+Output:
+  Description: 'Checks for calls to puts, print, etc.'
+  Enabled: false

data/lib/foreplay/deploy.rb

@@ -17,7 +17,7 @@ module Foreplay
     argument :filters,      type: :hash,   required: false
 
     DEFAULTS_KEY  = 'defaults'
-    INDENT        = ' ' * 4
+    INDENT        = "\t"
 
     def parse
       # Explain what we're going to do
@@ -83,6 +83,7 @@ module Foreplay
 
     def deploy_role(instructions)
       servers     = instructions[:servers]
+      threads     = []
       preposition = mode == :deploy ? 'to' : 'for'
 
       if servers.length > 1
@@ -91,7 +92,8 @@ module Foreplay
         puts message
       end
 
-      servers.each { |server| deploy_to_server server, instructions }
+      servers.each { |server| threads << Thread.new { deploy_to_server server, instructions } }
+      threads.each { |thread| thread.join }
     end
 
     def deploy_to_server(server, instructions)
@@ -121,9 +123,9 @@ module Foreplay
       current_port_string = execute_on_server(steps, instructions).strip!
 
       if current_port_string.blank?
-        puts "#{INDENT}No instance is currently deployed"
+        puts "#{name}#{INDENT}No instance is currently deployed"
       else
-        "#{INDENT}Current instance is using port #{current_port_string}"
+        "#{name}#{INDENT}Current instance is using port #{current_port_string}"
       end
 
       current_port = current_port_string.to_i
@@ -230,6 +232,7 @@ module Foreplay
     end
 
     def execute_on_server(steps, instructions)
+      name        = instructions[:name]
       server_port = instructions[:server]
       user        = instructions[:user]
       password    = instructions[:password]
@@ -267,12 +270,12 @@ module Foreplay
       output = ''
 
       if mode == :deploy
-        puts "#{INDENT}Connecting to #{server} on port #{port}"
+        puts "#{name}#{INDENT}Connecting to #{server} on port #{port}"
 
         # SSH connection
         begin
           Net::SSH.start(server, user, options) do |session|
-            puts "#{INDENT}Successfully connected to #{server} on port #{port}"
+            puts "#{name}#{INDENT}Successfully connected to #{server} on port #{port}"
 
             session.shell do |sh|
               steps.each do |step|
@@ -292,7 +295,7 @@ module Foreplay
                   sh.wait!
 
                   if step[:ignore_error] == true || process.exit_status == 0
-                    print output.gsub!(/^/, INDENT * 2) unless step[:silent] == true || output.blank?
+                    print output.gsub!(/^/, "#{name}#{INDENT * 2}") unless step[:silent] == true || output.blank?
                   else
                     terminate(output)
                   end
@@ -301,14 +304,14 @@ module Foreplay
             end
           end
         rescue SocketError => e
-          terminate "There was a problem starting an ssh session on #{server_port}:\n#{e.message}"
+          terminate "#{name}#{INDENT}There was a problem starting an ssh session on #{server_port}:\n#{e.message}"
         end
       else
         # Deployment check: just say what we would have done
         steps.each do |step|
           commands = build_step step, instructions
 
-          commands.each { |command| puts "#{INDENT * 2}#{command}" unless step[:silent] }
+          commands.each { |command| puts "#{name}#{INDENT * 2}#{command}" unless step[:silent] }
         end
       end
 
@@ -316,7 +319,7 @@ module Foreplay
     end
 
     def build_step(step, instructions)
-      puts "#{INDENT}#{(step[:commentary] || step[:command]).yellow}" unless step[:silent] == true
+      puts "#{instructions[:name]}#{INDENT}#{(step[:commentary] || step[:command]).yellow}" unless step[:silent] == true
 
       # Each step can be (1) a command or (2) a series of values to add to a file
       if step.key?(:key)

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -86,7 +86,11 @@ describe Foreplay::Deploy do
   end
 
   it 'should deploy to the environment' do
-    Net::SSH.should_receive(:start).with('web1.example.com', 'fred',  verbose: :warn, port: 22, password: 'trollope').and_yield(session)
+    Net::SSH
+      .should_receive(:start)
+      .with(/web[12].example.com/, 'fred',  verbose: :warn, port: 22, password: 'trollope')
+      .exactly(4).times
+      .and_yield(session)
 
     [
       'mkdir -p apps/foreplay && cd apps/foreplay && rm -rf 50000 && git clone -b master git@github.com:Xenapto/foreplay.git 50000',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport