baker 0.1.1 → 0.1.2

data/README.markdown

@@ -10,23 +10,34 @@ Install
 gem install baker --source http://gemcutter.org --no-ri --no-rdoc # sudo if you need to
 </pre>
 
-Prerequisite
+Usage
 -------
 
-You need to set up sshkeys on the server so you can ssh into the box without passwords.
+I. setup ssh key
+
+Set up your ssh key on the server so you can login into the box without a password.  The gem only supports logging in via a .ssh/config shortcut.  Your .ssh/config should look something like this:
+
+Host server_name
+  Hostname     xxx.xxx.xxx.xxx
+  Port         22  
+  User         root
 
-On the server:
+II. install chef
 
-You'll need to make sure to have chef installed.
+Can install chef with baker itself.  
 
-On the client:
+<pre>
+$ bake --setup server_name
+</pre>
 
-First you need to be in a cookbooks project.  Here's an example of a mininum cookbooks project:
+III. run chef recipes
 
+Create a cookbooks project.  Here's an example of a cookbooks project structure:
+
+<pre>
 ├── config
-│    └── baker
-│        ├── node.json
-│        └── solo.rb
+│   ├── node.json
+│   └── solo.rb
 └── cookbooks
     ├── example_recipe1
     │    └── recipes
@@ -34,26 +45,44 @@ First you need to be in a cookbooks project.  Here's an example of a mininum coo
     └── example_recipe2
         └── recipes
             └── default.rb
+</pre>
 
-config/baker/node.json and config/baker/solo.rb are important.  These are the configurations that get passed to the chef run that will tell it which recipes to run.  
+config/node.json and config/solo.rb are important.  These are the configurations that get passed to the chef run that will tell it which recipes to run.  
 
-You need configure solo.rb to have this:
+config/solo.rb looks like this: 
 
-solo.rb: 
+<pre>
 file_cache_path "/tmp/baker"
 cookbook_path "/tmp/baker/recipes/cookbooks"
+</pre>
 
-node.json will determine what recipes you'll run:
-
-config/baker/node.json:
-
+config/node.json looks like this:
 
-Usage
--------
+<pre>
+{
+  "ec2": true,
+  "environment": {"name":"production"},
+  "mysql_root_password":"whatever",
+  "packages":[
+    {"name": "git-core"},
+    {"name": "curl"}
+  ],
+  "gems":[
+  	{"name": "rails", "version": "3.0.3"},
+    {"name": "bundler"}
+  ],
+  "recipes":[
+    "example_recipe1",
+    "example_recipe2"
+  ]
+}
+</pre>
 
-Once all that is set up, you can run baker and that will upload the recipes to the server and run them.
-Errors are logged to /var/log/baker-chef-server.log and /var/log/baker-chef-client.log.
+To actually run the chef recipes, cd into the cookbooks project folder and run this command:
 
 <pre>
-bake <server>
+$ bake server_name
 </pre>
+
+After running chef you should check the /var/log/baker.chef.log on the server itself for possible errors.
+

data/TODO

@@ -1,28 +1,2 @@
 * if there is an error on the server chef-solo run, how can I notify bake command on the client.
 * uploading baker-client.log to server after done or on at_exit, take logger from ey-cap
-
-# 
-def execute
-  command = "#{@opts[:chef_bin]} -j /etc/chef/dna.json -c #{chef_config} -r \"#{@recipes_url}\" > #{@chef_log} 2>&1"
-  @logger.debug "Running: #{command}"
-  if system(command)
-    @logger.info "Running telinit"
-    system("telinit q")
-    @logger.info "Finished #{@name} chef run"
-  else
-    @logger.error("#{@name} chef run failed. Reporting error")
-    raise DeployError, "#{@name} chef run failed"
-  end
-ensure
-  if File.exists?(@chef_log)
-    FileUtils.ln_sf(@chef_log, "/var/log/chef.#{@name}.log")
-  end
-end
-
-##################################################################
-
-      @enzyme_log = Logger.new("/var/log/enzyme.log")
-      @stderr_log = Logger.new($stderr)
-
-      @stderr_log.send(level, message)
-      @enzyme_log.send(level, message)

data/baker.log

@@ -1 +1,15 @@
 # Logfile created on Sun Jul 11 19:37:09 -0700 2010 by logger.rb/22283
+I, [2011-01-15T01:51:47.994275 #20569]  INFO -- : *** setting up chef
+I, [2011-01-15T01:53:44.858036 #20583]  INFO -- : *** setting up chef
+I, [2011-01-15T01:58:52.780269 #20604]  INFO -- : *** setting up chef
+I, [2011-01-15T02:15:53.453185 #20690]  INFO -- : *** setting up chef
+I, [2011-01-15T02:16:05.445776 #20702]  INFO -- : *** setting up chef
+I, [2011-01-15T02:16:57.983443 #20715]  INFO -- : *** setting up chef
+I, [2011-01-15T02:18:03.389511 #20734]  INFO -- : *** setting up chef
+I, [2011-01-15T02:18:56.487040 #20748]  INFO -- : *** setting up chef
+I, [2011-01-15T02:21:35.250907 #20769]  INFO -- : *** setting up chef
+I, [2011-01-15T02:22:56.754542 #20786]  INFO -- : *** setting up chef
+I, [2011-01-15T02:23:59.002520 #20801]  INFO -- : *** setting up chef
+I, [2011-01-15T09:12:05.181993 #21256]  INFO -- : *** setting up chef
+I, [2011-01-15T09:16:55.445926 #21312]  INFO -- : *** setting up chef
+I, [2011-01-15T09:18:48.712336 #21334]  INFO -- : *** setting up chef

data/bin/bake

@@ -1,10 +1,4 @@
 #!/usr/bin/env ruby
 
 require File.join(File.expand_path('../../lib/baker', __FILE__))
-
-server = ARGV[0]
-if server.nil? or server == ""
-  puts "Usage: baker <server-name>"
-  exit 1
-end
-Baker.run(:host => server)
+Baker::CLI.run(ARGV)

data/gemspec.rb

@@ -1,3 +1,5 @@
+require File.expand_path("../lib/baker", __FILE__)
+
 GEM_NAME = 'baker'
 GEM_FILES = FileList['**/*'] - FileList['coverage', 'coverage/**/*', 'pkg', 'pkg/**/*']
 GEM_SPEC = Gem::Specification.new do |s|
@@ -14,5 +16,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.1.1"
+  s.version = Baker::Version
 end

data/lib/baker.rb

@@ -1,32 +1,47 @@
-# TODO: upload config files: dna.json and solo.rb
+# TODO: upload config files: node.json and solo.rb
 
 require 'rubygems'
 require 'net/ssh'
+require 'net/sftp'
 require 'pp'
 
-class NotCookbookProject < RuntimeError; end
+require File.expand_path('../cli', __FILE__)
 
 class Baker
+  Version = "0.1.2"
+
+  class NotCookbookProject < RuntimeError; end
+
+  def self.setup(options)
+    @baker = Baker.new(options)
+    @baker.setup
+  end
   def self.run(options)
     @baker = Baker.new(options)
     @baker.run
   end
 
   def initialize(options)
-    @host = options[:host] || raise("need to set host")
-    @user = options[:user]
-    @root = options[:root] || Dir.pwd
-    set_logger
+    @user   = nil
+    @host   = options[:host] || raise("need to set host")
+    @root   = Dir.pwd
+    @logger = Logger.new(File.exist?("#{@root}/log") ? "#{@root}/log/baker.log" : "#{@root}/baker.log")
   end
-
-  def set_logger
-    @logger = if File.exist?(@root+"/log")
-      Logger.new(@root+"/log/baker.log")
-    else
-      Logger.new(@root+"/baker.log")
+  
+  def setup
+    log "*** setting up chef"
+    Net::SFTP.start(@host, @user) do |sftp|
+      sftp.upload!(
+        File.expand_path("../../scripts/baker_setup.sh", __FILE__), 
+        "/tmp/baker_setup.sh"
+      )
+    end
+    Net::SSH.start(@host, @user) do |ssh|
+      remote_cmd(ssh, "bash -ex /tmp/baker_setup.sh >> /var/log/baker.setup.log 2>&1;") # 
     end
+    log "*** done setting up chef, check /var/log/baker.setup.log on #{@host} for possible errors."
   end
-
+  
   def run
     validate_cookbook_project
     log "*** start running chef recipes on #{@host}"
@@ -34,7 +49,7 @@ class Baker
       upload_recipes(ssh)
       run_chef(ssh)
     end
-    log "*** done running chef recipes on #{@host}, check /var/log/baker-chef-server.log"
+    log "*** done running chef recipes, check /var/log/baker.chef.log on #{@host}"
   end
 
   def validate_cookbook_project
@@ -44,8 +59,9 @@ class Baker
   end
 
   def upload_recipes(ssh)
-    if !File.exist?("config/dna.json") or !File.exist?("config/solo.rb")
-      raise "need to create a config/dna.json and config/solo.rb file, so it can be uploaded to the server that needs it"
+    configs = %w{config/node.json config/solo.rb}
+    if configs.find{|x| !File.exist?(x) }
+      raise "Need to create #{configs.join(', ')} files, it's required for chef to run."
     end
 
     log "*** uploading chef recipes to #{@host}..."
@@ -66,7 +82,7 @@ class Baker
 
   def run_chef(ssh)
     log "*** running chef recipes on #{@host}..."
-    chef_cmd = "chef-solo -c /tmp/baker/recipes/config/solo.rb -j /tmp/baker/recipes/config/dna.json > /var/log/baker-chef-server.log 2>&1"
+    chef_cmd = "chef-solo -c /tmp/baker/recipes/config/solo.rb -j /tmp/baker/recipes/config/node.json > /var/log/baker.chef.log 2>&1"
     log "CHEF_CMD : #{chef_cmd}"
     remote_cmd(ssh, chef_cmd)
   end

data/lib/cli.rb

@@ -0,0 +1,62 @@
+class Baker
+  class CLI
+    def self.run(args)
+      cli = new(args)
+      cli.parse_options!
+      cli.run
+    end
+
+    # The array of (unparsed) command-line options
+    attr_reader :args
+    # The hash of (parsed) command-line options
+    attr_reader :options
+
+    def initialize(args)
+      @args = args.dup
+    end
+
+    def option_parser
+      # @logger = Logger.new
+      @option_parser ||= OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename($0)} <server>"
+
+        opts.on("-s", "--setup", "sets up chef, must be ran once before you can run chef recipes.") do
+          options[:setup] = true
+        end
+
+        opts.on("-h", "--help", "Display this help message.") do
+          puts opts
+          exit
+        end
+
+        opts.on("-V", "--version", "Display the baker version, and exit.") do
+          puts "Baker Version #{Baker::Version}"
+          exit
+        end
+      end
+    end
+
+    def parse_options!
+      # defaults
+      @options = {:host => '', :setup => false}
+
+      if args.empty?
+        warn "Please specifiy the server to run the recipes on."
+        warn option_parser
+        exit 1
+      end
+
+      option_parser.parse!(args)
+      options[:host].concat(*args)
+    end
+
+    def run
+      # puts "%%% options #{options.inspect}"
+      if options[:setup]
+        Baker.setup(options)
+      else
+        Baker.run(options)
+      end
+    end
+  end
+end

data/scripts/baker_setup.sh

@@ -0,0 +1,32 @@
+#!/bin/bash -ex
+
+# this script can be ran incrementally. if the packages are already installed, it will do nothing.
+
+# install essential libraries
+type -P make &>/dev/null || { 
+  apt-get -q -y install build-essential
+}
+
+# install ruby
+type -P ruby &>/dev/null || { 
+  apt-get update
+  apt-get -q -y install ruby1.8 ruby1.8-dev libopenssl-ruby
+  ln -s /usr/bin/ruby1.8 /usr/bin/ruby
+}
+
+# install rubygems
+type -P gem &>/dev/null || {
+  wget http://files.rubyforge.vm.bytemark.co.uk/rubygems/rubygems-1.4.2.tgz
+  tar xzvf rubygems-1.4.2.tgz
+  cd rubygems-1.4.2 && ruby setup.rb
+  ln -s /usr/bin/gem1.8 /usr/bin/gem
+  gem update --system
+  rm -rf rubygems-1.4.2
+  rm -f rubygems-1.4.2.tgz
+}
+
+# install chef-solo
+type -P chef-solo &>/dev/null || {
+  gem install --no-ri --no-rdoc chef
+}
+

data/test/fixtures/cookbooks-valid/config/node.json

@@ -0,0 +1,17 @@
+{
+  "ec2": true,
+  "environment": {"name":"production"},
+  "mysql_root_password":"whatever",
+  "packages":[
+    {"name": "git-core"},
+    {"name": "curl"}
+  ],
+  "gems":[
+  	{"name": "rails", "version": "3.0.3"},
+    {"name": "bundler"}
+  ],
+  "recipes":[
+    "example_recipe1",
+    "example_recipe2"
+  ]
+}

data/test/fixtures/cookbooks-valid/config/solo.rb

@@ -0,0 +1,2 @@
+file_cache_path "/tmp/baker"
+cookbook_path "/tmp/baker/recipes/cookbooks"

data/tung

@@ -0,0 +1,34 @@
+# 
+def execute
+  command = "#{@opts[:chef_bin]} -j /etc/chef/node.json -c #{chef_config} -r \"#{@recipes_url}\" > #{@chef_log} 2>&1"
+  @logger.debug "Running: #{command}"
+  if system(command)
+    @logger.info "Running telinit"
+    system("telinit q")
+    @logger.info "Finished #{@name} chef run"
+  else
+    @logger.error("#{@name} chef run failed. Reporting error")
+    raise DeployError, "#{@name} chef run failed"
+  end
+ensure
+  if File.exists?(@chef_log)
+    FileUtils.ln_sf(@chef_log, "/var/log/chef.#{@name}.log")
+  end
+end
+
+##################################################################
+
+      @enzyme_log = Logger.new("/var/log/enzyme.log")
+      @stderr_log = Logger.new($stderr)
+
+      @stderr_log.send(level, message)
+      @enzyme_log.send(level, message)
+
+##################################################################
+
+
+with a new ubuntu instance:
+* need to set the root password (optional)
+* apt-get install -y openssh-server openssh-client
+* set up .ssh/authorized_keys .  .ssh 700, .ssh/authorized_keys 600
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: baker
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tung Nguyen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -08:00
+date: 2011-01-15 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -32,16 +32,18 @@ files:
 - bin/bake
 - gemspec.rb
 - lib/baker.rb
+- lib/cli.rb
 - Rakefile
 - README.markdown
+- scripts/baker_setup.sh
 - test/baker_test.rb
-- test/fixtures/cookbooks-empty/baker.log
 - test/fixtures/cookbooks-valid/baker.log
-- test/fixtures/cookbooks-valid/config/baker/node.json
-- test/fixtures/cookbooks-valid/config/baker/solo.rb
+- test/fixtures/cookbooks-valid/config/node.json
+- test/fixtures/cookbooks-valid/config/solo.rb
 - test/fixtures/cookbooks-valid/cookbooks/example_recipe1/recipes/default.rb
 - test/fixtures/cookbooks-valid/cookbooks/example_recipe2/recipes/default.rb
 - TODO
+- tung
 has_rdoc: true
 homepage: http://github.com/tongueroo/baker
 licenses: []

data/test/fixtures/cookbooks-empty/baker.log

@@ -1 +0,0 @@
-# Logfile created on Sun Jul 11 19:38:14 -0700 2010 by logger.rb/22283

data/test/fixtures/cookbooks-valid/config/baker/node.json

@@ -1,16 +0,0 @@
-{
-  "ec2": false,
-  "user":"root",
-  "packages":[],
-  "gems":[],
-  "users":[],
-  "environment": {"name":"staging"},
-  "packages":{},
-  "gems_to_install":[
-    {"name": "sinatra", "version": "0.9.4"}
-  ],
-  "recipes":[
-    "example_recipe1", 
-    "example_recipe1"
-  ]
-}

data/test/fixtures/cookbooks-valid/config/baker/solo.rb

@@ -1,2 +0,0 @@
-file_cache_path "/tmp/chef-solo"
-cookbook_path "/tmp/chef-solo/recipes/cookbooks"