ey_cloud_server 1.4.29 → 1.4.31

data/Gemfile

@@ -1,15 +1,13 @@
 source 'http://rubygems.org/'
-source 'http://geminst:hoa3laml@rubygems.engineyard.com/'
+source 'http://geminst:hoa3laml@gems-internal.engineyard.com/'
 
 gemspec
 
-## Group Dependencies
-
 group :test do
-  gem 'rspec'
+  gem 'rspec', '~>1.1'
   gem 'randexp'
   gem 'cucumber'
-  gem 'rcov'
+  gem 'rcov', '=0.8.6.ninjas'
   gem 'fakeweb', '1.2.6.ninjas'
   gem 'fakefs', '=0.0.1.ninjas'
   gem 'dbi'

data/Rakefile

@@ -3,16 +3,27 @@ Bundler.setup(:runtime, :test)
 $:.unshift File.dirname(__FILE__) + '/lib'
 require File.dirname(__FILE__) + '/lib/ey-flex'
 
-require 'rspec/core/rake_task'
+require 'spec/rake/spectask'
 desc "Run unit specifications"
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.rspec_opts = %w(-fs --color --backtrace)
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts << %w(-fs --color)
+  t.spec_opts << '--loadby' << 'random'
+  t.spec_files = Dir["spec/**/*_spec.rb"]
+
+  t.rcov = ENV['RCOV'] == "true"
+  t.rcov_opts << '--exclude' << 'spec'
+  t.rcov_opts << '--text-summary'
+  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
 end
 
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = %w{--format pretty}
+
+  t.rcov = ENV["RCOV"] == "true"
+  t.rcov_opts << '--text-summary'
+  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+  t.rcov_opts << '--exclude features/,spec/'
 end
 
 desc "Run unit specifications"

data/ey_cloud_server.gemspec

@@ -9,17 +9,22 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
+  gem.files         = `git ls-files -- {bin,lib,test,spec,features}/* Gemfile LICENSE README.rdoc Rakefile ey_cloud_server.gemspec`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+
   gem.name          = "ey_cloud_server"
   gem.require_paths = ["lib"]
   gem.version       = EY::CloudServer::VERSION
 
-  gem.add_runtime_dependency 'json', '~> 1.6.4'
-  gem.add_runtime_dependency 'open4', "~> 1.3.0"
+  gem.add_runtime_dependency 'json'
+  gem.add_runtime_dependency 'right_http_connection', '1.2.4'
+  gem.add_runtime_dependency 'right_aws', '2.0.0'
+  gem.add_runtime_dependency 'open4', "0.9.6"
 
-  gem.add_runtime_dependency 'fog', '~> 1.1.2'
+  gem.add_runtime_dependency 'aws-s3'
+  gem.add_runtime_dependency 'fog', '0.7.2'
+  gem.add_runtime_dependency 'mysql'
   gem.add_runtime_dependency "ey_enzyme"
 
-  gem.add_runtime_dependency "ey_instance_api_client", "~> 0.1.5"
+  gem.add_runtime_dependency "ey_instance_api_client", "0.1.1"
 end

data/features/support/env.rb

@@ -9,11 +9,9 @@ require File.dirname(__FILE__) + '/../../spec/helpers'
 
 FakeWeb.allow_net_connect = false # if it's not here, it doesn't exist
 Randexp::Dictionary.words
-Fog.mock!
-
-Fog.mock!
 
 World(Helpers)
+require 'spec/stubs/cucumber'
 
 Before do
   run_before

data/lib/ey-flex.rb

@@ -1,9 +1,11 @@
 require 'json'
+require 'aws/s3'
 require 'date'
 require 'digest'
 require 'net/http'
 require 'fileutils'
 require 'json/ext'
+require 'right_aws'
 require 'open-uri'
 require 'rest_client'
 require 'dbi'
@@ -47,4 +49,5 @@ require lib_dir + '/big-brother'
 require lib_dir + '/bucket_minder'
 require lib_dir + '/ey-api'
 require lib_dir + '/snapshot_minder'
+require lib_dir + '/ec2'
 require lib_dir + '/../ey_cloud_server/version'

data/lib/ey-flex/big-brother.rb

@@ -55,14 +55,14 @@ module EY
       end
       @result.to_json
     end
-
+    
     def check_mysql
       check_process('mysqld')
       DBI.connect("DBI:Mysql:mysql:#{@dna['db_host']}", 'root', @dna['users'].first['password'])
     rescue DBI::DatabaseError => e
       @result['mysqld'] = 'down'
     end
-
+    
     def check_process(name)
       return if name == ''
       pids = `pgrep #{name}`.split("\n")

data/lib/ey-flex/ec2.rb

@@ -0,0 +1,17 @@
+module EY
+  class EC2
+    def initialize(opts = {})
+      @ec2 = RightAws::Ec2.new(opts[:aws_secret_id], opts[:aws_secret_key], :logger => Logger.new("/dev/null"))
+    end
+
+    def method_missing(method, *a, &b)
+      @ec2.send(method, *a, &b)
+    rescue RightAws::AwsError => e
+      retries ||= 10
+      retries -= 1
+      raise e if retries == 0
+      sleep 30
+      retry
+    end
+  end
+end

data/lib/ey_backup/engines/postgresql_engine.rb

@@ -6,7 +6,7 @@ module EY
       def dump(database_name, basename)
         file = basename + '.dump'
 
-        command = "PGPASSWORD='#{password}' pg_dump -h #{host} --format=c --no-owner --no-privileges -U#{username} #{database_name}"
+        command = "PGPASSWORD='#{password}' pg_dump -h #{host} --format=c --no-privileges -Upostgres #{database_name}"
 
         if gpg?
           command << " | " << GPGEncryptor.command_for(key_id)
@@ -33,7 +33,7 @@ module EY
           raise "Cannot load a GPG backup"
         end
 
-        command << " | PGPASSWORD='#{password}' pg_restore -h #{host} --format=c --ignore-version -U#{username} -d #{database_name}"
+        command << " | PGPASSWORD='#{password}' pg_restore -h #{host} --format=c -Upostgres -d #{database_name}"
 
         run(command)
       end

data/lib/ey_cloud_server/version.rb

@@ -1,5 +1,5 @@
 module EY
   module CloudServer
-    VERSION = '1.4.29'
+    VERSION = '1.4.31'
   end
 end

data/spec/ey_backup/postgres_backups_spec.rb

@@ -12,7 +12,7 @@ describe "Postgres Backups" do
 
     EY::Backup.run(["-c", backup_config_file, "-l", @db_name, "-e", "postgresql"])
 
-    stdout.should match(/0:#{@db_name}.*\.dump$/)
+    stdout.should match(/0:#{@db_name}.*\.dump.gz$/)
   end
 
   it "makes a split backup" do

data/spec/helpers.rb

@@ -100,12 +100,13 @@ module Helpers
 
   def drop_postgresql_database(db_key)
     db_name = created_postgresql_dbs[db_key]
-    command = %Q{ PGPASSWORD='#{postgresql_password}' dropdb -U #{postgresql_user} -h #{postgresql_host} #{db_name} }
+#    system("PGPASSWORD='#{postgresql_password}' dropdb -U #{postgresql_user} -h #{postgresql_host} #{db_name}")
+    command=%Q{ssh -F /dev/null -o CheckHostIP=no -o StrictHostKeyChecking=no -i /home/#{postgresql_user}/.ssh/internal root@#{postgresql_host} "dropdb -U postgres -h localhost #{db_name}"}
     system(command)
   end
 
   def check_postgresql_database(db_name)
-    command = %Q{ PGPASSWORD='#{postgresql_password}' psql -l -U #{postgresql_user} -h #{postgresql_host} | grep '#{db_name}' }
+    command=%Q{ssh -F /dev/null -o CheckHostIP=no -o StrictHostKeyChecking=no -i /home/#{postgresql_user}/.ssh/internal root@#{postgresql_host} "psql -l -U #{postgresql_user} -h localhost | grep '#{db_name}'"}
     system(command) || raise("Could not find db: #{db_name} with command:\n #{command}")
     db_name
   end
@@ -114,12 +115,15 @@ module Helpers
     db_name = generate_database_name('postgresql')
     created_postgresql_dbs[db_key] = db_name
     drop_postgresql_database(db_key)
-    command = %Q{ PGPASSWORD='#{postgresql_password}' createdb -U #{postgresql_user} -h #{postgresql_host} #{db_name} }
+# ssh -F /dev/null -o CheckHostIP=no -o StrictHostKeyChecking=no -i /home/$USER/.ssh/internal root@$DB_HOST "createdb -U postgres -h localhost -O $USER testdbreallytestingweee8"
+#    system("PGPASSWORD='#{postgresql_password}' createdb -U #{postgresql_user} -h #{postgresql_host} #{db_name}") || raise("Could not create db: #{db_name}")
+    command=%Q{ssh -F /dev/null -o CheckHostIP=no -o StrictHostKeyChecking=no -i /home/#{postgresql_user}/.ssh/internal root@#{postgresql_host} "createdb -U postgres -h localhost -O #{postgresql_user} #{db_name}"}
     system(command) || raise("Could not create db: #{db_name} with command:\n #{command}")
     write_database_config('postgresql', postgresql_user, postgresql_password, postgresql_host, created_postgresql_dbs.values, region)
     db_name
   end
-
+  
+  
   def write_database_config(type, root_user, root_password, host, databases, region)
     @database_config = {
       :env            => 'production',
@@ -145,7 +149,7 @@ module Helpers
   end
 
   def run_sql(command, database)
-    system("mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -D#{database} -e '#{command}'")
+    system("echo '#{command}' |mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -D#{database}")
   end
 
   def run_sql_pipe(io, database)
@@ -189,11 +193,11 @@ module Helpers
   end
 
   def mysql_host
-    spec_config['mysql_host'] || 'localhost'
+    spec_config['mysql_host']
   end
 
   def postgresql_host
-    spec_config['postgresql_host'] || 'localhost'
+    spec_config['postgresql_host']
   end
 
   def created_mysql_dbs

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require 'randexp'
 require 'fog'
 
 # Made tests work with actual storage; better tests.  - rpowell Fri Aug  5 17:53:17 PDT 2011
-#
+# 
 Fog.mock!
 
 require File.dirname(__FILE__) + '/fakefs_hax'
@@ -18,7 +18,7 @@ Helpers.load_spec_config
 FakeWeb.allow_net_connect = false # if it's not here, it doesn't exist
 Randexp::Dictionary.words
 
-RSpec.configure do |config|
+Spec::Runner.configure do |config|
   config.include(Helpers)
 
   config.before(:each) do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_server
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 4
-  - 29
-  version: 1.4.29
+  - 31
+  version: 1.4.31
 platform: ruby
 authors: 
 - EngineYard
@@ -15,86 +14,127 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2012-01-10 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: right_http_connection
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
-        - 3
-        - 0
-        version: 1.3.0
+        - 2
+        - 4
+        version: 1.2.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: fog
+  name: right_aws
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
-        - 1
-        - 1
         - 2
-        version: 1.1.2
+        - 0
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ey_enzyme
+  name: open4
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 6
+        version: 0.9.6
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: fog
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 2
+        version: 0.7.2
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ey_enzyme
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ey_instance_api_client
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 1
-        - 5
-        version: 0.1.5
+        - 1
+        version: 0.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id009
 description: ""
 email: 
 - engineering@engineyard.com
@@ -110,14 +150,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- .rvmrc
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO
 - bin/binary_log_purge
 - bin/clear_binlogs_from_slave
 - bin/ey-agent
@@ -136,6 +172,7 @@ files:
 - lib/ey-flex.rb
 - lib/ey-flex/big-brother.rb
 - lib/ey-flex/bucket_minder.rb
+- lib/ey-flex/ec2.rb
 - lib/ey-flex/ey-api.rb
 - lib/ey-flex/snapshot_minder.rb
 - lib/ey_backup.rb
@@ -157,7 +194,6 @@ files:
 - lib/ey_cloud_server.rb
 - lib/ey_cloud_server/mysql_start.rb
 - lib/ey_cloud_server/version.rb
-- script/ci
 - spec/big-brother_spec.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
@@ -174,7 +210,7 @@ files:
 - spec/helpers.rb
 - spec/snapshot_minder_spec.rb
 - spec/spec_helper.rb
-- tmp/.gitignore
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -184,27 +220,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's cloud

data/.gitignore

@@ -1,10 +0,0 @@
-.DS_Store
-pkg
-vendor/gems/ruby/1.8/*
-vendor/gems/environment.rb
-!vendor/gems/ruby/1.8/cache
-gbin
-coverage
-spec/config.yml
-tmp
-.bundle

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.8.7

data/Gemfile.lock

@@ -1,124 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ey_cloud_server (1.4.29.pre)
-      ey_enzyme
-      ey_instance_api_client (~> 0.1.5)
-      fog (~> 1.1.2)
-      json (~> 1.6.4)
-      open4 (~> 1.3.0)
-
-GEM
-  remote: http://rubygems.org/
-  remote: http://geminst:hoa3laml@rubygems.engineyard.com/
-  specs:
-    builder (3.0.0)
-    chef (0.6.0.2)
-      erubis
-      extlib
-      json
-      ohai
-      ruby-openid
-      stomp
-    chef-deploy (0.2.5)
-    columnize (0.3.6)
-    cucumber (1.1.4)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    dbd-mysql (0.4.4)
-      dbi (>= 0.4.0)
-      mysql
-    dbi (0.4.5)
-      deprecated (= 2.0.1)
-    deprecated (2.0.1)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    excon (0.9.4)
-    extlib (0.9.15)
-    ey_enzyme (0.9.44)
-      chef (= 0.6.0.2)
-      chef-deploy (= 0.2.5)
-      json
-      rest-client (~> 1.6.1)
-    ey_instance_api_client (0.1.5)
-      json
-      rest-client
-    fakefs (0.0.1.ninjas)
-    fakeweb (1.2.6.ninjas)
-    fog (1.1.2)
-      builder
-      excon (~> 0.9.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0.3)
-      net-scp (~> 1.0.4)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-    formatador (0.2.1)
-    gherkin (2.7.1)
-      json (>= 1.4.6)
-    json (1.6.4)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mime-types (1.17.2)
-    mixlib-cli (1.2.2)
-    mixlib-config (1.1.2)
-    mixlib-log (1.3.0)
-    multi_json (1.0.4)
-    mysql (2.8.1)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.1)
-    nokogiri (1.5.0)
-    ohai (0.6.10)
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      systemu (~> 2.2.0)
-      yajl-ruby
-    open4 (1.3.0)
-    rake (0.9.2.2)
-    randexp (0.1.6)
-    rbx-require-relative (0.0.5)
-    rcov (0.9.11)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-hmac (0.4.0)
-    ruby-openid (2.1.8)
-    stomp (1.2.0)
-    systemu (2.2.0)
-    term-ansicolor (1.0.7)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cucumber
-  dbd-mysql
-  dbi
-  ey_cloud_server!
-  fakefs (= 0.0.1.ninjas)
-  fakeweb (= 1.2.6.ninjas)
-  rake
-  randexp
-  rcov
-  rspec
-  ruby-debug

data/TODO

@@ -1,4 +0,0 @@
-TODO:
-Fix LICENSE with your name
-Fix Rakefile with your name and contact info
-Add your code to lib/<%= name %>.rb

data/script/ci

@@ -1,31 +0,0 @@
-#! /bin/sh
-
-set -x
-set -e # exits on any non 0 exit code
-
-# TODO: WHY?
-
-sudo cp -pr /root/.gnupg $HOME/
-sudo chown -R deploy:deploy $HOME/.gnupg/
-
-cp spec/config-example.yml spec/config.yml
-
-sed -i "s/^mysql_host: *.*$/mysql_host: $DB_HOST/g" spec/config.yml
-sed -i "s/^mysql_user: *.*$/mysql_user: root/g" spec/config.yml
-sed -i "s/^mysql_password: *.*$/mysql_password: $DB_PASS/g" spec/config.yml
-
-sed -i "s/^postgresql_host: *.*$/postgresql_host: $DB_HOST/g" spec/config.yml
-sed -i "s/^postgresql_user: *.*$/postgresql_user: $USER/g" spec/config.yml
-sed -i "s/^postgresql_password: *.*$/postgresql_password: $DB_PASS/g" spec/config.yml
-
-# Get the real aws keys; first remove what we have
-grep -v aws_ spec/config.yml >spec/config.yml.tmp
-mv spec/config.yml.tmp spec/config.yml
-sudo grep -i aws_secret_key /etc/chef/dna.json | tail -n 1 | sed -e 's/,* *$//' -e 's/^ *//' >>spec/config.yml
-sudo grep -i aws_secret_id /etc/chef/dna.json | tail -n 1 | sed -e 's/,* *$//' -e 's/^ *//' >>spec/config.yml
-
-echo "CONFIG FILE: "
-cat spec/config.yml
-
-bundle install --deployment &> bundle.log
-bundle exec rake --trace