foreplay 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54fa14c8cd58bcbcfa3d6ae58721785d2cbedf60
-  data.tar.gz: 78bfd857d56736431725d9d3b9eddc307f327c85
+  metadata.gz: 890c4c0d5051375ad322d3de7434723c50f8c547
+  data.tar.gz: 012197386d009fae9f671ec6dcfbc5ab1325f041
 SHA512:
-  metadata.gz: df13a59675a8e854d44d4b09c85723af3d8ef482c1fd726a5f3c1dd7169d5d0e17b77b8b4a6088fe122c74a6942dc42989ae44a4cf6edfe2bb0ee4f5a6d59dab
-  data.tar.gz: d98356701a491e17c6beea0abeedf0530515f13f6952bb3278d289089990a87b984fbf64bcf3e91671f7cc2658acca1f3737eb1609f31078ab0239ec52c53266
+  metadata.gz: 9291d32cb558210be93527cd3c04e442f842ee23e6971b2160bf7a8caab8697d79e6c33472bd4d05684061d42f056e74f228bb720578ae8b4149a51be469635a
+  data.tar.gz: b333b86d8fc828e3161913b57f0dd1e6a945c08757d45bff0543cb21e20835e2b7f48f0c6816724ec6c76b2bacbc81082fb3c7f9b3afcc15d35e654f5b7e3aad

data/lib/foreplay/cli.rb

@@ -8,6 +8,7 @@ class Foreplay::CLI < Thor
   method_option :role,        aliases: '-r'
   method_option :server,      aliases: '-s'
   method_option :config_file, aliases: '-f'
+  method_option :verbose,     aliases: '-v'
 
   def deploy(environment)
     Foreplay::Launcher.start [:deploy, environment, options]
@@ -18,6 +19,7 @@ class Foreplay::CLI < Thor
   method_option :role,        aliases: '-r'
   method_option :server,      aliases: '-s'
   method_option :config_file, aliases: '-f'
+  method_option :verbose,     aliases: '-v'
 
   def check(environment)
     Foreplay::Launcher.start [:check, environment, options]

data/lib/foreplay/engine/logger.rb

@@ -0,0 +1,45 @@
+class Foreplay::Engine::Logger
+  INDENT = 4
+  MARGIN = 24
+
+  attr_reader :message, :options
+
+  def initialize(m, o = {})
+    @message = m
+    @options = o
+
+    output
+  end
+
+  def output
+    puts formatted_message unless silent?
+  end
+
+  def formatted_message
+    @formatted_message ||= header + message.gsub(/\s+\z/, '').gsub(/(\r\n*)/, "\\1#{margin}")
+  end
+
+  def header
+    @header ||= (margin_format % header_content[0, margin_width - 1]).white
+  end
+
+  def header_content
+    @header_content ||= (options[:host] || '')
+  end
+
+  def margin
+    @margin ||= margin_format % ''
+  end
+
+  def silent?
+    @silent ||= (options[:silent] == true) || message.blank?
+  end
+
+  def margin_width
+    @margin_width ||= MARGIN + INDENT * (options[:indent] || 0)
+  end
+
+  def margin_format
+    @margin_format ||= "%-#{margin_width}s"
+  end
+end

data/lib/foreplay/engine/port.rb

@@ -46,9 +46,9 @@ module Foreplay::Engine::Port
     current_port_string = Foreplay::Engine::Remote.new(server, port_steps, instructions).__send__(mode).strip!
 
     if current_port_string.blank?
-      puts "#{host}#{INDENT}No instance is currently deployed"
+      log 'No instance is currently deployed', host: host
     else
-      puts "#{host}#{INDENT}Current instance is using port #{current_port_string}"
+      log "Current instance is using port #{current_port_string}", host: host
     end
 
     cp      = current_port_string.to_i

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

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

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

@@ -10,21 +10,26 @@ class Foreplay::Engine::Remote::Step
   end
 
   def execute
-    puts "#{host}#{INDENT}#{(step['commentary'] || step['command']).yellow}" unless step['silent'] == true
-    output Foreplay::Engine::Step.new(step, instructions).build.map { |command| execute_command(command) }.join
+    s = Foreplay::Engine::Step.new(host, step, instructions)
+    s.announce
+    output s.commands.map { |command| execute_command(command) }.join
   end
 
   def execute_command(command)
     o = ''
     process = shell.execute command
-    process.on_output { |_, po| o = po }
+    process.on_output { |_, po| o += po }
     shell.wait!
     terminate(o) unless step['ignore_error'] == true || process.exit_status == 0
     o
   end
 
+  def silent
+    @silent ||= instructions['verbose'] ? false : step['silent']
+  end
+
   def output(o)
-    puts o.gsub!(/^/, "#{host}#{INDENT * 2}") unless step['silent'] == true || o.blank?
+    log o, host: host, silent: silent, indent: 1
     o
   end
 end

data/lib/foreplay/engine/remote.rb

@@ -14,12 +14,12 @@ class Foreplay::Engine::Remote
   def deploy
     output = ''
 
-    puts "#{host}#{INDENT}Connecting to #{host} on port #{port}"
+    log "Connecting to #{host} on port #{port}", host: host
 
     # SSH connection
     session = start_session(host, user, options)
 
-    puts "#{host}#{INDENT}Successfully connected to #{host} on port #{port}"
+    log "Successfully connected to #{host} on port #{port}", host: host
 
     session.shell do |sh|
       steps.each { |step| output += Foreplay::Engine::Remote::Step.new(host, sh, step, instructions).execute }
@@ -80,13 +80,13 @@ class Foreplay::Engine::Remote
     ) if keyfile.blank?
 
     # Get the key from the key file
-    puts "#{INDENT}Using private key from #{keyfile}"
+    log "Using private key from #{keyfile}"
     File.read keyfile
   end
 
   def start_session(host, user, options)
     Net::SSH.start(host, user, options)
   rescue SocketError => e
-    terminate "#{host}#{INDENT}There was a problem starting an ssh session on #{host}:\n#{e.message}"
+    terminate "There was a problem starting an ssh session on #{host}:\n#{e.message}"
   end
 end

data/lib/foreplay/engine/secrets.rb

@@ -1,3 +1,5 @@
+require 'pp' # debug
+
 class Foreplay::Engine::Secrets
   attr_reader :environment, :secret_locations
 
@@ -15,6 +17,7 @@ class Foreplay::Engine::Secrets
       secrets.merge! fetch_from(secret_location) || {}
     end
 
+pp secrets # debug
     secrets
   end
 
@@ -24,6 +27,7 @@ class Foreplay::Engine::Secrets
     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
+puts command.magenta # debug
     secrets_all   = YAML.load(`#{command}`)
     secrets       = secrets_all[environment]
 

data/lib/foreplay/engine/step.rb

@@ -1,24 +1,32 @@
 class Foreplay::Engine::Step
-  attr_reader :step, :instructions
+  include Foreplay
+  attr_reader :host, :step, :instructions
 
-  def initialize(s, i)
+  def initialize(h, s, i)
+    @host = h
     @step = s
     @instructions = i
   end
 
-  def build
+  def commands
+    return @commands if @commands
+
     # Each step can be (1) a command or (2) a series of values to add to a file
     if step.key?('key')
-      instructions.key?(step['key']) ? commands : []
+      if instructions.key?(step['key'])
+        build_commands
+      else
+        @commands = []
+      end
     else
       # ...or just execute the command specified
-      [step['command']]
+      @commands = [command]
     end
-  end
 
-  def commands
-    return @commands if @commands
+    @commands
+  end
 
+  def build_commands
     step['silent'] = true
 
     if header?
@@ -33,8 +41,6 @@ class Foreplay::Engine::Step
     else
       build_commands_from_string
     end
-
-    @commands
   end
 
   def build_commands_from_hash
@@ -56,6 +62,10 @@ class Foreplay::Engine::Step
     end
   end
 
+  def command
+    @command ||= step['command']
+  end
+
   def filename
     @filename ||= "#{path}#{prefix}#{key}#{suffix}"
   end
@@ -95,4 +105,13 @@ class Foreplay::Engine::Step
   def header?
     header.present?
   end
+
+  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
+  end
 end

data/lib/foreplay/engine/steps.yml

@@ -42,12 +42,12 @@
   commentary:   'Building config/resque.yml'
   before:       environment
   path:         'config/'
-- command:      'if [ -d ../cache/vendor/bundle/bundle ] ; then rm -rf ../cache/vendor/bundle/bundle ; else echo No evidence of legacy copy bug ; fi'
-  commentary:   'Fixing legacy copy bug'
 - command:      'if [ -d ../cache/vendor/bundle ] ; then rsync -aW --no-compress --delete --info=STATS1 ../cache/vendor/bundle/ vendor/bundle ; else echo No bundle to restore ; fi'
   commentary:   'Attempting to restore bundle from cache'
 - command:      'sudo ln -f `which bundle` /usr/bin/bundle || echo Using default version of bundle'
   commentary:   'Setting the current version of bundle to be the default'
+- command:      "gem install bundler -v '> 1.8'"
+  commentary:   'Updating the bundler version'
 - command:      'bundle install --deployment --clean --jobs 2 --without development test'
   commentary:   'Using bundler to install the required gems in deployment mode'
 - command:      'mkdir -p ../cache/vendor && rsync -aW --no-compress --delete --info=STATS1 vendor/bundle/ ../cache/vendor/bundle'

data/lib/foreplay/engine.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'string'
 require 'hash'
+require 'pp' # debug
 
 class Foreplay::Engine
   include Foreplay
@@ -51,9 +52,10 @@ class Foreplay::Engine
   end
 
   def build_instructions(role, additional_instructions)
-    instructions          = defaults.supermerge(additional_instructions)
-    instructions['role']  = role
-    required_keys         = %w(name environment role servers path repository)
+    instructions            = defaults.supermerge(additional_instructions)
+    instructions['role']    = role
+    instructions['verbose'] = verbose
+    required_keys           = %w(name environment role servers path repository)
 
     required_keys.each do |key|
       next if instructions.key? key
@@ -87,7 +89,7 @@ class Foreplay::Engine
 
     @defaults['env'].merge! secrets
     @defaults['application'] = secrets
-
+pp @defaults # debug
     @defaults = @defaults.supermerge(roles_all[DEFAULTS_KEY]) if roles_all.key? DEFAULTS_KEY
     @defaults = @defaults.supermerge(roles[DEFAULTS_KEY])     if roles.key? DEFAULTS_KEY
     @defaults
@@ -98,6 +100,10 @@ class Foreplay::Engine
     @secrets ||= Foreplay::Engine::Secrets.new(environment, roles_all['secrets']).fetch || {}
   end
 
+  def verbose
+    @verbose ||= filters.key?('verbose')
+  end
+
   def roles
     @roles ||= roles_all[environment]
   end

data/lib/foreplay/foreplay.rb

@@ -1,5 +1,7 @@
 module Foreplay
-  INDENT = "\t"
+  def log(message, options = {})
+    Foreplay::Engine::Logger.new(message, options)
+  end
 
   def terminate(message)
     fail message

data/lib/foreplay/launcher.rb

@@ -3,9 +3,9 @@ require 'thor/group'
 class Foreplay::Launcher < Thor::Group
   include Thor::Actions
 
-  argument :mode,         type: :string, required: true
-  argument :environment,  type: :string, required: true
-  argument :filters,      type: :hash,   required: false
+  argument :mode,         type: :string,  required: true
+  argument :environment,  type: :string,  required: true
+  argument :filters,      type: :hash,    required: false
 
   def parse
     Foreplay::Engine.new(environment, filters).__send__ mode

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 end

data/lib/foreplay.rb

@@ -5,6 +5,7 @@ require 'foreplay/engine'
 require 'foreplay/engine/remote'
 require 'foreplay/engine/remote/check'
 require 'foreplay/engine/remote/step'
+require 'foreplay/engine/logger'
 require 'foreplay/engine/port'
 require 'foreplay/engine/role'
 require 'foreplay/engine/secrets'

data/spec/lib/foreplay/deploy_spec.rb

@@ -150,8 +150,6 @@ describe Foreplay::Launcher do
       'echo "  host: TODO Put here the database host name" >> config/database.yml',
       'echo "  username: TODO Put here the database user" >> config/database.yml',
       'echo "  password: TODO Put here the database user\'s password" >> config/database.yml',
-      'if [ -d ../cache/vendor/bundle/bundle ] ; then rm -rf ../cache/vendor/bundle/bundle'\
-      ' ; else echo No evidence of legacy copy bug ; fi',
       'if [ -d ../cache/vendor/bundle ] ; then '\
       'rsync -aW --no-compress --delete --info=STATS1 ../cache/vendor/bundle/ vendor/bundle'\
       ' ; else echo No bundle to restore ; fi',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -222,6 +222,7 @@ files:
 - lib/foreplay.rb
 - lib/foreplay/cli.rb
 - lib/foreplay/engine.rb
+- lib/foreplay/engine/logger.rb
 - lib/foreplay/engine/port.rb
 - lib/foreplay/engine/remote.rb
 - lib/foreplay/engine/remote/check.rb