dream-ops 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 635291c5f60c092e9a6aadccbbb94b9c406f44aa
-  data.tar.gz: b53af42711e3c850419e528221e568bf14c136b7
+SHA256:
+  metadata.gz: e07301e3995e5b0cf1c52c79c24f23c13836f4d1f36e45b9882cc75df486636d
+  data.tar.gz: 825c82fcd97bf7d02582666cd997949836e3576140531a4a95b65e06bd924461
 SHA512:
-  metadata.gz: dec24a3be06450e6b4aadd9907d65e5f3020681680337bf8c8e119e76ce1e39049fdfb22dc712195135d0a60b992aa365ad1652a9e99e1268efc44e1a681e1ad
-  data.tar.gz: 52451f10fd6658f6b443ad632c60285c24be4b28d3117fafa45bc617638e40eeaa8e603d3543b4a9a53c737c8a95ff9ff65d6607983f4b50aa5d3e8abdb4c69f
+  metadata.gz: 9ddbdcf26a49a2ccd1f15dd1709c00ef1a54aa0c40842fcab8a76887e20e8dad8760e867cb116aa4ae8ab65a01f309c01057fb6ce57954d9065c462312911e69
+  data.tar.gz: 10a80d96c20276bdfe6729cfb024f153d2e6589234fb2feb1eee74c306a36cd4846f77034193bbdff32a05e7207bff24f5f0956c04d6df6ba5826f173628d642

data/CHANGELOG.md

@@ -6,6 +6,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.8.0]
+
+### Changed
+- Updated to use CINC instead of Chef Workstation
+- Updated to `thor@1.x` which removes warnings when using ruby 3.x
+
+### Fixes
+- Adds `solo` support for Ubuntu 22.04
+- Better error handling of missing SSH key for `solo` commands
+
+## [0.7.0]
+
+### Changed
+- Updated to use Chef Workstation instead of ChefDK
+
+### Fixes
+- Adds `solo` support for Ubuntu 20.04
+
+## [0.6.1]
+
+### Fixes
+- Now using thread-safe enum to avoid `FiberError`
+
 ## [0.6.0]
 
 ### Added
@@ -60,8 +83,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Gem version badge to README
 - Usage documentation
 
-[Unreleased]: https://github.com/chris-allen/dream-ops/compare/v0.5.0...HEAD
-[0.4.2]: https://github.com/chris-allen/dream-ops/compare/v0.4.2...v0.5.0
+[Unreleased]: https://github.com/chris-allen/dream-ops/compare/v0.8.0...HEAD
+[0.8.0]: https://github.com/chris-allen/dream-ops/compare/v0.7.0...v0.8.0
+[0.7.0]: https://github.com/chris-allen/dream-ops/compare/v0.6.1...v0.7.0
+[0.6.1]: https://github.com/chris-allen/dream-ops/compare/v0.6.0...v0.6.1
+[0.6.0]: https://github.com/chris-allen/dream-ops/compare/v0.5.0...v0.6.0
+[0.5.0]: https://github.com/chris-allen/dream-ops/compare/v0.4.2...v0.5.0
 [0.4.2]: https://github.com/chris-allen/dream-ops/compare/v0.4.1...v0.4.2
 [0.4.1]: https://github.com/chris-allen/dream-ops/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/chris-allen/dream-ops/compare/v0.3.0...v0.4.0

data/README.md

@@ -1,6 +1,6 @@
 # DreamOps
 [![Gem Version](https://img.shields.io/gem/v/dream-ops.svg)][gem]
-[![Build Status](https://travis-ci.org/chris-allen/dream-ops.svg?branch=master)](https://travis-ci.org/chris-allen/dream-ops)
+[![Build Status](https://travis-ci.com/chris-allen/dream-ops.svg?branch=master)](https://app.travis-ci.com/github/chris-allen/dream-ops)
 
 [gem]: https://rubygems.org/gems/dream-ops
 
@@ -74,11 +74,11 @@ Target: ip-172-31-53-232
 ```bash
 dream init solo -T ubuntu@example.com -i /path/to/key.pem
 Target: ip-172-31-53-232
---- ChefDK Installed: false
+--- Is chef-solo Installed: false
 --- Valid chef.json: false
 --- Valid role[setup]: false
 --- Valid role[deploy]: false
-...Installing ChefDK [target="ubuntu@example.com"]
+...Installing chef-solo via CINC [target="ubuntu@example.com"]
 ...Creating boilerplate /var/chef/chef.json [target="ubuntu@example.com"]
 ...Creating boilerplate /var/chef/roles/setup.json [target="ubuntu@example.com"]
 ...Creating boilerplate /var/chef/roles/deploy.json [target="ubuntu@example.com"]

data/dream-ops.gemspec

@@ -34,10 +34,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  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"
+  spec.add_dependency "rubyzip",               "~> 1.2"
+  spec.add_dependency "aws-sdk-core"
+  spec.add_dependency "aws-sdk-configservice", "~> 1"
+  spec.add_dependency "aws-sdk-opsworks",      "~> 1"
+  spec.add_dependency "aws-sdk-s3",            "~> 1"
+  spec.add_dependency "inifile",               "~> 3.0"
+  spec.add_dependency "berkshelf",             "~> 7.0"
+  spec.add_dependency "thor",                  "~> 1.0"
+  spec.add_dependency "chef",                  "~> 13.6"
 end

data/lib/dream-ops/cli.rb

@@ -55,7 +55,9 @@ module DreamOps
       if @options[:debug]
         ENV["DREAMOPS_DEBUG"] = "true"
         DreamOps.logger.level = ::Logger::DEBUG
+        Thread.report_on_exception = true
       else
+        Thread.report_on_exception = false
         Berkshelf.ui.mute!
       end
 
@@ -110,6 +112,10 @@ module DreamOps
       aliases: "-p",
       default: ""
 
+    def self.exit_on_failure?
+      false
+    end
+
     desc "version", "Display version"
     def version
       DreamOps.formatter.version

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

@@ -1,14 +1,16 @@
-require "dream-ops/utils/zip"
+require 'dream-ops/utils/zip'
+require 'dream-ops/utils/threaded_enum'
 require 'fileutils'
 
 module DreamOps
   class BaseDeployer
-    @@spinner = Enumerator.new do |e|
+
+    @@spinner = ThreadedEnum.new do |e|
       loop do
-        e.yield '|'
-        e.yield '/'
-        e.yield '-'
-        e.yield '\\'
+        e << '|'
+        e << '/'
+        e << '-'
+        e << '\\'
       end
     end
 

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

@@ -1,4 +1,5 @@
-require "aws-sdk"
+require "aws-sdk-opsworks"
+require "aws-sdk-s3"
 require "uri"
 
 Aws.use_bundled_cert!

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

@@ -161,11 +161,16 @@ module DreamOps
 
       uuid = SecureRandom.uuid
 
+      chef_cmd = "cinc-solo"
+      if !system("ssh #{@ssh_opts} #{target[:host]} which cinc-solo #{@q_all}")
+        chef_cmd = "chef-solo --chef-license accept"
+      end
+
       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}\""
+            "sudo #{chef_cmd} -j /var/chef/chef.json -o \"role[#{role}]\" 2>&1 | sudo tee /var/log/chef/#{uuid}.log #{@q_all}\""
         )
           exit 1
         end
@@ -178,9 +183,9 @@ module DreamOps
     end
 
     def deploy_target(target, cookbooks)
-      # Bail if ChefDK is not installed
-      if !system("ssh #{@ssh_opts} #{target[:host]} which chef #{@q_all}")
-        __bail_with_fatal_error(ChefDKNotInstalledError.new(target[:host]))
+      # Bail if chef-solo is not installed
+      if !system("ssh #{@ssh_opts} #{target[:host]} which chef-solo #{@q_all}")
+        __bail_with_fatal_error(ChefSoloNotInstalledError.new(target[:host]))
       end
 
       # Bail if chef.json doesn't exist

data/lib/dream-ops/errors.rb

@@ -66,7 +66,7 @@ module DreamOps
     end
   end
 
-  class ChefDKNotInstalledError < DreamOpsError
+  class ChefSoloNotInstalledError < DreamOpsError
     set_status_code(14)
 
     def initialize(target)
@@ -75,14 +75,14 @@ module DreamOps
 
     def to_s
       [
-        "ChefDK not installed on target \"#{@target}\". To initialize chef-solo, run:",
+        "chef-solo not installed on target \"#{@target}\". To initialize chef-solo, run:",
         "",
         "dream init solo -t #{@target} -i #{DreamOps.ssh_key}",
       ].join("\n")
     end
   end
 
-  class ChefDKFailedError < DreamOpsError
+  class ChefSoloFailedError < DreamOpsError
     set_status_code(15)
 
     def initialize(target, wget_url)
@@ -92,7 +92,7 @@ module DreamOps
 
     def to_s
       [
-        "Target \"#{@target}\" failed installing ChefDK from:",
+        "Target \"#{@target}\" failed installing chef-solo via CINC from:",
         "",
         @wget_url,
       ].join("\n")

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

@@ -25,7 +25,7 @@ module DreamOps
     #     [
     #       {
     #         :host => "ubuntu@example.com"
-    #         :chefdk_installed => false,
+    #         :solo_installed => false,
     #         :solo_json_exists => false,
     #         :setup_role_exists => true,
     #         :deploy_role_exists => true

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

@@ -21,8 +21,8 @@ module DreamOps
 
         target_result = { host: target }
 
-        target_result[:chefdk_installed] = system("ssh #{@ssh_opts} #{target} which chef #{@q_all}")
-        DreamOps.ui.info "--- ChefDK Installed: #{target_result[:chefdk_installed]}"
+        target_result[:solo_installed] = system("ssh #{@ssh_opts} #{target} which chef-solo #{@q_all}")
+        DreamOps.ui.info "--- Is chef-solo Installed: #{target_result[:solo_installed]}"
 
         target_result[:solo_json_exists] = system("ssh #{@ssh_opts} #{target} stat /var/chef/chef.json #{@q_all}")
         DreamOps.ui.info "--- Valid chef.json: #{target_result[:solo_json_exists]}"
@@ -40,29 +40,37 @@ module DreamOps
     end
 
     def init_target(target, dryrun)
-      # Install ChefDK if not already
-      if !target[:chefdk_installed]
+      # Install chef-solo if not available
+      if !target[:solo_installed]
         if dryrun
-          DreamOps.ui.warn "...WOULD Install ChefDK [target=\"#{target[:host]}\"]"
+          DreamOps.ui.warn "...WOULD Install chef-solo via CINC [target=\"#{target[:host]}\"]"
         else
-          DreamOps.ui.warn "...Installing ChefDK [target=\"#{target[:host]}\"]"
+          DreamOps.ui.warn "...Installing chef-solo via CINC [target=\"#{target[:host]}\"]"
 
           # Get ubuntu version
           ubuntu_ver = `ssh #{@ssh_opts} #{target[:host]} "awk 'BEGIN { FS = \\"=\\" } /DISTRIB_RELEASE/ { print \\$2 }' /etc/lsb-release"`.chomp
 
           # Download and install the package
-          chefdk_url = "https://packages.chef.io/files/stable/chefdk/3.3.23/ubuntu/#{ubuntu_ver}/chefdk_3.3.23-1_amd64.deb"
-          if system("ssh #{@ssh_opts} #{target[:host]} \"wget #{chefdk_url} -P /tmp\" #{@q_all}")
-            `ssh #{@ssh_opts} #{target[:host]} "sudo dpkg -i /tmp/chefdk_3.3.23-1_amd64.deb" #{@q_all}`
-            `ssh #{@ssh_opts} #{target[:host]} "sudo rm /tmp/chefdk_3.3.23-1_amd64.deb" #{@q_all}`
+          deb_file = "cinc_17.10.0-1_amd64.deb"
+          cinc_url = "http://downloads.cinc.sh/files/stable/cinc/17.10.0/ubuntu/#{ubuntu_ver}/#{deb_file}"
+          if system("ssh #{@ssh_opts} #{target[:host]} \"wget #{cinc_url} -P /tmp\" #{@q_all}")
+            `ssh #{@ssh_opts} #{target[:host]} "sudo dpkg -i /tmp/#{deb_file}" #{@q_all}`
+            `ssh #{@ssh_opts} #{target[:host]} "sudo rm /tmp/#{deb_file}" #{@q_all}`
           else
-            __bail_with_fatal_error(ChefDKFailedError.new(target, chefdk_url))
+            __bail_with_fatal_error(ChefSoloFailedError.new(target, cinc_url))
           end
         end
       end
 
       if !dryrun
+        `ssh #{@ssh_opts} #{target[:host]} sudo mkdir -p /var/chef/cookbooks`
         `ssh #{@ssh_opts} #{target[:host]} sudo mkdir -p /var/chef/roles`
+
+        if system("ssh #{@ssh_opts} #{target[:host]} which cinc-solo #{@q_all}")
+          `ssh #{@ssh_opts} #{target[:host]} sudo mkdir /var/cinc`
+          `ssh #{@ssh_opts} #{target[:host]} sudo ln -s /var/chef/cookbooks /var/cinc/cookbooks`
+          `ssh #{@ssh_opts} #{target[:host]} sudo ln -s /var/chef/roles /var/cinc/roles`
+        end
       end
 
       # Create empty json file for chef-solo

data/lib/dream-ops/utils/threaded_enum.rb

@@ -0,0 +1,81 @@
+# Credit: https://github.com/bittrance/rxruby/blob/master/lib/rx/concurrency/threaded_enumerator.rb
+#
+# ThreadedEnum can be used across threads unlike Ruby's default Enumerator
+# that will throw FiberError if the enumerator is used from more than one
+# thread.
+class ThreadedEnum
+  ERROR = Object.new
+  DONE = Object.new
+
+  if RUBY_ENGINE == 'jruby'
+    def self.new(*args, &block)
+      Enumerator.new(*args, &block)
+    end
+  end
+
+  # ThreadedEnum helper class
+  class Yielder
+    def initialize(queue, gate, condition)
+      @queue = queue
+      @gate = gate
+      @condition = condition
+    end
+
+    def <<(e)
+      @queue << e
+      @gate.synchronize do
+        @condition.wait @gate while @queue.size > 0
+      end
+    end
+  end
+
+  # The enumerator can be created with either an enumerable or a block that
+  # receives a yielder object, but not both. Note that the block or enumerable
+  # will be iterated immediately once making it possible to prepare the iterator
+  # e.g. when reading from a file or a socket.
+  def initialize(source_or_size_hint = nil, &block)
+    raise TypeError, 'Size hinting not supported' if source_or_size_hint && block_given?
+    @condition = ConditionVariable.new
+    @gate = Mutex.new
+    @queue = Queue.new
+    @done = false
+    setup_yielder(source_or_size_hint, &block)
+  end
+
+  # Receive the next item from the enumerator or any exception thrown from the
+  # enumerator.
+  def next
+    raise StopIteration if @done
+    @gate.synchronize do
+      @condition.signal
+    end
+    payload, type = @queue.pop
+    case type
+    when DONE
+      @done = true
+      raise StopIteration
+    when ERROR
+      @done = true
+      raise payload
+    end
+    payload
+  end
+
+  private
+
+  def setup_yielder(source, &block)
+    yielder = Yielder.new(@queue, @gate, @condition)
+    Thread.new do
+      begin
+        if source
+          source.each { |e| yielder << e }
+        else
+          block.call yielder
+        end
+      rescue => e
+        yielder << [e, ERROR]
+      end
+      yielder << [nil, DONE]
+    end
+  end
+end

data/lib/dream-ops/version.rb

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

data/lib/dream-ops.rb

@@ -10,7 +10,8 @@ end
 
 require "berkshelf"
 require "thor"
-require "aws-sdk"
+require "aws-sdk-core"
+require "aws-sdk-configservice"
 require "inifile"
 
 module DreamOps
@@ -68,7 +69,7 @@ module DreamOps
     #
     # @return [~String]
     def ssh_key
-      @ssh_key ||= nil
+      @ssh_key ||= ''
     end
 
     # Specify path to use for the SSH key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dream-ops
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Chris Allen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-configservice
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-opsworks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +199,7 @@ files:
 - lib/dream-ops/logger.rb
 - lib/dream-ops/mixin/logging.rb
 - lib/dream-ops/shell.rb
+- lib/dream-ops/utils/threaded_enum.rb
 - lib/dream-ops/utils/zip.rb
 - lib/dream-ops/version.rb
 homepage: https://github.com/chris-allen/dream-ops
@@ -165,7 +208,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/chris-allen/dream-ops
   changelog_uri: https://github.com/chris-allen/dream-ops/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,9 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.13
+signing_key:
 specification_version: 4
 summary: CLI for automating the deployment of application cookbooks
 test_files: []