ey_cloud_server 1.4.46 → 1.4.47a

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA512: 
-  data.tar.gz: 1818a85d93f4ff673283de54c5525184dab4e7930c76187924f43ada4d3954d098d3d4de88be84a0a4d574323da9bdd48d6a7c3dcb7f82cfac6a1f1d8fad1513
-  metadata.gz: c98047a1f643f28e44640d299ed2f948980aaf33515d9ebd844678af9d4b411bbafaa6a45a06f5e027b039c7e5f64864f0307d032bc129d8abb8b0ba1cddae4b
-SHA1: 
-  data.tar.gz: 3833f7443c2c0acec64a3313e5ecdf2bec44589d
-  metadata.gz: 8aa90e768eb6ada032b867ddebe5dccec06f8d10
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGM0MmFkNWZiYmVmNTNjOWNhNWRiM2E2NzA5NWI1YWZhMmVhNTY1Yg==
+  data.tar.gz: !binary |-
+    YTU4MmFjMGEwYjM2NzQ4OTMzNDhlZTRkZjY4NmQ4ZGEwMmEzZTM3Yw==
+SHA512:
+  metadata.gz: !binary |-
+    ODViNzVmZTE2MmJhMzc5OTk1ODU4MDhhMDJhNmQyNDNjNDk2NjYyNWIwOTk5
+    OTExYWRmYWRlOGU1MjIzMTJjMWMyMTUzMDc2YzU0Yjc0MjQyMmIzMmY5NDA2
+    ZjViMWNmNjlkZDg1YzFjM2I5YjNhZTdmYmVkOGNkYjA1MmRhZWU=
+  data.tar.gz: !binary |-
+    MWMyMGFlNDk5ZTdkNDliNzUxMTJjOGZmN2U4MzdmZDQ1OGVjYTEyNzJkYTIy
+    ZDQ4ZmMxNmI5ZWM5NzlkZDY1N2YxOGM0ZDhlNThhYTdjZTUxNzY4NjRkZTAx
+    YTcyYjFiNWUwYWFkNzU4NTVkODk3M2M0YmI3YzE0ZTJjODZlMjA=

data/features/support/env.rb

@@ -3,15 +3,15 @@ require File.dirname(__FILE__) + "/../../lib/ey_backup"
 require 'fakeweb'
 require 'fakefs/safe'
 require 'randexp'
+require 'fog'
+
+Fog.mock!
 
 require File.dirname(__FILE__) + '/../../spec/fakefs_hax'
 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)
 

data/lib/ey_cloud_server/version.rb

@@ -1,5 +1,5 @@
 module EY
   module CloudServer
-    VERSION = '1.4.46'
+    VERSION = '1.4.47a'
   end
 end

data/spec/config.yml

@@ -0,0 +1,11 @@
+---
+tmp_dir: 
+data_json: 
+mysql_user: root
+mysql_password:
+mysql_host: localhost
+postgresql_user: postgres
+postgresql_password: grew152
+postgresql_host: localhost
+aws_secret_id: 'AKIAIDNXVLT3THIWYMNQ'
+aws_secret_key: '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'

data/spec/ey_backup/mysql_backups_spec.rb

@@ -23,6 +23,7 @@ describe "MySQL Backups" do
   end
 
   it "makes GPG encrypted backups" do
+    import_gpg
     EY::Backup.run(["-c", backup_config_file, '-k', Helpers::PUBLIC_KEY_ID])
 
     EY::Backup.run(["-c", backup_config_file, "-l", @db_name])
@@ -89,29 +90,29 @@ describe "MySQL Backups" do
   it 'manually restores an encrypted backup' do
     run_sql("CREATE TABLE `foo` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_true
     run_sql("CREATE TABLE `bar` (`id` int(11) NOT NULL auto_increment, PRIMARY KEY(`id`));", @db_name).should be_true
-
+  
     import_gpg
-
+  
     EY::Backup.run(["-c", backup_config_file, '-k', Helpers::PUBLIC_KEY_ID])
-
+  
     run_sql("DROP TABLE `bar`;", @db_name).should be_true
     run_sql("SELECT * FROM `bar`;", @db_name).should be_false
-
+  
     reset_logger
-
+  
     EY::Backup.run(["-c", backup_config_file, "-l", @db_name])
-
+  
     stdout.should include("1 backup(s) found")
-
+  
     EY::Backup.run(["-c", backup_config_file, "--download", "0:#{@db_name}"])
     file = Dir["#{EY::Backup.tmp_dir}/*#{@db_name}*"].first
     stdout = StringIO.new
     EY::Backup::Spawner.spawn("gpg --no-default-keyring --keyring #{Helpers::PUBLIC_KEY_PATH} --secret-keyring #{Helpers::PRIVATE_KEY_PATH} --decrypt", stdout, file)
-
+  
     stdout.rewind
-
+  
     run_sql_pipe(stdout, @db_name)
-
+  
     run_sql("SELECT * FROM `foo`;", @db_name).should be_true
     run_sql("SELECT * FROM `bar`;", @db_name).should be_true
     FileUtils.rm(file)

data/spec/ey_backup/postgres_backups_spec.rb

@@ -24,11 +24,11 @@ describe "Postgres Backups" do
 
   it "makes GPG encrypted backups" do
     import_gpg
-
+ 
     EY::Backup.run(["-c", backup_config_file, '-e', 'postgresql', '-k', Helpers::PUBLIC_KEY_ID])
-
+ 
     EY::Backup.run(["-c", backup_config_file, '-e', 'postgresql', "-l", @db_name])
-
+ 
     stdout.should match(/0:#{@db_name}/)
   end
 
@@ -56,19 +56,19 @@ describe "Postgres Backups" do
   it "restores split backups" do
     run_psql("CREATE TABLE foo (id integer NOT NULL);", @db_name).should be_true
     run_psql("CREATE TABLE bar (id integer NOT NULL);", @db_name).should be_true
-
+  
     EY::Backup.run(["-c", backup_config_file, "-e", "postgresql", "-s", "100"])
     EY::Backup.run(["-c", backup_config_file, "-e", "postgresql", "-l", @db_name]).first.parts.should > 1
-
+  
     run_psql("DROP TABLE bar;", @db_name).should be_true
     run_psql("SELECT * FROM bar;", @db_name).should be_false
-
+  
     EY::Backup.run(["-c", backup_config_file, "-l", @db_name, '-e', 'postgresql'])
-
+  
     stdout.should include("1 backup(s) found")
-
+  
     EY::Backup.run(["-c", backup_config_file, "-r", "0:#{@db_name}", '-e', 'postgresql'])
-
+  
     run_psql("SELECT * FROM foo;", @db_name).should be_true
     run_psql("SELECT * FROM bar;", @db_name).should be_true
   end

data/spec/helpers.rb

@@ -4,7 +4,7 @@ module Helpers
   PUBLIC_KEY_ID = '4D5AA1CE74A97ADB'
 
   def run_before
-    public_key, private_key = read_keys
+    read_keys
 
     FakeWeb.clean_registry
     FakeWeb.passthrough_uri(:any, %r{^https?://s3.amazonaws.com/})
@@ -28,7 +28,7 @@ module Helpers
   end
 
   def stub_configs
-    # print "in stub_configs: #{YAML::dump(@database_config)}, #{YAML::dump(spec_config)}\n"
+    #print "in stub_configs: #{YAML::dump(@database_config)}, #{YAML::dump(spec_config)}\n"
     config = @database_config || spec_config
     config = config.merge({ :tmp_dir => tmp_dir })
     # print "in stub_configs2: #{YAML::dump(config)}\n"
@@ -59,7 +59,7 @@ module Helpers
     FileUtils.rm_f(backup_config_file)
     filenames = Dir.glob("#{tmp_dir}/*")
     if filenames.any?
-      raise "failed to remove #{filenames.join(' ')}"
+      raise "failed to remove #{filenames.join(', ')}"
     end
   end
 
@@ -82,7 +82,7 @@ module Helpers
   end
 
   def mysql_password_option
-    mysql_password.blank? ? "" : "-p#{mysql_password}"
+    mysql_password.nil? ? "" : "-p#{mysql_password}"
   end
 
   def generate_database_name(type)
@@ -156,7 +156,7 @@ module Helpers
     stdin.flush
     stdin.close
 
-    ignored, status = Process::waitpid2 pid
+    _, status = Process::waitpid2 pid
 
     status
   end
@@ -166,7 +166,7 @@ module Helpers
   end
 
   def tmp_dir
-    if spec_config['tmp_dir'].blank?
+    if spec_config['tmp_dir'].nil?
       File.dirname(__FILE__) + "/tmp/"
     else
       spec_config['tmp_dir'] || File.dirname("./tmp/")
@@ -174,11 +174,11 @@ module Helpers
   end
 
   def mysql_user
-    spec_config['mysql_user'] || raise("No mysql user provided")
+    spec_config['mysql_user'] || "root"
   end
 
   def postgresql_user
-    spec_config['postgresql_user'] || raise("No postgresql user provided")
+    spec_config['postgresql_user'] || "postgres"
   end
 
   def mysql_password
@@ -190,11 +190,11 @@ module Helpers
   end
 
   def mysql_host
-    spec_config['mysql_host'] || 'localhost'
+    spec_config['mysql_host'] || '127.0.0.1'
   end
 
   def postgresql_host
-    spec_config['postgresql_host'] || 'localhost'
+    spec_config['postgresql_host'] || '127.0.0.1'
   end
 
   def created_mysql_dbs
@@ -215,8 +215,14 @@ module Helpers
 
   def self.load_spec_config
     filename = File.dirname(__FILE__) + '/config.yml'
+
     if File.exist?(filename)
       @spec_config = YAML.load_file(filename)
+    elsif Fog.mocking?
+      @spec_config = {
+        'aws_secret_id'  => SecureRandom.base64(10),
+        'aws_secret_key' => SecureRandom.base64(20),
+      }
     else
       abort "Please setup your spec/config.yml file"
     end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + "/../lib/ey-flex"
 
-require 'ruby-debug'
 require 'fakeweb'
 require 'fakefs/safe'
 require 'randexp'

metadata

@@ -1,134 +1,179 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ey_cloud_server
-version: !ruby/object:Gem::Version 
-  version: 1.4.46
+version: !ruby/object:Gem::Version
+  version: 1.4.47a
 platform: ruby
-authors: 
+authors:
 - EngineYard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-01-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-07-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
     - - <=
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: right_http_connection
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+- !ruby/object:Gem::Dependency
+  name: right_http_connection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: right_aws
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+- !ruby/object:Gem::Dependency
+  name: right_aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.4.4
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.6.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.6.2
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.2
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.30.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.30.0
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.1
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: ey_enzyme
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: ey_enzyme
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.7
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: ey_instance_api_client
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: ey_instance_api_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id012 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Miscellaneous EY server utilities
-email: 
+email:
 - engineering@engineyard.com
-executables: 
+executables:
 - binary_log_purge
 - clear_binlogs_from_slave
 - ey-agent
@@ -136,21 +181,32 @@ executables:
 - eybackup
 - mysql_start
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- 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
+- 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/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
@@ -166,17 +222,13 @@ 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
-- README.rdoc
-- Rakefile
-- LICENSE
-- TODO
 - spec/big-brother_spec.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
+- spec/config.yml
 - spec/ey_api_spec.rb
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb
@@ -190,41 +242,34 @@ files:
 - spec/helpers.rb
 - spec/snapshot_minder_spec.rb
 - spec/spec_helper.rb
-- 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
 homepage: http://developer.engineyard.com
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id012
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id012
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Server side components for Engine Yard's cloud
-test_files: 
+test_files:
 - spec/big-brother_spec.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
+- spec/config.yml
 - spec/ey_api_spec.rb
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb