opsicle 0.3.1 → 0.4.0

data/README.markdown

@@ -89,6 +89,15 @@ opsicle ssh-key staging <key-file>
 opsicle monitor staging
 
 ```
+### Updating Custom Chef Recipes
+```bash
+ # Upload a cookbooks directory to S3 and update the stack's custom cookbooks
+ opsicle chef-update staging --bucket-name my-opsworks-cookbooks
+ 
+```
+This command accepts a --path argument to the directory of cookbooks to upload. It defaults to 'cookbooks'.
+It also accepts a --bucket-name for the base s3 bucket. This flag is required.
+ 
 
 Opsicle accepts a `--verbose` flag or the VERBOSE environment variable to show additional information as commands are run.
 

data/bin/opsicle

@@ -114,4 +114,19 @@ command 'opsworks-url' do |c|
   end
 end
 
+desc "Update the Stack Custom Chef Cookbooks"
+arg_name '<environment>'
+command 'chef-update' do |c|
+  c.flag [:path],
+    :desc => "Path to the directory of chef cookbooks to be uploaded to s3",
+    :default_value => "cookbooks"
+  c.flag [:"bucket-name"],
+    :desc => "The S3 bucket name to upload the cookbooks to"
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+
+    Opsicle::ChefUpdate.new(*args).execute global_options.merge(options)
+  end
+end
+
 exit run(ARGV)

data/lib/opsicle/client.rb

@@ -2,21 +2,23 @@ require 'opsicle/config'
 
 module Opsicle
   class Client
-    attr_reader :aws_client
+    attr_reader :opsworks
+    attr_reader :s3
     attr_reader :config
 
     def initialize(environment)
       @config = Config.new(environment)
       @config.configure_aws!
-      @aws_client = AWS::OpsWorks.new.client
+      @opsworks = AWS::OpsWorks.new.client
+      @s3 = AWS::S3.new
     end
 
     def run_command(command, options={})
-      aws_client.create_deployment(command_options(command, options))
+      opsworks.create_deployment(command_options(command, options))
     end
 
     def api_call(command, options={})
-      aws_client.public_send(command, options)
+      opsworks.public_send(command, options)
     end
 
     def opsworks_url

data/lib/opsicle/commands.rb

@@ -1,6 +1,7 @@
 require 'opsicle/client'
 
 require "opsicle/commands/deploy"
+require "opsicle/commands/chef_update"
 require "opsicle/commands/list"
 require "opsicle/commands/ssh"
 require "opsicle/commands/ssh_key"

data/lib/opsicle/commands/chef_update.rb

@@ -0,0 +1,54 @@
+require 'opsicle/s3_bucket'
+require 'zlib'
+require 'archive/tar/minitar'
+
+module Opsicle
+  class ChefUpdate
+    attr_reader :client
+    attr_reader :tar_file
+    attr_reader :stack
+
+    def initialize(environment)
+      @environment = environment
+      @client = Client.new(environment)
+      @stack = Stack.new(@client)
+      @tar_file = "#{@stack.name}.tgz"
+    end
+
+    def execute(options={ monitor: true })
+      tar_cookbooks(options[:path])
+      s3_upload(options[:"bucket-name"])
+      cleanup_tar
+      update_custom_cookbooks
+      launch_stack_monitor(options)
+    end
+
+    private
+
+    def tar_cookbooks(cookbooks_dir)
+      tgz = Zlib::GzipWriter.new(File.open(tar_file, 'wb'))
+      package = Dir[cookbooks_dir].entries.reject{ |entry| entry =~ /^\.\.?$/ }
+      Archive::Tar::Minitar.pack(package, tgz)
+    end
+
+    def s3_upload(bucket_name)
+      bucket = S3Bucket.new(@client, bucket_name)
+      bucket.update(tar_file)
+    end
+
+    def cleanup_tar
+      FileUtils.rm(tar_file)
+    end
+
+    def update_custom_cookbooks
+      Output.say "Starting OpsWorks Custom Cookboks Update..."
+      client.run_command('update_custom_cookbooks')
+    end
+
+    def launch_stack_monitor(options)
+      Output.say_verbose "Starting Stack Monitor..."
+      @monitor = Opsicle::Monitor::App.new(@environment, options)
+      @monitor.start
+    end
+  end
+end

data/lib/opsicle/s3_bucket.rb

@@ -0,0 +1,19 @@
+require 'pathname'
+
+module Opsicle
+  class S3Bucket
+     attr_reader :bucket
+
+     def initialize(client, bucket_name)
+        @bucket = client.s3.buckets[bucket_name]
+        raise UnknownBucket unless @bucket.exists?
+     end
+
+     def update(object)
+       obj = bucket.objects[object]
+       obj.write(Pathname.new(object))
+     end
+  end
+
+  UnknownBucket = Class.new(StandardError)
+end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/opsicle.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gli"
   spec.add_dependency "highline"
   spec.add_dependency "terminal-table"
+  spec.add_dependency "minitar"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/opsicle/commands/chef_update_spec.rb

@@ -0,0 +1,129 @@
+require "spec_helper"
+require "opsicle"
+require 'archive/tar/minitar'
+
+module Opsicle
+  describe  ChefUpdate do
+    subject { ChefUpdate.new('derp') }
+    let(:monitor) { double(:start => nil) }
+    let(:client) { double }
+    let(:stack) { double(name: 'stack')  }
+    let(:tar_file) { "stack.tgz" }
+    let(:bucket_name) { "cookbooks" }
+    let(:bucket) { double }
+    let(:cookbooks_dirname) { "cookbooks" }
+
+    before do
+      allow(Client).to receive(:new).with('derp').and_return(client)
+      allow(Stack).to receive(:new).with(client).and_return(stack)
+      allow(subject).to receive(:tar_file).and_return(tar_file)
+
+      allow(Monitor::App).to receive(:new).and_return(monitor)
+      allow(monitor).to receive(:start)
+
+      allow(Output).to receive(:say)
+      allow(Output).to receive(:say_verbose)
+    end
+
+    context "#execute" do
+
+      it "tars up the cookooks" do
+        allow(subject).to receive(:s3_upload)
+        allow(subject).to receive(:cleanup_tar)
+        allow(subject).to receive(:update_custom_cookbooks)
+        allow(subject).to receive(:launch_stack_monitor)
+        expect(subject).to receive(:tar_cookbooks)
+
+        subject.execute
+      end
+
+      it "uploads the cookbooks to s3" do
+        allow(subject).to receive(:tar_cookbooks)
+        allow(subject).to receive(:cleanup_tar)
+        allow(subject).to receive(:update_custom_cookbooks)
+        allow(subject).to receive(:launch_stack_monitor)
+        expect(subject).to receive(:s3_upload)
+
+        subject.execute
+      end
+
+      it "cleans up the tarball created to upload to s3" do
+        allow(subject).to receive(:tar_cookbooks)
+        allow(subject).to receive(:s3_upload)
+        allow(subject).to receive(:update_custom_cookbooks)
+        allow(subject).to receive(:launch_stack_monitor)
+        expect(subject).to receive(:cleanup_tar)
+
+        subject.execute
+      end
+
+      it "creates a new update_custom_cookbooks and opens stack monitor" do
+        allow(subject).to receive(:tar_cookbooks)
+        allow(subject).to receive(:s3_upload)
+        allow(subject).to receive(:cleanup_tar)
+        allow(subject).to receive(:launch_stack_monitor)
+        expect(subject).to receive(:update_custom_cookbooks)
+
+        subject.execute
+      end
+
+      it "starts the stack monitor" do
+        allow(subject).to receive(:tar_cookbooks)
+        allow(subject).to receive(:s3_upload)
+        allow(subject).to receive(:cleanup_tar)
+        allow(subject).to receive(:update_custom_cookbooks)
+        expect(subject).to receive(:launch_stack_monitor)
+
+        subject.execute
+      end
+    end
+
+    context "#tar_cookbooks" do
+      let(:tar_file_handle) { double }
+      let(:cookbooks_dir) { double }
+      let(:gzip) { double }
+      let(:entries) { %w(recipes templates files) }
+      it "tarballs up the cookbooks directory" do
+        expect(File).to receive(:open).with(tar_file, 'wb').and_return(tar_file_handle)
+        expect(Zlib::GzipWriter).to receive(:new).with(tar_file_handle).and_return(gzip)
+        expect(Dir).to receive(:"[]").with(cookbooks_dirname).and_return(cookbooks_dir)
+        expect(cookbooks_dir).to receive(:entries).and_return(entries)
+        expect(Archive::Tar::Minitar).to receive(:pack).with(entries, gzip)
+        subject.send :tar_cookbooks, cookbooks_dirname
+      end
+    end
+
+    context "#s3_upload" do
+      it "updates the s3 bucket with the tarballed cookbooks" do
+        expect(S3Bucket).to receive(:new).with(client, bucket_name).and_return(bucket)
+        expect(bucket).to receive(:update).with(tar_file)
+        subject.send :s3_upload, bucket_name
+      end
+    end
+
+    context "#cleanup_tar" do
+      it "removes the tar file now that the upload is complete" do
+        expect(FileUtils).to receive(:rm).with(tar_file)
+        subject.send :cleanup_tar
+      end
+    end
+
+    context "#update_custom_cookbooks" do
+      it "runs the aws update custom cookbooks command" do
+        expect(client).to receive(:run_command).with('update_custom_cookbooks')
+
+        subject.send :update_custom_cookbooks
+      end
+    end
+
+    context "#launch_stack_monitor" do
+      let(:options) { { derp: 'herp' } }
+      it "launches the opsicle stack monitor" do
+
+        expect(Monitor::App).to receive(:new).with('derp', options)
+
+        subject.send :launch_stack_monitor, options
+      end
+    end
+  end
+end

data/spec/opsicle/s3_bucket_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+require "opsicle"
+
+module Opsicle
+  describe  S3Bucket do
+    subject { S3Bucket.new(client, bucket_name) }
+    let(:bucket_name) { "bucket" }
+    let(:bucket) { double(exists?: true) }
+    let(:buckets) { double(:"[]" => bucket) }
+    let(:s3) { double(buckets: buckets) }
+    let(:client) { double(s3: s3) }
+
+    context "#new" do
+      subject { S3Bucket }
+      it "finds the bucket from s3" do
+        expect(client).to receive(:s3).and_return(s3)
+        expect(s3).to receive(:buckets).and_return(buckets)
+        expect(buckets).to receive(:"[]").with(bucket_name).and_return(bucket)
+        subject.new(client, bucket_name)
+      end
+
+      it "throws an error if the bucket can't be found" do
+        allow(bucket).to receive(:exists?).and_return(false)
+        expect(client).to receive(:s3).and_return(s3)
+        expect(s3).to receive(:buckets).and_return(buckets)
+        expect(buckets).to receive(:"[]").with(bucket_name).and_return(bucket)
+        expect { subject.new(client, bucket_name) }.to raise_error(UnknownBucket)
+      end
+    end
+
+    context "#update" do
+      let(:object) { double }
+      let(:objects) { double(:"[]" => object) }
+      before do
+        allow(Pathname).to receive(:new)
+      end
+
+      it "finds the object in the s3 bucket" do
+        allow(object).to receive(:write)
+        expect(bucket).to receive(:objects).and_return(objects)
+        subject.update(object)
+      end
+
+      it "writes the new object in the s3 bucket" do
+        allow(bucket).to receive(:objects).and_return(objects)
+        expect(object).to receive(:write)
+        subject.update(object)
+      end
+    end
+  end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,23 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -104,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -111,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,6 +193,7 @@ files:
 - lib/opsicle.rb
 - lib/opsicle/client.rb
 - lib/opsicle/commands.rb
+- lib/opsicle/commands/chef_update.rb
 - lib/opsicle/commands/deploy.rb
 - lib/opsicle/commands/list.rb
 - lib/opsicle/commands/ssh.rb
@@ -177,10 +213,12 @@ files:
 - lib/opsicle/monitor/subpanel.rb
 - lib/opsicle/monitor/translatable.rb
 - lib/opsicle/output.rb
+- lib/opsicle/s3_bucket.rb
 - lib/opsicle/stack.rb
 - lib/opsicle/version.rb
 - opsicle.gemspec
 - spec/opsicle/client_spec.rb
+- spec/opsicle/commands/chef_update_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
 - spec/opsicle/commands/list_spec.rb
 - spec/opsicle/commands/ssh_key_spec.rb
@@ -191,33 +229,42 @@ files:
 - spec/opsicle/monitor/screen_spec.rb
 - spec/opsicle/monitor/spy/deployments_spec.rb
 - spec/opsicle/monitor/subpanel_spec.rb
+- spec/opsicle/s3_bucket_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sportngin/opsicle
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1300190123240828980
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1300190123240828980
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: An opsworks specific abstraction on top of the aws sdk
 test_files:
 - spec/opsicle/client_spec.rb
+- spec/opsicle/commands/chef_update_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
 - spec/opsicle/commands/list_spec.rb
 - spec/opsicle/commands/ssh_key_spec.rb
@@ -228,4 +275,5 @@ test_files:
 - spec/opsicle/monitor/screen_spec.rb
 - spec/opsicle/monitor/spy/deployments_spec.rb
 - spec/opsicle/monitor/subpanel_spec.rb
+- spec/opsicle/s3_bucket_spec.rb
 - spec/spec_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWMyN2Q2YjBkN2FiMTgwNjhjZjg2N2IwZTI3ZGVkYTFjYTdjY2NlMQ==
-  data.tar.gz: !binary |-
-    YzJhOGM3MzMwNDBmNDczMTcwYWRkNjFlYTM2NDJmNjVhMWY4OTM4Ng==
-SHA512:
-  metadata.gz: !binary |-
-    ZTRjZDg3ZjQ4MjQwYTBkZDEzOWZjMTE4ZWU5MGE1NWE1ZTI2OTg0ZjFhNGQ4
-    ZGQ4MmUwMzJjMzllZDc4Y2M4NjE0YzI3MzA0MzM2ODBjYWFjZGJmMDYwYWE2
-    YWQ0Y2EwMzI4ZDdjY2NjNTEyZTFlYjM1MTFlYjQ3Mjc3Yjc5YzQ=
-  data.tar.gz: !binary |-
-    Y2I5OWMyMTI1YjhkMjg4NjczYjc4YzU5OTQ0MGQ3YzI1MDY3ZDAzY2NmYTkx
-    MDk3MTc3NzI4NzJiMDUwZWU4MDg1NzRkNTcyODM1MDZjMDY3ODI4NGI1ZWJi
-    MWQ1MWQyZmNlNmE0YmE0MWEzNzdkOGM5NGMzOWRiMDY1ZjM0MTI=