engineyard-serverside 1.4.9.nodestack → 1.4.11

data/spec/spec_helper.rb

@@ -1,10 +1,7 @@
 $LOAD_PATH.push File.expand_path("../lib", File.dirname(__FILE__))
 
-# Bundler.require :default, :test - FIXME when we return to ruby 1.8.7+
-require 'rubygems'
-require 'spec'
+Bundler.require :default, :test
 require 'pp'
-require 'tmpdir'
 require 'engineyard-serverside'
 
 module EY
@@ -35,64 +32,6 @@ 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,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: -1757219163
-  prerelease: 6
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 4
-  - 9
-  - nodestack
-  version: 1.4.9.nodestack
+  - 11
+  version: 1.4.11
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -16,40 +15,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 31
         segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   version_requirements: *id001
-  name: rake
+  name: rspec
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: "0"
   version_requirements: *id002
-  name: rspec
-  type: :development
-  prerelease: false
+  name: rake
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -60,8 +57,6 @@ 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
@@ -232,7 +227,6 @@ 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
@@ -271,28 +265,10 @@ files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- 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
@@ -327,18 +303,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -346,28 +320,10 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- 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

data/lib/core-ext/README.md

@@ -1,3 +0,0 @@
-# methods for core Ruby classes that aren't available in ruby 1.8.6 (used by ey_resin)
-# versions here are just workarounds
-# FIXME remove this folder when ey_resin (and .rvmrc) updated to ruby 1.8.7 or 1.9.2

data/lib/core-ext/string.rb

@@ -1,9 +0,0 @@
-# methods for String that aren't available in ruby 1.8.6 (used by ey_resin)
-# versions here are just workarounds
-# FIXME remove this module when ey_resin (and .rvmrc) updated to ruby 1.8.7 or 1.9.2
-module ModernString
-  def start_with?(prefix)
-    self.index(prefix) == 0
-  end
-end
-String.send(:include, ModernString)

data/lib/vendor/ruby_1.8.6_openssl.patch

@@ -1,7 +0,0 @@
-diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
-index 2ebf61a..8a0202a 100644
---- a/ext/openssl/openssl_missing.h
-+++ b/ext/openssl/openssl_missing.h
-@@ -123,2 +122,0 @@ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_
--int BN_rand_range(BIGNUM *r, BIGNUM *range);
--int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);

data/spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile

@@ -1,5 +0,0 @@
-# A sample Gemfile
-source "http://rubygems.org"
-
-gem "activerecord"
-gem "activerecord-jdbcmysql-adapter"

data/spec/fixtures/gemfiles/activerecord_jdbcmysql/Gemfile.lock

@@ -1,29 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activerecord-jdbc-adapter (1.1.3)
-    activerecord-jdbcmysql-adapter (1.1.3)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-mysql (~> 5.1.0)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
-    jdbc-mysql (5.1.13)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  activerecord-jdbcmysql-adapter

data/spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile

@@ -1,5 +0,0 @@
-# A sample Gemfile
-source "http://rubygems.org"
-
-gem "activerecord"
-gem "activerecord-jdbcpostgresql-adapter"

data/spec/fixtures/gemfiles/activerecord_jdbcpostgresql/Gemfile.lock

@@ -1,29 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activerecord-jdbc-adapter (1.1.3)
-    activerecord-jdbcpostgresql-adapter (1.1.3)
-      activerecord-jdbc-adapter (= 1.1.3)
-      jdbc-postgres (~> 9.0.0)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
-    jdbc-postgres (9.0.801)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  activerecord-jdbcpostgresql-adapter

data/spec/fixtures/gemfiles/activerecord_mysql/Gemfile

@@ -1,5 +0,0 @@
-# A sample Gemfile
-source "http://rubygems.org"
-
-gem "activerecord"
-gem "mysql"

data/spec/fixtures/gemfiles/activerecord_mysql/Gemfile.lock

@@ -1,25 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
-    mysql (2.8.1)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  mysql

data/spec/fixtures/gemfiles/activerecord_mysql2/Gemfile

@@ -1,5 +0,0 @@
-# A sample Gemfile
-source "http://rubygems.org"
-
-gem "activerecord"
-gem "mysql2"

data/spec/fixtures/gemfiles/activerecord_mysql2/Gemfile.lock

@@ -1,25 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
-    mysql2 (0.3.7)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  mysql2

data/spec/fixtures/gemfiles/activerecord_pg/Gemfile

@@ -1,5 +0,0 @@
-# A sample Gemfile
-source "http://rubygems.org"
-
-gem "activerecord"
-gem "pg"

data/spec/fixtures/gemfiles/activerecord_pg/Gemfile.lock

@@ -1,25 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    i18n (0.5.0)
-    pg (0.11.0)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  pg