ey_cloud_server 1.4.61 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODliZWU4ZDUzNjk1NTExYzdiMTJiMjE3MzUxOGI2Y2VjYmUwNzg4ZQ==
+    ZmFkNjBkYjY1OTNhZjQwNjMxNjUxMmNmOTRmOWQyZDMxMDJlNTUzYQ==
   data.tar.gz: !binary |-
-    OWI2Nzg4YWI5ZDFhNGZiNDcwOGM3ZGFmYTE5OTE4NzM2YzMyOGY3Zg==
+    YTA0NTBmMTAxYzk5ZmE5YjQ0MzViYjE4NWE2YjRjZGM5YWYxZDNiNQ==
 SHA512:
   metadata.gz: !binary |-
-    YzQxNzY3OTE3YWViZTZlMmFkNTc5ZWJiMWZiYTYyN2FmMDNkYTQyYjk5ZWQ4
-    MGVhOGRmNzVjZDVkMGFjYzFkN2UxMjdlODk3MDczNDVhMjI1MjFjOTg2YmUy
-    ZDRmY2I3YmU2OTk3N2E1MmU2ODc4NjBiMTQzNWNjNzcyYjNhYjI=
+    ZmRlZTQ1YThjMWU0N2RkMzVlNmFkNGY3YThmMDJhMzRjZTE4MzU4ZGJjOTAx
+    NzM5MDc4OGZmNTMxNzM1OGI1ZTk4NDgxZjY5MTIwYmZmMTI1NmNjNjc0NmFl
+    OTI3OWFmMjdiZGE0N2QwZmEyNjljYzQ0NTg0MjBmZWI3NTBiOWU=
   data.tar.gz: !binary |-
-    YTRlZjdjYmE2ODk5NTQ0YzE1ODkwOTAwYWM1OWZhMDRiMDhhZmYxZWYxZmQ3
-    ZTkwZWY0ZGRkZTE2MDZlNjU4ZGNlZWRmMzBjNTVmMGUyZmNlOWE2NDZjZjll
-    NDZmYTI4N2ZjZTdjNWE5MDA4NjAwMGE4NjUwODdlODZiODgzMzc=
+    MTdlZDkwYmQ1ZmNiYTJmY2U0YWMzMmQ2YjZmNzA5NWEzYTVlNTA4ODM1ZGZj
+    ZTBkN2EwZmVlODczYTAxMjYwNzA3OTk3ODcxODlkOTQwZjYwZDNhNjE4Mjk2
+    YThjMTZiNjBmMmY3NTE5Yjg0NjI2YjRkOGQwMDg0YmQ4OTY3ZGM=

data/features/support/env.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require File.dirname(__FILE__) + "/../../lib/ey-flex"
 require File.dirname(__FILE__) + "/../../lib/ey_backup"
 require 'fakeweb'

data/lib/ey_cloud_server/version.rb

@@ -1,5 +1,5 @@
 module EY
   module CloudServer
-    VERSION = '1.4.61'
+    VERSION = '1.5.0'
   end
 end

data/spec/config.yml.ci

@@ -0,0 +1,11 @@
+---
+tmp_dir:
+data_json:
+mysql_user: jenkins
+mysql_password: jenkins
+mysql_host: localhost
+postgresql_user: postgres
+postgresql_password: postgres
+postgresql_host: localhost
+aws_secret_id: 'abcd123.id'
+aws_secret_key: 'abcd123.key'

data/spec/helpers.rb

@@ -18,7 +18,7 @@ module Helpers
     FakeWeb.register_uri(:post, "http://example.org/api/environments", :body => JSON.generate({
       @mock_environment_name => {:id => 1}
     }))
-    
+
     create_or_clean_dir(tmp_dir)
     create_or_clean_dir(log_dir)
 
@@ -29,7 +29,7 @@ module Helpers
     # end
     stub_configs
   end
-  
+
   def create_or_clean_dir(dir)
     FileUtils.mkdir_p(dir)
     Dir.glob("#{dir}/*").each do |f|
@@ -48,6 +48,9 @@ module Helpers
   end
 
   def import_gpg
+    # GPG v2.1+ dropped support for the --secret-keyring option (https://lists.gnupg.org/pipermail/gnupg-devel/2014-December/029296.html)
+    # This means that we need to import private keys too
+    system("gpg --import #{PRIVATE_KEY_PATH}") || raise("Could not import public key")
     system("gpg --import #{PUBLIC_KEY_PATH}") || raise("Could not import public key")
   end
 
@@ -91,7 +94,7 @@ module Helpers
   def backup_config_file
     "#{tmp_dir}/spec_backups.yml"
   end
-  
+
   def mk_tmp
     FileUtils.mkdir_p("/tmp")
   end
@@ -113,7 +116,7 @@ module Helpers
     write_database_config('mysql', mysql_user, mysql_password, mysql_host, created_mysql_dbs.values, region)
     db_name
   end
-  
+
   def drop_mysql_database(db_name)
     command = %Q{mysql -u#{mysql_user} -h#{mysql_host} #{mysql_password_option} -e "drop database if exists #{db_name};"}
     puts "*** MySQL Drop Command: #{command}"
@@ -194,7 +197,7 @@ module Helpers
       spec_config['tmp_dir'] || File.dirname("./tmp/")
     end
   end
-  
+
   def log_dir
     if spec_config['log_dir'].nil?
       File.dirname(__FILE__) + "/log/"
@@ -299,7 +302,7 @@ module Helpers
   def stdout
     EY::Backup.logger.stdout.string
   end
-  
+
   def stderr
     EY::Backup.logger.stderr.string
   end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require File.dirname(__FILE__) + "/../lib/ey-flex"
 
+require 'simplecov'
+SimpleCov.start
+
 require 'fakeweb'
 require 'fakefs/safe'
 require 'randexp'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ey_cloud_server
 version: !ruby/object:Gem::Version
-  version: 1.4.61
+  version: 1.5.0
 platform: ruby
 authors:
 - EngineYard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +64,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -96,16 +90,16 @@ dependencies:
   name: ey_enzyme
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: 2.0.7pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: 2.0.7pre1
 - !ruby/object:Gem::Dependency
   name: ey_instance_api_client
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +212,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.13.7
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 description: Miscellaneous EY server utilities
 email:
 - engineering@engineyard.com
@@ -267,7 +275,7 @@ files:
 - lib/ey_cloud_server/version.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
-- spec/config.yml
+- spec/config.yml.ci
 - spec/ey_api_spec.rb
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb
@@ -279,7 +287,6 @@ files:
 - spec/gpg.public
 - spec/gpg.sekrit
 - spec/helpers.rb
-- spec/log/ey_flex_postgresql_db_thecae.sizes
 - spec/snapshot_minder_spec.rb
 - spec/spec_helper.rb
 homepage: http://developer.engineyard.com
@@ -301,14 +308,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Server side components for Engine Yard's cloud
 test_files:
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
-- spec/config.yml
+- spec/config.yml.ci
 - spec/ey_api_spec.rb
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb
@@ -320,7 +327,6 @@ test_files:
 - spec/gpg.public
 - spec/gpg.sekrit
 - spec/helpers.rb
-- spec/log/ey_flex_postgresql_db_thecae.sizes
 - spec/snapshot_minder_spec.rb
 - spec/spec_helper.rb
 - features/downloading_a_mysql_backup.feature

data/spec/config.yml

@@ -1,12 +0,0 @@
----
-tmp_dir: 
-log_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/log/ey_flex_postgresql_db_thecae.sizes

@@ -1 +0,0 @@
-2017-08-29 15:44:07 -0400 1.7 KB