adds git pull to cook meals

8thlight · Sep 25, 2012 · 3baa208 · 3baa208
1 parent d1a4f0c
commit 3baa208
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/boucher/compute.rb b/lib/boucher/compute.rb
@@ -64,7 +64,7 @@ def self.cook_meal(server, meal)
     Boucher::Nagios.remove_host(server)
 
     update_recipes(server)
-    ssh server, "cd infrastructure && sudo BUTCHER_ENV=#{Boucher::Config[:env]} BRANCH=#{Boucher::Config[:branch]} chef-solo -c config/solo.rb -j config/#{meal}.json"
+    ssh server, "cd infrastructure && git pull && sudo BUTCHER_ENV=#{Boucher::Config[:env]} BRANCH=#{Boucher::Config[:branch]} chef-solo -c config/solo.rb -j config/#{meal}.json"
 
     Boucher::Nagios.add_host(server)
   end

diff --git a/lib/boucher/meals.rb b/lib/boucher/meals.rb
@@ -7,15 +7,15 @@ module Boucher
   def self.json_to_meal(json)
     parser = JSON.parser.new(json, :symbolize_names => true)
     config = parser.parse
-    config[:boucher]
+    config[:boucher] || {}
   end
 
   def self.meals
     if @meals.nil?
       @meals = {}
       Dir.glob(File.join("config", "*.json")).each do |file|
         spec = json_to_meal(::IO.read(file))
-        meal_name = File.basename(file).to_sym
+        meal_name = File.basename(file)[0...-5].to_sym
         @meals[meal_name] = spec
       end
     end

diff --git a/spec/boucher/meals_spec.rb b/spec/boucher/meals_spec.rb
@@ -12,6 +12,9 @@
   it "pull classification from json" do
     json = "{\"boucher\": {\"foo\": 1,\n \"bar\": 2}}"
     Boucher.json_to_meal(json).should == {:foo => 1, :bar => 2}
+
+    json = "{}"
+    Boucher.json_to_meal(json).should == {}
   end
 
   it "can classify base server" do