foreplay 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62fed4f278257118a74f5de5caa3c7dd40e3b387
-  data.tar.gz: d147a749c74122ae09916f049a5f55a2959546d2
+  metadata.gz: 2c6f5e8bfcabd20afbaf44cabda6241b916603ce
+  data.tar.gz: 8a6de18e1a54e47caa12d1025cd9719f1cd928ac
 SHA512:
-  metadata.gz: 2cdd91eeadc8bef6324281617806068871c3a188b803d7e72f340d6e3a16aefb26c639c5b63e4ae0162183bcb4e2c2547dc0d26626ae6a469a30868bb0459aa0
-  data.tar.gz: aa4ab625feac4dd5adfaf2d02319f55d2087da680aa63c7641b57c7b1293621e00a74e81603382803b771881cdbdabb088b98590c4e14cf6026663b19e8a5b7e
+  metadata.gz: 89befabb8377516f2b655941ebd32efa5a9c2044ebd56c70a5047eb9bc37bbec0b53227afaded76b2b9a4ce0073cd29491b26b6c5443130f2833c3a06a9fa38e
+  data.tar.gz: fd4f72a2f5e5a1b209531a42e127dbaf2ee8515dc21145a81ca93641a45f3b12f53128ab0afb9eba87cecba5c7b6a0407bf57fe2d1aac8aef6a50d777d588e12

data/lib/foreplay/deploy.rb

@@ -96,7 +96,8 @@ module Foreplay
       threads.each { |thread| thread.join }
     end
 
-    def deploy_to_server(server, instructions)
+    def deploy_to_server(server_port, instructions)
+      server, _   = server_port.split(':') # Parse server + port
       name        = instructions[:name]
       role        = instructions[:role]
       path        = instructions[:path]
@@ -106,8 +107,6 @@ module Foreplay
       port        = instructions[:port]
       preposition = mode == :deploy ? 'to' : 'for'
 
-      instructions[:server] = server
-
       message = "#{mode.capitalize}ing #{name.yellow} #{preposition} #{server.yellow} "
       message += "for the #{role.dup.yellow} role in the #{environment.dup.yellow} environment"
       puts message
@@ -120,12 +119,12 @@ module Foreplay
       current_port_file = ".foreplay/#{name}/current_port"
       steps = [{ command: "mkdir -p .foreplay/#{name} && touch #{current_port_file} && cat #{current_port_file}", silent: true }]
 
-      current_port_string = execute_on_server(steps, instructions).strip!
+      current_port_string = execute_on_server(server_port, steps, instructions).strip!
 
       if current_port_string.blank?
-        puts "#{name}#{INDENT}No instance is currently deployed"
+        puts "#{server}#{INDENT}No instance is currently deployed"
       else
-        "#{name}#{INDENT}Current instance is using port #{current_port_string}"
+        "#{server}#{INDENT}Current instance is using port #{current_port_string}"
       end
 
       current_port = current_port_string.to_i
@@ -228,12 +227,10 @@ module Foreplay
            ignore_error: true }
       ]
 
-      execute_on_server steps, instructions
+      execute_on_server server_port, steps, instructions
     end
 
-    def execute_on_server(steps, instructions)
-      name        = instructions[:name]
-      server_port = instructions[:server]
+    def execute_on_server(server_port, steps, instructions)
       user        = instructions[:user]
       password    = instructions[:password]
       keyfile     = instructions[:keyfile]
@@ -241,8 +238,7 @@ module Foreplay
 
       keyfile.sub! '~', ENV['HOME'] || '/' unless keyfile.blank? # Remote shell won't expand this for us
 
-      # Parse server + port
-      server, port = server_port.split(':')
+      server, port = server_port.split(':') # Parse server + port
       port ||= 22
 
       # SSH authentication methods
@@ -270,19 +266,19 @@ module Foreplay
       output = ''
 
       if mode == :deploy
-        puts "#{name}#{INDENT}Connecting to #{server} on port #{port}"
+        puts "#{server}#{INDENT}Connecting to #{server} on port #{port}"
 
         # SSH connection
         begin
           Net::SSH.start(server, user, options) do |session|
-            puts "#{name}#{INDENT}Successfully connected to #{server} on port #{port}"
+            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 step, instructions
+                commands  = build_step server, step, instructions
 
                 commands.each do |command|
                   process = sh.execute command
@@ -295,7 +291,7 @@ module Foreplay
                   sh.wait!
 
                   if step[:ignore_error] == true || process.exit_status == 0
-                    print output.gsub!(/^/, "#{name}#{INDENT * 2}") unless step[:silent] == true || output.blank?
+                    print output.gsub!(/^/, "#{server}#{INDENT * 2}") unless step[:silent] == true || output.blank?
                   else
                     terminate(output)
                   end
@@ -304,22 +300,22 @@ module Foreplay
             end
           end
         rescue SocketError => e
-          terminate "#{name}#{INDENT}There was a problem starting an ssh session on #{server_port}:\n#{e.message}"
+          terminate "#{server}#{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 = build_step server, step, instructions
 
-          commands.each { |command| puts "#{name}#{INDENT * 2}#{command}" unless step[:silent] }
+          commands.each { |command| puts "#{server}#{INDENT * 2}#{command}" unless step[:silent] }
         end
       end
 
       output
     end
 
-    def build_step(step, instructions)
-      puts "#{instructions[:name]}#{INDENT}#{(step[:commentary] || step[:command]).yellow}" unless step[:silent] == true
+    def build_step(server, step, instructions)
+      puts "#{server}#{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.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Xenapto