elzar 0.0.2 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.0
+* Initial working version for relevance_rails
+
 ## 0.0.2
 * Fixed to also work with Vagrant
 * Support local dev with rake bam

data/README.md

@@ -1,45 +1,62 @@
-# Getting Started
+## Description
+This gem enables a Rails app to define custom Chef recipes while still using an awesome default set
+of Chef recipes. Best used in conjunction with relevance\_rails and slushy. Includes recipes for
+ruby 1.9, ree, mysql, postgresql and nginx/passenger.
+
+## Usage
+
+To use Elzar with your Rails app, just use (relevance_rails)[https://github.com/relevance/relevance_rails].
+
+But if you'd like to manually do it:
+
+```ruby
+# Creates a provision/ directory to define app-specific cookbooks
+Elzar.create_provision_directory 'provision'
+
+# To combine Elzar's cookbooks with your app's cookbooks
+dir = Elzar.merge_and_create_temp_directory 'provision'
+# You now have a directory you can put on a chef node
+```
+
+## Local Development
+
+If you'd like to try these Chef cookbooks with Vagrant:
+
+```sh
+$ git clone git@github.com:relevance/elzar.git
+$ cd elzar
+$ gem install bundler
+# creates provision/ for local vagrant use
+$ rake bam
+$ cd provision
+$ bundle install
+
+## Using Vagrant
 
 Download and install VirtualBox (as instructed in the Vagrant
 [Getting Started guide](http://vagrantup.com/docs/getting-started/index.html)). Then set up
 your bundle and grab the Ubuntu Lucid VM image.
 
-    gem install bundler
-    # creates provision/ for local vagrant use
-    rake bam
-    cd provision
-    bundle install
     vagrant box add lucid64 http://files.vagrantup.com/lucid64.box
 
+```sh
 ## Spin up a new VM
-
-    vagrant up
+$ vagrant up
 
 ## SSH into the VM
-
-    vagrant ssh
+$ vagrant ssh
 
 ## Destroy the VM
-
-    vagrant destroy
+$ vagrant destroy
 
 ## Re-run Chef recipes on the VM
-
-    vagrant provision
+$ vagrant provision
 
 ## Stop/Start the VM
+$ vagrant suspend
+$ vagrant resume
+```
 
-    vagrant suspend
-    vagrant resume
-
-# Install additional cookbooks
-
-This script (and the knife extension it invokes) automatically creates a
-vendor branch for tracking upstream git sources, merges the cookbook into the
-cookbooks/ directory, and makes it easy to update these cookbook as needed in
-the future.
-
-To use this script, the cookbook must be in its own git repository, like those
-at https://github.com/cookbooks/.
+## Issues
 
-    ./script/install_cookbook cookbooks/mysql
+Please file issues [on github](https://github.com/relevance/elzar/issues).

data/Rakefile

@@ -6,3 +6,10 @@ task :bam do
   require 'elzar'
   Elzar.create_provision_directory File.dirname(__FILE__) + '/provision', :local => true
 end
+
+desc "Run Rspec tests"
+task :spec do
+  sh 'rspec spec'
+end
+
+task :default => :spec

data/lib/elzar/assistant.rb

@@ -26,8 +26,10 @@ module Elzar
       cp "#{Elzar.templates_dir}/Gemfile", dest
       cp "#{Elzar.templates_dir}/upgrade-chef.sh", dest
       cp "#{Elzar.templates_dir}/.rvmrc", dest
+      cp "#{Elzar.templates_dir}/README.md", dest
       cp_r "#{Elzar.templates_dir}/data_bags", dest
       cp_r "#{Elzar.templates_dir}/script", dest
+      cp_r "#{Elzar.templates_dir}/.chef", dest
     end
 
     def self.merge_and_create_temp_directory(user_dir)
@@ -39,7 +41,6 @@ module Elzar
       cp_r Elzar::ROLES_DIR, dest
       cp_r "#{Elzar::CHEF_DIR}/cookbooks", elzar_dir
       cp_r "#{Elzar::CHEF_DIR}/site-cookbooks", elzar_dir
-      cp_r "#{Elzar::CHEF_DIR}/.chef", dest
       # merges user provision with elzar's provision
       cp_r "#{user_dir}/.", dest
       dest
@@ -52,7 +53,6 @@ module Elzar
       cp_r Elzar::ROLES_DIR, dest
       cp_r "#{Elzar::CHEF_DIR}/cookbooks", dest
       cp_r "#{Elzar::CHEF_DIR}/site-cookbooks", dest
-      cp_r "#{Elzar::CHEF_DIR}/.chef", dest
     end
 
     def self.generate_user_files(dest, options={})

data/lib/elzar/templates/README.md

@@ -0,0 +1,26 @@
+## Description
+Use this directory to define your app's Chef cookbooks. If you're using relevance\_rails,
+your app automatically bundles (Elzar's recipes)[http://github.com/relevance/elzar].
+
+## Usage
+
+First, setup this directory: `cd provision && bundle install`.
+
+To create new cookbooks or install [existing ones](https://github.com/cookbooks):
+
+```sh
+# Create a new cookbook
+$ script/new_cookbook my_cookbook
+
+# Install any cookbook on github by user/name
+$ script/install_cookbook cookbooks/mysql
+```
+
+Once you've added a cookbook you need to add the recipe name to the "run_list" key of dna.json.
+
+## Elzar Cookbooks
+Although Elzar's cookbooks and roles are automatically bundled, you can override them in cookbooks or
+site_cookbooks.
+
+## Vagrant
+To provision using Vagrant [see these detailed instructions](https://github.com/relevance/elzar#using-vagrant).

data/lib/elzar/version.rb

@@ -1,3 +1,3 @@
 module Elzar
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/spec/chef_dna_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Elzar::ChefDNA do
+  let(:database) { 'mysql' }
+  let(:json) {
+    {
+      "run_list" => ["role[plumbing]", "mysql::server", "role[enterprise_appstack]", "rails_app"],
+      'ruby' => {'url' => '', 'version' => '', 'gems_version' => ''},
+      'ruby_enterprise' => {'url' => '', 'version' => '', 'gems_version' => ''}
+    }
+  }
+  let(:run_list) { json['run_list'] }
+
+  def splice(database = nil)
+    Elzar::ChefDNA.gene_splice(json, database, ruby_version)
+  end
+
+  describe '.gene_splice' do
+    context 'for mri ruby' do
+      let(:ruby_version) { 'ruby-1.9.3-p194' }
+
+      it "updates run_list correctly for mysql" do
+        splice 'mysql'
+        run_list[1].should == 'mysql::server'
+      end
+
+      it "updates run_list correctly for mysql as default" do
+        splice nil
+        run_list[1].should == 'mysql::server'
+      end
+
+      it "updates run_list correctly for postgresql" do
+        splice 'postgresql'
+        run_list[1].should == 'role[postgres_database]'
+      end
+
+      it "updates ruby dna correctly" do
+        splice
+        json['ruby']['url'].should == "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz"
+        json['ruby']['version'].should == '1.9.3-p194'
+        json['ruby']['gems_version'].should == Gem::VERSION
+        run_list[2].should == 'role[ruby_appstack]'
+      end
+    end
+
+    context 'for ree' do
+      let(:ruby_version) { 'ree-1.8.7-2011.03' }
+
+      it "updates ree dna correctly" do
+        splice
+        json['ruby_enterprise']['url'].should == "http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2011.03"
+        json['ruby_enterprise']['version'].should == '1.8.7-2011.03'
+        json['ruby_enterprise']['gems_version'].should == Gem::VERSION
+        run_list[2].should == 'role[enterprise_appstack]'
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'elzar'
+
+RSpec.configure do |config|
+  config.filter_run_excluding :disabled => true
+  config.run_all_when_everything_filtered = true
+
+  config.alias_example_to :fit, :focused => true
+  config.alias_example_to :xit, :disabled => true
+  config.alias_example_to :they
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elzar
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -90,7 +90,6 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- chef/.chef/knife.rb
 - chef/cookbooks/.gitkeep
 - chef/cookbooks/apt/README.md
 - chef/cookbooks/apt/files/default/apt-cacher
@@ -227,8 +226,10 @@ files:
 - lib/elzar/assistant.rb
 - lib/elzar/chef_dna.rb
 - lib/elzar/template.rb
+- lib/elzar/templates/.chef/knife.rb
 - lib/elzar/templates/.rvmrc
 - lib/elzar/templates/Gemfile
+- lib/elzar/templates/README.md
 - lib/elzar/templates/Vagrantfile.erb
 - lib/elzar/templates/data_bags/deploy/authorized_keys.json
 - lib/elzar/templates/dna.json
@@ -237,6 +238,8 @@ files:
 - lib/elzar/templates/solo.rb.erb
 - lib/elzar/templates/upgrade-chef.sh
 - lib/elzar/version.rb
+- spec/chef_dna_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/relevance/elzar
 licenses: []
 post_install_message: 
@@ -261,4 +264,6 @@ rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Chef cookbooks for Rails
-test_files: []
+test_files:
+- spec/chef_dna_spec.rb
+- spec/spec_helper.rb