dream-ops 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb363370cd9c9603a6971dcf9cc367abaec8824b
-  data.tar.gz: 1b501140522af9ce3f984fe76ea8b498e4b44118
+  metadata.gz: a640e2b3d14a77a968e916ceff5699a51a75aa49
+  data.tar.gz: 8beff4a4bc985e83caa02d7c537a8595baf6d6e9
 SHA512:
-  metadata.gz: b15b31e9d7eed839854be3bd5589d56f4306b42664a9ac5a18bf222583d04bdf32dcab1320d616f941a37cbb1fed4d98a06df2b21fc83940532c100a128e0412
-  data.tar.gz: 230fc144ae650fbbe0d45cf5b8d56e29d8948786c04bd16ad316bf5b37d2a661b576c7594536dd42cba28a8bbbebcf8127903ac484c5f33743f1cc5e7c506ee3
+  metadata.gz: 54546e61709396f02aaab3f8f5d5653e44b1a9b2c25ff88057da04be2c3eaefba888c42084f3d3ddf8397f8be7a07265db51a77b654200ec10e8c3a257082019
+  data.tar.gz: c79c27aa79c56bf1ac0c5811d74283d9c3df208f9ab5bd5cab2e378a403850f57da4b93945adecb41ba9e34836d04240697f1fb6b0685170eab25c0ecbbc7837

data/CHANGELOG.md

@@ -0,0 +1,45 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.4.0]
+
+### Changed
+- **BREAKING CHANGE**: Renamed `-s` and `--stacks` options to `-T` and `--targets` respectively
+- Updated to `"berkshelf" ~> 7.0`
+- Updated to `"chef" ~> 13.6`
+- Updated to `"thor" ~> 0.20`
+
+### Added
+- Added `solo` deploy type
+- New `init` command for initializing configuration
+- Added global `ssh_key` option
+- Added global `force_setup` option
+- Better error handling / logging
+
+### Removed
+- Removed `ridley` as a dependency
+
+## [0.3.0]
+
+### Fixes
+- Problem with newer S3 domains
+
+### Added
+- Travis CI integration along with sample unit test
+
+## [0.2.0]
+
+### Added
+- Better error handling / logging
+- Gem version badge to README
+- Usage documentation
+
+[Unreleased]: https://github.com/chris-allen/dream-ops/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/chris-allen/dream-ops/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/chris-allen/dream-ops/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/chris-allen/dream-ops/compare/v0.1.0...v0.2.0

data/README.md

@@ -26,12 +26,25 @@ Or install it yourself as:
 
 ```bash
 dream help
+Commands:
+  dream deploy [TYPE] -T, --targets=one two three  # Deploys to specified targets
+  dream help [COMMAND]                             # Describe available commands or one specific command
+  dream init [TYPE] -T, --targets=one two three    # Initialize configuration on specified targets
+  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
+
 ```
 
 ### Deploying to OpsWorks
 
 ```bash
-dream deploy opsworks --stacks 08137c03-1e85-4787-b82c-cb825638cdfa
+dream deploy opsworks -T 08137c03-1e85-4787-b82c-cb825638cdfa
 Stack: nodeapp
 --- Cookbook: chef-nodeapp
 --- Apps: ["nodeapp"]
@@ -42,11 +55,63 @@ Stack: nodeapp
 ...Deploying [stack="nodeapp"] [app="nodeapp"]
 ```
 
+### Deploy Using `chef-solo`
+
+```bash
+dream deploy solo -T ubuntu@example.com -i /path/to/key.pem
+Target: ip-172-31-53-232
+--- Cookbook: chef-nodeapp (outdated)
+...Building cookbook [chef-nodeapp]
+...Deploying cookbook [chef-nodeapp]
+...Syncing [repo="nodeapp" target="ubuntu@example.com"]
+...Running setup role [target="ubuntu@example.com"]
+...Running deploy role [target="ubuntu@example.com"]
+```
+
+### Initialize `chef-solo`
+
+```bash
+dream init solo -T ubuntu@example.com -i /path/to/key.pem
+Target: ip-172-31-53-232
+--- ChefDK Installed: false
+--- Valid chef.json: false
+--- Valid role[setup]: false
+--- Valid role[deploy]: false
+...Installing ChefDK [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"]
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+
+## Release
+### switch to `master` branch:
+- Change package version in `version.rb` according to release changes (`major|minor|patch`).
+- Update `CHANGELOG.md`:
+  - Rename `[Unreleased]` section to reflect new release version and release date, same format as for all previous releases
+  - Create new `[Unreleased]` section on top of file, as it was previously
+  - On the bottom of `CHANGELOG.md` file, create comparison reference for current release changes:
+```
+# was
+[Unreleased]: https://github.com/chris-allen/dream-ops/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/chris-allen/dream-ops/compare/v0.2.0...v0.3.0
+
+# became
+# - "Unreleased" renamed to commit version
+# - new "Unreleased" created, comparing last "0.4.0" commit with "HEAD"
+[Unreleased]: https://github.com/chris-allen/dream-ops/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/chris-allen/dream-ops/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/chris-allen/dream-ops/compare/v0.2.0...v0.3.0
+```
+  - Commit `CHANGELOG.md` and `version.rb` with message `:rocket: {version}` (where version is your release version)
+
+- Then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/dream-ops.gemspec

@@ -11,10 +11,18 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version     = ">= 2.3.1"
   spec.required_rubygems_version = ">= 2.0.0"
 
-  spec.summary       = "This is the summary"
-  spec.description   = "This is the description"
+  spec.summary       = "CLI for automating the deployment of application cookbooks"
+  spec.description   = <<-EOF
+                         This CLI automatically rebuilds and deploys your cookbook
+                         when changes are detected. Application deployment is
+                         supported for OpsWorks stacks and ubuntu SSH hosts.
+                       EOF
   spec.homepage      = "https://github.com/chris-allen/dream-ops"
   spec.license       = "MIT"
+  spec.metadata      = {
+    "source_code_uri" => "https://github.com/chris-allen/dream-ops",
+    "changelog_uri"   => "https://github.com/chris-allen/dream-ops/blob/master/CHANGELOG.md"
+  }
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -28,8 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rubyzip",   "~> 1.2"
   spec.add_dependency "aws-sdk",   "~> 2"
-  spec.add_dependency "berkshelf", "~> 6.2"
-  spec.add_dependency "ridley",    "~> 5.0"
-  spec.add_dependency "thor",      "~> 0.19", "< 0.19.2"
-  spec.add_dependency "chef",      "~> 12.7"
+  spec.add_dependency "berkshelf", "~> 7.0"
+  spec.add_dependency "thor",      "~> 0.20"
+  spec.add_dependency "chef",      "~> 13.6"
 end

data/lib/dream-ops.rb

@@ -29,6 +29,9 @@ module DreamOps
 
   autoload :BaseDeployer,     "dream-ops/deployment/base"
   autoload :OpsWorksDeployer, "dream-ops/deployment/opsworks"
+  autoload :SoloDeployer,     "dream-ops/deployment/solo"
+  autoload :BaseInitializer,  "dream-ops/init/base"
+  autoload :SoloInitializer,  "dream-ops/init/solo"
 
   class << self
     include Mixin::Logging
@@ -58,11 +61,38 @@ module DreamOps
       id = name.to_s.capitalize
       @formatter = DreamOps.const_get("#{id}Formatter").new
     end
+
+    # Get path for the SSH key
+    #
+    # @return [~String]
+    def ssh_key
+      @ssh_key ||= nil
+    end
+
+    # Specify path to use for the SSH key
+    #
+    # @return [~String]
+    def set_ssh_key(key)
+      @ssh_key = key
+    end
+
+    # Get whether to always run setup
+    #
+    # @return [~boolean]
+    def force_setup
+      @force_setup ||= false
+    end
+
+    # Specify whether to always run setup
+    #
+    # @return [~boolean]
+    def set_force_setup(force)
+      @force_setup = force
+    end
   end
 end
 
 require_relative "dream-ops/cli"
 require_relative "dream-ops/logger"
 
-Ridley.logger          = DreamOps.logger
-DreamOps.logger.level  = Logger::WARN
+DreamOps.logger.level  = Logger::WARN

data/lib/dream-ops/cli.rb

@@ -64,6 +64,11 @@ module DreamOps
       end
 
       DreamOps.set_format @options[:format]
+
+      if @options[:ssh_key]
+        DreamOps.set_ssh_key @options[:ssh_key]
+      end
+
       @options = options.dup # unfreeze frozen options Hash from Thor
     end
 
@@ -90,26 +95,37 @@ module DreamOps
       desc: "Output debug information",
       aliases: "-d",
       default: false
+    class_option :ssh_key,
+      type: :string,
+      desc: "Path to SSH key",
+      aliases: "-i",
+      default: ""
 
     desc "version", "Display version"
     def version
       DreamOps.formatter.version
     end
 
-    method_option :stacks,
+    method_option :targets,
       type: :array,
-      desc: "Only these stack IDs.",
-      aliases: "-s",
+      desc: "Only these targets",
+      aliases: "-T",
       required: true
+    method_option :force_setup,
+      type: :boolean,
+      desc: "Always run setup",
+      aliases: "-f"
     desc "deploy [TYPE]", "Deploys to specified targets"
     def deploy(type)
       deployer = nil
+      DreamOps.set_force_setup options[:force_setup]
+      targets = options[:targets]
+      args = [*targets]
 
-      args = []
       if type == 'opsworks'
         deployer = OpsWorksDeployer.new
-        stack_ids = options[:stacks]
-        args = [*stack_ids]
+      elsif type == 'solo'
+        deployer = SoloDeployer.new
       else
         DreamOps.ui.error "Deployment of type '#{type}' is not supported"
         exit(1)
@@ -119,5 +135,33 @@ module DreamOps
         deployer.deploy(*args)
       end
     end
+
+    method_option :targets,
+      type: :array,
+      desc: "Only these targets",
+      aliases: "-T",
+      required: true
+    method_option :dryrun,
+      type: :boolean,
+      desc: "Only print what actions will be taken",
+      aliases: "-x",
+      default: false
+    desc "init [TYPE]", "Initialize configuration on specified targets"
+    def init(type)
+      initializer = nil
+      targets = options[:targets]
+      args = [*targets]
+
+      if type == 'solo'
+        initializer = SoloInitializer.new
+      else
+        DreamOps.ui.error "Type '#{type}' is not supported"
+        exit(1)
+      end
+
+      if !initializer.nil?
+        initializer.init(*args, options[:dryrun])
+      end
+    end
   end
 end

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

@@ -1,4 +1,3 @@
-require "berkshelf"
 require "dream-ops/utils/zip"
 require 'fileutils'
 
@@ -31,8 +30,8 @@ module DreamOps
     #       :cookbooks => [
     #         {
     #           :bucket => "chef-app",
-    #           :cookbook_key => "chef-app-dev.zip",
-    #           :sha_key => "chef-app-dev_SHA.txt",
+    #           :cookbook_filename => "chef-app-dev.zip",
+    #           :sha_filename => "chef-app-dev_SHA.txt",
     #           :name => "chef-app",
     #           :path => "./chef",
     #           :local_sha => "7bfa19491170563f422a321c144800f4435323b1",
@@ -59,8 +58,19 @@ module DreamOps
     #   a hash containing the deploy target details
     deployer_method :deploy_target
 
-    # It may turn out that cookbook building will be different for different
-    # deployments, but for now all deployments will build them the same way.
+    def __get_cookbook_paths()
+      # Treat any directory with a Berksfile as a cookbook
+      cookbooks = Dir.glob('./**/Berksfile')
+
+      return cookbooks.map { |path| path.gsub(/(.*)(\/Berksfile)(.*)/, '\1') }
+    end
+
+    def __bail_with_fatal_error(ex)
+      raise ex
+      Thread.exit
+    end
+
+    # Collect cookbook dependencies and compress based on file extension
     def build_cookbook(cookbook)
       berksfile = Berkshelf::Berksfile.from_file(File.join(cookbook[:path], "Berksfile"))
       berksfile.vendor("berks-cookbooks")
@@ -69,13 +79,18 @@ module DreamOps
         file.write("source \"https://supermarket.chef.io\"\n\n")
         file.write("cookbook \"#{cookbook[:name]}\", path: \"./#{cookbook[:name]}\"")
       }
-      zf = ZipFileGenerator.new("berks-cookbooks", cookbook[:cookbook_key])
-      zf.write
+
+      if cookbook[:cookbook_filename].end_with? ".zip"
+        zf = ZipFileGenerator.new("berks-cookbooks", cookbook[:cookbook_filename])
+        zf.write
+      elsif cookbook[:cookbook_filename].end_with? ".tar.gz"
+        system("tar -czvf #{cookbook[:cookbook_filename]} -C berks-cookbooks . > /dev/null 2>&1")
+      end
     end
 
     def cleanup_cookbooks(cookbooks)
       cookbooks.each do |cookbook|
-        File.delete(cookbook[:cookbook_key])
+        File.delete(cookbook[:cookbook_filename])
         FileUtils.remove_dir("berks-cookbooks")
       end
     end
@@ -113,4 +128,4 @@ module DreamOps
       exit(1) if !deploy_success
     end
   end
-end
+end

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

@@ -1,5 +1,4 @@
 require "aws-sdk"
-require "ridley"
 require "uri"
 
 Aws.use_bundled_cert!
@@ -18,8 +17,8 @@ module DreamOps
     #       :cookbooks => [
     #         {
     #           :bucket => "chef-app",
-    #           :cookbook_key => "chef-app-dev.zip",
-    #           :sha_key => "chef-app-dev_SHA.txt",
+    #           :cookbook_filename => "chef-app-dev.zip",
+    #           :sha_filename => "chef-app-dev_SHA.txt",
     #           :name => "chef-app",
     #           :path => "./chef",
     #           :local_sha => "7bfa19491170563f422a321c144800f4435323b1",
@@ -34,8 +33,8 @@ module DreamOps
     #           ],
     #           :cookbook => {
     #             :bucket => "chef-app",
-    #             :cookbook_key => "chef-app-dev.zip",
-    #             :sha_key => "chef-app-dev_SHA.txt",
+    #             :cookbook_filename => "chef-app-dev.zip",
+    #             :sha_filename => "chef-app-dev_SHA.txt",
     #             :name => "chef-app",
     #             :path => "./chef",
     #             :local_sha => "7bfa19491170563f422a321c144800f4435323b1",
@@ -81,7 +80,6 @@ module DreamOps
     # Retrieves stack apps and gets all information about remote/local cookbook
     def analyze_stack(stack)
       cookbook = nil
-      cookbookName = nil
 
       DreamOps.ui.info "Stack: #{stack.name}"
       if !stack.custom_cookbooks_source.nil?
@@ -93,30 +91,40 @@ module DreamOps
           firstSlash = cookbookPath.index('/')
           cookbook = {
               bucket: cookbookPath[0..(firstSlash-1)],
-              cookbook_key: cookbookPath[(firstSlash+1)..-1],
-              sha_key: cookbookPath[firstSlash+1..-1].sub('.zip', '_SHA.txt')
+              cookbook_filename: cookbookPath[(firstSlash+1)..-1],
+              sha_filename: cookbookPath[firstSlash+1..-1].sub('.zip', '_SHA.txt')
           }
 
-          # Treat any directory with a Berksfile as a cookbook
-          cookbooks = Dir.glob('./**/Berksfile')
+          cookbooks = __get_cookbook_paths()
 
           # For now we only handle if we find one cookbook
           if cookbooks.length == 1
-            metadata = Ridley::Chef::Cookbook::Metadata.from_file(cookbooks[0].sub("Berksfile", "metadata.rb"))
+            path = cookbooks[0]
+            loader = Chef::Cookbook::CookbookVersionLoader.new(path)
+            loader.load_cookbooks
+            cookbook_version = loader.cookbook_version
+            metadata = cookbook_version.metadata
+
             cookbook[:name] = metadata.name
-            cookbook[:path] = cookbooks[0].sub('/Berksfile', '')
-            if cookbook[:cookbook_key].include? cookbook[:name]
+            cookbook[:path] = path
+            if cookbook[:cookbook_filename].include? cookbook[:name]
               cookbook[:local_sha] = `git log --pretty=%H -1 #{cookbook[:path]}`.chomp
 
               begin
-                obj = Aws::S3::Object.new(cookbook[:bucket], cookbook[:sha_key])
+                obj = Aws::S3::Object.new(cookbook[:bucket], cookbook[:sha_filename])
                 cookbook[:remote_sha] = obj.get.body.string
               rescue Aws::S3::Errors::NoSuchKey
-                cookbook[:remote_sha] = ''
+                cookbook[:remote_sha] = ""
               end
             else
-              DreamOps.ui.info "Stack cookbook source is '#{cookbook[:cookbook_key]}' but found '#{cookbook[:name]}' locally"
+              DreamOps.ui.warn "Stack cookbook source is '#{cookbook[:cookbook_filename]}' but found '#{cookbook[:name]}' locally"
             end
+          elsif cookbooks.length > 1
+            DreamOps.ui.warn "Found more than one cookbook at paths #{cookbooks}.  Skipping build."
+            cookbook[:name] = "???"
+          else
+            DreamOps.ui.warn "No cookbook found"
+            cookbook[:name] = "???"
           end
           DreamOps.ui.info "--- Cookbook: #{cookbook[:name]}"
         end
@@ -135,12 +143,12 @@ module DreamOps
     # Deploys cookbook to S3
     def deploy_cookbook(cookbook)
       begin
-        archiveFile = File.open(cookbook[:cookbook_key])
-        remoteCookbook = Aws::S3::Object.new(cookbook[:bucket], cookbook[:cookbook_key])
+        archiveFile = File.open(cookbook[:cookbook_filename])
+        remoteCookbook = Aws::S3::Object.new(cookbook[:bucket], cookbook[:cookbook_filename])
         response = remoteCookbook.put({ acl: "private", body: archiveFile })
         archiveFile.close
 
-        remoteSha = Aws::S3::Object.new(cookbook[:bucket], cookbook[:sha_key])
+        remoteSha = Aws::S3::Object.new(cookbook[:bucket], cookbook[:sha_filename])
         response = remoteSha.put({ acl: "private", body: cookbook[:local_sha] })
       rescue => e
         DreamOps.ui.error "#{$!}"
@@ -150,8 +158,8 @@ module DreamOps
     # 
     def deploy_target(target, cookbooks)
       # If this stack has a new cookbook
-      if !target[:cookbook].nil?
-        if __cookbook_in_array(target[:cookbook], cookbooks)
+      if !target[:cookbook].nil? || DreamOps.force_setup
+        if __cookbook_in_array(target[:cookbook], cookbooks) || DreamOps.force_setup
           # Grab a fresh copy of the cookbook on all instances in the stack
           update_custom_cookbooks(target[:stack])
 
@@ -174,12 +182,12 @@ module DreamOps
           command: { name: "update_custom_cookbooks" }
         })
       rescue Aws::OpsWorks::Errors::ValidationException
-        bail_with_fatal_error(NoRunningInstancesError.new(stack))
+        __bail_with_fatal_error(NoRunningInstancesError.new(stack))
       end
 
       status = wait_for_deployment(response.deployment_id)
       if status != 'successful'
-        bail_with_fatal_error(OpsWorksCommandFailedError.new(
+        __bail_with_fatal_error(OpsWorksCommandFailedError.new(
           stack, response.deployment_id, 'update_custom_cookbooks')
         )
       end
@@ -194,7 +202,7 @@ module DreamOps
       
       status = wait_for_deployment(response.deployment_id)
       if status != 'successful'
-        bail_with_fatal_error(OpsWorksCommandFailedError.new(
+        __bail_with_fatal_error(OpsWorksCommandFailedError.new(
           stack, response.deployment_id, 'setup')
         )
       end
@@ -209,12 +217,12 @@ module DreamOps
           command: { name: "deploy" }
         })
       rescue Aws::OpsWorks::Errors::ValidationException
-        bail_with_fatal_error(NoRunningInstancesError.new(stack))
+        __bail_with_fatal_error(NoRunningInstancesError.new(stack))
       end
 
       status = wait_for_deployment(response.deployment_id)
       if status != 'successful'
-        bail_with_fatal_error(OpsWorksCommandFailedError.new(
+        __bail_with_fatal_error(OpsWorksCommandFailedError.new(
           stack, response.deployment_id, 'deploy')
         )
       end
@@ -238,15 +246,10 @@ module DreamOps
       return status
     end
 
-    def bail_with_fatal_error(ex)
-      raise ex
-      Thread.exit
-    end
-
     def __cookbook_in_array(cb, cookbooks)
       return cookbooks.any? {|c|
-        c[:cookbook_key] == cb[:cookbook_key] and c[:bucket] == cb[:bucket]
+        c[:cookbook_filename] == cb[:cookbook_filename] and c[:bucket] == cb[:bucket]
       }
     end
   end
-end
+end

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

@@ -0,0 +1,200 @@
+require 'securerandom'
+
+module DreamOps
+  class SoloDeployer < BaseDeployer
+    def __cookbook_in_array(cb, cookbooks)
+      return cookbooks.any? {|c| c[:name] == cb[:name]}
+    end
+
+    def __cookbook_was_updated(target, cookbooks)
+      return cookbooks.any? {|c| c[:targets].include? target }
+    end
+
+    # Analyze the SSH hosts for deployment
+    #
+    # @return [Hash]
+    #   a hash containing cookbooks that need to be built/updated
+    #   and deploy targets
+    #
+    #   Example:
+    #     {
+    #       :cookbooks => [
+    #         {
+    #           :bucket => "chef-app",
+    #           :cookbook_filename => "chef-app-dev.tar.gz",
+    #           :sha_filename => "chef-app-dev_SHA.txt",
+    #           :name => "chef-app",
+    #           :path => "./chef",
+    #           :local_sha => "7bfa19491170563f422a321c144800f4435323b1",
+    #           :targets => [ "ubuntu@example.com" ]
+    #         }
+    #       ],
+    #       deploy_targets: [
+    #         {
+    #           :host => "ubuntu@example.com"
+    #           :remote_sha => ""
+    #         }
+    #       ]
+    #     }
+    def analyze(targets)
+      @ssh_opts = "-i #{DreamOps.ssh_key} -o 'StrictHostKeyChecking no'"
+      @q_all = "> /dev/null 2>&1"
+      @q_stdout = "> /dev/null"
+
+      # Collect and print target info
+      result = { cookbooks: [], deploy_targets: [] }
+      targets.each do |target|
+        target_result = analyze_target(target)
+        # Add the target to the deploy targets
+        result[:deploy_targets] << target_result[:deploy_target]
+        # Determine whether the cookbook needs to be built
+        cbook = target_result[:cookbook]
+        if !cbook.nil? && !cbook[:local_sha].nil?
+          # We only build the cookbook if we don't have this version remotely
+          if target_result[:deploy_target][:remote_sha] != cbook[:local_sha]
+            # Don't build the same destination cookbook more than once
+            if !__cookbook_in_array(cbook, result[:cookbooks])
+              cbook[:targets] = [target]
+              result[:cookbooks] << cbook
+            else
+              # Add target to be deployed to
+              cbook_index = result[:cookbooks].index { |c| c[:name] == cbook[:name] }
+              result[:cookbooks][cbook_index][:targets] << target
+            end
+          end
+        end
+      end
+
+      return result
+    end
+
+    def analyze_target(target)
+      # Validate SSH creds
+      if DreamOps.ssh_key.empty?
+        __bail_with_fatal_error(NoSshKeyError.new())
+      end
+      hostname = `ssh #{@ssh_opts} #{target} sudo hostname 2>&1`.chomp
+      if ! $?.success?
+        __bail_with_fatal_error(InvalidSshKeyError.new(target, hostname))
+      end
+
+      DreamOps.ui.info "Target: #{hostname}"
+
+      result = { host: target }
+      cookbook = { }
+      cookbooks = __get_cookbook_paths()
+
+      # For now we only handle if we find one cookbook
+      if cookbooks.length == 1
+        path = cookbooks[0]
+        loader = Chef::Cookbook::CookbookVersionLoader.new(path)
+        loader.load_cookbooks
+        cookbook_version = loader.cookbook_version
+        metadata = cookbook_version.metadata
+
+        cookbook[:sha_filename] = "#{metadata.name}_SHA.txt"
+        cookbook[:cookbook_filename] = "#{metadata.name}.tar.gz"
+        cookbook[:name] = metadata.name
+        cookbook[:path] = path
+        cookbook[:local_sha] = `git log --pretty=%H -1 #{cookbook[:path]}`.chomp
+
+        `ssh #{@ssh_opts} #{target} sudo mkdir -p /var/chef/cookbooks`
+
+        if system("ssh #{@ssh_opts} #{target} stat /var/chef/#{cookbook[:sha_filename]} #{@q_all}")
+          result[:remote_sha] = `ssh #{@ssh_opts} #{target} cat /var/chef/#{cookbook[:sha_filename]}`.chomp
+        else
+          result[:remote_sha] = ""
+        end
+      elsif cookbooks.length > 1
+        DreamOps.ui.warn "Found more than one cookbook at paths #{cookbooks}.  Skipping build."
+        cookbook[:name] = "???"
+      else
+        DreamOps.ui.warn "No cookbook found"
+        cookbook[:name] = "???"
+      end
+
+      suffix = if cookbook[:local_sha] != result[:remote_sha] then "(outdated)" else "(up to date)" end
+      DreamOps.ui.info "--- Cookbook: #{cookbook[:name]} #{suffix}"
+
+      return { deploy_target: result, cookbook: cookbook }
+    end
+
+    # Deploys cookbook to server
+    def deploy_cookbook(cookbook)
+      cookbook[:targets].each do |target|
+        if system("scp #{@ssh_opts} #{cookbook[:cookbook_filename]} #{target}:/tmp #{@q_all}")
+          `ssh #{@ssh_opts} #{target} sudo rm -rf /var/chef/cookbooks/* #{@q_all}`
+          `ssh #{@ssh_opts} #{target} sudo tar -xzvf /tmp/#{cookbook[:cookbook_filename]} -C /var/chef/cookbooks #{@q_all}`
+          `ssh #{@ssh_opts} #{target} sudo rm -rf /tmp/#{cookbook[:cookbook_filename]} #{@q_all}`
+        else
+          DreamOps.ui.error "Failed to copy cookbook to host '#{target}'"
+        end
+
+        if !system(
+          "ssh #{@ssh_opts} #{target} "+
+          "\"echo '#{cookbook[:local_sha]}' | sudo tee /var/chef/#{cookbook[:sha_filename]}\" #{@q_all}"
+        )
+          DreamOps.ui.error "Failed to update remote cookbook sha"
+        end
+      end
+    end
+
+    def run_chef_role(target, role)
+      if !system("ssh #{@ssh_opts} #{target[:host]} stat /var/log/chef #{@q_all}")
+        `ssh #{@ssh_opts} #{target[:host]} sudo mkdir -p /var/log/chef`
+      end
+
+      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}\""
+      )
+        __bail_with_fatal_error(ChefSoloFailedError.new(target[:host], "/var/log/chef/#{uuid}.log"))
+      end
+    end
+
+    # Deploy latest code
+    def deploy_target(target, cookbooks)
+      # Sync code to home directory
+      repo_path = `git rev-parse --show-toplevel`.chomp
+      repo_name = `basename #{repo_path}`.chomp
+      DreamOps.ui.info "...Syncing [repo=\"#{repo_name}\" target=\"#{target[:host]}\"]"
+      `rsync -r -e "ssh #{@ssh_opts}" . #{target[:host]}:~/#{repo_name}`
+
+
+      # Bail if ChefDK is not installed
+      if !system("ssh #{@ssh_opts} #{target[:host]} which chef #{@q_stdout}")
+        __bail_with_fatal_error(ChefDKNotInstalledError.new(target[:host]))
+      end
+
+      # Bail if chef.json doesn't exist
+      if !system("ssh #{@ssh_opts} #{target[:host]} stat /var/chef/chef.json #{@q_all}")
+        __bail_with_fatal_error(ChefJsonNotFoundError.new(target[:host]))
+      end
+
+      # Bail if setup.json doesn't exist
+      if !system("ssh #{@ssh_opts} #{target[:host]} stat /var/chef/roles/setup.json #{@q_all}")
+        __bail_with_fatal_error(RoleNotFoundError.new(target[:host], "setup"))
+      end
+
+      # Bail if deploy.json doesn't exist
+      if !system("ssh #{@ssh_opts} #{target[:host]} stat /var/chef/roles/deploy.json #{@q_all}")
+        __bail_with_fatal_error(RoleNotFoundError.new(target[:host], "deploy"))
+      end
+
+      # If this stack has a new cookbook, re-run the setup role
+      if (
+        __cookbook_was_updated(target[:host], cookbooks) ||
+        DreamOps.force_setup
+      )
+        DreamOps.ui.info "...Running setup role [target=\"#{target[:host]}\"]"
+        run_chef_role(target, "setup")
+      end
+
+      DreamOps.ui.info "...Running deploy role [target=\"#{target[:host]}\"]"
+      run_chef_role(target, "deploy")
+    end
+  end
+end

data/lib/dream-ops/errors.rb

@@ -39,7 +39,113 @@ module DreamOps
         "https://console.aws.amazon.com/opsworks/home?region=#{@stack.region}#/stack/#{@stack.stack_id}/deployments/#{@deployment_id}",
       ].join("\n")
     end
+  end
 
-    alias_method :message, :to_s
+  class NoSshKeyError < DreamOpsError
+    set_status_code(12)
+
+    def to_s
+      "You mush specify a SSH key for authentication."
+    end
+  end
+
+  class InvalidSshKeyError < DreamOpsError
+    set_status_code(13)
+
+    def initialize(target, output)
+      @target = target
+      @output = output
+    end
+
+    def to_s
+      [
+        "Failed to communicate with '#{@target}' over ssh:",
+        "",
+        @output,
+    ].join("\n")
+    end
+  end
+
+  class ChefDKNotInstalledError < DreamOpsError
+    set_status_code(14)
+
+    def initialize(target)
+      @target = target
+    end
+
+    def to_s
+      [
+        "ChefDK 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
+    set_status_code(15)
+
+    def initialize(target, wget_url)
+      @target   = target
+      @wget_url = wget_url
+    end
+
+    def to_s
+      [
+        "Target \"#{@target}\" failed installing ChefDK from:",
+        "",
+        @wget_url,
+      ].join("\n")
+    end
+  end
+
+  class ChefSoloFailedError < DreamOpsError
+    set_status_code(16)
+
+    def initialize(target, log_path)
+      @target   = target
+      @log_path = log_path
+    end
+
+    def to_s
+      [
+        "Target \"#{@target}\" failed running chef-solo. The failure log is located at:",
+        "",
+        @log_path,
+      ].join("\n")
+    end
+  end
+
+  class ChefJsonNotFoundError < DreamOpsError
+    set_status_code(17)
+
+    def initialize(target)
+      @target = target
+    end
+
+    def to_s
+      [
+        "Could not find /var/chef/chef.json \"#{@target}\". To initialize with an empty runlist, run:",
+        "",
+        "dream init solo -t #{@target} -i #{DreamOps.ssh_key}",
+      ].join("\n")
+    end
+  end
+
+  class RoleNotFoundError < DreamOpsError
+    set_status_code(18)
+
+    def initialize(target, role)
+      @target = target
+      @role   = role
+    end
+
+    def to_s
+      [
+        "Could not find /var/chef/roles/#{@role}.json \"#{@target}\". To initialize with an empty runlist, run:",
+        "",
+        "dream init solo -t #{@target} -i #{DreamOps.ssh_key}",
+      ].join("\n")
+    end
   end
-end
+end

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

@@ -40,4 +40,4 @@ module DreamOps
     # The cleanup hook is defined by subclasses and is called by the CLI.
     def cleanup_hook; end
   end
-end
+end

data/lib/dream-ops/formatters/human.rb

@@ -160,4 +160,4 @@ module DreamOps
       DreamOps.ui.info "DEPRECATED: #{message}"
     end
   end
-end
+end

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

@@ -0,0 +1,69 @@
+module DreamOps
+  class BaseInitializer
+    class << self
+      #
+      # @macro initiailizer_method
+      #   @method $1(*args)
+      #     Create a initiailizer method for the declaration
+      #
+      def initiailizer_method(name)
+        class_eval <<-EOH, __FILE__, __LINE__ + 1
+          def #{name}(*args)
+            raise AbstractFunction,
+              "##{name} must be implemented on \#{self.class.name}!"
+          end
+        EOH
+      end
+    end
+
+    # This method MUST be implemented by subclasses.
+    #
+    # @return [Array]
+    #   an array of configuration for each target
+    #
+    #   Example:
+    #     [
+    #       {
+    #         :host => "ubuntu@example.com"
+    #         :chefdk_installed => false,
+    #         :solo_json_exists => false,
+    #         :setup_role_exists => true,
+    #         :deploy_role_exists => true
+    #       }
+    #     ]
+    initiailizer_method :analyze
+
+    # This method MUST be implemented by subclasses.
+    #
+    # @param [String] target
+    #   a target host
+    initiailizer_method :init_target
+
+    def __bail_with_fatal_error(ex)
+      raise ex
+      Thread.exit
+    end
+
+    def init(*args, dryrun)
+      targets = analyze(args)
+
+      # Update cookbooks if needed and deploy to all targets
+      deploy_success = true
+      deploy_threads = []
+      targets.each do |target|
+        deploy_threads << Thread.new { init_target(target, dryrun) }
+      end
+      deploy_threads.each do |t|
+        begin
+          t.join
+        rescue DreamOps::DreamOpsError
+          DreamOps.ui.error "#{$!}"
+          deploy_success = deploy_success && false
+        end
+      end
+
+      # If ANY deploy threads failed, exit with failure
+      exit(1) if !deploy_success
+    end
+  end
+end

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

@@ -0,0 +1,120 @@
+module DreamOps
+  class SoloInitializer < BaseInitializer
+    def analyze(targets)
+      @ssh_opts = "-i #{DreamOps.ssh_key} -o 'StrictHostKeyChecking no'"
+      @q_all = "> /dev/null 2>&1"
+      @q_stdout = "> /dev/null"
+
+      result = []
+
+      targets.each do |target|
+        # Validate SSH creds
+        if DreamOps.ssh_key.empty?
+          __bail_with_fatal_error(NoSshKeyError.new())
+        end
+        hostname = `ssh #{@ssh_opts} #{target} sudo hostname 2>&1`.chomp
+        if ! $?.success?
+          __bail_with_fatal_error(InvalidSshKeyError.new(target, hostname))
+        end
+
+        DreamOps.ui.info "Target: #{hostname}"
+
+        target_result = { host: target }
+
+        target_result[:chefdk_installed] = system("ssh #{@ssh_opts} #{target} which chef #{@q_stdout}")
+        DreamOps.ui.info "--- ChefDK Installed: #{target_result[:chefdk_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]}"
+
+        target_result[:setup_role_exists] = system("ssh #{@ssh_opts} #{target} stat /var/chef/roles/setup.json #{@q_all}")
+        DreamOps.ui.info "--- Valid role[setup]: #{target_result[:setup_role_exists]}"
+
+        target_result[:deploy_role_exists] = system("ssh #{@ssh_opts} #{target} stat /var/chef/roles/deploy.json #{@q_all}")
+        DreamOps.ui.info "--- Valid role[deploy]: #{target_result[:deploy_role_exists]}"
+
+        result << target_result
+      end
+
+      return result
+    end
+
+    def init_target(target, dryrun)
+      # Install ChefDK if not already
+      if !target[:chefdk_installed]
+        if dryrun
+          DreamOps.ui.warn "...WOULD Install ChefDK [target=\"#{target[:host]}\"]"
+        else
+          DreamOps.ui.warn "...Installing ChefDK [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}`
+          else
+            __bail_with_fatal_error(ChefDKFailedError.new(target, chefdk_url))
+          end
+        end
+      end
+
+      if !dryrun
+        `ssh #{@ssh_opts} #{target[:host]} sudo mkdir -p /var/chef/roles`
+      end
+
+      # Create empty json file for chef-solo
+      if !target[:solo_json_exists]
+        json_path = "/var/chef/chef.json"
+        if dryrun
+          DreamOps.ui.warn "...WOULD Create boilerplate #{json_path} [target=\"#{target[:host]}\"]"
+        else
+          DreamOps.ui.warn "...Creating boilerplate #{json_path} [target=\"#{target[:host]}\"]"
+          `ssh #{@ssh_opts} #{target[:host]} "echo '{\n  \\"run_list\\": []\n}' | sudo tee -a #{json_path}"`
+        end
+      end
+
+      # Create setup role with empty run_list for chef-solo
+      if !target[:setup_role_exists]
+        setup_path = "/var/chef/roles/setup.json"
+        if dryrun
+          DreamOps.ui.warn "...WOULD Create boilerplate #{setup_path} [target=\"#{target[:host]}\"]"
+        else
+          DreamOps.ui.warn "...Creating boilerplate #{setup_path} [target=\"#{target[:host]}\"]"
+          role_contents = [
+            '{',
+            '  \"name\": \"setup\",',
+            '  \"json_class\": \"Chef::Role\",',
+            '  \"description\": \"This role is intended for use when cookbook changes are detected\",',
+            '  \"chef_type\": \"role\",',
+            '  \"run_list\": []',
+            '}',
+          ].join("\n")
+          `ssh #{@ssh_opts} #{target[:host]} "echo '#{role_contents}' | sudo tee -a #{setup_path}"`
+        end
+      end
+
+      # Create deploy role with empty run_list for chef-solo
+      if !target[:deploy_role_exists]
+        deploy_path = "/var/chef/roles/deploy.json"
+        if dryrun
+          DreamOps.ui.warn "...WOULD Create boilerplate #{deploy_path} [target=\"#{target[:host]}\"]"
+        else
+          DreamOps.ui.warn "...Creating boilerplate #{deploy_path} [target=\"#{target[:host]}\"]"
+          role_contents = [
+            '{',
+            '  \"name\": \"deploy\",',
+            '  \"json_class\": \"Chef::Role\",',
+            '  \"description\": \"This role is intended for use when code changes\",',
+            '  \"chef_type\": \"role\",',
+            '  \"run_list\": []',
+            '}',
+          ].join("\n")
+          `ssh #{@ssh_opts} #{target[:host]} "echo '#{role_contents}' | sudo tee -a #{deploy_path}"`
+        end
+      end
+    end
+  end
+end

data/lib/dream-ops/logger.rb

@@ -1,5 +1,5 @@
 module DreamOps
-  class Logger < Ridley::Logging::Logger
+  class Logger < Logger
     alias_method :fatal, :error
 
     def deprecate(message)

data/lib/dream-ops/shell.rb

@@ -28,4 +28,4 @@ module DreamOps
       super(message)
     end
   end
-end
+end

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

@@ -43,5 +43,4 @@ class ZipFileGenerator
       end
     }
   end
-
-end
+end

data/lib/dream-ops/version.rb

@@ -1,3 +1,3 @@
 module DreamOps
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dream-ops
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Allen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,63 +72,46 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
-- !ruby/object:Gem::Dependency
-  name: ridley
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.7'
+        version: '13.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.7'
-description: This is the description
+        version: '13.6'
+description: |2
+                           This CLI automatically rebuilds and deploys your cookbook
+                           when changes are detected. Application deployment is
+                           supported for OpsWorks stacks and ubuntu SSH hosts.
 email:
 - chris@apaxsoftware.com
 executables:
@@ -138,6 +121,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -150,9 +134,12 @@ files:
 - lib/dream-ops/cli.rb
 - lib/dream-ops/deployment/base.rb
 - lib/dream-ops/deployment/opsworks.rb
+- lib/dream-ops/deployment/solo.rb
 - lib/dream-ops/errors.rb
 - lib/dream-ops/formatters/base.rb
 - lib/dream-ops/formatters/human.rb
+- lib/dream-ops/init/base.rb
+- lib/dream-ops/init/solo.rb
 - lib/dream-ops/logger.rb
 - lib/dream-ops/mixin/logging.rb
 - lib/dream-ops/shell.rb
@@ -161,7 +148,9 @@ files:
 homepage: https://github.com/chris-allen/dream-ops
 licenses:
 - MIT
-metadata: {}
+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: 
 rdoc_options: []
 require_paths:
@@ -181,5 +170,5 @@ rubyforge_project:
 rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: This is the summary
+summary: CLI for automating the deployment of application cookbooks
 test_files: []