dumbwaiter 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f20eaec8369f54bbc83d62f0ade5f99a735f98
-  data.tar.gz: 1c4eca739c2b72e96ee6908df4ace69fc688f081
+  metadata.gz: 037e1bc90c9a39f1a16951de02c0e95ea6fc0bcb
+  data.tar.gz: 3cf2330286cabb2f654b92a43458ff1177d75eab
 SHA512:
-  metadata.gz: fc160beefbabeca4bc392e0b75c8c80d5e94a4abf2aadde4c39c10dbad7e0a5cf3d82cc26164a7d182fb23c7864c2a2bf5a87ba5967b929f434c43fbe7d0b9f7
-  data.tar.gz: 2bad21df531df0ea6ec2ba1f4b394a2ebc6528f627d0b72ff440035c248f1fa1b5899e9385fdccba0af9ebd24ed6d8433e6b8485dbf91dadc3d0f950b9974d0c
+  metadata.gz: f3acb077db8d3514aff5babefb2e783f7fa0b92c70b2cd62240f518452821e4bfbcd8b4d9ef084ff0cba6a1b783ce1e3411b5dcd8587487c86f5e61b2d7e578e
+  data.tar.gz: e4ac64be955b4545a0dc4430509dc2541d61bec1b2836da0df9af3f161ce9050c5f9057e5d8063f4cbc032c65cd37e9c7aea6f0ca58aa30a447446f05c1d48e0

data/Guardfile

@@ -8,6 +8,5 @@ end
 
 guard :bundler do
   watch('Gemfile')
-  # Uncomment next line if your Gemfile contains the `gemspec' command.
-  # watch(/^.+\.gemspec/)
+  watch(/^.+\.gemspec/)
 end

data/README.md

@@ -21,7 +21,7 @@ Dumbwaiter prescribes a very specific OpsWorks-centric workflow with the same
 feeling of the Scalarium gem's CLI:
 
   * Create OpsWorks stacks, layers and instances via YAML files
-  * Collect custom Chef cookbooks via Berkshelf and upload to S3
+  * Assign a stack's custom Chef cookbooks as a custom GitHub repo
   * Create an application corresponding to a GitHub repo
   * Run versioned deployments, rollbacks and one-off recipes
 
@@ -61,6 +61,10 @@ Deploy the "cinnamon" branch of the "syrup" application to the "Pancake" stack:
 
   `dumbwaiter deploy Pancake syrup cinnamon`
 
+List all the layers of the "Pizza" stack:
+
+  `dumbwaiter layers Pizza`
+
 List the deployments on the "Maniacal Checklist" stack:
 
   `dumbwaiter list "Maniacal Checklist"`
@@ -73,6 +77,10 @@ Roll back the "Snowman" stack's "dandruff" application:
 
   `dumbwaiter rollback Snowman dandruff`
 
+Run the sneakers recipe on all the angsty instances of the "Documentarian" stack:
+
+  `dumbwaiter run_recipe Documentarian angsty sneakers`
+
 List the stacks and apps in your OpsWorks environment:
 
   `dumbwaiter stacks`

data/lib/dumbwaiter/cli.rb

@@ -5,7 +5,7 @@ require "dumbwaiter/stack"
 
 module Dumbwaiter
   class Cli < Thor
-    desc "deploy STACK_NAME APP_NAME GIT_REF", "Deploy an application revision"
+    desc "deploy STACK APP GIT_REF", "Deploy an application revision"
     def deploy(stack_name, app_name, revision)
       stack = Stack.find(stack_name)
       app = App.find(stack, app_name)
@@ -14,12 +14,12 @@ module Dumbwaiter
       raise Thor::Error.new(e.message)
     end
 
-    desc "list STACK_NAME", "List all the deployments for a stack"
+    desc "list STACK", "List all the deployments for a stack"
     def list(stack_name)
       stack = Stack.find(stack_name)
 
       deployments = stack.deployments.select do |deployment|
-        %w(rollback deploy update_custom_cookbooks).include?(deployment.command_name)
+        %w(rollback deploy update_custom_cookbooks execute_recipes).include?(deployment.command_name)
       end
 
       deployments.each do |deployment|
@@ -36,7 +36,7 @@ module Dumbwaiter
       raise Thor::Error.new(e.message)
     end
 
-    desc "rollback STACK_NAME APP_NAME", "Roll back an application"
+    desc "rollback STACK APP", "Roll back an application"
     def rollback(stack_name, app_name)
       stack = Stack.find(stack_name)
       app = App.find(stack, app_name)
@@ -45,9 +45,27 @@ module Dumbwaiter
       raise Thor::Error.new(e.message)
     end
 
+    desc "run_recipe STACK LAYER RECIPE", "Run a recipe against a stack's layer"
+    def run_recipe(stack_name, layer_name, recipe)
+      stack = Stack.find(stack_name)
+      layer = Layer.find(stack, layer_name)
+      layer.run_recipe(recipe)
+    rescue Dumbwaiter::Stack::NotFound, Dumbwaiter::Layer::NotFound => e
+      raise Thor::Error.new(e.message)
+    end
+
     desc "stacks", "List all the stacks"
     def stacks
       Stack.all.each { |stack| Kernel.puts("#{stack.name}: #{stack.apps.map(&:name).join(', ')}") }
     end
+
+    desc "layers STACK", "List all the layers for a stack"
+    def layers(stack_name)
+      stack = Stack.find(stack_name)
+      layer_names = stack.layers.map(&:shortname)
+      Kernel.puts(layer_names.join(', '))
+    rescue Dumbwaiter::Stack::NotFound => e
+      raise Thor::Error.new(e.message)
+    end
   end
 end

data/lib/dumbwaiter/instance.rb

@@ -0,0 +1,18 @@
+class Dumbwaiter::Instance
+  attr_reader :layer, :opsworks_instance, :opsworks
+
+  def self.all(layer, opsworks = Aws::OpsWorks.new(region: "us-east-1"))
+    instances = opsworks.describe_instances(layer_id: layer.id).instances
+    instances.map { |instance| new(layer, instance, opsworks) }
+  end
+
+  def initialize(layer, opsworks_instance, opsworks)
+    @layer = layer
+    @opsworks_instance = opsworks_instance
+    @opsworks = opsworks
+  end
+
+  def id
+    opsworks_instance.instance_id
+  end
+end

data/lib/dumbwaiter/layer.rb

@@ -0,0 +1,46 @@
+require "dumbwaiter/instance"
+
+class Dumbwaiter::Layer
+  attr_reader :stack, :opsworks_layer, :opsworks
+
+  class NotFound < Exception; end
+
+  def self.all(stack, opsworks = Aws::OpsWorks.new(region: "us-east-1"))
+    opsworks.describe_layers(stack_id: stack.id).layers.map { |layer| new(stack, layer, opsworks) }
+  end
+
+  def self.find(stack, layer_name, opsworks = Aws::OpsWorks.new(region: "us-east-1"))
+    layer = all(stack, opsworks).detect { |layer| layer.shortname == layer_name }
+    raise NotFound.new("No layer found with name #{layer_name}") if layer.nil?
+    layer
+  end
+
+  def initialize(stack, opsworks_layer, opsworks)
+    @stack = stack
+    @opsworks_layer = opsworks_layer
+    @opsworks = opsworks
+  end
+
+  def id
+    opsworks_layer.layer_id
+  end
+
+  def shortname
+    opsworks_layer.shortname
+  end
+
+  def run_recipe(recipe)
+    opsworks.create_deployment(
+      stack_id: stack.id,
+      instance_ids: instances.map(&:id),
+      command: {
+        name: "execute_recipes",
+        args: {recipes: [recipe]}
+      }
+    )
+  end
+
+  def instances
+    @instances ||= Dumbwaiter::Instance.all(self, opsworks)
+  end
+end

data/lib/dumbwaiter/stack.rb

@@ -1,5 +1,6 @@
 require "dumbwaiter/app"
 require "dumbwaiter/deployment"
+require "dumbwaiter/layer"
 
 class Dumbwaiter::Stack
   attr_reader :opsworks, :opsworks_stack
@@ -37,6 +38,10 @@ class Dumbwaiter::Stack
     @deployments ||= Dumbwaiter::Deployment.all(self, opsworks)
   end
 
+  def layers
+    @layers ||= Dumbwaiter::Layer.all(self, opsworks)
+  end
+
   def rechef
     opsworks.create_deployment(stack_id: id, command: {name: "update_custom_cookbooks"})
   end

data/lib/dumbwaiter/version.rb

@@ -1,3 +1,3 @@
 module Dumbwaiter
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/lib/dumbwaiter/cli_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 
 describe Dumbwaiter::Cli do
   let(:fake_app) { double(:app, name: "reifel") }
+  let(:fake_layer) { double(:layer, shortname: "beans") }
   let(:fake_stack) { double(:stack, name: "ducks", id: "wat", apps: [fake_app]) }
 
   subject(:cli) { Dumbwaiter::Cli.new }
@@ -9,6 +10,7 @@ describe Dumbwaiter::Cli do
   before do
     Dumbwaiter::Stack.stub(all: [fake_stack])
     Dumbwaiter::App.stub(all: [fake_app])
+    Dumbwaiter::Layer.stub(all: [fake_layer])
   end
 
   describe "#deploy" do
@@ -88,6 +90,15 @@ describe Dumbwaiter::Cli do
         end
       end
 
+      context "when the deployment is a recipe execution" do
+        let(:fake_deployment) { double(:deployment, command_name: "execute_recipes", to_log: "whee!") }
+
+        it "lists the deployment" do
+          Kernel.should_receive(:puts).with("whee!")
+          cli.list("ducks")
+        end
+      end
+
       context "when the deployment is something else" do
         let(:fake_deployment) { double(:deployment, command_name: "gargle", to_log: "brblrgl") }
 
@@ -105,10 +116,20 @@ describe Dumbwaiter::Cli do
     end
   end
 
-  describe "#stacks" do
-    it "lists the stacks" do
-      Kernel.should_receive(:puts).with("ducks: reifel")
-      cli.stacks
+  describe "#layers" do
+    context "when the stack exists" do
+      before { fake_stack.stub(layers: [fake_layer]) }
+
+      it "lists the layers" do
+        Kernel.should_receive(:puts).with("beans")
+        cli.layers("ducks")
+      end
+    end
+
+    context "when the stack does not exist" do
+      it "blows up" do
+        expect { cli.layers("wat") }.to raise_error(Thor::Error)
+      end
     end
   end
 
@@ -126,4 +147,34 @@ describe Dumbwaiter::Cli do
       end
     end
   end
+
+  describe "#run_recipe" do
+    context "when the stack exists" do
+      context "when the layer exists" do
+        it "runs the recipe on the layer" do
+          fake_layer.should_receive(:run_recipe).with("meatballs")
+          cli.run_recipe("ducks", "beans", "meatballs")
+        end
+      end
+
+      context "when the layer does not exist" do
+        it "blows up" do
+          expect { cli.run_recipe("ducks", "brick", "meatballs") }.to raise_error(Thor::Error)
+        end
+      end
+    end
+
+    context "when the stack does not exist" do
+      it "blows up" do
+        expect { cli.run_recipe("toques", "beans", "meatballs") }.to raise_error(Thor::Error)
+      end
+    end
+  end
+
+  describe "#stacks" do
+    it "lists the stacks" do
+      Kernel.should_receive(:puts).with("ducks: reifel")
+      cli.stacks
+    end
+  end
 end

data/spec/lib/dumbwaiter/deployment_spec.rb

@@ -38,6 +38,7 @@ describe Dumbwaiter::Deployment do
 
   describe ".all" do
     let(:fake_stack) { double(:stack, id: "pancakes") }
+
     it "fetches all the deployments" do
       fake_opsworks.should_receive(:describe_deployments).with(stack_id: "pancakes")
       Dumbwaiter::Deployment.all(fake_stack, fake_opsworks).should have(1).app

data/spec/lib/dumbwaiter/instance_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Dumbwaiter::Instance do
+  let(:fake_stack) { double(:stack, id: "pancakes") }
+  let(:fake_layer) { double(:layer, id: "pinto", stack: fake_stack) }
+
+  let(:fake_instance) { double(:instance, instance_id: "dragons") }
+  let(:fake_instances) { double(:instances, instances: [fake_instance]) }
+  let(:fake_opsworks) { double(:opsworks, describe_instances: fake_instances) }
+
+  subject(:instance) { Dumbwaiter::Instance.new(fake_layer, fake_instance, fake_opsworks) }
+
+  its(:opsworks_instance) { should == fake_instance }
+  its(:id) { should == "dragons" }
+
+  describe ".all" do
+    it "fetches all the instances" do
+      fake_opsworks.should_receive(:describe_instances).with(layer_id: "pinto")
+      Dumbwaiter::Instance.all(fake_layer, fake_opsworks).should have(1).instance
+    end
+  end
+end

data/spec/lib/dumbwaiter/layer_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+
+describe Dumbwaiter::Layer do
+  let(:fake_stack) { double(:stack, id: "pancakes") }
+  let(:fake_layer) { double(:layer, shortname: "meaty", layer_id: "pinto") }
+  let(:fake_layers) { double(:layers, layers: [fake_layer]) }
+  let(:fake_instance) { double(:instance, id: "dragons") }
+  let(:fake_instances) { double(:instances, instances: [fake_instance]) }
+  let(:fake_opsworks) { double(:opsworks, describe_layers: fake_layers, describe_instances: fake_instances) }
+
+  before do
+    Dumbwaiter::Instance.stub(all: [fake_instance])
+  end
+
+  subject(:layer) { Dumbwaiter::Layer.new(fake_stack, fake_layer, fake_opsworks) }
+
+  its(:opsworks_layer) { should == fake_layer }
+  its(:id) { should == "pinto" }
+  its(:shortname) { should == "meaty" }
+
+  its(:instances) { should == [fake_instance] }
+
+  describe ".all" do
+    it "fetches all the deployments" do
+      fake_opsworks.should_receive(:describe_layers).with(stack_id: "pancakes")
+      Dumbwaiter::Layer.all(fake_stack, fake_opsworks).should have(1).layer
+    end
+  end
+
+  describe ".find" do
+    context "when the layer exists" do
+      it "finds the layer by name" do
+        Dumbwaiter::Layer.find(fake_stack, "meaty", fake_opsworks).shortname.should == "meaty"
+      end
+    end
+
+    context "when the layer does not exist" do
+      it "blows up" do
+        expect {
+          Dumbwaiter::Layer.find(fake_stack, "brick", fake_opsworks)
+        }.to raise_error(Dumbwaiter::Layer::NotFound)
+      end
+    end
+  end
+
+  describe "#run_recipe" do
+    it "executes a recipe" do
+      fake_opsworks.should_receive(:create_deployment) do |params|
+        params[:stack_id].should == "pancakes"
+        params[:instance_ids].should == ["dragons"]
+        params[:command].should == {name: "execute_recipes", args: {recipes: ["meatballs"]}}
+      end
+      layer.run_recipe("meatballs")
+    end
+  end
+end

data/spec/lib/dumbwaiter/stack_spec.rb

@@ -6,12 +6,14 @@ describe Dumbwaiter::Stack do
   let(:fake_opsworks) { double(:opsworks, describe_stacks: fake_stacks) }
   let(:fake_app) { double(:app) }
   let(:fake_deployment) { double(:deployment) }
+  let(:fake_layer) { double(:layer) }
 
   subject(:stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
 
   before do
     Dumbwaiter::App.stub(all: [fake_app])
     Dumbwaiter::Deployment.stub(all: [fake_deployment])
+    Dumbwaiter::Layer.stub(all: [fake_layer])
   end
 
   its(:opsworks_stack) { should == fake_stack }
@@ -20,6 +22,7 @@ describe Dumbwaiter::Stack do
 
   its(:apps) { should == [fake_app] }
   its(:deployments) { should == [fake_deployment] }
+  its(:layers) { should == [fake_layer] }
 
   describe ".all" do
     it "fetches all the stacks" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumbwaiter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Doc Ritezel
@@ -118,6 +118,8 @@ files:
 - lib/dumbwaiter/cli.rb
 - lib/dumbwaiter/deployment.rb
 - lib/dumbwaiter/deployment_custom_json.rb
+- lib/dumbwaiter/instance.rb
+- lib/dumbwaiter/layer.rb
 - lib/dumbwaiter/stack.rb
 - lib/dumbwaiter/version.rb
 - script/ci.sh
@@ -125,6 +127,8 @@ files:
 - spec/lib/dumbwaiter/cli_spec.rb
 - spec/lib/dumbwaiter/deployment_custom_json_spec.rb
 - spec/lib/dumbwaiter/deployment_spec.rb
+- spec/lib/dumbwaiter/instance_spec.rb
+- spec/lib/dumbwaiter/layer_spec.rb
 - spec/lib/dumbwaiter/stack_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/minifast/dumbwaiter
@@ -156,5 +160,7 @@ test_files:
 - spec/lib/dumbwaiter/cli_spec.rb
 - spec/lib/dumbwaiter/deployment_custom_json_spec.rb
 - spec/lib/dumbwaiter/deployment_spec.rb
+- spec/lib/dumbwaiter/instance_spec.rb
+- spec/lib/dumbwaiter/layer_spec.rb
 - spec/lib/dumbwaiter/stack_spec.rb
 - spec/spec_helper.rb