foreplay 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33731b365e619f93a9a5f950b59bbeec1c1f6bde
-  data.tar.gz: ba47694849c84746f1cd75d9bdcb3ac51403bccc
+  metadata.gz: fd947f263c336b9ee4804c52ef96e2a324185e52
+  data.tar.gz: dba7b672e1ea208a90bfb78b68f3c3f0414a038d
 SHA512:
-  metadata.gz: 2f87782c848542519af918f6e46e55f05260bca250f1eda2db647b9c7c245d13e872cddbf789b7f317e1f07fcddd1fb8de1edc15c24178439d0632dd29782625
-  data.tar.gz: 101180a567f815cd9033a2f464e0b277662214e6d84883ff87d045ccf022b3a72340d69c7c61cef47032ba2d8e1648a51d27877f5b66300774e5d9ed4f25662a
+  metadata.gz: 783a8c5a52cce85e2ea6b595484cabe6c3bb3aceb120df29f0db988bb88be629ab0053318daa224cb1fda219704dff59f5a148165df58429e2555e1b9181c6fc
+  data.tar.gz: 8018019cfd60afde106770c319494e1a1c52e33740cd3fd4e90772ddfd5f521ae6f7e6c715b1c3207e0e74d7b996510d53add7b7385278db04fa04a9ad5bbfca

data/.rubocop.yml

@@ -42,7 +42,7 @@ LineLength:
 
 MethodLength:
   Description: 'Avoid methods longer than 10 lines of code.'
-  Max: 18 # 27 # 85
+  Max: 14 # 18 # 27 # 85
 
 AbcSize:
-  Max: 23 # 62
+  Max: 21 # 23 # 62

data/lib/foreplay/engine/logger.rb

@@ -16,7 +16,10 @@ class Foreplay::Engine::Logger
   end
 
   def formatted_message
-    @formatted_message ||= header + message.gsub(/\s+\z/, '').gsub(/(\r\n*)/, "\\1#{margin}")
+    @formatted_message ||= header + message
+                                    .gsub(/\A\s*/, '')
+                                    .gsub(/\s+\z/, '')
+                                    .gsub(/(\r\n*)/, "\\1#{margin}")
   end
 
   def header

data/lib/foreplay/engine/port.rb

@@ -40,19 +40,30 @@ module Foreplay::Engine::Port
     ]
   end
 
-  def port_details
-    return @port_details if @port_details
+  def current_port_remote
+    return @current_port_remote if @current_port_remote
 
-    current_port_string = Foreplay::Engine::Remote.new(server, port_steps, instructions).__send__(mode).strip!
+    @current_port_remote = Foreplay::Engine::Remote
+                           .new(server, port_steps, instructions)
+                           .__send__(mode)
+                           .strip!
+                           .to_i
 
-    if current_port_string.blank?
-      log 'No instance is currently deployed', host: host
-    else
-      log "Current instance is using port #{current_port_string}", host: host
-    end
+    message = if @current_port_remote.blank?
+                'No instance is currently deployed'
+              else
+                "Current instance is using port #{@current_port_remote}"
+              end
+
+    log message, host: host
+    @current_port_remote
+  end
+
+  def port_details
+    return @port_details if @port_details
 
-    cp      = current_port_string.to_i
-    port    = instructions['port']
+    cp      = current_port_remote
+    port    = instructions['port'].to_i
     ports   = [port + 1000, port]
     cp, fp  = cp == port ? ports : ports.reverse
 

data/lib/foreplay/engine/steps.yml

@@ -14,6 +14,8 @@
   commentary:   'If you have a .rvmrc file there may be a delay now while we install a new ruby'
 - command:      'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi'
   commentary:   'If you have a .ruby-version file there may be a delay now while we install a new ruby'
+- command:      'rvm info'
+  commentary:   'Showing RVM environment'
 - key:          'env'
   delimiter:    '='
   prefix:       '.'

data/lib/foreplay/engine.rb

@@ -25,26 +25,27 @@ class Foreplay::Engine
   end
 
   def execute
-    # Explain what we're going to do
     puts "#{mode.capitalize}ing #{environment.dup.yellow} environment, "\
          "#{explanatory_text(filters, 'role')}, #{explanatory_text(filters, 'server')}"
 
-    actionable_roles.map do |role, instructions|
-      Foreplay::Engine::Role.new(
-        environment,
-        mode,
-        build_instructions(role, instructions)
-      ).threads
-    end.flatten.each(&:join)
+    actionable_roles.map { |role, instructions| threads(role, instructions) }.flatten.each(&:join)
 
     puts mode == :deploy ? 'Finished deployment' : 'Deployment configuration check was successful'
   end
 
+  private
+
   def actionable_roles
     roles.select { |role, _i| role != DEFAULTS_KEY && role != filters['role'] }
   end
 
-  private
+  def threads(role, instructions)
+    Foreplay::Engine::Role.new(
+      environment,
+      mode,
+      build_instructions(role, instructions)
+    ).threads
+  end
 
   def explanatory_text(hsh, key)
     hsh.key?(key) ? "#{hsh[key].dup.yellow} #{key}" : "all #{key}s"

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.9.11'
+  VERSION = '0.9.12'
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -137,6 +137,7 @@ describe Foreplay::Launcher do
       'rvm rvmrc warning ignore 50000',
       'gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys D39DC0E3',
       'cd 50000 && mkdir -p tmp doc log config',
+      'rvm info',
       'if [ -f .ruby-version ] ; then rvm install `cat .ruby-version` ; else echo "No .ruby-version file found" ; fi',
       'echo "RAILS_ENV=production" > .env',
       'echo "concurrency: web=1,worker=0,scheduler=0" > .foreman',

metadata

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