dumbwaiter 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d982d2f214ae14a68e7580cf7fce7ac5c5faab5b
-  data.tar.gz: 8c61bcff1b9d5bba3837d0bed4b321758a49e9a3
+  metadata.gz: dcaf684002c436fa32d8091bbc6bfc5058d244cd
+  data.tar.gz: 6118f4b3bb27ca9f007c6421b518e3a9cac822ac
 SHA512:
-  metadata.gz: 14c30206fe158fb0da5ef33b546070bc59d14def43685b256bf08334d33648ae34dead8915ae60072bcf4a70a242d6d5d274b704050baf35dc06ddadb634fd2c
-  data.tar.gz: d49f8e84274ffbe8e490cd3e2da8a552ebfa310e16dacd31457a949dac7c2188ad882fcf56834a03da343523fccc10e8ad0030d24c34eaf1a4cdedf8f6795a9e
+  metadata.gz: 6f73d6c80660e706b578b01648595fc33af488f9891a877f66d210c4d75bbfec7f84f9361e88ef02f2a125b2053c8327df5e63b74f0da84f6bb4e33fbda1a4a8
+  data.tar.gz: 0226c5b905d5bb1b872691123bb514c4cab48ca57a3888adb4ba4e283588d4914c8efad029ecab0106930fd21b0e019c532c0672ba6842c9f2057e1740af110c

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.1.0

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 script: script/ci.sh

data/lib/dumbwaiter/cli.rb

@@ -58,7 +58,8 @@ module Dumbwaiter
     def custom_recipes(stack_name, layer_name, event_name)
       stack = Stack.find(stack_name)
       layer = Layer.find(stack, layer_name)
-      Kernel.puts(layer.custom_recipes[event_name.to_sym].join(" "))
+      recipes = layer.custom_recipes.fetch(event_name, []).join(" ")
+      Kernel.puts(recipes)
     rescue Dumbwaiter::Stack::NotFound, Dumbwaiter::Layer::NotFound => e
       raise Thor::Error.new(e.message)
     end

data/lib/dumbwaiter/deployment.rb

@@ -31,7 +31,7 @@ class Dumbwaiter::Deployment
   end
 
   def user_name
-    if opsworks_deployment.iam_user_arn.nil? || user_profile.nil?
+    if user_profile.nil?
       "OpsWorks"
     else
       user_profile.name

data/lib/dumbwaiter/mock.rb

@@ -1,8 +1,14 @@
+require "ostruct"
 require "faker"
 
 class Dumbwaiter::Mock
   attr_reader :stacks, :deployments, :apps, :layers, :instances, :user_profiles
 
+  class HashWithIndifferentAccess < Hash
+    include Hashie::Extensions::MergeInitializer
+    include Hashie::Extensions::IndifferentAccess
+  end
+
   def opsworks; self; end
   def describe_stacks(*_); OpenStruct.new(stacks: stacks); end
   def describe_deployments(*_); OpenStruct.new(deployments: deployments); end
@@ -21,57 +27,84 @@ class Dumbwaiter::Mock
   end
 
   def initialize
-    super
     clear
   end
 
-  def make_stack(id = make_id, name = Faker::Name.first_name, color = make_color)
-    stack = OpenStruct.new(stack_id: id, name: name, attributes: {"Color" => color})
+  def create_stack(params = {})
+    params[:name] ||= Faker::Name.first_name
+    params[:attributes] ||= {}
+    params[:attributes]["Color"] ||= make_color
+    stack = OpenStruct.new(params.merge(stack_id: make_id))
     stacks << stack
     stack
   end
 
-  def make_app(stack = make_stack, id = make_id, name = Faker::Name.first_name, url = Faker::Internet.url, revision = make_revision)
-    app = OpenStruct.new(stack_id: stack.stack_id, app_id: id, name: name, app_source: make_app_source(url, revision))
+  def create_app(params = {})
+    params[:stack_id] ||= create_stack.stack_id
+    params[:name] ||= Faker::Name.last_name
+    params[:shortname] ||= Faker::Name.first_name.downcase
+    params[:app_source] = Hashie::Mash.new(params.fetch(:app_source, {}))
+    params[:app_source][:url] ||= Faker::Internet.url
+    params[:app_source][:revision] = params[:app_source].fetch(:revision, make_revision)
+    app = OpenStruct.new(params.merge(app_id: make_id))
     apps << app
     app
   end
 
-  def make_layer(stack = make_stack, id = make_id, shortname = Faker::Name.first_name.downcase, custom_recipes = {})
-    layer = OpenStruct.new(stack_id: stack.stack_id, layer_id: id, shortname: shortname, custom_recipes: make_custom_default_recipes.merge(custom_recipes))
+  def create_layer(params = {})
+    params[:stack_id] ||= create_stack.stack_id
+    params[:name] ||= Faker::Name.last_name
+    params[:shortname] ||= Faker::Name.first_name.downcase
+    params[:custom_recipes] = HashWithIndifferentAccess.new(params[:custom_recipes] || {})
+    params[:custom_recipes] = HashWithIndifferentAccess.new(setup: [], configure: [], deploy: [], undeploy: [], shutdown:[]).merge(params[:custom_recipes])
+    params[:type] ||= %w[lb web php-app rails-app nodejs-app memcached db-master monitoring-master custom].sample
+    layer = OpenStruct.new(params.merge(layer_id: make_id))
     layers << layer
     layer
   end
 
-  def make_deployment(stack = make_stack, app = make_app, id = make_id, command_name = Faker::Name.first_name.downcase, status = Faker::Name.first_name, custom_json = "{}", at = Time.now.to_s, arn = Faker::Name.first_name, comment = Faker::Company.bs)
-    command = OpenStruct.new(name: command_name)
-    deployment = OpenStruct.new(stack_id: stack.stack_id, app_id: app.app_id, deployment_id: id, command: command, created_at: at, status: status, comment: comment, iam_user_arn: arn, custom_json: custom_json)
+  def create_deployment(params = {})
+    params[:stack_id] ||= create_stack.stack_id
+    params[:app_id] ||= create_app.app_id
+    params[:command] = Hashie::Mash.new(params.fetch(:command, {}))
+    params[:command][:name] ||= %w[install_dependencies update_dependencies update_custom_cookbooks execute_recipes deploy rollback start stop restart undeploy].sample
+    params[:custom_json] ||= "{}"
+    params[:comment] ||= Faker::Company.bs
+    params[:iam_user_arn] = params.fetch(:iam_user_arn, create_user_profile.iam_user_arn)
+    params[:created_at] ||= Time.now.to_s
+    params[:status] ||= %w[running failed successful].sample
+    deployment = OpenStruct.new(params.merge(deployment_id: make_id))
     deployments << deployment
     deployment
   end
 
-  def make_instance(stack = make_stack, layer = make_layer, id = make_id)
-    instance = OpenStruct.new(layer_id: layer.layer_id, stack_id: stack.stack_id, instance_id: id)
+  def create_instance(params = {})
+    params[:stack_id] ||= create_stack.stack_id
+    params[:layer_id] ||= create_layer.layer_id
+    instance = OpenStruct.new(params.merge(instance_id: make_id))
+    instances << instance
+    instance
+  end
+
+  def create_instance(params = {})
+    params[:stack_id] ||= create_stack.stack_id
+    params[:layer_id] ||= create_layer.layer_id
+    instance = OpenStruct.new(params.merge(instance_id: make_id))
     instances << instance
     instance
   end
 
-  def make_user_profile(id = Faker::Name.last_name.downcase, name = Faker::Name.first_name)
-    user_profile = OpenStruct.new(aws_iam_arn: id, name: name)
+  def create_user_profile(params = {})
+    params[:iam_user_arn] ||= Faker::Name.first_name.downcase
+    params[:ssh_username] ||= Faker::Name.first_name.downcase
+    params[:name] ||= Faker::Name.first_name.downcase
+    user_profile = OpenStruct.new(params)
     user_profiles << user_profile
     user_profile
   end
 
   protected
 
-  def make_custom_default_recipes
-    {setup: [], configure: [], deploy: [], undeploy: [], shutdown:[]}
-  end
-
-  def make_app_source(url, revision)
-    OpenStruct.new(url: url, revision: revision)
-  end
-
   def make_revision
     "%06x" % (rand * 0xffffff)
   end

data/lib/dumbwaiter/user_profile.rb

@@ -6,7 +6,10 @@ class Dumbwaiter::UserProfile
   end
 
   def self.find(iam_user_arn, opsworks = Aws::OpsWorks.new(region: "us-east-1"))
-    cache[iam_user_arn] ||= opsworks.describe_user_profiles(iam_user_arns: [iam_user_arn]).user_profiles.first
+    unless cache.has_key?(iam_user_arn)
+      cache[iam_user_arn] = opsworks.describe_user_profiles(iam_user_arns: [iam_user_arn]).user_profiles.detect { |p| p.iam_user_arn == iam_user_arn }
+    end
+    cache[iam_user_arn]
   end
 
   def initialize(opsworks_user_profile, opsworks = Aws::OpsWorks.new(region: "us-east-1"))

data/lib/dumbwaiter/version.rb

@@ -1,3 +1,3 @@
 module Dumbwaiter
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/spec/lib/dumbwaiter/app_spec.rb

@@ -2,25 +2,27 @@ require "spec_helper"
 
 describe Dumbwaiter::App do
   let(:fake_opsworks) { Dumbwaiter::Mock.new }
-  let(:fake_stack) { fake_opsworks.make_stack("pancakes") }
-  let!(:fake_app) { fake_opsworks.make_app(fake_stack, "amazing", "goose", "git@example.com:tacos/great.git") }
+  let(:fake_stack) { fake_opsworks.create_stack }
+  let(:fake_custom_recipes) { {setup: ["ham"]} }
+  let(:app_source) { Hashie::Mash.new(url: "git@example.com:tacos/great.git") }
+  let!(:fake_app) { fake_opsworks.create_app(stack_id: fake_stack.stack_id, name: "goose", app_source: app_source) }
   let(:real_stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
 
   subject(:app) { Dumbwaiter::App.new(real_stack, fake_app, fake_opsworks) }
 
-  its(:id) { should == "amazing" }
+  its(:id) { should == fake_app.app_id }
   its(:name) { should == "goose" }
   its(:url) { should == "git@example.com:tacos/great.git" }
 
   describe "#revision" do
     context "when there is no revision specified" do
-      let(:fake_app) { fake_opsworks.make_app(fake_stack, "amazing", "goose", "git@example.com:tacos/great.git", nil) }
+      let(:app_source) { {url: "git@example.com:tacos/great.git", revision: nil} }
 
       its(:revision) { should == "master" }
     end
 
     context "when a revision is specified" do
-      let(:fake_app) { fake_opsworks.make_app(fake_stack, "amazing", "goose", "git@example.com:tacos/great.git", "wat") }
+      let(:app_source) { {url: "git@example.com:tacos/great.git", revision: "wat"} }
 
       its(:revision) { should == "wat" }
     end
@@ -30,8 +32,8 @@ describe Dumbwaiter::App do
     context "when no revision is specified" do
       it "creates a deployment" do
         fake_opsworks.should_receive(:create_deployment) do |params|
-          params[:stack_id].should == "pancakes"
-          params[:app_id].should == "amazing"
+          params[:stack_id].should == fake_stack.stack_id
+          params[:app_id].should == fake_app.app_id
           params[:command].should == {name: "deploy", args: {migrate: ["true"]}}
         end
         app.deploy
@@ -51,8 +53,8 @@ describe Dumbwaiter::App do
   describe "#rollback" do
     it "creates a rollback" do
       fake_opsworks.should_receive(:create_deployment) do |params|
-        params[:stack_id].should == "pancakes"
-        params[:app_id].should == "amazing"
+        params[:stack_id].should == fake_stack.stack_id
+        params[:app_id].should == fake_app.app_id
         params[:command].should == {name: "rollback"}
       end
       app.rollback
@@ -61,7 +63,7 @@ describe Dumbwaiter::App do
 
   describe ".all" do
     it "fetches all the apps" do
-      fake_opsworks.should_receive(:describe_apps).with(stack_id: "pancakes").and_call_original
+      fake_opsworks.should_receive(:describe_apps).with(stack_id: fake_stack.stack_id).and_call_original
       Dumbwaiter::App.all(real_stack, fake_opsworks).should have(1).app
     end
   end
@@ -69,7 +71,7 @@ describe Dumbwaiter::App do
   describe ".find" do
     context "when the app exists" do
       it "finds the app by name" do
-        Dumbwaiter::App.find(real_stack, "goose", fake_opsworks).id.should == "amazing"
+        Dumbwaiter::App.find(real_stack, "goose", fake_opsworks).id.should == fake_app.app_id
       end
     end
 
@@ -85,7 +87,7 @@ describe Dumbwaiter::App do
   describe ".find" do
     context "when the app exists" do
       it "finds the app by id" do
-        Dumbwaiter::App.find_by_id(real_stack, "amazing", fake_opsworks).name.should == "goose"
+        Dumbwaiter::App.find_by_id(real_stack, fake_app.app_id, fake_opsworks).name.should == "goose"
       end
     end
 

data/spec/lib/dumbwaiter/cli_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 
 describe Dumbwaiter::Cli do
   let(:fake_opsworks) { Dumbwaiter::Mock.new }
-  let!(:fake_stack) { fake_opsworks.make_stack("amazing", "ducks") }
-  let!(:fake_layer) { fake_opsworks.make_layer(fake_stack, "mighty", "beans", setup: %w[ham salami]) }
-  let!(:fake_app) { fake_opsworks.make_app(fake_stack, "delightful", "reifel") }
+  let!(:fake_stack) { fake_opsworks.create_stack }
+  let!(:fake_layer) { fake_opsworks.create_layer(stack_id: fake_stack.stack_id, custom_recipes: {setup: %w[ham salami]}) }
+  let!(:fake_app) { fake_opsworks.create_app(stack_id: fake_stack.stack_id) }
 
   subject(:cli) { Dumbwaiter::Cli.new }
 
@@ -15,20 +15,20 @@ describe Dumbwaiter::Cli do
       context "when the app exists" do
         it "deploys the stack with the resolved id" do
           Dumbwaiter::App.any_instance.should_receive(:deploy).with("corn")
-          cli.deploy("ducks", "reifel", "corn")
+          cli.deploy(fake_stack.name, fake_app.name, "corn")
         end
       end
 
       context "when the app does not exist" do
         it "blows up" do
-          expect { cli.deploy("ducks", "squirrel", "corn") }.to raise_error(Thor::Error)
+          expect { cli.deploy(fake_stack.name, "squirrel", "corn") }.to raise_error(Thor::Error)
         end
       end
     end
 
     context "when the stack does not exist" do
       it "blows up" do
-        expect { cli.deploy("toques", "reifel", "corn") }.to raise_error(Thor::Error)
+        expect { cli.deploy("toques", fake_app.name, "corn") }.to raise_error(Thor::Error)
       end
     end
   end
@@ -38,20 +38,20 @@ describe Dumbwaiter::Cli do
       context "when the app exists" do
         it "deploys the stack with the resolved id" do
           Dumbwaiter::App.any_instance.should_receive(:rollback)
-          cli.rollback("ducks", "reifel")
+          cli.rollback(fake_stack.name, fake_app.name)
         end
       end
 
       context "when the app does not exist" do
         it "blows up" do
-          expect { cli.rollback("ducks", "montreal") }.to raise_error(Thor::Error)
+          expect { cli.rollback(fake_stack.name, "montreal") }.to raise_error(Thor::Error)
         end
       end
     end
 
     context "when the stack does not exist" do
       it "blows up" do
-        expect { cli.rollback("maple syrup", "reifel") }.to raise_error(Thor::Error)
+        expect { cli.rollback("maple syrup", fake_app.name) }.to raise_error(Thor::Error)
       end
     end
   end
@@ -59,47 +59,47 @@ describe Dumbwaiter::Cli do
   describe "#list" do
     context "when the stack exists" do
       context "when the deployment is a rollback" do
-        before { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "rollback") }
+        before { fake_opsworks.create_deployment(stack_id: fake_stack.stack_id, command: {name: "rollback"}) }
 
         it "lists the deployment" do
           Kernel.should_receive(:puts) { |m| m.should =~ /rollback/ }
-          cli.list("ducks")
+          cli.list(fake_stack.name)
         end
       end
 
       context "when the deployment is a deploy" do
-        before { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "deploy") }
+        before { fake_opsworks.create_deployment(stack_id: fake_stack.stack_id, command: {name: "deploy"}) }
 
         it "lists the deployment" do
           Kernel.should_receive(:puts) { |m| m.should =~ /deploy/ }
-          cli.list("ducks")
+          cli.list(fake_stack.name)
         end
       end
 
       context "when the deployment is a custom cookbook update" do
-        before { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "update_custom_cookbooks") }
+        before { fake_opsworks.create_deployment(stack_id: fake_stack.stack_id, command: {name: "update_custom_cookbooks"}) }
 
         it "lists the deployment" do
           Kernel.should_receive(:puts) { |m| m.should =~ /update_custom_cookbooks/ }
-          cli.list("ducks")
+          cli.list(fake_stack.name)
         end
       end
 
       context "when the deployment is a recipe execution" do
-        before { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "execute_recipes") }
+        before { fake_opsworks.create_deployment(stack_id: fake_stack.stack_id, command: {name: "execute_recipes"}) }
 
         it "lists the deployment" do
           Kernel.should_receive(:puts) { |m| m.should =~ /execute_recipes/ }
-          cli.list("ducks")
+          cli.list(fake_stack.name)
         end
       end
 
       context "when the deployment is something else" do
-        let(:fake_deployment) { double(:deployment, command_name: "gargle", to_log: "brblrgl") }
+        before { fake_opsworks.create_deployment(stack_id: fake_stack.stack_id, command: {name: "wat"}) }
 
         it "does not print anything" do
           Kernel.should_not_receive(:puts)
-          cli.list("ducks")
+          cli.list(fake_stack.name)
         end
       end
     end
@@ -113,11 +113,11 @@ describe Dumbwaiter::Cli do
 
   describe "#layers" do
     context "when the stack exists" do
-      before { fake_opsworks.make_layer(fake_stack, "handsome", "frijoles") }
+      before { fake_opsworks.create_layer(stack_id: fake_stack.stack_id, shortname: "frijoles") }
 
       it "lists the layers" do
-        Kernel.should_receive(:puts).with("beans frijoles")
-        cli.layers("ducks")
+        Kernel.should_receive(:puts).with("#{fake_layer.shortname} frijoles")
+        cli.layers(fake_stack.name)
       end
     end
 
@@ -132,7 +132,7 @@ describe Dumbwaiter::Cli do
     context "when the stack exists" do
       it "deploys the stack with the resolved id" do
         Dumbwaiter::Stack.any_instance.should_receive(:rechef)
-        cli.rechef("ducks")
+        cli.rechef(fake_stack.name)
       end
     end
 
@@ -148,20 +148,20 @@ describe Dumbwaiter::Cli do
       context "when the layer exists" do
         it "runs the recipe on the layer" do
           Dumbwaiter::Layer.any_instance.should_receive(:run_recipe).with("meatballs")
-          cli.run_recipe("ducks", "beans", "meatballs")
+          cli.run_recipe(fake_stack.name, fake_layer.shortname, "meatballs")
         end
       end
 
       context "when the layer does not exist" do
         it "blows up" do
-          expect { cli.run_recipe("ducks", "brick", "setup") }.to raise_error(Thor::Error)
+          expect { cli.run_recipe(fake_stack.name, "brick", "setup") }.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", "setup") }.to raise_error(Thor::Error)
+        expect { cli.run_recipe("toques", fake_layer.shortname, "setup") }.to raise_error(Thor::Error)
       end
     end
   end
@@ -171,20 +171,20 @@ describe Dumbwaiter::Cli do
       context "when the layer exists" do
         it "prints custom recipes for a layer event" do
           Kernel.should_receive(:puts).with("ham salami")
-          cli.custom_recipes("ducks", "beans", "setup")
+          cli.custom_recipes(fake_stack.name, fake_layer.shortname, "setup")
         end
       end
 
       context "when the layer does not exist" do
         it "blows up" do
-          expect { cli.custom_recipes("ducks", "brick", "setup") }.to raise_error(Thor::Error)
+          expect { cli.custom_recipes(fake_stack.name, "brick", "setup") }.to raise_error(Thor::Error)
         end
       end
     end
 
     context "when the stack does not exist" do
       it "blows up" do
-        expect { cli.custom_recipes("toques", "beans", "setup") }.to raise_error(Thor::Error)
+        expect { cli.custom_recipes("toques", fake_layer.shortname, "setup") }.to raise_error(Thor::Error)
       end
     end
   end
@@ -194,27 +194,27 @@ describe Dumbwaiter::Cli do
       context "when the layer exists" do
         it "updates custom recipes on the layer for the event" do
           Dumbwaiter::Layer.any_instance.should_receive(:update_custom_recipes).with(:setup, ["eggs"])
-          cli.update_custom_recipes("ducks", "beans", "setup", "eggs")
+          cli.update_custom_recipes(fake_stack.name, fake_layer.shortname, "setup", "eggs")
         end
       end
 
       context "when the layer does not exist" do
         it "blows up" do
-          expect { cli.update_custom_recipes("ducks", "brick", "meatballs") }.to raise_error(Thor::Error)
+          expect { cli.update_custom_recipes(fake_stack.name, "brick", "meatballs") }.to raise_error(Thor::Error)
         end
       end
     end
 
     context "when the stack does not exist" do
       it "blows up" do
-        expect { cli.update_custom_recipes("toques", "beans", "meatballs") }.to raise_error(Thor::Error)
+        expect { cli.update_custom_recipes("toques", fake_layer.shortname, "meatballs") }.to raise_error(Thor::Error)
       end
     end
   end
 
   describe "#stacks" do
     it "lists the stacks" do
-      Kernel.should_receive(:puts).with("ducks: reifel")
+      Kernel.should_receive(:puts).with("#{fake_stack.name}: #{fake_app.name}")
       cli.stacks
     end
   end

data/spec/lib/dumbwaiter/deployment_spec.rb

@@ -2,11 +2,27 @@ require "spec_helper"
 
 describe Dumbwaiter::Deployment do
   let(:fake_opsworks) { Dumbwaiter::Mock.new }
-  let(:fake_stack) { fake_opsworks.make_stack("pancakes") }
-  let(:fake_app) { fake_opsworks.make_app(fake_stack, "yo") }
-  let!(:fake_user_profile) { fake_opsworks.make_user_profile("ie", "goose") }
+  let(:fake_stack) { fake_opsworks.create_stack }
+  let(:fake_app) { fake_opsworks.create_app(stack_id: fake_stack.stack_id) }
+  let!(:fake_user_profile) { fake_opsworks.create_user_profile(name: "goose") }
   let(:custom_json) { Dumbwaiter::DeploymentCustomJson.create("hockey", "eh-buddy").to_json }
-  let!(:fake_deployment) { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "deploy", "badical", custom_json, DateTime.parse("last Tuesday").to_s, "ie", "i love sports") }
+  let(:deployment_params) do
+    {
+      command: {name: "deploy"},
+      status: "badical",
+      comment: "i love sports",
+      created_at: DateTime.parse("last Tuesday").to_s
+    }
+  end
+
+  let!(:fake_deployment) do
+    fake_opsworks.create_deployment({
+      iam_user_arn: fake_user_profile.iam_user_arn,
+      stack_id: fake_stack.stack_id,
+      app_id: fake_app.app_id,
+      custom_json: custom_json
+    }.merge(deployment_params))
+  end
   let(:real_stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
 
   subject(:deployment) { Dumbwaiter::Deployment.new(real_stack, fake_deployment, fake_opsworks) }
@@ -23,35 +39,47 @@ describe Dumbwaiter::Deployment do
   end
 
   context "when the command name is not deploy" do
-    let!(:fake_deployment) { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "floss", "badical", custom_json, DateTime.parse("last Tuesday").to_s, "ie", "i love sports") }
+    let(:deployment_params) do
+      {
+        command: {name: "floss"},
+        status: "badical",
+        created_at: DateTime.parse("last Tuesday").to_s
+      }
+    end
 
     its(:to_log) { should == "#{DateTime.parse("last Tuesday")} - goose - floss - badical" }
   end
 
-  context "when the iam user arn is nil" do
-    let!(:fake_deployment) { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "deploy", "badical", custom_json, DateTime.parse("last Tuesday").to_s, nil, "i love sports") }
-
-    its(:user_name) { should == "OpsWorks" }
-  end
-
-  context "when the iam user arn does not exist" do
-    let!(:fake_deployment) { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "deploy", "badical", custom_json, DateTime.parse("last Tuesday").to_s, "wait which user is this", "i love sports") }
-
-    before { fake_opsworks.clear }
+  context "when the iam user does not exist" do
+    let(:deployment_params) do
+      {
+        command: {name: "floss"},
+        status: "badical",
+        created_at: DateTime.parse("last Tuesday").to_s,
+        iam_user_arn: nil
+      }
+    end
 
     its(:user_name) { should == "OpsWorks" }
   end
 
   context "when custom_json is nil" do
     let(:real_app) { Dumbwaiter::App.new(real_stack, fake_app, fake_opsworks) }
-    let!(:fake_deployment) { fake_opsworks.make_deployment(fake_stack, fake_app, "jello", "deploy", "badical", nil, DateTime.parse("last Tuesday").to_s, "ie", "i love sports") }
+    let(:deployment_params) do
+      {
+        command: {name: "floss"},
+        status: "badical",
+        created_at: DateTime.parse("last Tuesday").to_s,
+        custom_json: nil
+      }
+    end
 
     its(:revision) { should == "#{real_app.revision}@{#{DateTime.parse("last Tuesday")}}" }
   end
 
   describe ".all" do
     it "fetches all the deployments" do
-      fake_opsworks.should_receive(:describe_deployments).with(stack_id: "pancakes").and_call_original
+      fake_opsworks.should_receive(:describe_deployments).with(stack_id: fake_stack.stack_id).and_call_original
       Dumbwaiter::Deployment.all(real_stack, fake_opsworks).should have(1).deployment
     end
   end

data/spec/lib/dumbwaiter/instance_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 
 describe Dumbwaiter::Instance do
   let(:fake_opsworks) { Dumbwaiter::Mock.new }
-  let(:fake_stack) { fake_opsworks.make_stack }
-  let(:fake_layer) { fake_opsworks.make_layer(fake_stack) }
-  let!(:fake_instance) { fake_opsworks.make_instance(fake_stack, fake_layer) }
+  let(:fake_stack) { fake_opsworks.create_stack }
+  let(:fake_layer) { fake_opsworks.create_layer }
+  let!(:fake_instance) { fake_opsworks.create_instance(stack_id: fake_stack.stack_id, layer_id: fake_layer.layer_id) }
 
   subject(:instance) { Dumbwaiter::Instance.new(fake_layer, fake_instance, fake_opsworks) }
 

data/spec/lib/dumbwaiter/layer_spec.rb

@@ -2,16 +2,17 @@ require "spec_helper"
 
 describe Dumbwaiter::Layer do
   let(:fake_opsworks) { Dumbwaiter::Mock.new }
-  let(:fake_stack) { fake_opsworks.make_stack("pancakes") }
-  let(:fake_layer) { fake_opsworks.make_layer(fake_stack, "pinto", "meaty", setup: ["ham"]) }
-  let!(:fake_instance) { fake_opsworks.make_instance(fake_layer, fake_stack, "dragons") }
+  let(:fake_stack) { fake_opsworks.create_stack }
+  let(:fake_custom_recipes) { {setup: ["ham"]} }
+  let(:fake_layer) { fake_opsworks.create_layer(stack_id: fake_stack.stack_id, shortname: "meaty", custom_recipes: fake_custom_recipes) }
+  let!(:fake_instance) { fake_opsworks.create_instance }
 
   let(:real_stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
 
   subject(:layer) { Dumbwaiter::Layer.new(real_stack, fake_layer, fake_opsworks) }
 
   its(:opsworks_layer) { should == fake_layer }
-  its(:id) { should == "pinto" }
+  its(:id) { should == fake_layer.layer_id }
   its(:shortname) { should == "meaty" }
   its(:custom_recipes) { should include(setup: ["ham"]) }
 
@@ -21,13 +22,15 @@ describe Dumbwaiter::Layer do
     let(:real_stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
 
     it "fetches all the deployments" do
-      fake_opsworks.should_receive(:describe_layers).with(stack_id: "pancakes").and_call_original
+      fake_opsworks.should_receive(:describe_layers).with(stack_id: fake_stack.stack_id).and_call_original
       Dumbwaiter::Layer.all(real_stack, fake_opsworks).should have(1).layer
     end
   end
 
   describe ".find" do
     context "when the layer exists" do
+      let!(:layer) { Dumbwaiter::Layer.new(real_stack, fake_layer, fake_opsworks) }
+
       it "finds the layer by name" do
         Dumbwaiter::Layer.find(real_stack, "meaty", fake_opsworks).shortname.should == "meaty"
       end
@@ -45,8 +48,8 @@ describe Dumbwaiter::Layer do
   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[:stack_id].should == fake_stack.stack_id
+        params[:instance_ids].should == [fake_instance.instance_id]
         params[:command].should == {name: "execute_recipes", args: {recipes: ["meatballs"]}}
       end
       layer.run_recipe("meatballs")
@@ -56,7 +59,7 @@ describe Dumbwaiter::Layer do
   describe "#update_custom_recipes" do
     it "overwrites existing custom recipes for an event" do
       fake_opsworks.should_receive(:update_layer) do |params|
-        params[:layer_id].should == "pinto"
+        params[:layer_id].should == fake_layer.layer_id
         params[:custom_recipes].should include(setup: ["feet"])
       end
       layer.update_custom_recipes(:setup, ["feet"])

data/spec/lib/dumbwaiter/stack_spec.rb

@@ -2,10 +2,10 @@ require "spec_helper"
 
 describe Dumbwaiter::Stack do
   let(:fake_opsworks) { Dumbwaiter::Mock.new }
-  let!(:fake_stack) { fake_opsworks.make_stack("cool", "ducks", "hot pink") }
-  let!(:fake_app) { fake_opsworks.make_app(fake_stack) }
-  let!(:fake_deployment) { fake_opsworks.make_deployment(fake_stack, fake_app) }
-  let!(:fake_layer) { fake_opsworks.make_layer(fake_stack) }
+  let!(:fake_stack) { fake_opsworks.create_stack(name: "ducks", attributes:{"Color" => "hot pink"}) }
+  let!(:fake_app) { fake_opsworks.create_app(stack_id: fake_stack.stack_id) }
+  let!(:fake_deployment) { fake_opsworks.create_deployment(stack_id: fake_stack.stack_id, app_id: fake_app.app_id) }
+  let!(:fake_layer) { fake_opsworks.create_layer(stack_id: fake_stack.stack_id) }
 
   subject(:stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
 
@@ -13,7 +13,7 @@ describe Dumbwaiter::Stack do
   it { should have(1).deployments }
   it { should have(1).layers }
 
-  its(:id) { should == "cool" }
+  its(:id) { should == fake_stack.stack_id }
   its(:name) { should == "ducks" }
   its(:color) { should == "hot pink" }
 
@@ -26,7 +26,7 @@ describe Dumbwaiter::Stack do
   describe ".find" do
     context "when the stack exists" do
       it "finds the stack by name" do
-        Dumbwaiter::Stack.find("ducks", fake_opsworks).id.should == "cool"
+        Dumbwaiter::Stack.find("ducks", fake_opsworks).id.should == fake_stack.stack_id
       end
     end
 
@@ -42,7 +42,7 @@ describe Dumbwaiter::Stack do
   describe ".find_by_id" do
     context "when the stack exists" do
       it "finds the stack by id" do
-        Dumbwaiter::Stack.find_by_id("cool", fake_opsworks).name.should == "ducks"
+        Dumbwaiter::Stack.find_by_id(fake_stack.stack_id, fake_opsworks).name.should == "ducks"
       end
     end
 
@@ -58,7 +58,7 @@ describe Dumbwaiter::Stack do
   describe "#rechef" do
     it "creates a deployment" do
       fake_opsworks.should_receive(:create_deployment) do |params|
-        params[:stack_id].should == "cool"
+        params[:stack_id].should == fake_stack.stack_id
         params[:command].should == {name: "update_custom_cookbooks"}
       end
       stack.rechef

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: dumbwaiter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Doc Ritezel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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: hashie
   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: thor
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hoist your code up to Opsworks
@@ -116,11 +116,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -158,17 +158,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Monitor, deploy and maintain your Opsworks application stacks