opzworks 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32fa5567e79a890164a7a1891c4815e874223cce
-  data.tar.gz: f56bf6aeec3a01091e3a5426bf04a3cde4b60e22
+  metadata.gz: 12927c6f956242bf1f1e1c90f9c4b14ddd42b472
+  data.tar.gz: 81d891cf89b29772a00d6de50c820d248adf8a96
 SHA512:
-  metadata.gz: a4c2d4364428919c56bc5507bef241c9f80dbff36d8f7c160a0d873e20e1aae0ee1d99d3dd869c1f7f79e40c3b17b9fae6934ccbf3365340d92b89cf0d21610c
-  data.tar.gz: c0d927dfb44193ffb7ebe478a9faf1c64f312ad0593fde708101f1710fa4b6f2051fb3fbb7b3f58867b1b77ee254728239f1cc51f560895dc98894fd16f76819
+  metadata.gz: fb75b56d8dd6b30dddccc38f91202b4e509f708985bca9145ff545c687fff08d9a893c8a075f358d046e827441c14a3e18c7ad612d723db68c1494379e86f934
+  data.tar.gz: 748284a47c95da53cd59ed00d7ca12d0e0b418eae160f4317b1e692125cd984b936ce3b6e10d1f0e612b0cde046afbf3539d1dc2e901d2c421edeb758c9e188c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opzworks (0.5.7)
+    opzworks (0.5.8)
       aws-sdk (~> 2.2.7)
       diffy (~> 3.1.0)
       faraday (~> 0.9.2)
@@ -15,8 +15,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.2.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
     awesome_print (1.6.1)
     aws-sdk (2.2.12)
       aws-sdk-resources (= 2.2.12)
@@ -41,15 +39,12 @@ GEM
     powerpack (0.1.1)
     rainbow (2.0.0)
     rake (10.5.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.36.0)
+      parser (>= 2.3.0.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
     ruby-progressbar (1.7.5)
-    tins (1.6.0)
     trollop (2.1.2)
 
 PLATFORMS
@@ -60,7 +55,7 @@ DEPENDENCIES
   bundler (~> 1.11)
   opzworks!
   rake
-  rubocop (~> 0.35.0)
+  rubocop (~> 0.36.0)
 
 BUNDLED WITH
    1.11.2

data/lib/opzworks/commands/berks.rb

@@ -62,9 +62,9 @@ module OpzWorks
 
           berks_cook_path  = config.berks_base_path || '/tmp'
           cook_path        = "#{berks_cook_path}/#{@project}-#{@branch}"
-          install_path     = "#{cook_path}" + '/' + "cookbooks-#{@project}-#{@branch}"
+          install_path     = cook_path + '/' + "cookbooks-#{@project}-#{@branch}"
           cookbook_tarball = config.berks_tarball_name || 'cookbooks.tgz'
-          cookbook_upload  = "#{cook_path}" + '/' "#{cookbook_tarball}"
+          cookbook_upload  = cook_path + '/' "#{cookbook_tarball}"
           s3_bucket        = config.berks_s3_bucket || 'opzworks'
           overrides        = 'overrides'
 
@@ -89,9 +89,7 @@ module OpzWorks
           #     custom nginx.conf.erb in it.
           #
           if File.file?("#{@target_path}/#{overrides}")
-            unless File.directory?("#{install_path}")
-              FileUtils.mkdir_p("#{install_path}")
-            end
+            FileUtils.mkdir_p(install_path) unless File.directory?(install_path)
             File.open("#{@target_path}/#{overrides}") do |f|
               f.each_line do |line|
                 puts "Copying override #{line}".foreground(:blue)
@@ -104,7 +102,7 @@ module OpzWorks
           system "cd #{@target_path} && git commit -am 'berks update'; git push origin #{@branch}"
 
           puts 'Creating tarball of cookbooks'.foreground(:blue)
-          FileUtils.mkdir_p("#{cook_path}")
+          FileUtils.mkdir_p(cook_path)
           run_local "tar czf #{cookbook_upload} -C #{install_path} ."
 
           # upload
@@ -113,12 +111,12 @@ module OpzWorks
 
           begin
             obj = s3.bucket(s3_bucket).object("#{@s3_path}/#{cookbook_tarball}")
-            obj.upload_file("#{cookbook_upload}")
+            obj.upload_file(cookbook_upload)
           rescue StandardError => e
             puts "Caught exception while uploading to S3 bucket #{s3_bucket}: #{e}".foreground(:red)
             puts 'Cleaning up before exiting'.foreground(:blue)
-            FileUtils.rm("#{cookbook_upload}")
-            FileUtils.rm_rf("#{install_path}")
+            FileUtils.rm(cookbook_upload)
+            FileUtils.rm_rf(install_path)
             abort
           else
             puts "Completed successful upload of #{@s3_path}/#{cookbook_tarball} to #{s3_bucket}!".foreground(:green)
@@ -127,8 +125,8 @@ module OpzWorks
           # cleanup
           #
           puts 'Cleaning up'.foreground(:blue)
-          FileUtils.rm("#{cookbook_upload}")
-          FileUtils.rm_rf("#{install_path}")
+          FileUtils.rm(cookbook_upload)
+          FileUtils.rm_rf(install_path)
           puts 'Done!'.foreground(:green)
 
           # update remote cookbooks

data/lib/opzworks/commands/elastic.rb

@@ -47,16 +47,14 @@ module OpzWorks
 
         # loops over inputs
         ARGV.each do |opt|
-          if options[:start]
-            var = es_get_input(opt, response, 'start')
-          else
-            var = es_get_input(opt, response)
-          end
+          var = if options[:start]
+                  es_get_input(opt, response, 'start')
+                else
+                  es_get_input(opt, response)
+                end
           next if var == false
 
-          if options[:old_service_name]
-            @service_name = 'elasticsearch'
-          end
+          options[:old_service_name] ? @service_name = 'elasticsearch' : false
 
           case options[:rolling]
           when true

data/lib/opzworks/commands/include/elastic.rb

@@ -24,7 +24,7 @@ def es_get_input(input, data = {}, *cmd)
     puts 'Found more than one stack matching input '.foreground(:yellow) + input.foreground(:green) + ', skipping.'.foreground(:yellow)
     return false
   else
-    puts 'Operating on stack '.foreground(:blue) + "#{match[:name]}".foreground(:green)
+    puts 'Operating on stack '.foreground(:blue) + match[:name].to_s.foreground(:green)
     layers = @client.describe_layers(stack_id: match[:stack_id])
     layers[:layers].each { |layer| printf("%-30s %-50s\n", layer[:name], layer[:layer_id]) }
 
@@ -34,12 +34,12 @@ def es_get_input(input, data = {}, *cmd)
     unless cmd.include? 'start'
       STDOUT.print 'Disable shard allocation before starting? (true/false, default is true): '.foreground(:blue)
       disable_allocation = STDIN.gets.chomp
-      case disable_allocation
-      when 'false'
-        @disable_shard_allocation = false
-      else
-        @disable_shard_allocation = true
-      end
+      @disable_shard_allocation = case disable_allocation
+                                  when false
+                                    false
+                                  else
+                                    true
+                                  end
     end
 
     options = {}
@@ -49,7 +49,7 @@ def es_get_input(input, data = {}, *cmd)
     else
       options[:layer_id] = layer
       get_shortname = @client.describe_layers(layer_ids: [layer])
-      get_shortname[:layers].each { |layer| @service_name = layer[:shortname] }
+      get_shortname[:layers].each { |l| @service_name = l[:shortname] }
     end
     opsworks_list_ips(options)
   end
@@ -72,7 +72,7 @@ def es_enable_allocation(ip, type)
       end
       break
     rescue StandardError => e
-      puts 'Caught exception while trying to change allocation state: '.foreground(:yellow) + "#{e}".foreground(:red) + ', looping around...'.foreground(:yellow) if count == 0
+      puts 'Caught exception while trying to change allocation state: '.foreground(:yellow) + e.foreground(:red) + ', looping around...'.foreground(:yellow) if count == 0
       count += 1
       sleep 1
     end
@@ -96,7 +96,7 @@ def es_service(command, ips = [], service_name = 'elasticsearch')
 end
 
 def es_wait_for_status(ip, color)
-  puts 'Waiting for cluster to go '.foreground(:blue) + "#{color}".foreground(:"#{color}")
+  puts 'Waiting for cluster to go '.foreground(:blue) + color.foreground(:"#{color}")
   conn = Faraday.new(url: "http://#{ip}:9200") do |f|
     f.adapter :net_http
   end
@@ -112,14 +112,14 @@ def es_wait_for_status(ip, color)
       end
       json = JSON.parse response.body
     rescue StandardError => e
-      puts 'Caught exception while trying to check cluster status: '.foreground(:yellow) + "#{e}".foreground(:red) + ', looping around...'.foreground(:yellow) if rescue_count == 0
+      puts 'Caught exception while trying to check cluster status: '.foreground(:yellow) + e.foreground(:red) + ', looping around...'.foreground(:yellow) if rescue_count == 0
       rescue_count += 1
       printf '.'
       sleep 1
     else
       case json['status']
       when color
-        puts "\nCluster is now ".foreground(:blue) + "#{color}".foreground(:"#{color}")
+        puts "\nCluster is now ".foreground(:blue) + color.foreground(:"#{color}")
         break
       when 'green'
         puts "\nCluster is green, proceeding without waiting for requested status of #{color}".foreground(:green)
@@ -127,7 +127,7 @@ def es_wait_for_status(ip, color)
       else
         count += 1
         if count == 10
-          puts "\nStill waiting, cluster is currently ".foreground(:blue) + "#{json['status']}".foreground(:"#{json['status']}")
+          puts "\nStill waiting, cluster is currently ".foreground(:blue) + json['status'].to_s.foreground(:"#{json['status']}")
           count = 0
         end
         printf '.'

data/lib/opzworks/commands/json.rb

@@ -67,30 +67,28 @@ module OpzWorks
 
           if diff_str.empty?
             puts 'There are no differences between the existing stack json and the json you\'re asking to push.'.foreground(:yellow)
-          else
-            if options[:quiet]
-              puts 'Quiet mode detected. Pushing the following updated json:'.foreground(:yellow)
-              puts diff_str
+          elsif options[:quiet]
+            puts 'Quiet mode detected. Pushing the following updated json:'.foreground(:yellow)
+            puts diff_str
+
+            puts 'Committing changes and pushing'.foreground(:blue)
+            system "cd #{@target_path} && git commit -am 'stack update'; git push origin #{@branch}"
 
+            client.update_stack(hash)
+            puts 'Done!'.color(:green)
+          else
+            puts "The following is a partial diff of the existing stack json and the json you're asking to push:".foreground(:yellow)
+            puts diff_str
+            STDOUT.print "\nType ".foreground(:yellow) + 'yes '.foreground(:blue) + 'to continue, any other key will abort: '.foreground(:yellow)
+            input = STDIN.gets.chomp
+            if input =~ /^y/i
               puts 'Committing changes and pushing'.foreground(:blue)
               system "cd #{@target_path} && git commit -am 'stack update'; git push origin #{@branch}"
 
               client.update_stack(hash)
               puts 'Done!'.color(:green)
             else
-              puts "The following is a partial diff of the existing stack json and the json you're asking to push:".foreground(:yellow)
-              puts diff_str
-              STDOUT.print "\nType ".foreground(:yellow) + 'yes '.foreground(:blue) + 'to continue, any other key will abort: '.foreground(:yellow)
-              input = STDIN.gets.chomp
-              if input =~ /^y/i
-                puts 'Committing changes and pushing'.foreground(:blue)
-                system "cd #{@target_path} && git commit -am 'stack update'; git push origin #{@branch}"
-
-                client.update_stack(hash)
-                puts 'Done!'.color(:green)
-              else
-                puts 'Update skipped.'.foreground(:red)
-              end
+              puts 'Update skipped.'.foreground(:red)
             end
           end
         end

data/lib/opzworks/commands/ssh.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'aws-sdk'
 require 'trollop'
 require 'opzworks'
 
-SSH_PREFIX  = '# --- OpzWorks ---'
-SSH_POSTFIX = '# --- End of OpzWorks ---'
+SSH_PREFIX  = '# --- OpzWorks ---'.freeze
+SSH_POSTFIX = '# --- End of OpzWorks ---'.freeze
 
 module OpzWorks
   class Commands
@@ -57,11 +59,11 @@ module OpzWorks
           instances += result.instances.select { |i| i[:status] != 'stopped' }
 
           instances.map! do |instance|
-            if options[:private]
-              ip = instance[:private_ip]
-            else
-              instance[:elastic_ip].nil? ? ip = instance[:public_ip] : ip = instance[:elastic_ip]
-            end
+            ip = if options[:private]
+                   instance[:private_ip]
+                 else
+                   instance[:elastic_ip].nil? ? instance[:public_ip] : instance[:elastic_ip]
+                 end
 
             if options[:raw]
               puts ip
@@ -77,32 +79,29 @@ module OpzWorks
             end
           end
 
-          if options[:raw]
-            next
-          else
-            new_contents = "#{instances.join("\n")}\n"
-
-            if options[:update]
-              ssh_config = "#{ENV['HOME']}/.ssh/config"
-              old_contents = File.read(ssh_config)
-
-              if options[:backup]
-                backup_name = ssh_config + '.backup'
-                File.open(backup_name, 'w') { |file| file.puts old_contents }
-              end
-
-              File.open(ssh_config, 'w') do |file|
-                file.puts old_contents.gsub(
-                  /\n?\n?#{SSH_PREFIX}.*#{SSH_POSTFIX}\n?\n?/m,
-                  ''
-                )
-                file.puts new_contents
-              end
-
-              puts "Successfully updated #{ssh_config} with #{instances.length} instances!"
-            else
-              puts new_contents.strip
+          next if options[:raw]
+          new_contents = "#{instances.join("\n")}\n"
+
+          if options[:update]
+            ssh_config = "#{ENV['HOME']}/.ssh/config"
+            old_contents = File.read(ssh_config)
+
+            if options[:backup]
+              backup_name = ssh_config + '.backup'
+              File.open(backup_name, 'w') { |file| file.puts old_contents }
+            end
+
+            File.open(ssh_config, 'w') do |file|
+              file.puts old_contents.gsub(
+                /\n?\n?#{SSH_PREFIX}.*#{SSH_POSTFIX}\n?\n?/m,
+                ''
+              )
+              file.puts new_contents
             end
+
+            puts "Successfully updated #{ssh_config} with #{instances.length} instances!"
+          else
+            puts new_contents.strip
           end
         end
       end

data/lib/opzworks/meta.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 module OpzWorks
-  VERSION     = '0.5.8'
-  AUTHORS     = ['Grant Heffernan', 'Mapzen']
-  EMAIL       = ['grant@mapzen.com']
-  DESCRIPTION = 'OpzWorks Utilities'
-  SUMMARY     = 'Command line interface for Amazon OpsWorks'
+  VERSION     = '0.6.0'.freeze
+  AUTHORS     = ['Grant Heffernan', 'Mapzen'].freeze
+  EMAIL       = ['grant@mapzen.com'].freeze
+  DESCRIPTION = 'OpzWorks Utilities'.freeze
+  SUMMARY     = 'Command line interface for Amazon OpsWorks'.freeze
 end

data/opzworks.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'net-ssh', '~> 3.0.1'
   spec.add_dependency 'net-ssh-multi', '~> 1.2.1'
 
-  spec.add_development_dependency 'rubocop', '~> 0.35.0'
+  spec.add_development_dependency 'rubocop', '~> 0.36.0'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'awesome_print'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opzworks
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Grant Heffernan
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement