awsborn 0.5.0 → 0.5.1

data/README.mdown

@@ -61,7 +61,7 @@ Server types can be named anything but must inherit from `Awsborn::Server`.
 Servers take five different directives:
 
 * `instance_type` -- a symbol.  One of `:m1_small`, `:m1_large`, `:m1_xlarge`,
-  `:m2_2xlarge`, `:m2_4xlarge`, `:c1_medium`, and `:c1_xlarge`.
+  `:m2_2xlarge`, `:m2_4xlarge`, `:c1_medium`, `:c1_xlarge`, `cc1.4xlarge`, and `t1.micro`.
 * `image_id` -- a valid EC2 AMI or a hash `{:i386 => 'ami-3232', :x64 => 'ami-6464'}`
   Specify `:sudo_user` as an option if the AMI does not allow you to log in as root.
 * `security_group` -- a security group that you own.
@@ -85,7 +85,8 @@ and a hash:
 Mandatory keys:
 
 * `:zone` -- the availability zone for the server.  One of `:us_east_1a`, `:us_east_1b`,
-  `:us_east_1c`, `:us_west_1a`, `:us_west_1b`, `:eu_west_1a`, `:eu_west_1b`.
+  `:us_east_1c`, `:us_east_1d`, `:us_west_1a`, `:us_west_1b`, `:eu_west_1a`, `:eu_west_1b`,
+  `:ap-southeast-1a`, `:ap-southeast-1b`.
 * `:disk` -- a hash of `device => volume-id`.  Awsborn uses the disks to tell if a server
   is running or not (see *Launching a cluster*).  `volume-id` can also be an array
   `[volume-id, :format]`, in which case `the_server.format_disk_on_device?(device)`
@@ -111,7 +112,7 @@ The `launch` method on the cluster checks to see if each server is running by ch
 if the server's disks are attached to an EC2 instance, i.e., the server is
 defined by its content, not by its AMI or ip address.
 
-Servers that not running are started by calling the `start` method on the server,
+Servers that are not running are started by calling the `start` method on the server,
 which does the following:
 
     def start (key_pair)
@@ -224,7 +225,8 @@ Just add a `Rakefile` in the same directory:
     include Awsborn::Chef::Rake
     require './servers'
 
-You are now able to run `rake` to start all servers and run Chef on each of them.
+Put your cookbooks directory in the same directory as the `Rakefile` or in its
+parent directory.  Run `rake` to start all servers and run Chef on each of them.
 Other rake tasks include:
 
 * `rake chef` - Run chef on all servers, or the ones specified with `host=name1,name2`.
@@ -261,12 +263,23 @@ Other rake tasks include:
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* At the moment, the gem does not have any tests.  I intend to fix that,
+* At the moment, the gem does not have much tests.  I intend to fix that,
   and I won't accept patches without tests.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+## Changes
+
+### New in 0.5.1
+
+* When awsborn uploads cookbooks and configuration, it looks for a `cookbooks`
+  directory in the parent directory if none is found in the `Rakefile`'s directory.
+
+### New in 0.5.0
+
+* Support for cc1.4xlarge and t1.micro instance types.
+
 ## History
 
 This gem is inspired by [Awsymandias](http://github.com/bguthrie/awsymandias)

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/awsborn/rake.rb

@@ -1,8 +1,23 @@
 module Awsborn
-  module Chef
+  module Chef #:nodoc:
+    # Just add a `Rakefile` in the same directory as your server definition file.
+    #
+    #     require 'awsborn'
+    #     include Awsborn::Chef::Rake
+    #     require './servers'
+    #
+    # You are now able to run `rake` to start all servers and run Chef on each of them.
+    # Other rake tasks include:
+    #
+    # * `rake chef` - Run chef on all servers, or the ones specified with `host=name1,name2`.
+    # * `rake chef:debug` - Ditto, but with chef's log level set to `debug`.
+    # * `rake start` - Start all servers (or host=name1,name2) but don't run `chef`.
+    #
+    # You can use `server=name1,name2` as a synonym for `host=...`
+    #
     module Rake
 
-      def default_cluster
+      def default_cluster #:nodoc:
         default_klass = Awsborn::Server.children.first
         default_klass.clusters.first
       end
@@ -16,8 +31,15 @@ module Awsborn
 
       desc "Start all servers (or host=name1,name2) but don't run chef."
       task :start do |t,args|
-        hosts = args[:host] && args[:host].split(',')
-        default_cluster.launch hosts
+        default_cluster.launch get_hosts(args)
+      end
+
+      desc "Update .ssh/known_hosts with data from all servers (or host=host1,host2)"
+      task :update_known_hosts do |t,args|
+        hosts = get_hosts(args)
+        default_cluster.each do |server|
+          server.running? && server.update_known_hosts if hosts.nil? || hosts.include?(server.name.to_s)
+        end
       end
 
       desc "Run chef on all servers (or host=name1,name2)."
@@ -25,9 +47,11 @@ module Awsborn
 
       namespace :chef do
         task :run => [:check_syntax] do |t,args|
-          hosts = args[:host] && args[:host].split(',')
+          hosts = get_hosts(args)
           default_cluster.each do |server|
-            server.cook if hosts.nil? || hosts.include?(server.name.to_s)
+            next unless hosts.nil? || hosts.include?(server.name.to_s)
+            puts framed("Running chef on '#{server.name}'")
+            server.cook
           end
         end
 
@@ -54,7 +78,7 @@ module Awsborn
         end
       end
 
-      def create_cookbook(dir)
+      def create_cookbook(dir) #:nodoc:
         raise "Must provide a cookbook=" unless ENV["cookbook"]
         puts "** Creating cookbook #{ENV["cookbook"]}"
         sh "mkdir -p #{File.join(dir, ENV["cookbook"], "attributes")}" 
@@ -75,6 +99,14 @@ EOH
           end
         end
       end
+
+      def get_hosts (args) #:nodoc:
+        args[:host] && args[:host].split(',') || args[:server] && args[:server].split(',')
+      end
+
+      def framed (message) #:nodoc:
+        '*' * (4 + message.length) + "\n* #{message} *\n" + '*' * (4 + message.length)
+      end
     end
   end
 end

data/lib/awsborn/server.rb

@@ -177,10 +177,16 @@ module Awsborn
 
     def upload_cookbooks
       logger.info "Uploading cookbooks to #{host_name}"
+
+      cookbooks_dir = '../cookbooks' # Hard coded for now
+      temp_link = File.directory?(cookbooks_dir) && ! File.directory?('cookbooks')
+      File.symlink(cookbooks_dir, 'cookbooks') if temp_link
+
       File.open("config/dna.json", "w") { |f| f.write(chef_dna.to_json) }
-      sh "rsync -rL --delete --exclude '.*' ./ root@#{host_name}:#{Awsborn.remote_chef_path}"
+      system "rsync -rL --delete --exclude '.*' ./ root@#{host_name}:#{Awsborn.remote_chef_path}"
     ensure
       File.delete("config/dna.json")
+      File.delete("cookbooks") if temp_link
     end
 
     def run_chef

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - David Vrensk
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: icehouse-right_aws
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 1
         - 11
@@ -35,9 +38,11 @@ dependencies:
   name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 2
@@ -49,9 +54,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,9 +68,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -75,9 +84,11 @@ dependencies:
   name: webmock
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 9
@@ -127,23 +138,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Awsborn defines servers as instances with a certain disk volume, which makes it easy to restart missing servers.