foreplay 0.15.2 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d031a72dd4857652d92f44c5ba0c33e08e478cc5
-  data.tar.gz: 80203d38c89a6cc95d8eef8834935638bdc996f4
+  metadata.gz: 3758e074daab2a595d32666e7eb7034efd7eaff2
+  data.tar.gz: a40d78f7cbb448bcf8eba79e1b69904f866ac6bc
 SHA512:
-  metadata.gz: ed5c6d4b7c435b34f9ffa367cf8bbc6ce13b969c4a01e8f9940105e4b4f7e6a3ee030869524f3184b93fdf258b9445ce41b70aa0fb9df43f61fc01e2e4f2230e
-  data.tar.gz: 008925d3421721325e330aa3595ae861a1c5f31e3a1e589d3272606fddff32e9f2c3902d6f0973af1fea96bcf7e232995c005f2ff0de01acce67e7e3424cf062
+  metadata.gz: fc871cf10d5eec20ae4d665c68b4b7fd64db402a32edc6d2de71aa453b8adbd14a4eefe15ca021a72ba59d2b8ae4839f84c3c508d89cb51881b86d4f86031670
+  data.tar.gz: 745f3bf9544292a942718e600ee1a8c12c7caa248a4f86d8e58cfd0b288c19daf913c5d8dffcfbde02afd43297e1e62eccd0eae36e701919c56f33fa94069c31

data/.rubocop.yml

@@ -44,3 +44,7 @@ MethodLength:
 
 AbcSize:
   Max: 21 # 23 # 62
+
+CyclomaticComplexity:
+  Max: 7
+

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-ruby "2.1.9"
+ruby '2.1.9'
 gemspec

data/README.md

@@ -1,6 +1,7 @@
 # Foreplay
 
 ![Gem Version](http://img.shields.io/gem/v/foreplay.svg?style=flat) [![Code Climate](http://img.shields.io/codeclimate/github/Xenapto/foreplay.svg?style=flat)](https://codeclimate.com/github/Xenapto/foreplay) [![Coverage Status](https://img.shields.io/coveralls/Xenapto/foreplay.svg?style=flat)](https://coveralls.io/r/Xenapto/foreplay?branch=develop)
+[![Dependency Status](https://dependencyci.com/github/Xenapto/foreplay/badge)](https://dependencyci.com/github/Xenapto/foreplay)
 [![Developer status](http://img.shields.io/badge/developer-awesome-brightgreen.svg?style=flat)](http://xenapto.com)
 ![build status](https://circleci.com/gh/Xenapto/foreplay.png?circle-token=dd3a51864d33f6506b18a355bc901b90c0df3b3b) [![Join the chat at https://gitter.im/Xenapto/foreplay](https://badges.gitter.im/Xenapto/foreplay.svg)](https://gitter.im/Xenapto/foreplay?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 

data/lib/foreplay.rb

@@ -12,7 +12,7 @@ module Foreplay
   end
 
   def terminate(message)
-    fail message
+    raise message
   end
 end
 
@@ -28,20 +28,20 @@ class Hash
   #   h1.supermerge(h2)
   #   #=> {:x=>{:y=>[4, 5, 6, 7, 8, 9]}, :z=>[7, 8, 9, "xyz"]}
   def supermerge(other_hash)
-    fail "supermerge needs a Hash, not a #{other_hash.class}." unless other_hash.is_a?(Hash)
+    raise "supermerge needs a Hash, not a #{other_hash.class}." unless other_hash.is_a?(Hash)
 
     new_hash = deep_dup
 
     other_hash.each_pair do |k, v|
       tv = new_hash[k]
 
-      if tv.is_a?(Hash) && v.is_a?(Hash)
-        new_hash[k] = tv.supermerge(v)
-      elsif tv.is_a?(Array) || v.is_a?(Array)
-        new_hash[k] = Array.wrap(tv) + Array.wrap(v)
-      else
-        new_hash[k] = v
-      end
+      new_hash[k] = if tv.is_a?(Hash) && v.is_a?(Hash)
+                      tv.supermerge(v)
+                    elsif tv.is_a?(Array) || v.is_a?(Array)
+                      Array.wrap(tv) + Array.wrap(v)
+                    else
+                      v
+                    end
     end
 
     new_hash

data/lib/foreplay/engine/defaults.rb

@@ -3,8 +3,8 @@ module Foreplay
     module Defaults
       include Foreplay
 
-      DEFAULT_CONFIG_FILE = "#{Dir.getwd}/config/foreplay.yml"
-      DEFAULTS_KEY        = 'defaults'
+      DEFAULT_CONFIG_FILE = "#{Dir.getwd}/config/foreplay.yml".freeze
+      DEFAULTS_KEY        = 'defaults'.freeze
 
       def defaults
         return @defaults if @defaults

data/lib/foreplay/engine/logger.rb

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

data/lib/foreplay/engine/port.rb

@@ -51,7 +51,7 @@ module Foreplay
                                .strip
                                .to_i
 
-        if @current_port_remote == 0
+        if @current_port_remote.zero?
           message = 'No instance is currently deployed'
           @current_port_remote = DEFAULT_PORT + PORT_GAP
         else

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

@@ -13,7 +13,7 @@ module Foreplay
 
         def perform
           steps.each do |step|
-            log "#{(step['commentary'] || step['command']).yellow}", host: host, silent: step['silent']
+            log (step['commentary'] || step['command']).yellow.to_s, host: host, silent: step['silent']
 
             if step.key? 'key'
               list_file_contents step['key']

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

@@ -23,7 +23,7 @@ module Foreplay
           process = shell.execute command
           process.on_output { |_, po| o += po }
           shell.wait!
-          terminate(o) unless step['ignore_error'] == true || process.exit_status == 0
+          terminate(o) unless step['ignore_error'] == true || process.exit_status.zero?
           o
         end
 

data/lib/foreplay/engine/step.rb

@@ -114,7 +114,7 @@ module Foreplay
       end
 
       def announce
-        log "#{(step['commentary'] || command).yellow}", host: host, silent: silent?
+        log (step['commentary'] || command).yellow.to_s, 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

@@ -52,7 +52,7 @@
   commentary:   'Updating the bundler version'
 - 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:      '/usr/bin/bundle install --deployment --clean --jobs 2 --without development test'
+- command:      '/usr/bin/bundle install --deployment --clean --full-index --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'
   commentary:   'Caching bundle'

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.15.2'
+  VERSION = '0.15.4'.freeze
 end

data/spec/lib/foreplay/deploy_spec.rb

@@ -173,7 +173,7 @@ describe Foreplay::Launcher do
       ' ; else echo No bundle to restore ; fi',
       'gem install bundler -v "> 1.8"',
       'sudo ln -f `which bundle` /usr/bin/bundle || echo Using default version of bundle',
-      '/usr/bin/bundle install --deployment --clean --jobs 2 --without development test',
+      '/usr/bin/bundle install --deployment --clean --full-index --jobs 2 --without development test',
       'mkdir -p ../cache/vendor && '\
       'rsync -aW --no-compress --delete --info=STATS1 vendor/bundle/ ../cache/vendor/bundle',
       'if [ -f public/assets/manifest.yml ] ; then echo "Not precompiling assets"'\

data/spec/lib/yaml_spec.rb

@@ -9,12 +9,12 @@ describe YAML do
     end
 
     it 'correctly escape a basic string' do
-      expect(YAML.escape 'brian').to eq('brian')
+      expect(YAML.escape('brian')).to eq('brian')
     end
 
     it 'correctly escape a troublesome string' do
-      expect(YAML.escape '{{moustache}} beard').to eq('"{{moustache}} beard"')
-      expect(YAML.escape "Brian O'Brien").to eq("Brian O'Brien")
+      expect(YAML.escape('{{moustache}} beard')).to eq('"{{moustache}} beard"')
+      expect(YAML.escape("Brian O'Brien")).to eq("Brian O'Brien")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.4
 platform: ruby
 authors:
 - Xenapto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: 'Example: foreplay deploy production'