boucher 0.3.0 → 0.3.1

data/CHANGES.md

@@ -0,0 +1,4 @@
+# 0.3.1
+
+* add servers:recipe task
+* renames tak servers:chef to servers:meal

data/README.md

@@ -1,8 +1,8 @@
-<img src="" alt="boucher logo" title="Boucher" align="right"/>
+<img src="https://raw.github.com/8thlight/boucher/master/boucher_logo.jpg" alt="Boucher logo" title="Boucher" align="right"/>
 # Boucher
 
 Boucher, pronounced [boo-shay], and meaning Butcher in French, is a suite of Rake tasks that simplfy your AWS
-deployment strategy.  It's built ontop of Chef and Fog giving your fingers the power to create new servers,
+deployment strategy.  It's built on top of Chef and Fog giving your fingers the power to create new servers,
 install required software, and deploy your system all in a single command.
 
 It also helps manage your system with support for different environments and tasks to:
@@ -26,15 +26,16 @@ that'll get you off the ground.  We recomend
     git clone git://github.com/8thlight/boucher_template.git infrastructure
     rm -rf infrastructure/.git
 
-You'll probabaly want to create a repository for your own to track the work here.
+You'll probably want to create a repository for your own to track the work here.
 
-Read config/env/shared.rb to get a feel for the configuration options.  You'll fill in some of those values as your continue to get started below.
+Read config/env/shared.rb to get a feel for the configuration options.  You'll fill in some of those values as you continue to get started below.
 
 ### Creating a base image
 
 1) Launch new instance: Ubuntu Server 12.04.1 LTS
 
- * Create a new key saved in your infrastructure project
+ * Create a new keyfile (*.pem) saved in your infrastructure project
+ * `chmod 0600 KEYFILE_NAME.pem` in your infrastructure project
  * Be sure to add a security group that opens port 22 for SSH
 
 2) Update config/env/shared.rb
@@ -47,11 +48,11 @@ Read config/env/shared.rb to get a feel for the configuration options.  You'll f
 
     rake servers:list
 
-4) SSH into new server.  (:username config must be 'ubunutu' at this point)
+4) SSH into new server.  (:username config must be 'ubuntu' at this point)
 
     rake servers:ssh[<instance id>]
 
-5) Create new poweruser (unless you like 'unubutu' as your poweruser).
+5) Create new poweruser (unless you like 'ubuntu' as your poweruser).
 
     sudo adduser <username>
     sudo adduser <username> sudo
@@ -73,15 +74,16 @@ Read config/env/shared.rb to get a feel for the configuration options.  You'll f
     # add the following line at the end of the file:
     <username> ALL=(ALL) NOPASSWD: ALL
 
-9) Install required pacakges and gems.
+9) Install required packages and gems.
 
     sudo apt-get update
     sudo apt-get install ruby1.9.1 ruby1.9.1-dev git gcc make libxml2-dev libxslt1-dev
     sudo apt-get upgrade
     sudo gem install bundler chef
 
-10) Checkout your infrstructure repo.  (Yes.  You should push your repo even in this early stage.)
-If you use github, you'll have to generate ssh keys and add them to the github repo.
+10) Checkout your infrastructure repo.  (Yes.  You should push your repo even in this early stage.)
+If you use github, you'll have to generate ssh keys and add them to the github repo. Note: be sure
+you name the directory "infrastructure" when cloning, since boucher assumes that location.
 
     cd ~/.ssh
     ssh-keygen -t rsa -C "your_email@youremail.com"
@@ -104,9 +106,9 @@ Run rake to see the list of tasks provided.
 
 ### Meals
 
-We're sticking with the metephore here.  A Meal is basically a set of recipes for a single server.
+We're sticking with the metaphor here.  A Meal is basically a set of recipes for a single server.
 Boucher will expect meals to exist in the config directory.  They are JSON files usable by chef-solo, and Boucher
-allows you too add extra configuration information under the "Boucher": key.  For example:
+allows you to add extra configuration information under the "Boucher": key.  For example:
 
     {
       "run_list": [
@@ -125,7 +127,7 @@ allows you too add extra configuration information under the "Boucher": key.  Fo
 
 ### ERB in config
 
-Meal .json files may contain ERB in the "boucher" section.  However, the file get's parsed by chef-solo so it has to remain a valid JSON file.  But you can do things like this:
+Meal .json files may contain ERB in the "boucher" section.  However, the file gets parsed by chef-solo so it has to remain a valid JSON file.  But you can do things like this:
 
          {
            "run_list": ...
@@ -170,11 +172,11 @@ Environment configuration is available in your chef recipes.  Just require 'bouc
 
 ### Recipes
 
-We'll assume you're familiar with Chef.  So you know, there are plany of open source cookbooks/recipes on the intertubes.
+We'll assume you're familiar with Chef.  So you know, there are plenty of open source cookbooks/recipes on the intertubes.
 Convention is to grab the files, put them in your cookbooks folder and take ownership of them.  There's a good chance you'll
 want to change them.
 
 ## License
 
 Copyright (c) 2012 8th Light, Inc.
-MIT License
+MIT License

data/boucher.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "boucher"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.authors     = ["'Micah Micah'"]
   s.email       = ["'micah@8thlight.com'"]
   s.homepage    = "http://github.com/8thlight/boucher"

data/lib/boucher/compute.rb

@@ -48,6 +48,12 @@ module Boucher
     ssh server, "cd infrastructure && sudo BENV=#{Boucher::Config[:env]} BRANCH=#{Boucher::Config[:branch]} chef-solo -c config/solo.rb -j config/#{meal_name}.json"
   end
 
+  def self.cook_recipe(server, recipe)
+    update_recipes(server)
+    ssh server, "echo '{\\\"run_list\\\": [\\\"recipe[#{recipe}]\\\"]}' > /tmp/single_recipe.json"
+    ssh server, "cd infrastructure && sudo BENV=#{Boucher::Config[:env]} BRANCH=#{Boucher::Config[:branch]} chef-solo -c config/solo.rb -j /tmp/single_recipe.json"
+  end
+
   def self.ssh_open?(server)
     ssh server, "echo 'SSH is open for business!'"
     true

data/lib/boucher/tasks/servers.rake

@@ -112,12 +112,20 @@ web console and click Instance Actions -> Change Termination Protection -> Yes."
   end
 
   desc "Cook the specified meal on the instance(s) specified by the given id or meal"
-  task :chef, [:meal, :server_id] do |t, args|
+  task :meal, [:meal, :server_id] do |t, args|
     Boucher.assert_env!
     servers = Boucher.resolve_servers(args.server_id || args.meal)
     servers.each do |server|
       Boucher.cook_meal(server, args.meal)
     end
   end
+
+  desc "Cook the specified recipe on the instance(s) specified by the given id or meal"
+  task :recipe, [:recipe, :id_or_meal] do |t, args|
+    servers = Boucher.resolve_servers(args.id_or_meal || args.meal)
+    servers.each do |server|
+      Boucher.cook_recipe(server, args.recipe)
+    end
+  end
 end
 

data/spec/boucher/env_spec.rb

@@ -11,6 +11,7 @@ describe "Environment" do
     end
 
     it "defaults to :dev" do
+      Boucher::Config.delete(:env)
       ENV.delete('BENV')
       #load File.expand_path(File.dirname(__FILE__) + "/../../lib/boucher/env.rb")
       Boucher::env_name.should == :dev

data/spec/boucher/snapshots_spec.rb

@@ -20,6 +20,7 @@ describe "Boucher::snapshots" do
     end
 
     it "finds all snapshots" do
+      Boucher::Snapshots.instance_variable_set(:@snapshots, nil)
       Boucher::Snapshots.all.size.should == 3
       Boucher::Snapshots.all.should == remote_snapshots
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boucher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,6 +85,7 @@ files:
 - .gitignore
 - .gitmodules
 - .rvmrc
+- CHANGES.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -92,6 +93,8 @@ files:
 - Rakefile
 - TODO.md
 - boucher.gemspec
+- boucher.jpg
+- boucher_logo.jpg
 - lib/boucher/addresses.rb
 - lib/boucher/compute.rb
 - lib/boucher/env.rb