dumbwaiter 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94944ee58a46b0164e4f7937fcc3b066213f042c
-  data.tar.gz: 50cdfe19a328a832ff374dc68cbe50900e090b0e
+  metadata.gz: a3d7718c5ed04fbb0968d7137db8b407664c2208
+  data.tar.gz: 58012f46d1485fc677be218a88accdefe6ea0faa
 SHA512:
-  metadata.gz: 0ca9bbc6e30aa1b6dee2a134d419c7180c5586979f83f7c633971de0800eb2f8e2966bb8252f13627b07e082ee5dcef1a95338b9f1359dff34adb90eea7ee9cd
-  data.tar.gz: fdedb2834345c6a697cf7ff8664473bfd494fc100a396afe13d8e4969c70f294da1269cd7965647da53a998146737e5faa44ff1271534061cba82a39123a2888
+  metadata.gz: ca37b421c99a6925f6341f1399e4ec8722d84df5be94bdf7a186da8974beb61bc371bcf3effc5bb22c7ffe6b60d2a5bcfbad8e8695e29caeb96cf10de9af526f
+  data.tar.gz: 1dc41bf27d1fbacb8459bc4c3953cc9b4f053c2428dcdcd4fda46cbe2ae2551880e1d9e3432f665b51a23b9fc0af1268aebad69eecc6107ce8a46af89c064a53

data/lib/dumbwaiter/cli.rb

@@ -54,6 +54,24 @@ module Dumbwaiter
       raise Thor::Error.new(e.message)
     end
 
+    desc "custom_recipes STACK LAYER EVENT", "Show custom recipes for an event"
+    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(" "))
+    rescue Dumbwaiter::Stack::NotFound, Dumbwaiter::Layer::NotFound => e
+      raise Thor::Error.new(e.message)
+    end
+
+    desc "update_custom_recipes STACK LAYER EVENT RECIPE...", "Update custom recipes for an event"
+    def update_custom_recipes(stack_name, layer_name, event_name, *recipes)
+      stack = Stack.find(stack_name)
+      layer = Layer.find(stack, layer_name)
+      layer.update_custom_recipes(event_name.to_sym, recipes)
+    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(', ')}") }

data/lib/dumbwaiter/layer.rb

@@ -40,6 +40,17 @@ class Dumbwaiter::Layer
     )
   end
 
+  def custom_recipes
+    opsworks_layer.custom_recipes.to_hash
+  end
+
+  def update_custom_recipes(event_name, runlist)
+    opsworks.update_layer(
+      layer_id: id,
+      custom_recipes: custom_recipes.merge(event_name => runlist)
+    )
+  end
+
   def instances
     @instances ||= Dumbwaiter::Instance.all(self, opsworks)
   end

data/lib/dumbwaiter/mock.rb

@@ -37,8 +37,8 @@ class Dumbwaiter::Mock
     app
   end
 
-  def make_layer(stack = make_stack, id = make_id, shortname = Faker::Name.first_name.downcase)
-    layer = OpenStruct.new(stack_id: stack.stack_id, layer_id: id, shortname: shortname)
+  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))
     layers << layer
     layer
   end
@@ -64,6 +64,10 @@ class Dumbwaiter::Mock
 
   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

data/lib/dumbwaiter/version.rb

@@ -1,3 +1,3 @@
 module Dumbwaiter
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/lib/dumbwaiter/cli_spec.rb

@@ -3,7 +3,7 @@ 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") }
+  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") }
 
   subject(:cli) { Dumbwaiter::Cli.new }
@@ -152,14 +152,60 @@ describe Dumbwaiter::Cli do
 
       context "when the layer does not exist" do
         it "blows up" do
-          expect { cli.run_recipe("ducks", "brick", "meatballs") }.to raise_error(Thor::Error)
+          expect { cli.run_recipe("ducks", "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", "meatballs") }.to raise_error(Thor::Error)
+        expect { cli.run_recipe("toques", "beans", "setup") }.to raise_error(Thor::Error)
+      end
+    end
+  end
+
+  describe "#custom_recipes" do
+    context "when the stack exists" do
+      context "when the layer exists" do
+        it "prints custom recipes for a layer event" do
+          Kernel.should_receive(:puts) { |m| m.should == "ham salami" }
+          cli.custom_recipes("ducks", "beans", "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)
+        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)
+      end
+    end
+  end
+
+  describe "#update_custom_recipes" do
+    context "when the stack exists" 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")
+        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)
+        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)
       end
     end
   end

data/spec/lib/dumbwaiter/deployment_spec.rb

@@ -5,7 +5,7 @@ describe Dumbwaiter::Deployment do
   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(:custom_json) { JSON.dump(deploy: {"hockey" => {scm: {revision: "eh-buddy"}}}) }
+  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(:real_stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
 

data/spec/lib/dumbwaiter/layer_spec.rb

@@ -3,7 +3,7 @@ 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") }
+  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(:real_stack) { Dumbwaiter::Stack.new(fake_stack, fake_opsworks) }
@@ -13,6 +13,7 @@ describe Dumbwaiter::Layer do
   its(:opsworks_layer) { should == fake_layer }
   its(:id) { should == "pinto" }
   its(:shortname) { should == "meaty" }
+  its(:custom_recipes) { should include(setup: ["ham"]) }
 
   it { should have(1).instances }
 
@@ -51,4 +52,21 @@ describe Dumbwaiter::Layer do
       layer.run_recipe("meatballs")
     end
   end
+
+  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[:custom_recipes].should include(setup: ["feet"])
+      end
+      layer.update_custom_recipes(:setup, ["feet"])
+    end
+
+    it "preserves existing custom recipes for an event when updating another event" do
+      fake_opsworks.should_receive(:update_layer) do |params|
+        params[:custom_recipes].should include(setup: ["ham"])
+      end
+      layer.update_custom_recipes(:deploy, ["feet"])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "dumbwaiter"
 require "dumbwaiter/mock"
 
 Aws.config = {access_key_id: "tacos", secret_access_key: "secret chocolate"}
+I18n.enforce_available_locales = false
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dumbwaiter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Doc Ritezel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core