qops 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e47dc490e28da0f8d6c2c9a040d0b84708f09b
-  data.tar.gz: 7045e80b70da5f36b63d647436c8cb334fd99fce
+  metadata.gz: c0c9b4d83a9c50a14d230be5ee24da52ef5bd414
+  data.tar.gz: 53bc8c501afd3e9edae0f3efa950f719f695cdb7
 SHA512:
-  metadata.gz: bf0bb0d96a9db7f3855b4a4aceb308be596c775c96980a46a9992c2195bda1cdd90b34f318cf342a43b7e19d655561b4265bbfb1fb8ad8feeae72d90c54d4b0b
-  data.tar.gz: 569864c4f98fefadc8c12957fc4ed8120174b3730bf1dc099bd1fb851dc18795a4d5a5dbda0735ccf0ae1ff0ae4eaaaf99df3a111961195c2921f2773ad3fa46
+  metadata.gz: 7ca556cc6964ffe542f7b5e585390d156255c1fb1b0694d7d50975af7d11fd059d0c40e5eb6a10965c0325412d4756beeb48064cca96cee2d1e25864501b7323
+  data.tar.gz: 1769474f6e6c8a39c16ebe8c3340526d16838cde73f83813a45f8bff06e14aa6bba3cbb1e9cb57be796c24f5147f37275fb727282231312f35f315a166a0da42

data/lib/qops/cookbook/cookbook.rb

@@ -120,7 +120,7 @@ class Qops::Cookbook < Thor
 
     @_config ||= Qops::Environment.new
 
-    %w(cookbook_dir cookbook_s3_bucket cookbook_s3_path cookbook_name cookbook_version).each do |var|
+    %w[cookbook_dir cookbook_s3_bucket cookbook_s3_path cookbook_name cookbook_version].each do |var|
       fail ArgumentError.new("Must specify a '#{var}' in the config") if !@_config.respond_to?(var) && !@_config.configuration.respond_to?(var)
     end
 

data/lib/qops/deployment/app.rb

@@ -12,7 +12,7 @@ class Qops::Deploy < Thor
                 end
     online_instances = instances.select { |instance| instance.status == 'online' }
 
-    if online_instances.count == 0
+    if online_instances.zero?
       raise 'Could not find any running instance(s) to deploy to. Perhaps you need to run "qops:instance:up" first'
     end
 

data/lib/qops/deployment/helpers.rb

@@ -17,7 +17,7 @@ module Qops::DeployHelpers
     Qops::Environment.notifiers
     @_config ||= Qops::Environment.new
 
-    fail "Invalid configure deploy_type detected: #{@_config.deploy_type}" unless %w(staging production).include?(@_config.deploy_type)
+    fail "Invalid configure deploy_type detected: #{@_config.deploy_type}" unless %w[staging production].include?(@_config.deploy_type)
 
     @_config
   end

data/lib/qops/deployment/instances.rb

@@ -17,7 +17,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
         stack_id: config.stack_id,
         layer_ids: [config.layer_id],
         instance_type: config.instance_type,
-        os: 'Ubuntu 14.04 LTS',
+        os: config.os,
         hostname: requested_hostname,
         subnet_id: config.subnet,
         auto_scaling_type: config.autoscale_type,
@@ -55,7 +55,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
     # Start the instance if necessary
     print 'Booting instance ...'
-    unless %w(online booting).include?(instance.status)
+    unless %w[online booting].include?(instance.status)
       config.opsworks.start_instance(instance_id: instance_id)
     end
 
@@ -70,7 +70,7 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
       instance_results = config.opsworks.describe_instances(instance_ids: [instance_id])
       instance = instance_results.data.instances.first
 
-      if %w(booting requested pending).include?(instance.status)
+      if %w[booting requested pending].include?(instance.status)
         print '.'
         print " #{instance.status} :" if been_a_minute?(i)
       else
@@ -196,9 +196,9 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
     puts "Preparing to run command to all servers (#{instances.map(&:hostname).join(', ')})"
 
-    command = ask('Which command you want to execute?', limited_to: %w(setup configure install_dependencies update_dependencies))
+    command = ask('Which command you want to execute?', limited_to: %w[setup configure install_dependencies update_dependencies])
 
-    option = ask('Which command you want to execute?', limited_to: %w(all_in_once one_by_one))
+    option = ask('Which command you want to execute?', limited_to: %w[all_in_once one_by_one])
 
     base_deployment_params = {
       stack_id: config.stack_id,
@@ -259,9 +259,10 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
   end
 
   def setup_instance(instance, initial_instance_state, manifest)
+    print 'Setup instance ...'
+
     # If the previous instance setup failed then run the setup task again when trying to bring up the instance.
     if initial_instance_state.status == 'setup_failed'
-      print 'Setup instance ...'
       run_opsworks_command(
         {
           stack_id: config.stack_id,
@@ -274,15 +275,14 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
 
     # Monitor the existing instance setup.
     else
-      print 'Setup instance ...'
       iterator(manifest) do |i|
         instance_results = config.opsworks.describe_instances(instance_ids: [instance.instance_id])
         instance = instance_results.data.instances.first
 
-        if %w(online).include?(instance.status)
+        if %w[online].include?(instance.status)
           puts ' ' + instance.status
           true
-        elsif %w(setup_failed).include?(instance.status)
+        elsif %w[setup_failed].include?(instance.status)
           puts ' ' + instance.status
           read_failure_log(
             { instance_id: instance.instance_id },

data/lib/qops/environment.rb

@@ -32,7 +32,7 @@ module Qops
     end
 
     def initialize
-      %w(deploy_type region stack_id app_name).each do |v|
+      %w[deploy_type region stack_id app_name].each do |v|
         fail "Please configure #{v} before continuing." unless option?(v)
       end
 
@@ -68,13 +68,17 @@ module Qops
       configuration.autoscale_type || nil
     end
 
+    def opsworks_os
+      configuration.os || 'Ubuntu 14.04 LTS'
+    end
+
     # Default 1 days
     def max_instance_duration
       configuration.max_instance_duration || 86_400
     end
 
     def clean_commands_to_ignore
-      configuration.clean_commands_to_ignore.present? ? configuration.clean_commands_to_ignore : %w(update_custom_cookbooks update_agent configure shutdown)
+      configuration.clean_commands_to_ignore.present? ? configuration.clean_commands_to_ignore : %w[update_custom_cookbooks update_agent configure shutdown]
     end
 
     def file_name
@@ -106,12 +110,12 @@ module Qops
     end
 
     def ebs_optimize
-      !configuration.ebs_optimize.nil? ? configuration.ebs_optimize : !!(deploy_type =~ /production/) # rubocop:disable Style/DoubleNegation
+      !configuration.ebs_optimize.nil? ? configuration.ebs_optimize : !deploy_type !~ /production/
     end
 
     private
 
-    def method_missing(method_sym, *arguments, &block)
+    def method_missing(method_sym, *arguments, &block) # rubocop:disable Style/MethodMissing
       if configuration.respond_to?(method_sym)
         configuration.send(method_sym, *arguments, &block)
       else

data/lib/qops/helpers.rb

@@ -17,7 +17,7 @@ module Qops::Helpers
   end
 
   def been_a_minute?(i)
-    i > 1 && i % 60 == 0
+    i > 1 && (i % 60).zero?
   end
 
   def iterator(options)
@@ -126,7 +126,7 @@ module Qops::Helpers
     if File.exist?(file_path) # rubocop:disable Style/GuardClause
       raw_config = File.read(file_path)
       erb_config = ERB.new(raw_config).result
-      configs = YAML.load(erb_config)
+      configs = YAML.safe_load(erb_config)
 
       env = options[:environment]
 

data/lib/qops/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Qops
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.4.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qops
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - Matthew Basset
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qthor
@@ -135,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Helper commands for deployment of opsworks projects.
 test_files: []
-has_rdoc: