awsborn 0.2.1 → 0.3.0

data/README.mdown

@@ -16,8 +16,8 @@ that are not running.
     require 'awsborn'
 
     # If not set, will be picked up from ENV['AMAZON_ACCESS_KEY_ID']
-    # and ENV['AMAZON_SECRET_ACCESS_KEY'].
     Awsborn.access_key_id = 'AAAAAAAAAAAA'
+    # Can be picked up from ENV['AMAZON_SECRET_ACCESS_KEY'] or Keychain (OS X)
     Awsborn.secret_access_key = 'KKKKKKKKKKKK'
 
     # Logs to `awsborn.log` in current dir with level INFO by default.
@@ -155,6 +155,71 @@ This is what we use with the AMI above:
     echo 'Bootstrapping Chef - done'
     echo '-------------------------'
 
+## Running with Chef Solo
+
+Awsborn integrates with [Chef Solo](http://github.com/opscode/chef).  An example from reality:
+
+    Awsborn.access_key_id = 'AKIAJHL53MPX7LPCKIFQ'
+
+    class LogServer < Awsborn::Server
+      instance_type    :m1_small
+      image_id         'ami-2fc2e95b', :sudo_user => 'ubuntu'
+      security_group   'Basic web'
+      keys             '../keys/*'
+      bootstrap_script 'chef-bootstrap.sh'
+      monitor          true
+
+      cluster do
+        domain 'releware.net'
+        server :log_a, :zone => :eu_west_1a, :disk => {:sdf => "vol-a857b8c1"}, :ip => 'log-a'
+        server :log_b, :zone => :eu_west_1b, :disk => {:sdf => "vol-aa57b8c3"}, :ip => 'log-b'
+      end
+
+      def chef_dna
+        {
+          :user => "lumberjack",
+          :host => host_name,
+          :users =>  [
+            {
+              :username => "lumberjack",
+              :authorized_keys => key_data,
+              :gid => 1001,
+              :uid => 1001,
+              :sudo => true,
+            }
+          ],
+          :packages => %w[
+            vim
+            heirloom-mailx
+          ],
+          :gems => [
+            "rake"
+          ],
+          :ebs_volumes => [
+            {:device => "sdf", :path => "/apps"}
+          ],
+          :recipes => [
+            "packages",
+            "users",
+            "sudo",
+            "openssh",
+            "ec2-ebs",
+            "git",
+            "gems",
+          ]
+        }
+      end
+    end
+
+Just add a `Rakefile` in the same directory:
+
+    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.
+See `rake -T` for more options.
+
 ## Bugs and surprising features
 
 No bugs are known at this time.

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/icehouse/awsborn"
     gem.authors = ["David Vrensk"]
     gem.add_dependency "icehouse-right_aws", ">= 1.11.0"
+    gem.add_dependency "json_pure", ">= 1.2.3"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "webmock", ">= 0.9.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/awsborn/awsborn.rb

@@ -3,7 +3,7 @@ module Awsborn
   class ServerError < StandardError ; end
 
   class << self
-    attr_writer :access_key_id, :secret_access_key, :logger
+    attr_writer :access_key_id, :secret_access_key, :logger, :remote_chef_path
     attr_accessor :verbose
 
     Awsborn.verbose = true
@@ -13,7 +13,27 @@ module Awsborn
     end
     
     def secret_access_key
-      @secret_access_key ||= ENV['AMAZON_SECRET_ACCESS_KEY']
+      unless @secret_access_key
+        @secret_access_key = ENV['AMAZON_SECRET_ACCESS_KEY']
+        if @secret_access_key.to_s == ''
+          @secret_access_key = secret_access_key_from_keychain(access_key_id)
+        end
+      end
+      @secret_access_key
+    end
+
+    def secret_access_key_from_keychain (key_id)
+      @credentials ||= {}
+      unless @credentials[key_id]
+        dump = `security -q find-generic-password -a "#{key_id}" -g 2>&1`
+        secret_key = dump[/password: "(.*)"/, 1]
+        @credentials[key_id] = secret_key
+      end
+      @credentials[key_id]
+    end
+
+    def remote_chef_path
+      @remote_chef_path ||= '/etc/chef'
     end
   
     def logger

data/lib/awsborn/git_branch.rb

@@ -0,0 +1,30 @@
+module Awsborn
+  class GitBranch
+
+    attr_reader :branch
+
+    def initialize (branch)
+      require 'git'
+      @branch = branch
+    end
+    
+    def file (path)
+      path, file = File.split(path)
+
+      repo = Git.open(root)
+      tree = repo.branches[branch].gcommit.gtree
+      path.each { |dir| tree = tree.subtrees[dir] }
+      tree.blobs[file].contents
+    end
+
+    protected
+
+    def root
+      dir = File.expand_path('.')
+      while dir != '/'
+        return dir if File.directory?(File.join(dir, '.git'))
+        dir = File.dirname(dir)
+      end
+    end
+  end
+end

data/lib/awsborn/rake.rb

@@ -0,0 +1,64 @@
+module Awsborn
+  module Chef
+    module Rake
+
+      def default_cluster
+        default_klass = Awsborn::Server.children.first
+        default_klass.clusters.first
+      end
+
+      desc "Start all servers (if needed) and deploy with chef"
+      task :default => [:start, :cook]
+
+      desc "Start all servers"
+      task :start do
+        default_cluster.launch
+      end
+
+      desc "Run chef on all servers"
+      task :cook => [:check_syntax] do
+        default_cluster.each do |server|
+          server.cook
+        end
+      end
+
+      desc "Check your cookbooks and config files for syntax errors"
+      task :check_syntax do
+        Dir["**/*.rb"].each do |recipe|
+          RakeFileUtils.verbose(false) do
+            sh %{ruby -c #{recipe} > /dev/null} do |ok, res|
+              raise "Syntax error in #{recipe}" if not ok 
+            end
+          end
+        end
+      end
+
+      desc "Create a new cookbook (with cookbook=name)"
+      task :new_cookbook do
+        create_cookbook("cookbooks")
+      end
+
+      def create_cookbook(dir)
+        raise "Must provide a cookbook=" unless ENV["cookbook"]
+        puts "** Creating cookbook #{ENV["cookbook"]}"
+        sh "mkdir -p #{File.join(dir, ENV["cookbook"], "attributes")}" 
+        sh "mkdir -p #{File.join(dir, ENV["cookbook"], "recipes")}" 
+        sh "mkdir -p #{File.join(dir, ENV["cookbook"], "definitions")}" 
+        sh "mkdir -p #{File.join(dir, ENV["cookbook"], "libraries")}" 
+        sh "mkdir -p #{File.join(dir, ENV["cookbook"], "files", "default")}" 
+        sh "mkdir -p #{File.join(dir, ENV["cookbook"], "templates", "default")}" 
+
+        unless File.exists?(File.join(dir, ENV["cookbook"], "recipes", "default.rb"))
+          open(File.join(dir, ENV["cookbook"], "recipes", "default.rb"), "w") do |file|
+            file.puts <<-EOH
+#
+# Cookbook Name:: #{ENV["cookbook"]}
+# Recipe:: default
+#
+EOH
+          end
+        end
+      end
+    end
+  end
+end

data/lib/awsborn/server.rb

@@ -8,7 +8,11 @@ module Awsborn
     end
     
     class << self
-      attr_accessor :logger
+      attr_accessor :logger, :children, :clusters
+      def inherited (klass)
+        @children ||= []
+        @children << klass
+      end
       def image_id (*args)
         unless args.empty?
           @image_id = args.first
@@ -42,7 +46,9 @@ module Awsborn
       end
       
       def cluster (&block)
-        ServerCluster.build self, &block
+        @clusters ||= []
+        @clusters << ServerCluster.build(self, &block)
+        @clusters.last
       end
       def logger
         @logger ||= Awsborn.logger
@@ -163,6 +169,25 @@ module Awsborn
       end
     end
 
+    def cook
+      upload_cookbooks
+      run_chef
+    end
+
+    def upload_cookbooks
+      logger.info "Uploading cookbooks to #{host_name}"
+      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}"
+    ensure
+      File.delete("config/dna.json")
+    end
+
+    def run_chef
+      logger.info "Running chef on #{host_name}"
+      # Absolute path to config files to avoid a nasty irrational bug.
+      sh "ssh root@#{host_name} \"cd #{Awsborn.remote_chef_path}; chef-solo -c #{Awsborn.remote_chef_path}/config/solo.rb -j #{Awsborn.remote_chef_path}/config/dna.json\""
+    end
+
     def ec2
       @ec2 ||= Ec2.new(zone)
     end

data/lib/awsborn.rb

@@ -4,6 +4,7 @@ require 'tempfile'
 
 require 'rubygems'
 require 'right_aws'
+require 'json'
 
 # %w[
 #   awsborn

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Vrensk
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
+date: 2010-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,11 +58,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,7 +72,7 @@ dependencies:
         - 1
         version: 0.9.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Awsborn lets you define and launch a server cluster on Amazon EC2.
 email: david@icehouse.se
 executables: []
@@ -80,7 +94,9 @@ files:
 - lib/awsborn/ec2.rb
 - lib/awsborn/extensions/object.rb
 - lib/awsborn/extensions/proc.rb
+- lib/awsborn/git_branch.rb
 - lib/awsborn/known_hosts_updater.rb
+- lib/awsborn/rake.rb
 - lib/awsborn/server.rb
 - lib/awsborn/server_cluster.rb
 - spec/awsborn_spec.rb