cuoco 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+## 0.0.2 - 2012-09-03
+
+* added option to pass data from Capistrano to Chef;
+* added option to use an arbitrary custom bootstrap script instead of Omnibus;
+* reset Capistrano sessions after a Chef run to refresh configuration;
+* fix issue with Omnibus not working on a bare Ubuntu box without `curl`;
+
+## 0.0.1 - 2012-09-03
+
+Initial release

data/README.md

@@ -10,11 +10,11 @@
 
 *Capistrano and Chef Solo, sitting in a tree...*
 
-[Capistrano](https://github.com/capistrano/capistrano#capistrano) is a framework that allows you to run commands in parallel on multiple remote machines. It's primary use is application deployment, but Capistrano can automate any task you can do over SSH. A big advantage of Capistrano is that it is wildly popular among web developers, and thus well supported and rich with plugins.
+[Capistrano](https://github.com/capistrano/capistrano#capistrano) is a framework that allows you to run commands in parallel on multiple remote machines. Its primary use is application deployment, but Capistrano can automate any task you can do over SSH. A big advantage of Capistrano is that it is wildly popular among web developers, and thus well supported and rich with plugins.
 
 Another common task you have to do on the remote machines is server provisioning/management, and Capistrano has no facilities for that. It's definitely possible to manage machines using Capistrano, but you have to bring your own scripts.
 
-[Chef Solo](http://wiki.opscode.com/display/chef/Chef+Solo) is a tool that uses well-structured, data-driven Ruby scripts to describe and run configuration management routines. It runs locally and manages the machine it's running from. So before running Chef Solo, you have to install it and upload your scripts to that machine. You can do that by hand, you can use one of the many Chef Solo bootstrap scripts, or you can use some tool like littlechef, which needs to be configured to know about your servers.
+[Chef Solo](http://wiki.opscode.com/display/chef/Chef+Solo) is a tool that uses well-structured, data-driven Ruby scripts to describe and run configuration management routines. It manages the machine it's running from. So before running Chef Solo on a remote machine, you have to install it there and upload your scripts to that machine. You can do that by hand, you can use one of the many Chef Solo bootstrap scripts, or you can use some tool like littlechef, which needs to be configured to know about your servers.
 
 But wait - not only Capistrano knows where your servers are, it can already run commands on them, and in parallel. It's exactly what Chef Solo is lacking.
 
@@ -34,7 +34,7 @@ To make Cuoco tasks available in Capistrano, require this file in your `Capfile`
 
 ### Fully automatic mode
 
-Cuoco can turn a completely bare machine into a live server with a single command. You buy servers, you declare them in Capistrano, you run `cap deploy:setup && cap deploy`. Done! [*]
+Cuoco can turn a completely bare machine into a live server with a single command. You buy servers, you declare them in Capistrano, you run `cap deploy:setup deploy`. Done! [*]
 
 To do so, require this file in your `Capfile` or `config/deploy.rb`.
 
@@ -65,11 +65,20 @@ If application deployment doesn't apply in your scenario, you can just run
 
 directly.
 
+### Custom bootstrap scripts
+
+**As of September 2, 2012 the [pg gem fails to compile on Chef installed with the default bootstrap script](http://tickets.opscode.com/browse/COOK-1406).**
+
+You can replace the Omnibus installation script with any other, like [this one](https://gist.github.com/3601146) I wrote for Ubuntu 12.04, by setting the `:chef_install_command` variable:
+
+    set :chef_install_command, 'wget -q -O - https://raw.github.com/gist/3601146/install_chef_ubuntu_precise.sh | sudo bash'
+
 ## Minimal requirements for remote machines
 
 Here are the minimal requirements for running Cuoco:
 
 * the server is running [one of the operating systems supported by Omnibus](http://wiki.opscode.com/display/chef/Installing+Omnibus+Chef+Client+on+Linux+and+Mac#InstallingOmnibusChefClientonLinuxandMac-TestedOperatingSystems) (most flavors of Linux will do);
+* the server has `sudo`, `bash` and either `curl` or `wget` installed (most Linux servers do);
 * Capistrano can connect to the server;
 * the Capistrano user has sudo rights on the server. See [my article on setting up user accounts](http://leonid.shevtsov.me/en/how-to-set-up-user-accounts-on-your-web-server) for the suggested approach.
 
@@ -92,7 +101,17 @@ The chef roles directory *must* contain a role file for every Capistrano role yo
 
 ### Variables
 
-TODO
+You can pass data into chef by declaring a `:chef_data` variable
+
+    set :chef_data, {
+      :myapp => {
+        :path => deploy_to
+      }
+    }
+
+The hash gets passed to Chef as if it was specified on the command line with `chef-solo -j chef_data.json`.
+
+This approach is very simplistic and not very DRY, so I'm planning to expand on variables in further releases.
 
 ### Environments
 
@@ -102,7 +121,7 @@ TODO Environments are not supported by Chef Solo. It would be nice to provide th
 
 "Cuoco" means "cook" in Italian. The original [Capistrano is a city in Italy](https://maps.google.com/maps?f=q&source=s_q&hl=en&geocode=&q=Capistrano,+Vibo+Valentia,+Italy&aq=0&oq=capistrano,+italy&sll=37.0625,-95.677068&sspn=60.376022,135.263672&vpsrc=0&t=h&ie=UTF8&hq=&hnear=Capistrano,+Province+of+Vibo+Valentia,+Calabria,+Italy&z=16). So a chef working solo in Capistrano would be called *un cuoco*... get it now?
 
-(If you've been expecting to see Kaley Cuoco here, I'll save you a trip to Reddit:)
+(If you've been expecting to see Kaley Cuoco here, I'll save you a trip to Google:)
 
 ![Another Cuoco](http://i.imgur.com/u5OIil.jpg)
 

data/cuoco.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Cuoco::VERSION
 
   gem.add_runtime_dependency 'capistrano', '>= 2'
-  
+  gem.add_runtime_dependency 'json'
+
   gem.add_development_dependency 'rake'
 end

data/lib/cuoco/bootstrapper.rb

@@ -3,7 +3,7 @@ module Cuoco
     BOOTSTRAP_COMMAND = "\
       if ! command -v chef-solo &>/dev/null;\
       then\
-        curl -L http://opscode.com/chef/install.sh | sudo -p \"sudo password: \" bash;\
+        INSTALL_COMMAND;
         if ! command -v chef-solo &>/dev/null;\
         then\
           false;\
@@ -15,12 +15,23 @@ module Cuoco
       fi\
     ".gsub(/ +/,' ')
 
+    DEFAULT_INSTALL_COMMAND = "
+      if command -v curl &>/dev/null;
+      then
+        curl -L http://opscode.com/chef/install.sh | sudo -p \"sudo password: \" bash;\
+      else
+        wget -q -O - http://opscode.com/chef/install.sh | sudo -p \"sudo password: \" bash;\
+      fi\
+    "
+
     def initialize(capistrano)
       @cap = capistrano
+
+      @install_command = @cap.fetch(:chef_install_command, DEFAULT_INSTALL_COMMAND)
     end
 
     def bootstrap
-      @cap.run(BOOTSTRAP_COMMAND, :shell => '/bin/bash')
+      @cap.run(BOOTSTRAP_COMMAND.gsub('INSTALL_COMMAND', @install_command), :shell => '/bin/bash')
     end
   end
 end

data/lib/cuoco/capistrano.rb

@@ -6,6 +6,7 @@ require 'cuoco'
     task :update_configuration do
       bootstrap
       run_roles
+      restart_sessions
     end
 
     desc "Sets up Chef on remote server"
@@ -40,5 +41,14 @@ require 'cuoco'
       runner = Cuoco::Runner.new(self)
       runner.run_list( list )
     end
+
+    task :restart_sessions do
+      logger.info "Cuoco: restarting sessions"
+      sessions.each do |key, session|
+        logger.info "Closing: #{key}"
+        session.close
+      end    
+      sessions.clear  
+    end
   end
 end

data/lib/cuoco/uploader.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'cuoco/config_generator'
 
 module Cuoco
@@ -7,6 +8,7 @@ module Cuoco
       @cap = capistrano
 
       @chef_path = File.expand_path(@cap.fetch(:chef_path, 'config/chef'))
+      @node_data = @cap.fetch(:chef_data, {})
 
       @cuoco_remote_path = '/tmp/cuoco'
     end
@@ -20,6 +22,7 @@ module Cuoco
 
     def prepare_directory_structure
       @cap.run("mkdir -p #{@cuoco_remote_path}", :shell => '/bin/bash')
+      @cap.sudo("mkdir -p /etc/chef", :shell => '/bin/bash')
     end
 
     def upload_chef_config
@@ -35,7 +38,7 @@ module Cuoco
     end
 
     def upload_node_json
-      @cap.put('{}', @cuoco_remote_path+'/node.json')
+      @cap.put(@node_data.to_json, @cuoco_remote_path+'/node.json')
     end
   end
 end

data/lib/cuoco/version.rb

@@ -1,3 +1,3 @@
 module Cuoco
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuoco
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -79,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3430509962393590737
+      hash: -893324196147809541
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3430509962393590737
+      hash: -893324196147809541
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24