opsworks-cli 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ce9cc1bf75c7a559b0adb4a905ef560706df8a
-  data.tar.gz: 3411f737526fc1212a710a0a63eba9842065c244
+  metadata.gz: 8db33372954155ca2aa7df0535f12e67decbaa83
+  data.tar.gz: 0a98b7220142d4f68b99c525db8e459af142a7cf
 SHA512:
-  metadata.gz: f7111a5b4d35f7f402b427ac916b7de4d75073667b62286de98ff1317adb6d9cd26d67165cd8a895dadacf06d6ce154a2bc5a5d82e97e4e98a96fdafc71ecae6
-  data.tar.gz: c0d2f3e0431d8bd6a2fbcba477508f3696f88c0b189bcd42d1be00e60c48120224e93cda35621d5c664f6edd65cfef86dc5a0d2156ba311b83128f020d5df008
+  metadata.gz: 2f7eabb9792ff89932746e8d3c187bb6074a0e5e4b5e41c7231a8901078693fefecb3f40e4634af17fea9b9f02676df7366b46940f5ec78c34515db1a235b786
+  data.tar.gz: c938ebc4718cee2eb56a16637dad7ffc753b826c7b7bd6961544d58e71e168e18de18721831de789c07232839891f550a5b0c3084a50f953acd8050482a4dbd2

data/README.md

@@ -29,6 +29,8 @@ Commands:
   opsworks apps:create APP [--stack STACK]                 # Create a new OpsWorks app
   opsworks apps:deploy APP [--stack STACK]                 # Deploy an OpsWorks app
   opsworks apps:status APP [--stack STACK]                 # Display the most recent deployment of an app
+  opsworks chef:configure [--stack STACK]                  # Configure Chef/Berkshelf
+  opsworks chef:sync [--stack STACK]                       # Sync OpsWorks custom cookbooks
   opsworks config:get KEY [--stack STACK]                  # Get a single config value
   opsworks config:set KEY VALUE [--stack STACK]            # Set a config value
   opsworks config:unset KEY [--stack STACK]                # Unset a config value
@@ -36,9 +38,8 @@ Commands:
   opsworks iam:allow USER [--stack STACK]                  # Allow an IAM user on a stack
   opsworks iam:lockdown [--stack STACK]                    # Remove all stack permissions
   opsworks recipes:add LAYER EVENT RECIPE [--stack STACK]  # Add a recipe to a given layer and lifecycle event
+  opsworks recipes:rm LAYER EVENT RECIPE [--stack STACK]   # Remove a recipe from a given layer and lifecycle event
   opsworks recipes:run RECIPE [--stack STACK]              # Execute a Chef recipe
-  opsworks update [--stack STACK]                          # Update OpsWorks custom cookbooks
-  opsworks upgrade-chef [--stack STACK]                    # Upgrade Chef version
   opsworks version                                         # Print OpsWorks CLI version
 ```
 

data/lib/opsworks/cli/agent.rb

@@ -4,8 +4,7 @@ require 'aws'
 require_relative 'helpers/credentials'
 require_relative 'helpers/options'
 
-require_relative 'subcommands/update'
-require_relative 'subcommands/upgrade_chef'
+require_relative 'subcommands/chef'
 require_relative 'subcommands/recipes'
 require_relative 'subcommands/apps'
 require_relative 'subcommands/iam'
@@ -19,8 +18,7 @@ module OpsWorks
       include Helpers::Credentials
       include Helpers::Options
 
-      include Subcommands::Update
-      include Subcommands::UpgradeChef
+      include Subcommands::Chef
       include Subcommands::Recipes
       include Subcommands::Apps
       include Subcommands::IAM

data/lib/opsworks/cli/subcommands/{update.rb → chef.rb}

@@ -1,22 +1,41 @@
 require 'aws'
-require 'opsworks/deployment'
+require 'opsworks/stack'
 
 module OpsWorks
   module CLI
     module Subcommands
-      module Update
+      module Chef
         # rubocop:disable MethodLength
         # rubocop:disable CyclomaticComplexity
         def self.included(thor)
           thor.class_eval do
-            desc 'update [--stack STACK]', 'Update OpsWorks custom cookbooks'
+            desc 'chef:configure [--stack STACK]', 'Configure Chef/Berkshelf'
+            option :stack, type: :array
+            option :version, default: OpsWorks::Stack.latest_chef_version
+            option :manage_berkshelf, type: :boolean, default: false
+            option :berkshelf_version, default: '3.2.0'
+            option :cookbook_git_url
+            option :cookbook_branch
+            option :cookbook_s3_url
+            option :cookbook_username
+            option :cookbook_password
+            define_method 'chef:configure' do
+              fetch_credentials unless env_credentials?
+              stacks = parse_stacks(options.merge(active: true))
+              stacks.each do |stack|
+                say "Configuring Chef #{options[:version]} on #{stack.name}..."
+                stack.update_chef(options)
+              end
+            end
+
+            desc 'chef:sync [--stack STACK]', 'Sync OpsWorks custom cookbooks'
             option :stack, type: :array
             option :timeout, type: :numeric, default: 300
-            def update
+            define_method 'chef:sync' do
               fetch_credentials unless env_credentials?
               stacks = parse_stacks(options.merge(active: true))
               deployments = stacks.map do |stack|
-                say "Updating #{stack.name}..."
+                say "Syncing #{stack.name}..."
                 stack.update_custom_cookbooks
               end
               OpsWorks::Deployment.wait(deployments, options[:timeout])

data/lib/opsworks/cli/subcommands/recipes.rb

@@ -43,6 +43,22 @@ module OpsWorks
                 layer.add_custom_recipe(event, recipe)
               end
             end
+
+            desc 'recipes:rm LAYER EVENT RECIPE [--stack STACK]',
+                 'Remove a recipe from a given layer and lifecycle event'
+            option :stack, type: :array
+            define_method 'recipes:rm' do |layername, event, recipe|
+              fetch_credentials unless env_credentials?
+              stacks = parse_stacks(options)
+              stacks.each do |stack|
+                layer = stack.layers.find { |l| l.shortname == layername }
+                next unless layer
+                next unless layer.custom_recipes[event].include?(recipe)
+
+                say "Removing recipe from #{stack.name}."
+                layer.remove_custom_recipe(event, recipe)
+              end
+            end
           end
         end
         # rubocop:enable CyclomaticComplexity

data/lib/opsworks/cli/version.rb

@@ -1,5 +1,5 @@
 module OpsWorks
   module CLI
-    VERSION = '0.3.5'
+    VERSION = '0.4.0'
   end
 end

data/lib/opsworks/layer.rb

@@ -32,5 +32,15 @@ module OpsWorks
         custom_recipes: custom_recipes
       )
     end
+
+    def remove_custom_recipe(event, recipe)
+      return unless custom_recipes[event].include?(recipe)
+
+      custom_recipes[event].delete recipe
+      self.class.client.update_layer(
+        layer_id: id,
+        custom_recipes: custom_recipes
+      )
+    end
   end
 end

data/lib/opsworks/stack.rb

@@ -60,12 +60,30 @@ module OpsWorks
       @layers ||= initialize_layers
     end
 
-    def upgrade_chef(version, options = {})
-      self.class.client.update_stack(
+    def update_chef(options)
+      params = {
         stack_id: id,
-        configuration_manager: { name: 'Chef', version: version },
-        chef_configuration: { manage_berkshelf: options[:manage_berkshelf] }
-      )
+        configuration_manager: { name: 'Chef', version: options[:version] },
+        chef_configuration: {
+          manage_berkshelf: options[:manage_berkshelf],
+          berkshelf_version: options[:berkshelf_version]
+        }
+      }
+      if options[:cookbook_git_url]
+        params[:custom_cookbooks_source] = {
+          type: 'git',
+          url: options[:cookbook_git_url],
+          revision: options[:cookbook_branch] || 'master'
+        }
+      elsif options[:cookbook_s3_url]
+        params[:custom_cookbooks_source] = {
+          type: 's3',
+          url: options[:cookbook_s3_url],
+          username: options[:cookbook_username],
+          password: options[:cookbook_password]
+        }
+      end
+      self.class.client.update_stack(params)
     end
 
     def update_custom_cookbooks

data/spec/opsworks/cli/subcommands/{update_spec.rb → chef_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe OpsWorks::CLI::Agent do
-  describe '#update' do
+  describe 'chef:sync' do
     let(:stacks) { 2.times.map { Fabricate(:stack) } }
     let(:deployment) { Fabricate(:deployment, status: 'successful') }
 
@@ -13,7 +13,7 @@ describe OpsWorks::CLI::Agent do
     it 'should update custom cookbooks on all stacks' do
       expect(stacks[0]).to receive(:update_custom_cookbooks) { deployment }
       expect(stacks[1]).to receive(:update_custom_cookbooks) { deployment }
-      subject.update
+      subject.send('chef:sync')
     end
 
     it 'should optionally run on a subset of stacks' do
@@ -21,7 +21,7 @@ describe OpsWorks::CLI::Agent do
       expect(stacks[1]).not_to receive(:update_custom_cookbooks)
 
       allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
-      subject.update
+      subject.send('chef:sync')
     end
 
     it 'should fail if any update fails' do
@@ -29,7 +29,7 @@ describe OpsWorks::CLI::Agent do
       expect(stacks[0]).to receive(:update_custom_cookbooks) { failure }
 
       allow(subject).to receive(:options) { { stack: [stacks[0].name] } }
-      expect { subject.update }.to raise_error
+      expect { subject.send('chef:sync') }.to raise_error
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsworks-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -186,11 +186,10 @@ files:
 - lib/opsworks/cli/helpers/credentials.rb
 - lib/opsworks/cli/helpers/options.rb
 - lib/opsworks/cli/subcommands/apps.rb
+- lib/opsworks/cli/subcommands/chef.rb
 - lib/opsworks/cli/subcommands/config.rb
 - lib/opsworks/cli/subcommands/iam.rb
 - lib/opsworks/cli/subcommands/recipes.rb
-- lib/opsworks/cli/subcommands/update.rb
-- lib/opsworks/cli/subcommands/upgrade_chef.rb
 - lib/opsworks/cli/version.rb
 - lib/opsworks/deployment.rb
 - lib/opsworks/instance.rb
@@ -205,10 +204,10 @@ files:
 - spec/fabricators/opsworks/stack_fabricator.rb
 - spec/opsworks/cli/agent_spec.rb
 - spec/opsworks/cli/subcommands/apps_spec.rb
+- spec/opsworks/cli/subcommands/chef_spec.rb
 - spec/opsworks/cli/subcommands/config_spec.rb
 - spec/opsworks/cli/subcommands/iam_spec.rb
 - spec/opsworks/cli/subcommands/recipes_spec.rb
-- spec/opsworks/cli/subcommands/update_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aptible/opsworks-cli
 licenses:
@@ -241,8 +240,8 @@ test_files:
 - spec/fabricators/opsworks/stack_fabricator.rb
 - spec/opsworks/cli/agent_spec.rb
 - spec/opsworks/cli/subcommands/apps_spec.rb
+- spec/opsworks/cli/subcommands/chef_spec.rb
 - spec/opsworks/cli/subcommands/config_spec.rb
 - spec/opsworks/cli/subcommands/iam_spec.rb
 - spec/opsworks/cli/subcommands/recipes_spec.rb
-- spec/opsworks/cli/subcommands/update_spec.rb
 - spec/spec_helper.rb

data/lib/opsworks/cli/subcommands/upgrade_chef.rb

@@ -1,32 +0,0 @@
-require 'aws'
-require 'opsworks/stack'
-
-module OpsWorks
-  module CLI
-    module Subcommands
-      module UpgradeChef
-        # rubocop:disable MethodLength
-        # rubocop:disable CyclomaticComplexity
-        def self.included(thor)
-          thor.class_eval do
-            desc 'upgrade-chef [--stack STACK]', 'Upgrade Chef version'
-            option :stack, type: :array
-            option :version
-            option :manage_berkshelf, type: :boolean, default: false
-            def upgrade_chef
-              fetch_credentials unless env_credentials?
-              stacks = parse_stacks(options.merge(active: true))
-              version = OpsWorks::Stack.latest_chef_version
-              stacks.each do |stack|
-                say "Upgrading #{stack.name} to #{version}..."
-                stack.upgrade_chef(version, options)
-              end
-            end
-          end
-        end
-        # rubocop:enable CyclomaticComplexity
-        # rubocop:enable MethodLength
-      end
-    end
-  end
-end