foreplay 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26c9d6cbed4a92a4b4b5563d9206615b6437f0fe
-  data.tar.gz: e05eb4274e0dc08923dd61b90fdeeeb3391818c8
+  metadata.gz: 2549644d6810e287084e17740a653682877e6243
+  data.tar.gz: 15a78061f9c39aefa585063eb6c389cc58af37d5
 SHA512:
-  metadata.gz: 62f9aabc395352d3b843ff1b193f57514d82e73683b71ae615bd65116b686a6042bbbacfbd733c32d4176fe56cea9a057674066051b6b68a39d41fdbac515a47
-  data.tar.gz: 123400f0bc6adb4fcb878405da223a0f360a78e5af47713fb3cdf7a64f706afb24d7abf80f08aa8426c759f5420d6e818c06893ccf8d13e37991543324badf21
+  metadata.gz: 50658886356018efd8556c0066c01747c8cf2b26a641116dcd1f621978c1fb5ae212d2eaaf3fcbd669eea65dca4f7b65095fc90a7d90a97944ac4bcfd929b732
+  data.tar.gz: de2640d6018a3aa287fe0e6ca3e9eae2f8f317abe51e7d362bf6457f56b5c658f76fd5f564793ff97a28a8cbfcf4d581b6687446ab0e7e7385f8947ec451f658

data/.codeclimate.yml

@@ -0,0 +1,17 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+  fixme:
+    enabled: false # Too many permanent TODOs included in the templates
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- script/
+- spec/

data/.rubocop.yml

@@ -1,10 +1,19 @@
 ---
 AllCops:
+  TargetRubyVersion: 2.1
+  DisplayCopNames: true
   Exclude:
-    - '*.gemspec'
-    - 'spec/**/*'
+    - 'tmp/**/*'
+
+Style/MixinGrouping:
+  Exclude:
+    - 'spec/**/*.rb'
+
+Metrics/BlockLength:
+  CountComments: false  # count full line comments?
+  Exclude:
+    - '**/*_spec.rb'
 
-# These are OK:
 StringLiterals:
   EnforcedStyle: single_quotes
   Enabled: true
@@ -23,24 +32,36 @@ Documentation:
   Description: 'Document classes and non-namespace modules.'
   Enabled: false
 
-Output:
-  Description: 'Checks for calls to puts, print, etc.'
-  Enabled: false
-
-ExtraSpacing:
-  Enabled: false
-
 FileName:
   Description: 'Use snake_case for source file names.'
   Enabled: true
 
-Eval:
-  Enabled: false
-
 LineLength:
   Max: 120
   Enabled: true
 
+Style/ExtraSpacing:
+  Description: 'Do not use unnecessary spacing.'
+  Enabled: true
+
+Lint/LiteralInInterpolation:
+  Description: 'Avoid interpolating literals in strings'
+  AutoCorrect: true
+
+Style/ModuleFunction:
+  EnforcedStyle: extend_self # Allows us to have private methods too
+
+Style/PercentLiteralDelimiters:
+  # Hound and CodeClimate are currently using an old version of Rubocop with
+  # different defaults, so we set them explicitly here.
+  PreferredDelimiters:
+    default: ()
+    '%i': '[]'
+    '%I': '[]'
+    '%r': '{}'
+    '%w': '[]'
+    '%W': '[]'
+
 # Work on these:
 
 MethodLength:

data/.travis.yml

@@ -0,0 +1,15 @@
+---
+language: ruby
+dist: trusty
+rvm:
+  - 2.4.0
+  - 2.3
+  - 2.2
+  - 2.1
+  # - 2.0 # undefined method `safe_load' for Psych:Module
+before_install:
+  - gem update bundler
+script:
+  - bundle exec rspec
+  - rake features
+after_success: bundle exec codeclimate-test-reporter

data/Gemfile

@@ -1,19 +1,19 @@
 source 'https://rubygems.org'
-ruby '2.1.9'
+ruby RUBY_VERSION
 gemspec
 
 group :test do
+  gem 'aruba'
+  gem 'codeclimate-test-reporter'
+  gem 'coveralls'
+  gem 'cucumber'
   gem 'rspec'
   gem 'rspec_junit_formatter'
-  gem 'cucumber'
-  gem 'aruba'
   gem 'simplecov'
-  gem 'coveralls'
-  gem 'codeclimate-test-reporter'
 end
 
 local_gemfile = 'Gemfile.local'
 
 if File.exist?(local_gemfile)
-  eval(File.read(local_gemfile)) # rubocop:disable Lint/Eval
+  eval(File.read(local_gemfile)) # rubocop:disable Security/Eval
 end

data/Gemfile.local.example

@@ -4,7 +4,7 @@ group :development do
   gem 'rake'
   gem 'gem-release'
   gem 'rubocop'
-  gem 'listen', '~> 3.0', '< 3.1' # Dependency of guard, 3.1 requires Ruby 2.2+
+  gem 'listen', '~> 3.0', (RUBY_VERSION < '2.2' ? '< 3.1' : '> 0') # Dependency of guard, 3.1 requires Ruby 2.2+
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'

data/README.md

@@ -1,9 +1,12 @@
-# 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)
+## Foreplay
+
+[![Gem version](https://badge.fury.io/rb/foreplay.svg)](https://rubygems.org/gems/foreplay)
+[![Gem downloads](https://img.shields.io/gem/dt/foreplay.svg)](https://rubygems.org/gems/foreplay)
+[![Build Status](https://travis-ci.org/dominicsayers/foreplay.svg?branch=master)](https://travis-ci.org/dominicsayers/foreplay)
+[![Code Climate](https://codeclimate.com/github/dominicsayers/foreplay/badges/gpa.svg)](https://codeclimate.com/github/dominicsayers/foreplay)
+[![Test Coverage](https://codeclimate.com/github/dominicsayers/foreplay/badges/coverage.svg)](https://codeclimate.com/github/dominicsayers/foreplay/coverage)
+[![Dependency Status](https://gemnasium.com/badges/github.com/dominicsayers/foreplay.svg)](https://gemnasium.com/github.com/dominicsayers/foreplay)
+[![Security](https://hakiri.io/github/dominicsayers/foreplay/master.svg)](https://hakiri.io/github/dominicsayers/foreplay/master)
 
 Deploying Rails projects to Ubuntu using Foreman
 

data/Rakefile

@@ -1,26 +1,12 @@
 #!/usr/bin/env rake
+require 'rubygems'
+
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Foreplay'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 Bundler::GemHelper.install_tasks
 Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |f| load f }
 
@@ -32,3 +18,17 @@ begin
 rescue LoadError
   nil
 end
+
+begin
+  require 'cucumber'
+  require 'cucumber/rake/task'
+
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.cucumber_opts = "--format pretty"
+  end
+rescue LoadError
+  desc 'Cucumber rake task not available'
+  task :features do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end

data/bin/console

@@ -0,0 +1,2 @@
+#!/bin/sh
+bundle exec irb -rubygems -I lib -r foreplay.rb

data/foreplay.gemspec

@@ -5,19 +5,19 @@ require 'foreplay/version'
 Gem::Specification.new do |s|
   s.name          = 'foreplay'
   s.version       = Foreplay::VERSION
-  s.authors       = ['Xenapto']
-  s.email         = ['developers@xenapto.com']
+  s.authors       = ['Dominic Sayers']
+  s.email         = ['dominic@sayers.cc']
   s.description   = 'Deploying Rails projects to Ubuntu using Foreman'
   s.summary       = 'Example: foreplay deploy production'
-  s.homepage      = 'https://github.com/Xenapto/foreplay'
+  s.homepage      = 'https://github.com/dominicsayers/foreplay'
   s.license       = 'MIT'
 
-  s.files = `git ls-files`.split($RS).reject { |file| file =~ /^spec\// }
+  s.files = `git ls-files`.split($RS).reject { |file| file =~ %r{^spec/} }
   s.test_files = []
-  s.executables   = s.files.grep(%r{^bin\/}) { |f| File.basename(f) }
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'foreman', '>= 0.76', '< 1.0'
   s.add_runtime_dependency 'ssh-shell', '>= 0.4', '< 1.0'
-  s.add_runtime_dependency 'activesupport', '>= 3.2', '< 5.0'
+  s.add_runtime_dependency 'activesupport', '>= 3.2.22', '<= 5'
 end

data/lib/foreplay.rb

@@ -50,7 +50,7 @@ end
 
 # Some useful additions to the String class
 class String
-  colors = %w(black red green yellow blue magenta cyan white)
+  colors = %w[black red green yellow blue magenta cyan white]
 
   colors.each_with_index do |fg_color, i|
     fg = 30 + i
@@ -66,7 +66,7 @@ class String
   end
 
   def fake_erb
-    gsub(/(<%=\s+([^%]+)\s+%>)/) { |e| eval "_ = #{e.split[1]}" }
+    gsub(/(<%=\s+([^%]+)\s+%>)/) { |e| eval "_ = #{e.split[1]}" } # rubocop:disable Security/Eval
   end
 
   def escape_double_quotes

data/lib/foreplay/cli.rb

@@ -40,8 +40,8 @@ module Foreplay
     method_option :db_adapter,  aliases: '-a'
     method_option :db_encoding, aliases: '-e'
     method_option :db_name,     aliases: '-d'
-    method_option :db_pool,                    type: :numeric
-    method_option :db_host,     aliases: '-h'
+    method_option :db_pool, type: :numeric
+    method_option :db_host, aliases: '-h'
     method_option :db_user
     method_option :db_password
     method_option :resque_redis

data/lib/foreplay/engine.rb

@@ -20,7 +20,7 @@ module Foreplay
       @roles_all = nil
     end
 
-    [:deploy, :check].each { |m| define_method(m) { execute m } }
+    %i[deploy check].each { |m| define_method(m) { execute m } }
 
     def execute(m)
       @mode = m
@@ -54,7 +54,7 @@ module Foreplay
       instructions            = defaults.supermerge(additional_instructions)
       instructions['role']    = role
       instructions['verbose'] = verbose
-      required_keys           = %w(name environment role servers path repository)
+      required_keys           = %w[name environment role servers path repository]
 
       required_keys.each do |key|
         next if instructions.key? key

data/lib/foreplay/engine/defaults.rb

@@ -37,7 +37,7 @@ module Foreplay
       def roles_all
         return @roles_all if @roles_all
 
-        @roles_all = YAML.load(File.read(config_file))
+        @roles_all = YAML.safe_load(File.read(config_file))
 
         # This environment
         unless @roles_all.key? environment

data/lib/foreplay/engine/port.rb

@@ -21,9 +21,10 @@ module Foreplay
         @current_service ||= port_details['current_service']
       end
 
-      def former_port
-        @former_port ||= port_details['former_port']
-      end
+      # Not apparently used
+      #- def former_port
+      #-   @former_port ||= port_details['former_port']
+      #- end
 
       def former_service
         @former_service ||= port_details['former_service']

data/lib/foreplay/engine/remote.rb

@@ -81,10 +81,12 @@ module Foreplay
         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?
+        if keyfile.blank?
+          terminate(
+            'No authentication methods supplied. '\
+            'You must supply a private key, key file or password in the configuration file'
+          )
+        end
 
         # Get the key from the key file
         log "Using private key from #{keyfile}"

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

@@ -32,7 +32,7 @@ module Foreplay
         def all_secrets
           return @all_secrets if @all_secrets
 
-          @all_secrets = url ? YAML.load(raw_secrets) : {}
+          @all_secrets = url ? YAML.safe_load(raw_secrets) : {}
         rescue Psych::SyntaxError => e
           log "Exception caught when loading secrets from this location: #{url}"
           log "#{e.class}: #{e.message}".red

data/lib/foreplay/engine/server.rb

@@ -73,7 +73,7 @@ module Foreplay
       def steps
         concurrency = foreman.key?('concurrency') ? " -m #{foreman['concurrency']}" : ''
 
-        @steps ||= YAML.load(
+        @steps ||= YAML.safe_load(
           ERB.new(
             File.read(
               "#{File.dirname(__FILE__)}/steps.yml"

data/lib/foreplay/engine/step.rb

@@ -42,7 +42,7 @@ module Foreplay
       end
 
       def instructions_hash
-        header? ? {  header => instructions[key] } : instructions[key]
+        header? ? { header => instructions[key] } : instructions[key]
       end
 
       def instructions_yaml

data/lib/foreplay/setup.rb

@@ -10,12 +10,12 @@ module Foreplay
     class_option :password
     class_option :keyfile
     class_option :private_key,  aliases: '-k'
-    class_option :port,         aliases: '-p', default: 50_000
+    class_option :port,         aliases: '-p', default: '50000'
     class_option :path,         aliases: '-f'
     class_option :servers,      aliases: '-s', type: :array
     class_option :db_adapter,   aliases: '-a', default: 'postgresql'
     class_option :db_encoding,  aliases: '-e', default: 'utf8'
-    class_option :db_pool,                     default: 5
+    class_option :db_pool,                     default: '5'
     class_option :db_name,      aliases: '-d'
     class_option :db_host,      aliases: '-h'
     class_option :db_user

data/lib/foreplay/version.rb

@@ -1,3 +1,3 @@
 module Foreplay
-  VERSION = '0.17.0'.freeze
+  VERSION = '0.17.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
-- Xenapto
+- Dominic Sayers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -56,38 +56,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+        version: 3.2.22
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+        version: 3.2.22
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 description: Deploying Rails projects to Ubuntu using Foreman
 email:
-- developers@xenapto.com
+- dominic@sayers.cc
 executables:
+- console
 - foreplay
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Gemfile.local.example
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - bin/foreplay
 - circle.yml
 - features/check.feature
@@ -114,7 +118,7 @@ files:
 - lib/foreplay/setup.rb
 - lib/foreplay/setup/foreplay.template.yml
 - lib/foreplay/version.rb
-homepage: https://github.com/Xenapto/foreplay
+homepage: https://github.com/dominicsayers/foreplay
 licenses:
 - MIT
 metadata: {}
@@ -134,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: 'Example: foreplay deploy production'