ey_cloud_server 1.4.28 → 1.4.29

data/spec/helpers.rb

@@ -100,50 +100,25 @@ module Helpers
 
   def drop_postgresql_database(db_key)
     db_name = created_postgresql_dbs[db_key]
-#    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}"}
+    command = %Q{ PGPASSWORD='#{postgresql_password}' dropdb -U #{postgresql_user} -h #{postgresql_host} #{db_name} }
     system(command)
   end
 
   def check_postgresql_database(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}'"}
+    command = %Q{ PGPASSWORD='#{postgresql_password}' psql -l -U #{postgresql_user} -h #{postgresql_host} | grep '#{db_name}' }
     system(command) || raise("Could not find db: #{db_name} with command:\n #{command}")
     db_name
   end
 
   def create_postgresql_database(db_key, region = 'us-east-1')
-    db_name = generate_database_name('mongo')
+    db_name = generate_database_name('postgresql')
     created_postgresql_dbs[db_key] = db_name
     drop_postgresql_database(db_key)
-# 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}"}
+    command = %Q{ PGPASSWORD='#{postgresql_password}' createdb -U #{postgresql_user} -h #{postgresql_host} #{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 drop_mongodb_database(db_key)
-    db_name = created_mongodb_dbs[db_key]
-    command=%Q{ssh -F /dev/null -o CheckHostIP=no -o StrictHostKeyChecking=no -i /home/#{mongodb_user}/.ssh/internal root@#{mongodb_host} "mongo --host localhost #{db_name} --quiet --eval 'printjson(db.dropDatabase());'"}
-    system(command)
-  end
-
-  def check_mongodb_database(db_name)
-    command=%Q{ssh -F /dev/null -o CheckHostIP=no -o StrictHostKeyChecking=no -i /home/#{mongodb_user}/.ssh/internal root@#{mongodb_host} "mongo --host localhost --quiet --eval "for each(var db in db.runCommand('listDatabases').databases) if(db.sizeOnDisk > 1) print(db.name);" admin | grep '#{db_name}'"}
-    system(command) || raise("Could not find db: #{db_name} with command:\n #{command}")
-    db_name
-  end
-
-  def create_mongodb_database(db_key, region = 'us-east-1')
-    db_name = generate_database_name('test')
-    drop_mongodb_database(db_key)
-    command=%Q{ssh -F /dev/null -o CheckHostIP=no -o StrictHostKeyChecking=no -i /home/#{mongodb_user}/.ssh/internal root@#{mongodb_host} "mongo --host localhost #{db_name} --quiet --eval 'db.foo.save({ name : "derp"});'"}
-    system(command) || raise("Could not create db: #{db_name} with command:\n #{command}")
-    write_database_config('mongodb', mongodb_user, mongodb_password, mongodb_host, created_mongodb_dbs.values, region)
-    db_name
-  end  
-  
 
   def write_database_config(type, root_user, root_password, host, databases, region)
     @database_config = {
@@ -170,7 +145,7 @@ module Helpers
   end
 
   def run_sql(command, database)
-    system("echo '#{command}' |mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -D#{database}")
+    system("mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -D#{database} -e '#{command}'")
   end
 
   def run_sql_pipe(io, database)
@@ -189,10 +164,6 @@ module Helpers
     system("PGPASSWORD='#{postgresql_password}' psql -c '#{command}' -h #{postgresql_host} -U #{postgresql_user} #{database}")
   end
 
-  def run_mongocmd(command, database)
-    system("mongo #{database} --quiet --eval \"#{command}\" --quiet")
-  end
-  
   def tmp_dir
     if spec_config['tmp_dir'].blank?
       File.dirname(__FILE__) + "/tmp/"
@@ -209,10 +180,6 @@ module Helpers
     spec_config['postgresql_user'] || raise("No postgresql user provided")
   end
 
-  def mongodb_user
-    spec_config['mongodb_user'] || raise("No mongodb user provided")
-  end
-
   def mysql_password
     spec_config['mysql_password']
   end
@@ -221,20 +188,12 @@ module Helpers
     spec_config['postgresql_password']
   end
 
-  def mongodb_password #<- is this really needed? Supported mongo will run in trusted mode
-    spec_config['mongodb_password']
-  end
-
   def mysql_host
-    spec_config['mysql_host']
+    spec_config['mysql_host'] || 'localhost'
   end
 
   def postgresql_host
-    spec_config['postgresql_host']
-  end
-
-  def mongodb_host
-    spec_config['mongodb_host']
+    spec_config['postgresql_host'] || 'localhost'
   end
 
   def created_mysql_dbs
@@ -245,10 +204,6 @@ module Helpers
     @created_postgresql_dbs ||= {}
   end
 
-  def created_mongodb_dbs
-    @created_mongodb_dbs ||= {}
-  end
-
   def spec_config
     Helpers.spec_config
   end

data/spec/spec_helper.rb

@@ -7,8 +7,8 @@ require 'randexp'
 require 'fog'
 
 # Made tests work with actual storage; better tests.  - rpowell Fri Aug  5 17:53:17 PDT 2011
-# 
-# Fog.mock!
+#
+Fog.mock!
 
 require File.dirname(__FILE__) + '/fakefs_hax'
 require File.dirname(__FILE__) + '/helpers'
@@ -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
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(Helpers)
 
   config.before(:each) do

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_server
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 1
   - 4
-  - 28
-  version: 1.4.28
+  - 29
+  version: 1.4.29
 platform: ruby
 authors: 
-- Engine Yard
+- EngineYard
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-12-22 00:00:00 Z
+date: 2011-12-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -23,124 +23,52 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: right_http_connection
+  name: open4
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 4
-        version: 1.2.4
+        - 3
+        - 0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: right_aws
+  name: fog
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
+        - 1
+        - 1
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 1.1.2
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: open4
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        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 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: fog
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ey_enzyme
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -150,162 +78,26 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ey_instance_api_client
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
-  type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: randexp
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 17
         segments: 
         - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: -1842207251
-        segments: 
-        - 0
-        - 8
-        - 6
-        - ninjas
-        version: 0.8.6.ninjas
-  type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: -1842207315
-        segments: 
         - 1
-        - 2
-        - 6
-        - ninjas
-        version: 1.2.6.ninjas
-  type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: fakefs
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: -1842207311
-        segments: 
-        - 0
-        - 0
-        - 1
-        - ninjas
-        version: 0.0.1.ninjas
-  type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: dbi
-  prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: dbd-mysql
-  prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id019
-description: Server side components for Engine Yard's cloud
+        - 5
+        version: 0.1.5
+  type: :runtime
+  version_requirements: *id005
+description: ""
 email: 
-- gems@engineyard.com
+- engineering@engineyard.com
 executables: 
 - binary_log_purge
 - clear_binlogs_from_slave
@@ -318,12 +110,35 @@ 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
+- bin/ey-snapshots
+- bin/eybackup
+- bin/mysql_start
+- ey_cloud_server.gemspec
+- features/downloading_a_mysql_backup.feature
+- features/making_a_postgresql_backup.feature
+- features/restoring_postgres_backup.feature
+- features/step_definitions/backups.rb
+- features/step_definitions/commands.rb
+- features/step_definitions/mysql.rb
+- features/step_definitions/postgresql.rb
+- features/support/env.rb
+- 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-flex.rb
+- lib/ey_backup.rb
 - lib/ey_backup/backend.rb
 - lib/ey_backup/backup_set.rb
 - lib/ey_backup/base.rb
@@ -331,7 +146,6 @@ files:
 - lib/ey_backup/database.rb
 - lib/ey_backup/dumper.rb
 - lib/ey_backup/engine.rb
-- lib/ey_backup/engines/mongodb_engine.rb
 - lib/ey_backup/engines/mysql_engine.rb
 - lib/ey_backup/engines/postgresql_engine.rb
 - lib/ey_backup/loader.rb
@@ -340,10 +154,10 @@ files:
 - lib/ey_backup/processors/gzipper.rb
 - lib/ey_backup/processors/splitter.rb
 - lib/ey_backup/spawner.rb
-- lib/ey_backup.rb
+- lib/ey_cloud_server.rb
 - lib/ey_cloud_server/mysql_start.rb
 - lib/ey_cloud_server/version.rb
-- lib/ey_cloud_server.rb
+- script/ci
 - spec/big-brother_spec.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
@@ -351,7 +165,6 @@ files:
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb
 - spec/ey_backup/cli_spec.rb
-- spec/ey_backup/mongo_backups_spec.rb
 - spec/ey_backup/mysql_backups_spec.rb
 - spec/ey_backup/postgres_backups_spec.rb
 - spec/ey_backup/spec_helper.rb
@@ -361,13 +174,8 @@ files:
 - spec/helpers.rb
 - spec/snapshot_minder_spec.rb
 - spec/spec_helper.rb
-- bin/binary_log_purge
-- bin/clear_binlogs_from_slave
-- bin/ey-agent
-- bin/ey-snapshots
-- bin/eybackup
-- bin/mysql_start
-homepage: http://github.com/engineyard/ey_cloud_server
+- tmp/.gitignore
+homepage: ""
 licenses: []
 
 post_install_message: 
@@ -396,11 +204,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's cloud
 test_files: 
+- features/downloading_a_mysql_backup.feature
+- features/making_a_postgresql_backup.feature
+- features/restoring_postgres_backup.feature
+- features/step_definitions/backups.rb
+- features/step_definitions/commands.rb
+- features/step_definitions/mysql.rb
+- features/step_definitions/postgresql.rb
+- features/support/env.rb
 - spec/big-brother_spec.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
@@ -408,7 +224,6 @@ test_files:
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb
 - spec/ey_backup/cli_spec.rb
-- spec/ey_backup/mongo_backups_spec.rb
 - spec/ey_backup/mysql_backups_spec.rb
 - spec/ey_backup/postgres_backups_spec.rb
 - spec/ey_backup/spec_helper.rb

data/lib/ey-flex/ec2.rb

@@ -1,17 +0,0 @@
-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/mongodb_engine.rb

@@ -1,64 +0,0 @@
-module EY
-  module Backup
-    class Mongodb < Engine
-      register 'mongodb'
-
-      def dump(database_name, basename)
-        # Mongo dumps in directories. Compressing 
-        file = basename
-        
-        command = "mongodump --host #{host} -o #{file} --db #{database_name}; tar -cz #{file}"
-          
-        if gpg?
-          command << " | " << GPGEncryptor.command_for(key_id)
-          file << GPGEncryptor.extension
-        end
-
-        command << " > #{file}"
-
-        run(command)
-
-        file
-      end
-
-      def load(database_name, file)
-        if database_exists?(database_name)
-          cycle_database(database_name)
-        else
-          create_database(database_name)
-        end
-
-        command = "cat #{file}"
-
-        if gpg?
-          raise "Cannot load a GPG backup"
-        end
-
-        command << " | mongorestore --host #{host} --db #{database_name}"
-
-        run(command)
-      end
-
-      def database_exists?(database_name)
-        runs?("mongo --host #{host}  --quiet --eval \"for each(var db in db.runCommand('listDatabases').databases) if(db.sizeOnDisk > 1) print(db.name);\" admin | grep '#{database_name}'")
-      end
-
-      def drop_database(database_name)
-        runs?("mongo --host #{host} #{database_name} --quiet --eval 'printjson(db.dropDatabase());'")
-      end
-
-      def create_database(database_name) 
-        runs?("mongo --host #{host} #{database_name} --quiet --eval 'db.createCollection('ey_backup');'")
-      end
-
-      def cycle_database(database_name)
-        drop_database(database_name)
-        create_database(database_name)
-      end
-
-      def suffix
-        /\.(gz)$/
-      end
-    end
-  end
-end