foreplay 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88819e9e2b64f99fe34c4f2db6644ebba55e9ad6
-  data.tar.gz: 4e8818325e534443f4e066fc3157d7496dc07a38
+  metadata.gz: 693a6cc6b88a2957765b798ac1f1de80a1e99579
+  data.tar.gz: c8a26ffe9a1e24c087e59c1555defe29afca81e7
 SHA512:
-  metadata.gz: fe138f745c09e417df8a3548dc9e8e0d756336930c4d0b646a04e5a880ce1f15d1ef4cbd73596192150cd50505d2bf4a5acc6fbdadd221ba5dea670a54596640
-  data.tar.gz: 27a1ec20a0f06a3c374c30904518b1e1c7ca221a604a654ea4393ee0b0bdbe639495a2fbda7926ba4ce76655341058886bcd495c418a1f6e1c8f127c8645e5fc
+  metadata.gz: 781a7928b8f5e0023692b1a40db8233433b2f85dbe636a344f7b95173d68a76c69da78cbabcadeb0fa21e274fcc16b12ce603e3e657a6b96ded6a60a41bee604
+  data.tar.gz: f2ca0483339c263fe652ddde1def30fde44be01f3e34acfcb38cde390fd5cc830076016e613a55c30a84e776bf2660f1cb8cd69fc67a2296b31efe3d1501dfdb

data/lib/foreplay/engine/logger.rb

@@ -21,7 +21,7 @@ module Foreplay
         @formatted_message ||= header + message
                                         .gsub(/\A\s+/, '')
                                         .gsub(/\s+\z/, '')
-                                        .gsub(/(\r\n|\r|\n)/, "\\1#{margin}")
+                                        .gsub(/(\r\n|\r|\n)/, "\n#{margin}")
       end
 
       def header

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

@@ -27,12 +27,12 @@ module Foreplay
           o
         end
 
-        def silent
-          @silent ||= instructions['verbose'] ? false : step['silent']
+        def silent?
+          @silent ||= instructions.key?('verbose') ? false : step['silent']
         end
 
         def output(o)
-          log o, host: host, silent: silent, indent: 1
+          log o, host: host, silent: silent?, indent: 1
           o
         end
       end

data/lib/foreplay/engine/secrets.rb

@@ -1,3 +1,5 @@
+require 'foreplay/engine/secrets/location'
+
 module Foreplay
   class Engine
     class Secrets
@@ -12,26 +14,12 @@ module Foreplay
         return unless secret_locations
 
         secrets = {}
-
-        secret_locations.each do |secret_location|
-          secrets.merge! fetch_from(secret_location) || {}
-        end
-
+        secret_locations.each { |secret_location| secrets.merge! location_secrets(secret_location) }
         secrets
       end
 
-      def fetch_from(secret_location)
-        url = secret_location['url'] || return
-
-        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}".fake_erb
-        secrets_all   = YAML.load(`#{command}`)
-        secrets       = secrets_all[environment]
-
-        secrets if secrets.is_a? Hash
-      rescue Psych::SyntaxError
-        nil
+      def location_secrets(secret_location)
+        Location.new(secret_location, environment).secrets
       end
     end
   end

data/lib/foreplay/engine/secrets/location.rb

@@ -0,0 +1,55 @@
+module Foreplay
+  class Engine
+    class Secrets
+      class Location
+        include Foreplay
+        attr_reader :secret_location, :environment
+
+        def initialize(s, e)
+          @secret_location = s
+          @environment = e
+        end
+
+        def secrets
+          return @secrets if @secrets
+
+          @secrets = all_secrets[environment]
+
+          if @secrets.is_a? Hash
+            log "Loaded #{secrets.keys.length} secrets"
+            @secrets
+          else
+            log 'No secrets found'
+            @secrets = {}
+          end
+        end
+
+        def all_secrets
+          return @all_secrets if @all_secrets
+
+          @all_secrets = url ? YAML.load(`#{command}`) : {}
+        rescue Psych::SyntaxError => e
+          log "Exception caught when loading secrets using this command: #{command}"
+          log "#{e.class}: #{e.message}".red
+          @all_secrets = {}
+        end
+
+        def command
+          @command ||= "curl -k -L#{header_string} #{url}".fake_erb
+        end
+
+        def header_string
+          @header_string ||= headers.map { |k, v| " -H \"#{k}: #{v}\"" }.join if headers.is_a? Hash
+        end
+
+        def headers
+          @headers ||= secret_location['headers']
+        end
+
+        def url
+          @url ||= @secret_location['url']
+        end
+      end
+    end
+  end
+end

data/lib/foreplay/engine/step.rb

@@ -32,7 +32,7 @@ module Foreplay
       end
 
       def build_commands
-        step['silent'] = true
+        step['silent'] = !instructions.key?('verbose')
 
         if header?
           @commands  = ["echo \"#{header}\" > #{filename}"]
@@ -111,13 +111,13 @@ module Foreplay
         header.present?
       end
 
-      def silent
+      def silent?
         @silent ||= step['silent']
       end
 
       def announce
-        log "#{(step['commentary'] || command).yellow}", host: host, silent: silent
-        log command.cyan, host: host, silent: silent if instructions['verbose'] && step['commentary'] && command
+        log "#{(step['commentary'] || command).yellow}", host: host, silent: silent?
+        log command.cyan, host: host, silent: silent? if instructions['verbose'] && step['commentary'] && command
       end
     end
   end

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/spec/lib/foreplay/secrets_spec.rb

@@ -29,11 +29,11 @@ describe Foreplay::Engine::Secrets do
     let(:secret) { Foreplay::Engine::Secrets.new('', ['x']) }
 
     before :each do
-      allow(secret).to receive(:fetch_from).and_return(secrets)
+      allow(secret).to receive(:location_secrets).and_return(secrets)
     end
 
     it 'does what it is told' do
-      expect(secret.fetch_from).to eq(secrets)
+      expect(secret.location_secrets).to eq(secrets)
     end
 
     it 'returns a hash of secrets' do
@@ -48,11 +48,22 @@ describe Foreplay::Engine::Secrets do
     let(:secret) { Foreplay::Engine::Secrets.new('', %w(x x)) }
 
     before :each do
-      allow(secret).to receive(:fetch_from).and_return(secrets1, secrets2)
+      allow(secret).to receive(:location_secrets).and_return(secrets1, secrets2)
     end
 
     it 'returns a hash of secrets' do
       expect(secret.fetch).to eq(secrets)
     end
   end
+
+  context 'Location returns a hash if one is found' do
+    let(:location) { Foreplay::Engine::Secrets::Location.new('', 'p') }
+    let(:secrets) { { 'p' => { 'a' => 'x', 'b' => 'y', 'c' => 'z' }, 'q' => 'zzz', 'r' => { 'd' => 1 } } }
+
+    before { allow(location).to receive(:all_secrets).and_return(secrets) }
+
+    it 'returns the secrets for the right environment' do
+      expect(location.secrets).to eq(secrets['p'])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -229,6 +229,7 @@ files:
 - lib/foreplay/engine/remote/step.rb
 - lib/foreplay/engine/role.rb
 - lib/foreplay/engine/secrets.rb
+- lib/foreplay/engine/secrets/location.rb
 - lib/foreplay/engine/server.rb
 - lib/foreplay/engine/step.rb
 - lib/foreplay/engine/steps.yml