dream-ops 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9729a06fc81ca0a17b9897304d0de3562c28f05a
-  data.tar.gz: 707bbb6ca751d6d55e5a6c2d0557d0f87c99329d
+  metadata.gz: 635291c5f60c092e9a6aadccbbb94b9c406f44aa
+  data.tar.gz: b53af42711e3c850419e528221e568bf14c136b7
 SHA512:
-  metadata.gz: fd9d0dc3bc43af57f596e2d9e161481cf4b0bdc529c7c769c752d67df07f92258beb5f6fc2702949809a3a057e723f34d52da3e306a17e341c548c808ded35d5
-  data.tar.gz: 7a9a2de51970785f8ce5a71bcffaf6f5f7cc523a0465350a1ef227a2cafaffded305f632007872b6246b61c2c05273e419731f3c22440a22522d3e3da4d79ef2
+  metadata.gz: dec24a3be06450e6b4aadd9907d65e5f3020681680337bf8c8e119e76ce1e39049fdfb22dc712195135d0a60b992aa365ad1652a9e99e1268efc44e1a681e1ad
+  data.tar.gz: 52451f10fd6658f6b443ad632c60285c24be4b28d3117fafa45bc617638e40eeaa8e603d3543b4a9a53c737c8a95ff9ff65d6607983f4b50aa5d3e8abdb4c69f

data/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.6.0]
+
+### Added
+- Added global `aws_profile` option
+- Added spinner to all deployments to avoid CI hangs
+
 ## [0.5.0]
 
 ### Changed

data/README.md

@@ -33,11 +33,12 @@ Commands:
   dream version                                    # Display version
 
 Options:
-  -F, [--format=FORMAT]        # Output format to use.
-                               # Default: human
-  -q, [--quiet], [--no-quiet]  # Silence all informational output.
-  -d, [--debug], [--no-debug]  # Output debug information
-  -i, [--ssh-key=SSH_KEY]      # Path to SSH key
+  -F, [--format=FORMAT]            # Output format to use.
+                                   # Default: human
+  -q, [--quiet], [--no-quiet]      # Silence all informational output.
+  -d, [--debug], [--no-debug]      # Output debug information
+  -i, [--ssh-key=SSH_KEY]          # Path to SSH key
+  -p, [--aws-profile=AWS_PROFILE]  # AWS profile to use
 
 ```
 

data/dream-ops.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rubyzip",   "~> 1.2"
   spec.add_dependency "aws-sdk",   "~> 2"
+  spec.add_dependency "inifile",   "~> 3.0"
   spec.add_dependency "berkshelf", "~> 7.0"
   spec.add_dependency "thor",      "~> 0.20"
   spec.add_dependency "chef",      "~> 13.6"

data/lib/dream-ops.rb

@@ -10,6 +10,8 @@ end
 
 require "berkshelf"
 require "thor"
+require "aws-sdk"
+require "inifile"
 
 module DreamOps
 
@@ -76,6 +78,29 @@ module DreamOps
       @ssh_key = key
     end
 
+    # Specify AWS profile to use
+    def use_aws_profile(profile)
+      begin
+        shared_creds = Aws::SharedCredentials.new(profile_name: profile)
+        Aws.config.update(credentials: shared_creds)
+      rescue Aws::Errors::NoSuchProfileError => error
+        DreamOps.ui.error error
+        exit(1)
+      end
+
+      # Unfortunately, Aws::OpsWorks::Client only loads the default profile's
+      # region. This parses the INI files and honors the profile region if set.
+      ini = IniFile.load("#{ENV['HOME']}/.aws/config")
+      if ini.nil? || !ini.has_section(profile)
+        ini = IniFile.load("#{ENV['HOME']}/.aws/credentials")
+      end
+
+      region = ini.to_h[profile]['region']
+      if !region.nil? && !region.empty?
+        Aws.config.update(region: region)
+      end
+    end
+
     # Get whether to always run setup
     #
     # @return [~boolean]

data/lib/dream-ops/cli.rb

@@ -65,10 +65,14 @@ module DreamOps
 
       DreamOps.set_format @options[:format]
 
-      if @options[:ssh_key]
+      if !@options[:ssh_key].empty?
         DreamOps.set_ssh_key @options[:ssh_key]
       end
 
+      if !@options[:aws_profile].empty?
+        DreamOps.use_aws_profile @options[:aws_profile]
+      end
+
       @options = options.dup # unfreeze frozen options Hash from Thor
     end
 
@@ -100,6 +104,11 @@ module DreamOps
       desc: "Path to SSH key",
       aliases: "-i",
       default: ""
+    class_option :aws_profile,
+      type: :string,
+      desc: "AWS profile to use",
+      aliases: "-p",
+      default: ""
 
     desc "version", "Display version"
     def version

data/lib/dream-ops/deployment/base.rb

@@ -3,6 +3,15 @@ require 'fileutils'
 
 module DreamOps
   class BaseDeployer
+    @@spinner = Enumerator.new do |e|
+      loop do
+        e.yield '|'
+        e.yield '/'
+        e.yield '-'
+        e.yield '\\'
+      end
+    end
+
     class << self
       #
       # @macro deployer_method
@@ -96,6 +105,11 @@ module DreamOps
     end
 
     def deploy(*args)
+      # Ensure git is installed
+      if (!system("which git > /dev/null 2>&1"))
+        __bail_with_fatal_error(GitNotInstalledError.new)
+      end
+
       # Find unique cookbooks and deploy targets
       result = analyze(args)
 

data/lib/dream-ops/deployment/opsworks.rb

@@ -240,8 +240,12 @@ module DreamOps
       status = "failed"
       while true
         status = get_deployment_status(deployment_id)
-        break if ["successful", "failed"].include? status
+        if ["successful", "failed"].include? status
+          print "\b"
+          break
+        end
         sleep(2)
+        print "\r#{@@spinner.next}"
       end
       return status
     end

data/lib/dream-ops/deployment/solo.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'timeout'
 
 module DreamOps
   class SoloDeployer < BaseDeployer
@@ -10,6 +11,20 @@ module DreamOps
       return cookbooks.any? {|c| c[:targets].include? target }
     end
 
+    def __wait_for_pid(pid)
+      while true do
+        begin
+          Timeout.timeout(5) do
+            Process.wait pid
+          end
+          print "\b"
+          return $?.exitstatus == 0
+        rescue Timeout::Error
+          print "\r#{@@spinner.next}"
+        end
+      end
+    end
+
     # Analyze the SSH hosts for deployment
     #
     # @return [Hash]
@@ -146,11 +161,18 @@ module DreamOps
 
       uuid = SecureRandom.uuid
 
-      if ! system(
-        "ssh #{@ssh_opts} #{target[:host]} \"" +
-          "set -o pipefail && " +
-          "sudo chef-solo -j /var/chef/chef.json -o \"role[#{role}]\" 2>&1 | sudo tee /var/log/chef/#{uuid}.log #{@q_all}\""
-      )
+      pid = fork do
+        if ! system(
+          "ssh #{@ssh_opts} #{target[:host]} \"" +
+            "set -o pipefail && " +
+            "sudo chef-solo -j /var/chef/chef.json -o \"role[#{role}]\" 2>&1 | sudo tee /var/log/chef/#{uuid}.log #{@q_all}\""
+        )
+          exit 1
+        end
+        exit 0
+      end
+
+      if !__wait_for_pid(pid)
         __bail_with_fatal_error(ChefSoloFailedError.new(target[:host], "/var/log/chef/#{uuid}.log"))
       end
     end

data/lib/dream-ops/errors.rb

@@ -148,4 +148,12 @@ module DreamOps
       ].join("\n")
     end
   end
+
+  class GitNotInstalledError < DreamOpsError
+    set_status_code(19)
+
+    def to_s
+      "Unabled to find git in your PATH."
+    end
+  end
 end

data/lib/dream-ops/version.rb

@@ -1,3 +1,3 @@
 module DreamOps
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dream-ops
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Allen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement