ey_cloud_server 1.4.47a → 1.4.47

checksums.yaml

@@ -1,15 +1,7 @@
----
-!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=
+--- 
+SHA512: 
+  metadata.gz: 8ea9f9720c697f5544e918ffc6efaa33294ee3b1ba9c5bf3b79e7dabb8fb7215aae5e9daea553db1d570785e0f86dc8522f81d2ad7ff8b720f3a7d53c523583d
+  data.tar.gz: a2e1b80bc70a1a6c01ec14de5691f467a8cd1fe443155220fbfed4e58ddbed7d87543e2a84978c781b06991ecd482fd7759aa5b4c912dd7a2122f4f352c71cf9
+SHA1: 
+  metadata.gz: eae0875e369ab43aba8d8f8f8df4f73c718afcfb
+  data.tar.gz: 959fdaab084788b57dc364842f57a8a90b3e9e44

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.47a'
+    VERSION = '1.4.47'
   end
 end

data/spec/ey_backup/mysql_backups_spec.rb

@@ -23,7 +23,6 @@ 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])
@@ -90,29 +89,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
-    read_keys
+    public_key, private_key = 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.nil? ? "" : "-p#{mysql_password}"
+    mysql_password.blank? ? "" : "-p#{mysql_password}"
   end
 
   def generate_database_name(type)
@@ -156,7 +156,7 @@ module Helpers
     stdin.flush
     stdin.close
 
-    _, status = Process::waitpid2 pid
+    ignored, status = Process::waitpid2 pid
 
     status
   end
@@ -166,7 +166,7 @@ module Helpers
   end
 
   def tmp_dir
-    if spec_config['tmp_dir'].nil?
+    if spec_config['tmp_dir'].blank?
       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'] || "root"
+    spec_config['mysql_user'] || raise("No mysql user provided")
   end
 
   def postgresql_user
-    spec_config['postgresql_user'] || "postgres"
+    spec_config['postgresql_user'] || raise("No postgresql user provided")
   end
 
   def mysql_password
@@ -190,11 +190,11 @@ module Helpers
   end
 
   def mysql_host
-    spec_config['mysql_host'] || '127.0.0.1'
+    spec_config['mysql_host'] || 'localhost'
   end
 
   def postgresql_host
-    spec_config['postgresql_host'] || '127.0.0.1'
+    spec_config['postgresql_host'] || 'localhost'
   end
 
   def created_mysql_dbs
@@ -215,14 +215,8 @@ 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,5 +1,6 @@
 require File.dirname(__FILE__) + "/../lib/ey-flex"
 
+require 'ruby-debug'
 require 'fakeweb'
 require 'fakefs/safe'
 require 'randexp'

metadata

@@ -1,179 +1,134 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ey_cloud_server
-version: !ruby/object:Gem::Version
-  version: 1.4.47a
+version: !ruby/object:Gem::Version 
+  version: 1.4.47
 platform: ruby
-authors:
+authors: 
 - EngineYard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-05-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.4
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !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
-- !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: *id001
+- !ruby/object:Gem::Dependency 
+  name: right_http_connection
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !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: *id002
+- !ruby/object:Gem::Dependency 
+  name: right_aws
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id003 !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
-        version: 1.3.0
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: open4
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !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: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id005 !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
-        version: 0.6.2
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !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: *id006
+- !ruby/object:Gem::Dependency 
+  name: fog
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id007 !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
-        version: 2.8.1
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mysql
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !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: *id008
+- !ruby/object:Gem::Dependency 
+  name: ey_enzyme
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id009 !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
-        version: 0.1.1
   type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: ey_instance_api_client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.1.1
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id012 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: Miscellaneous EY server utilities
-email:
+email: 
 - engineering@engineyard.com
-executables:
+executables: 
 - binary_log_purge
 - clear_binlogs_from_slave
 - ey-agent
@@ -181,32 +136,21 @@ executables:
 - eybackup
 - mysql_start
 extensions: []
+
 extra_rdoc_files: []
-files:
-- LICENSE
-- README.rdoc
-- Rakefile
-- TODO
+
+files: 
 - 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_backup.rb
+- lib/ey-flex.rb
 - lib/ey_backup/backend.rb
 - lib/ey_backup/backup_set.rb
 - lib/ey_backup/base.rb
@@ -222,13 +166,17 @@ files:
 - lib/ey_backup/processors/gzipper.rb
 - lib/ey_backup/processors/splitter.rb
 - lib/ey_backup/spawner.rb
-- lib/ey_cloud_server.rb
+- lib/ey_backup.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
@@ -242,34 +190,41 @@ 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:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id012
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id012
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14
 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

data/spec/config.yml

@@ -1,11 +0,0 @@
----
-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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'