foreplay 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 792102ce293a729754f551ac87b6289ff1c7c81c
-  data.tar.gz: 7d74c817f3aa6b8209b73a0d10cd7202a24a37dc
+  metadata.gz: dab6ab214634a4bf887140be748689c069df8697
+  data.tar.gz: ebc44d5b3b2caf10f54ccb49fb3c5d39cf1f0908
 SHA512:
-  metadata.gz: 63dea290c9868a255eaefa222a159d8f9bc38bd8e9df82e7834cf33fc50b77f770b894d14b8070398aa186053ae383b73c45238ee04432f408fd3a35cc394185
-  data.tar.gz: 40eddda360ffb3caeb8338e96209213f5276893113968ce9b8488434cda06fbd5905178473f70ca0cceafab0b2f2e1d7be6d53493dcb3e71df5de75f11707cc5
+  metadata.gz: 12e8ed27a1c13ed643465bb0804b28a91551dd4e9aa96cccedfbd55f240f436a9ce54a39d132a3af76be8a3d660259e97e4be94cf010a158e3fa81e8429b6953
+  data.tar.gz: 33200e22c3789e2f84fb3f160d09b5083c8de42ebbbe42839944b8270e8fe205cd9278b8faafbe69b2f7e0d4418019349145d2eeebe2890bad45ab22f183fefe

data/lib/foreplay/engine/remote/check.rb

@@ -0,0 +1,42 @@
+class Foreplay::Engine::Remote::Check
+  include Foreplay
+  attr_reader :host, :steps, :instructions
+
+  def initialize(h, s, i)
+    @host = h
+    @steps = s
+    @instructions = i
+  end
+
+  def perform
+    steps.each do |step|
+      puts "#{host}#{INDENT}#{(step['commentary'] || step['command']).yellow}" unless step['silent'] == true
+
+      if step.key? 'key'
+        list_file_contents step['key']
+      else
+        list_commands step
+      end
+    end
+
+    ''
+  end
+
+  def list_file_contents(id)
+    i = instructions[id]
+
+    if i.is_a? Hash
+      i.each { |k, v| puts "#{host}#{INDENT * 2}#{k}: #{v}" }
+    else
+      puts "#{host}#{INDENT * 2}#{i}"
+    end
+  end
+
+  def list_commands(step)
+    commands = Foreplay::Engine::Step.new(step, instructions).build
+
+    commands.each do |command|
+      puts "#{host}#{INDENT * 2}#{command}" unless step['silent']
+    end
+  end
+end

data/lib/foreplay/engine/remote/step.rb

@@ -0,0 +1,39 @@
+class Foreplay::Engine::Remote::Step
+  include Foreplay
+  attr_reader :host, :shell, :step, :instructions
+
+  def initialize(h, sh, st, i)
+    @host = h
+    @shell = sh
+    @step = st
+    @instructions = i
+  end
+
+  def deploy
+    puts "#{host}#{INDENT}#{(step['commentary'] || step['command']).yellow}" unless step['silent'] == true
+
+    # Output from this step
+    output    = ''
+    previous  = '' # We don't need or want the final CRLF
+    commands  = Foreplay::Engine::Step.new(step, instructions).build
+
+    commands.each do |command|
+      process = shell.execute command
+
+      process.on_output do |_, o|
+        previous = o
+        output += previous
+      end
+
+      shell.wait!
+
+      if step['ignore_error'] == true || process.exit_status == 0
+        print output.gsub!(/^/, "#{host}#{INDENT * 2}") unless step['silent'] == true || output.blank?
+      else
+        terminate(output)
+      end
+    end
+
+    output
+  end
+end

data/lib/foreplay/engine/remote.rb

@@ -1,5 +1,4 @@
 require 'net/ssh'
-require 'pp' # debug
 
 class Foreplay::Engine::Remote
   include Foreplay
@@ -22,31 +21,7 @@ class Foreplay::Engine::Remote
     puts "#{host}#{INDENT}Successfully connected to #{host} on port #{port}"
 
     session.shell do |sh|
-      steps.each do |step|
-        puts "#{host}#{INDENT}#{(step['commentary'] || step['command']).yellow}" unless step['silent'] == true
-
-        # Output from this step
-        output    = ''
-        previous  = '' # We don't need or want the final CRLF
-        commands  = Foreplay::Engine::Step.new(step, instructions).build
-
-        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!(/^/, "#{host}#{INDENT * 2}") unless step['silent'] == true || output.blank?
-          else
-            terminate(output)
-          end
-        end
-      end
+      steps.each { |step| output += Foreplay::Engine::Remote::Step.new(host, sh, step, instructions).deploy }
     end
 
     session.close
@@ -55,27 +30,7 @@ class Foreplay::Engine::Remote
 
   # Deployment check: just say what we would have done
   def check
-    steps.each do |step|
-      puts "#{host}#{INDENT}#{(step['commentary'] || step['command']).yellow}" unless step['silent'] == true
-
-      if step.key? 'key'
-        i = instructions[step['key']]
-
-        if i.is_a? Hash
-          i.each { |k, v| puts "#{host}#{INDENT * 2}#{k}: #{v}" }
-        else
-          puts "#{host}#{INDENT * 2}#{i}"
-        end
-      else
-        commands = Foreplay::Engine::Step.new(step, instructions).build
-
-        commands.each do |command|
-          puts "#{host}#{INDENT * 2}#{command}" unless step['silent']
-        end
-      end
-    end
-
-    ''
+    Foreplay::Engine::Remote::Check.new(host, steps, instructions).perform
   end
 
   def user
@@ -97,37 +52,37 @@ class Foreplay::Engine::Remote
   def options
     return @options if @options
 
-    password    = instructions['password']
-    keyfile     = instructions['keyfile']
-    private_key = instructions['private_key']
-
-    keyfile.sub! '~', ENV['HOME'] || '/' unless keyfile.blank? # Remote shell won't expand this for us
-
-    # SSH authentication methods
     @options = { verbose: :warn, port: port }
+    password = instructions['password']
 
     if password.blank?
-      # If there's no password we must supply a private key
-      if private_key.blank?
-        message = 'No authentication methods supplied. '\
-                  'You must supply a private key, key file or password in the configuration file'
-        terminate(message) if keyfile.blank?
-        # Get the key from the key file
-        puts "#{INDENT}Using private key from #{keyfile}"
-        private_key = File.read keyfile
-      else
-        puts "#{INDENT}Using private key from the configuration file"
-      end
-
       @options[:key_data] = [private_key]
     else
-      # Use the password supplied
       @options[:password] = password
     end
 
     @options
   end
 
+  def private_key
+    pk = instructions['private_key']
+    pk.blank? ? private_key_from_file : pk
+  end
+
+  def private_key_from_file
+    keyfile = instructions['keyfile']
+    keyfile.sub! '~', ENV['HOME'] || '/' unless keyfile.blank? # Remote shell won't expand this for us
+
+    terminate(
+      'No authentication methods supplied. '\
+      'You must supply a private key, key file or password in the configuration file'
+    ) if keyfile.blank?
+
+    # Get the key from the key file
+    puts "#{INDENT}Using private key from #{keyfile}"
+    File.read keyfile
+  end
+
   def start_session(host, user, options)
     Net::SSH.start(host, user, options)
   rescue SocketError => e

data/lib/foreplay/engine/secrets.rb

@@ -1,3 +1,5 @@
+require 'pp' # debug
+
 class Foreplay::Engine::Secrets
   attr_reader :environment, :secret_locations
 
@@ -12,20 +14,22 @@ class Foreplay::Engine::Secrets
     secrets = {}
 
     secret_locations.each do |secret_location|
-      secrets.merge! fetch_from(secret_location)
+      secrets.merge! fetch_from(secret_location) || {}
     end
 
     secrets
   end
 
   def fetch_from(secret_location)
-    return unless secret_location['url']
+    url = secret_location['url'] || return
 
-    headers = secret_location['headers'].map { |k, v| " -H \"#{k}: #{v}\"" }.join
-    command = "curl -k -L#{headers} #{secret_location['url']}"
+    headers       = secret_location['headers']
+    header_string = headers.map { |k, v| " -H \"#{k}: #{v}\"" }.join if headers.is_a? Hash
+    command       = "curl -k -L#{header_string} #{url}"
+    secrets_all   = YAML.load(`#{command}`)
+    secrets       = secrets_all[environment]
 
-    secrets_all = YAML.load(`#{command}`)
-    secrets_all[environment]
+    secrets if secrets.is_a? Hash
   rescue Psych::SyntaxError
     nil
   end

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/lib/foreplay.rb

@@ -3,6 +3,8 @@ require 'foreplay/foreplay'
 require 'foreplay/launcher'
 require 'foreplay/engine'
 require 'foreplay/engine/remote'
+require 'foreplay/engine/remote/check'
+require 'foreplay/engine/remote/step'
 require 'foreplay/engine/role'
 require 'foreplay/engine/secrets'
 require 'foreplay/engine/server'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Xenapto
@@ -223,6 +223,8 @@ files:
 - lib/foreplay/cli.rb
 - lib/foreplay/engine.rb
 - lib/foreplay/engine/remote.rb
+- lib/foreplay/engine/remote/check.rb
+- lib/foreplay/engine/remote/step.rb
 - lib/foreplay/engine/role.rb
 - lib/foreplay/engine/secrets.rb
 - lib/foreplay/engine/server.rb