engineyard-serverside 1.4.3.nodestack → 1.4.7.pre

data/spec/real_deploy_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/lib/full_test_deploy'
 
-module EY::Serverside::Strategies::IntegrationSpec
+module EY::Serverside::Strategies::DeployIntegrationSpec
   module Helpers
 
     def update_repository_cache
@@ -19,7 +20,6 @@ module EY::Serverside::Strategies::IntegrationSpec
 
       FileUtils.mkdir_p(File.join(c.shared_path, 'config'))
 
-      FileUtils.mkdir_p(cached_copy)
       Dir.chdir(cached_copy) do
         `echo "this is my file; there are many like it, but this one is mine" > file`
         File.open('Gemfile', 'w') do |f|
@@ -46,21 +46,6 @@ DEPENDENCIES
   rake
 EOF
         end
-
-        File.open('package.json', 'w') do |f|
-          f.write <<-EOF
-{
-    "name": "application-name"
-  , "version": "0.0.1"
-  , "private": true
-  , "dependencies": {
-      "express": "2.3.12"
-    , "jade": ">= 0.0.1"
-  }
-}
-EOF
-        end
-
       end
     end
 
@@ -76,125 +61,44 @@ EOF
 end
 
 describe "deploying an application" do
-  class FullTestDeploy < EY::Serverside::Deploy
-    attr_reader :infos, :debugs, :commands
-
-    def initialize(*)
-      super
-      @infos = []
-      @debugs = []
-      @commands = []
-    end
-
-    # stfu
-    def info(msg)
-      @infos << msg
-    end
-
-    # no really, stfu
-    def debug(msg)
-      @debugs << msg
-    end
-
-    # passwordless sudo is neither guaranteed nor desired
-    def sudo(cmd)
-      run(cmd)
-    end
-
-    def run(cmd)
-      @commands << cmd
-      super
-    end
-
-    def version_specifier
-      # Normally, the deploy task invokes the hook task by executing
-      # the rubygems-generated wrapper (it's what's in $PATH). It
-      # specifies the version to make sure that the pieces don't get
-      # out of sync. However, in test mode, there's no
-      # rubygems-generated wrapper, and so the hook task doesn't get
-      # run because thor thinks we're trying to invoke the _$VERSION_
-      # task instead, which doesn't exist.
-      #
-      # By stripping that out, we can get the hooks to actually run
-      # inside this test.
-      nil
-    end
-
-    def restart
-      FileUtils.touch("#{c.release_path}/restart")
-    end
-
-    # we're probably running this spec under bundler, but a real
-    # deploy does not
-    def bundle
-      my_env = ENV.to_hash
-
-      ENV.delete("BUNDLE_GEMFILE")
-      ENV.delete("BUNDLE_BIN_PATH")
-
-      result = super
-
-      ENV.replace(my_env)
-      result
-    end
-
-    def get_bundler_installer(lockfile)
-      installer = super
-      installer.options << ' --quiet'   # stfu already!
-      installer
-    end
-
-  end
 
   before(:all) do
     @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+    FileUtils.mkdir_p(@deploy_dir)
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset
     EY::Serverside::Server.add(:hostname => 'localhost', :roles => %w[solo])
 
+    setup_dna_json
+
     # run a deploy
     config = EY::Serverside::Deploy::Configuration.new({
-        "strategy"      => "IntegrationSpec",
+        "strategy"      => "DeployIntegrationSpec",
         "deploy_to"     => @deploy_dir,
         "group"         => `id -gn`.strip,
         "stack"         => 'nginx_passenger',
         "migrate"       => "ruby -e 'puts ENV[\"PATH\"]' > #{@deploy_dir}/path-when-migrating",
-        'app'           => 'foo',
+        'app'           => 'myfirstapp',
         'framework_env' => 'staging'
       })
 
     # pretend there is a shared bundled_gems directory
     FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
-    %w(RUBY_VERSION SYSTEM_VERSION).each do |name| 
+    %w(RUBY_VERSION SYSTEM_VERSION).each do |name|
       File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
     end
 
     @binpath = $0 = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
+
     @deployer = FullTestDeploy.new(config)
     @deployer.deploy
   end
 
-  it "runs the right bundler command" do
-    install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
-    install_bundler_command_ran.should_not be_nil
-    install_bundler_command_ran.should == "#{@binpath} _#{EY::Serverside::VERSION}_ install_bundler 1.0.10"
-  end
-
   it "creates a REVISION file" do
     File.exist?(File.join(@deploy_dir, 'current', 'REVISION')).should be_true
   end
 
-  it "restarts the app servers" do
-    File.exist?(File.join(@deploy_dir, 'current', 'restart')).should be_true
-  end
-
-  it "runs 'bundle install' with --deployment" do
-    bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
-    bundle_install_cmd.should_not be_nil
-    bundle_install_cmd.should include('--deployment')
-  end
-
   it "creates a ruby version file" do
     File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
   end
@@ -203,27 +107,40 @@ describe "deploying an application" do
     File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
   end
 
-  it "removes bundled_gems directory if the ruby version changed" do
-    clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
-    clear_bundle_cmd.should_not be_nil
-  end
+  if RUBY_VERSION != '1.8.6'
+    it "runs the right bundler command" do
+      install_bundler_command_ran = @deployer.commands.detect{ |command| command.index("install_bundler") }
+      install_bundler_command_ran.should_not be_nil
+      install_bundler_command_ran.should == "#{@binpath} _#{EY::Serverside::VERSION}_ install_bundler 1.0.10"
+    end
 
-  it "removes bundled_gems directory if the system version changed" do
-    clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
-    clear_bundle_cmd.should_not be_nil
-  end
+    it "runs 'bundle install' with --deployment" do
+      bundle_install_cmd = @deployer.commands.grep(/bundle _\S+_ install/).first
+      bundle_install_cmd.should_not be_nil
+      bundle_install_cmd.should include('--deployment')
+    end
 
-  it "runs 'npm install'" do
-    bundle_install_cmd = @deployer.commands.grep(/npm install/).first
-    bundle_install_cmd.should_not be_nil
-  end
+    it "creates binstubs somewhere out of the way" do
+      File.exist?(File.join(@deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
+    end
 
-  it "creates binstubs somewhere out of the way" do
-    File.exist?(File.join(@deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
+    it "has the binstubs in the path when migrating" do
+      File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
+    end
+
+    it "removes bundled_gems directory if the ruby version changed" do
+      clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
+      clear_bundle_cmd.should_not be_nil
+    end
+
+    it "removes bundled_gems directory if the system version changed" do
+      clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
+      clear_bundle_cmd.should_not be_nil
+    end
   end
 
-  it "has the binstubs in the path when migrating" do
-    File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
+  it "generates a database.yml file" do
+    File.exist?(File.join(@deploy_dir, 'current', 'config', 'database.yml')).should be_true
   end
 
   it "runs all the hooks" do
@@ -236,4 +153,8 @@ describe "deploying an application" do
     File.exist?(File.join(@deploy_dir, 'current', 'before_restart.ran')).should be_true
     File.exist?(File.join(@deploy_dir, 'current', 'after_restart.ran' )).should be_true
   end
+
+  it "restarts the app servers" do
+    File.exist?(File.join(@deploy_dir, 'current', 'restart')).should be_true
+  end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 $LOAD_PATH.push File.expand_path("../lib", File.dirname(__FILE__))
 
-Bundler.require :default, :test
+# Bundler.require :default, :test - FIXME when we return to ruby 1.8.7+
+require 'rubygems'
+require 'spec'
 require 'pp'
+require 'tmpdir'
 require 'engineyard-serverside'
 
 module EY
@@ -32,6 +35,64 @@ GITREPO_DIR = "#{FIXTURES_DIR}/gitrepo"
 FileUtils.rm_rf GITREPO_DIR if File.exists? GITREPO_DIR
 Kernel.system "tar xzf #{GITREPO_DIR}.tar.gz -C #{FIXTURES_DIR}"
 
+def setup_dna_json(options = {})
+  EY::Serverside.dna_json = {
+    'environment' => {
+      "framework_env" => "production",
+    },
+    'engineyard' => {
+      "environment" => {
+        "apps" => [{
+          "name"          => "myfirstapp",
+          "database_name" => "myfirstapp",
+          "type"          => "rack"
+        }],
+        "instances"     => dna_instances_for(options[:cluster_type] || :solo),
+        "components"    => [{"key" => "ruby_187"}],
+        "framework_env" => "production",
+        "stack_name"    => "nginx_passenger",
+        "ssh_username"  => "deploy",
+        "ssh_password"  => "12345678",
+        "db_stack_name" => options[:db_stack_name] || "mysql",
+        "db_host"       => "localhost"
+      }
+    }    
+  }.to_json
+end
+def dna_instances_for(cluster_type = :solo)
+  case cluster_type
+  when :solo
+    [{
+      "public_hostname" => "solo.compute-1.amazonaws.com",
+      "role" => "solo",
+      "private_hostname" => "solo.compute-1.internal"
+    }]
+  when :slaves
+    [
+      {
+        "public_hostname" => "app_master.compute-1.amazonaws.com",
+        "role" => "app_master",
+        "private_hostname" => "app_master.ec2.internal"
+      },
+      {
+        "public_hostname" => "db_master.compute-1.amazonaws.com",
+        "role" => "db_master",
+        "private_hostname" => "db_master.ec2.internal"
+      },
+      {
+        "public_hostname" => "db_slave1.compute-1.amazonaws.com",
+        "role" => "db_slave",
+        "private_hostname" => "db_slave1.ec2.internal",
+      },
+      {
+        "public_hostname" => "db_slave2.compute-1.amazonaws.com",
+        "role" => "db_slave",
+        "private_hostname" => "db_slave2.ec2.internal",
+      }
+    ]
+  end
+end
+
 Spec::Runner.configure do |config|
   config.before(:all) do
     EY::Serverside.dna_json = {}.to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: -1757219187
+  hash: 961916008
   prerelease: 6
   segments: 
   - 1
   - 4
-  - 3
-  - nodestack
-  version: 1.4.3.nodestack
+  - 7
+  - pre
+  version: 1.4.7.pre
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -16,9 +16,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
-dependencies: []
-
+date: 2011-09-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  version_requirements: *id001
+  name: rake
+  type: :development
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  version_requirements: *id002
+  name: rspec
+  type: :development
+  prerelease: false
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -29,6 +60,8 @@ extra_rdoc_files: []
 
 files: 
 - bin/engineyard-serverside
+- lib/core-ext/README.md
+- lib/core-ext/string.rb
 - lib/engineyard-serverside/bundle_installer.rb
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/configuration.rb
@@ -199,6 +232,7 @@ files:
 - lib/vendor/json_pure/tools/server.rb
 - lib/vendor/json_pure/VERSION
 - lib/vendor/open4/lib/open4.rb
+- lib/vendor/ruby_1.8.6_openssl.patch
 - lib/vendor/thor/bin/rake2thor
 - lib/vendor/thor/bin/thor
 - lib/vendor/thor/CHANGELOG.rdoc
@@ -237,12 +271,28 @@ files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- spec/fixtures/gitrepo/bar
+- spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile
+- spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile
+- spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_mysql/Gemfile
+- spec/fixtures/gemfiles/activerecord_mysql/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_mysql2/Gemfile
+- spec/fixtures/gemfiles/activerecord_mysql2/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_pg/Gemfile
+- spec/fixtures/gemfiles/activerecord_pg/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_sqlite3/Gemfile
+- spec/fixtures/gemfiles/activerecord_sqlite3/Gemfile.lock
+- spec/fixtures/gemfiles/diy_database_yml/config/database.yml
+- spec/fixtures/gemfiles/diy_database_yml/Gemfile
+- spec/fixtures/gemfiles/diy_database_yml/Gemfile.lock
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
+- spec/generate_configs_spec.rb
 - spec/git_strategy_spec.rb
+- spec/lib/full_test_deploy.rb
 - spec/lockfile_parser_spec.rb
 - spec/real_deploy_spec.rb
 - spec/restart_spec.rb
@@ -296,12 +346,28 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- spec/fixtures/gitrepo/bar
+- spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile
+- spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile
+- spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_mysql/Gemfile
+- spec/fixtures/gemfiles/activerecord_mysql/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_mysql2/Gemfile
+- spec/fixtures/gemfiles/activerecord_mysql2/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_pg/Gemfile
+- spec/fixtures/gemfiles/activerecord_pg/Gemfile.lock
+- spec/fixtures/gemfiles/activerecord_sqlite3/Gemfile
+- spec/fixtures/gemfiles/activerecord_sqlite3/Gemfile.lock
+- spec/fixtures/gemfiles/diy_database_yml/config/database.yml
+- spec/fixtures/gemfiles/diy_database_yml/Gemfile
+- spec/fixtures/gemfiles/diy_database_yml/Gemfile.lock
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
+- spec/generate_configs_spec.rb
 - spec/git_strategy_spec.rb
+- spec/lib/full_test_deploy.rb
 - spec/lockfile_parser_spec.rb
 - spec/real_deploy_spec.rb
 - spec/restart_spec.rb