elzar 0.1.2 → 0.2.0

data/spec/lib/elzar/assistant_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe Elzar::Assistant do
+
+  context '.validate_dna!' do
+
+    def tempfile(content)
+      Tempfile.open('dna-tmp') do |f|
+        f.write(content)
+        f
+      end
+    end
+
+    it 'raises an error if the dna contains a TODO item' do
+      dna_file = tempfile %Q[{\n"foo": "bar",\n"baz": "TODO - Fill out your baz"\n}]
+      expect do
+        Elzar::Assistant.validate_dna! dna_file.path
+      end.to raise_error(Elzar::Assistant::InvalidDnaError, /dna\.json:3/)
+    end
+
+    it 'does not raise an error if the dna does not contain a TODO item' do
+      dna_file = tempfile %Q[{\n"foo": "bar",\n"baz": "filled-out"\n}]
+      expect do
+        Elzar::Assistant.validate_dna! dna_file.path
+      end.to_not raise_error(Elzar::Assistant::InvalidDnaError)
+    end
+  end
+
+end

data/spec/lib/elzar/aws_config_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+require 'fileutils'
+
+describe Elzar::AwsConfig do
+  let(:aws_config) do
+    <<-YAML
+      server:
+        creation_config:
+          flavor_id: 'm1.large'
+          image_id: "ami-fd589594"
+          groups: default
+          key_name: relevance_aws
+    YAML
+  end
+
+  let(:private_aws_config) do
+    <<-YAML
+      aws_credentials:
+        aws_access_key_id: AKIAIQZWXGD2S56W2MMQ
+        aws_secret_access_key: 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
+
+      server:
+        private_key: |
+          -----BEGIN RSA PRIVATE KEY-----
+          SecretsSecretsSecretsSecretsSecretsSecretsSecretsSecretsSecretsSecrets
+          SecretsSecretsSecretsSecretsSecretsSecretsSecretsSecretsSecretsSecrets
+          SecretsSecretsSecretsSecretsSecretsSecretsSecretsSecretsSecretsSecrets
+          -----END RSA PRIVATE KEY-----
+    YAML
+  end
+
+  context '.load_configs' do
+    def create_configs_at(path)
+      FileUtils.mkdir_p path
+      File.open(File.join(path, 'aws_config.yml'), 'w') { |f| f << aws_config }
+      File.open(File.join(path, 'aws_config.private.yml'), 'w') { |f| f << private_aws_config }
+    end
+
+    def cleanup_configs(path)
+      %w(aws_config.yml aws_config.private.yml).each do |base|
+        full_path = File.join(path, base)
+        FileUtils.rm(full_path) if File.exist?(full_path)
+      end
+    end
+
+    after do
+      cleanup_configs '/tmp/elzar'
+      cleanup_configs '/tmp/elzar-specified'
+    end
+
+    it 'tries to load config files in the DEFAULT_CONFIG_DIR if no config_directory specified' do
+      stub_const 'Elzar::AwsConfig::DEFAULT_CONFIG_DIR', '/tmp/elzar'
+      create_configs_at '/tmp/elzar'
+
+      config = Elzar::AwsConfig.load_configs
+      config['aws_credentials'].should_not be_nil
+      config['aws_credentials']['aws_access_key_id'].should == 'AKIAIQZWXGD2S56W2MMQ'
+    end
+
+    it 'tries to load config files in config_directory if specified' do
+      create_configs_at '/tmp/elzar-specified'
+
+      config = Elzar::AwsConfig.load_configs '/tmp/elzar-specified'
+      config['aws_credentials'].should_not be_nil
+      config['aws_credentials']['aws_access_key_id'].should == 'AKIAIQZWXGD2S56W2MMQ'
+    end
+
+    it 'does a deep merge of the configuration files' do
+      create_configs_at '/tmp/elzar'
+      config = Elzar::AwsConfig.load_configs '/tmp/elzar'
+
+      config['server']['creation_config']['flavor_id'].should == 'm1.large'
+      config['server']['private_key'].should match(/Secrets/)
+    end
+
+    it 'raises an error if it was unable to find the configuration files' do
+      expect do
+        Elzar::AwsConfig.load_configs '/tmp/nothing-to-see-here'
+      end.to raise_error(Elzar::AwsConfig::ConfigFileNotFound)
+    end
+  end
+
+
+end

data/spec/lib/elzar/ssh_key_locator_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require 'tempfile'
+require 'elzar/ssh_key_locator'
+
+describe Elzar::SshKeyLocator do
+
+  describe "#find_local_keys" do
+
+    def create_key_file(seed, content)
+      Tempfile.open(seed) do |f|
+        f.write(content)
+        f
+      end
+    end
+
+    it "returns an array of keys from the first existing key file" do
+      key_file_1 = create_key_file 'foo.pub', "foo\nbar"
+      key_file_2 = create_key_file 'baz.pub', "baz"
+
+      keys = Elzar::SshKeyLocator.find_local_keys(["/tmp/bogus.pub", key_file_1.path, key_file_2.path])
+      keys.should == ['foo', 'bar']
+    end
+
+    it "returns an empty array when no key files are found" do
+      keys = Elzar::SshKeyLocator.find_local_keys(["/tmp/bogus.pub"])
+      keys.should == []
+    end
+
+    it "ignores blank lines in key files" do
+      key_file = create_key_file 'foo.pub', "\nfoo\n\nbar"
+      keys = Elzar::SshKeyLocator.find_local_keys([key_file.path])
+      keys.should == ['foo', 'bar']
+    end
+
+  end
+
+  describe "#find_keys" do
+    it "returns the local keys when they exist" do
+      Elzar::SshKeyLocator.should_receive(:find_local_keys).and_return ['some-local-key']
+      Elzar::SshKeyLocator.find_keys.should == ['some-local-key']
+    end
+
+    it "returns the ssh-agent keys when no local keys exist" do
+      Elzar::SshKeyLocator.stub(:find_local_keys).and_return []
+      Elzar::SshKeyLocator.should_receive(:find_agent_keys).and_return ['some-agent-key']
+      Elzar::SshKeyLocator.find_keys.should == ['some-agent-key']
+    end
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -1,10 +1,21 @@
 require 'elzar'
+require 'bahia'
+
+Dir['spec/support/**/*.rb'].each do |support_file|
+  require File.expand_path(support_file)
+end
+
+Bahia.project_directory = File.expand_path('../..', __FILE__)
 
 RSpec.configure do |config|
   config.filter_run_excluding :disabled => true
+  config.filter_run_excluding :ci => 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
+
+  config.include Bahia, :ci => true
+  config.include ShellInteractionHelpers, :ci => true
 end

data/spec/support/shell_interaction_helpers.rb

@@ -0,0 +1,33 @@
+module ShellInteractionHelpers
+  def capture_stderr(&block)
+    original_stderr = $stderr
+    $stderr = fake = StringIO.new
+    begin
+      yield
+    ensure
+      $stderr = original_stderr
+    end
+    fake.string
+  end
+
+  def capture_stdout(&block)
+    original_stdout = $stdout
+    $stdout = fake = StringIO.new
+    begin
+      yield
+    ensure
+      $stdout = original_stdout
+    end
+    fake.string
+  end
+
+  # wrapper around raise_error that captures stderr
+  def should_abort_with(msg)
+    capture_stderr do
+      expect do
+        yield
+      end.to raise_error SystemExit, msg
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elzar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -28,6 +44,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: slushy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +108,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bahia
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,16 +144,20 @@ description: Provides Chef cookbooks for a production Rails environment. Also su
   Chef-erizing a Rails app.
 email:
 - alex.redington@thinkrelevance.com
-executables: []
+executables:
+- elzar
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
 - CHANGELOG.md
+- Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- USAGE.md
+- bin/elzar
 - chef/cookbooks/.gitkeep
 - chef/cookbooks/apt/README.md
 - chef/cookbooks/apt/files/default/apt-cacher
@@ -221,25 +289,43 @@ files:
 - chef/site-cookbooks/ruby/attributes/default.rb
 - chef/site-cookbooks/ruby/metadata.rb
 - chef/site-cookbooks/ruby/recipes/default.rb
+- chef/site-cookbooks/ruby/recipes/path.rb
 - elzar.gemspec
 - lib/elzar.rb
 - lib/elzar/assistant.rb
-- lib/elzar/chef_dna.rb
+- lib/elzar/aws_config.rb
+- lib/elzar/cli.rb
+- lib/elzar/compute.rb
+- lib/elzar/core_ext/hash.rb
+- lib/elzar/fog.rb
+- lib/elzar/ssh_key_locator.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/aws_config.private.yml
+- lib/elzar/templates/aws_config.yml
 - lib/elzar/templates/data_bags/deploy/authorized_keys.json
-- lib/elzar/templates/dna.json
+- lib/elzar/templates/dna/rails.json
+- lib/elzar/templates/gitignore
 - lib/elzar/templates/script/install_cookbook
 - lib/elzar/templates/script/new_cookbook
 - lib/elzar/templates/solo.rb.erb
 - lib/elzar/templates/upgrade-chef.sh
 - lib/elzar/version.rb
-- spec/chef_dna_spec.rb
+- script/ci_nightly
+- spec/fixtures/rails_integration_template/add_root_user.rb
+- spec/fixtures/rails_integration_template/database.yml
+- spec/fixtures/rails_integration_template/deploy.rb
+- spec/fixtures/rails_integration_template/template.rb
+- spec/integration/rails_spec.rb
+- spec/lib/elzar/assistant_spec.rb
+- spec/lib/elzar/aws_config_spec.rb
+- spec/lib/elzar/ssh_key_locator_spec.rb
 - spec/spec_helper.rb
+- spec/support/shell_interaction_helpers.rb
 homepage: http://github.com/relevance/elzar
 licenses: []
 post_install_message: 
@@ -252,12 +338,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -228900275979059414
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -228900275979059414
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -265,5 +357,13 @@ signing_key:
 specification_version: 3
 summary: Chef cookbooks for Rails
 test_files:
-- spec/chef_dna_spec.rb
+- spec/fixtures/rails_integration_template/add_root_user.rb
+- spec/fixtures/rails_integration_template/database.yml
+- spec/fixtures/rails_integration_template/deploy.rb
+- spec/fixtures/rails_integration_template/template.rb
+- spec/integration/rails_spec.rb
+- spec/lib/elzar/assistant_spec.rb
+- spec/lib/elzar/aws_config_spec.rb
+- spec/lib/elzar/ssh_key_locator_spec.rb
 - spec/spec_helper.rb
+- spec/support/shell_interaction_helpers.rb

data/lib/elzar/chef_dna.rb

@@ -1,48 +0,0 @@
-module Elzar
-  module ChefDNA
-    def self.gene_splice(content, database, ruby_version)
-      set_ruby(content, ruby_version)
-      set_database(content, database)
-    end
-
-    private
-
-    def self.set_database(content, database)
-      if database == 'postgresql'
-        db_index = content['run_list'].find_index { |e| (e == 'mysql::server') || (e == 'role[postgres_database]')}
-        content['run_list'][db_index] = 'role[postgres_database]'
-      elsif database.nil? || (database == 'mysql')
-        db_index = content['run_list'].find_index { |e| (e == 'mysql::server') || (e == 'role[postgres_database]')}
-        content['run_list'][db_index] = 'mysql::server'
-      end
-    end
-
-    def self.set_ruby(content, ruby_version)
-      if ruby_version =~ /^ree-(.*)/i
-        content['ruby_enterprise']['version'] = $1
-        content['ruby_enterprise']['url'] = "http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-#{$1}"
-        content['ruby_enterprise']['gems_version'] = rubygems_version
-        update_run_list! content['run_list'], 'role[enterprise_appstack]'
-      elsif ruby_version =~ /^ruby-(.*)/i
-        full_version = $1
-        content['ruby']['version'] = full_version
-        major_version = full_version[/(\d\.\d).*/, 1]
-        content['ruby']['url'] = "http://ftp.ruby-lang.org/pub/ruby/#{major_version}/ruby-#{full_version}.tar.gz"
-        content['ruby']['gems_version'] = rubygems_version
-        update_run_list! content['run_list'], 'role[ruby_appstack]'
-      else
-        raise "Your ruby is NOT SUPPORTED. Please use ree or ruby."
-      end
-    end
-
-    def self.update_run_list!(run_list, val)
-      appstack_index = run_list.find_index {|e| e[/^role\[.*_appstack\]$/] }
-      run_list[appstack_index] = val
-    end
-
-    def self.rubygems_version
-      require 'rubygems' unless defined?(Gem)
-      Gem::VERSION
-    end
-  end
-end