engineyard-serverside 2.8.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbdbd466a22b707283bf47395220f0a81b77ac9ec926ffcaef805f0d9a2448c
-  data.tar.gz: 7289debb0ab4af4df33dec2ae0e6f8464a8e3b883479cafd24fe18423703cf48
+  metadata.gz: c3c2f206c82409786eb545bb2ac6384b750834bb07efb5dfeb74d38f929693cd
+  data.tar.gz: b593b15c6bf51cfc074bce4ff8237c28b92e49e005d11a08eed3cb133c349870
 SHA512:
-  metadata.gz: 832ef48fc2a640afbf443e680353bb5e77d2c1d05517ef00c06be0c6668117a65da3acdffbb46cecce8e768d29bf5f2656886b070e3109fa91c0378a9f642308
-  data.tar.gz: 9f7fb645f31ece040e792ebfacb5a40bf6d74ffd1abf56a1b538fa2b4efab315cddee784c4dc833100c954de4e71ca5e1a5d3b5f653fa53d98cfa7f9a064013d
+  metadata.gz: 2dcf7810ff833248884086b964ebfe1c2efb4bbb6ab06f20ab3a4f097f5568ceabaf3fbda16f72f5d1c2e75298033b294f855f2d6ef1783ab8d510bed3964875
+  data.tar.gz: 77f63935c4fcf8355aae3ac771da5fc4225f5c790547b82966ab45611f5adef6e1448b3e70d53d47efc233db5a5b12870d2d6476213ae2a4e9d2539f636fd306

data/lib/engineyard-serverside.rb

@@ -13,13 +13,10 @@ if defined?(Encoding) && Encoding.respond_to?(:default_internal=) # String.insta
 end
 
 $LOAD_PATH.unshift File.expand_path('vendor/thor/lib', File.dirname(__FILE__))
-$LOAD_PATH.unshift File.expand_path('vendor/systemu/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/escape/lib', File.dirname(__FILE__))
-$LOAD_PATH.unshift File.expand_path('vendor/json_pure/lib', File.dirname(__FILE__))
-$LOAD_PATH.unshift File.expand_path('vendor/multi_json/lib', File.dirname(__FILE__))
 
 require 'escape'
-require 'multi_json'
+require 'json'
 require 'uri'
 
 require 'engineyard-serverside/version'
@@ -39,7 +36,7 @@ module EY
     RemoteFailure = Class.new StandardError
 
     def self.node
-      @node ||= deep_indifferentize(MultiJson.load(dna_json))
+      @node ||= deep_indifferentize(JSON.load(dna_json))
     end
 
     def self.dna_json

data/lib/engineyard-serverside/configuration.rb

@@ -1,4 +1,4 @@
-require 'multi_json'
+require 'json'
 require 'thor'
 require 'pp'
 require 'yaml'
@@ -131,7 +131,7 @@ module EY
 
       def initialize(options)
         opts = string_keys(options)
-        config = MultiJson.load(opts.delete("config") || "{}")
+        config = JSON.load(opts.delete("config") || "{}")
         append_config_source opts # high priority
         append_config_source config # lower priority
       end
@@ -216,7 +216,7 @@ module EY
       end
 
       def to_json
-        MultiJson.dump(configuration)
+        JSON.dump(configuration)
       end
 
       def node

data/lib/engineyard-serverside/deploy.rb

@@ -1,6 +1,7 @@
 # Inspired by capistrano, thanks Jamis!
 require 'base64'
-require 'multi_json'
+#require 'multi_json'
+require 'json'
 require 'engineyard-serverside/rails_assets'
 require 'engineyard-serverside/maintenance'
 require 'engineyard-serverside/dependency_manager'

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.8.0'
+    VERSION = '3.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 3.0.3
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -122,48 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.13
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.25'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.20
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.20
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: contracts
   requirement: !ruby/object:Gem::Requirement
@@ -231,12 +203,9 @@ files:
 - bin/engineyard-serverside
 - bin/engineyard-serverside-execute-hook
 - bin/engineyard-serverside-execute-service-hook
-- features/enable_maintenance/step_definitions/enable_maintenance_steps.rb
 - features/hook/running-a-deploy-hook.feature
 - features/hook/step_definitions/running-a-deploy-hook-steps.rb
-- features/step_definitions/app_steps.rb
 - features/step_definitions/command_steps.rb
-- features/step_definitions/server_steps.rb
 - features/step_definitions/version_steps.rb
 - features/support/env.rb
 - features/support/error_codes.rb
@@ -331,52 +300,6 @@ files:
 - lib/vendor/escape/Readme
 - lib/vendor/escape/doc_include/template/qualitysmith.rb
 - lib/vendor/escape/lib/escape.rb
-- lib/vendor/json_pure/COPYING
-- lib/vendor/json_pure/GPL
-- lib/vendor/json_pure/README.rdoc
-- lib/vendor/json_pure/VERSION
-- lib/vendor/json_pure/lib/json.rb
-- lib/vendor/json_pure/lib/json/add/bigdecimal.rb
-- lib/vendor/json_pure/lib/json/add/complex.rb
-- lib/vendor/json_pure/lib/json/add/core.rb
-- lib/vendor/json_pure/lib/json/add/date.rb
-- lib/vendor/json_pure/lib/json/add/date_time.rb
-- lib/vendor/json_pure/lib/json/add/exception.rb
-- lib/vendor/json_pure/lib/json/add/ostruct.rb
-- lib/vendor/json_pure/lib/json/add/range.rb
-- lib/vendor/json_pure/lib/json/add/rational.rb
-- lib/vendor/json_pure/lib/json/add/regexp.rb
-- lib/vendor/json_pure/lib/json/add/struct.rb
-- lib/vendor/json_pure/lib/json/add/symbol.rb
-- lib/vendor/json_pure/lib/json/add/time.rb
-- lib/vendor/json_pure/lib/json/common.rb
-- lib/vendor/json_pure/lib/json/ext.rb
-- lib/vendor/json_pure/lib/json/generic_object.rb
-- lib/vendor/json_pure/lib/json/pure.rb
-- lib/vendor/json_pure/lib/json/pure/generator.rb
-- lib/vendor/json_pure/lib/json/pure/parser.rb
-- lib/vendor/json_pure/lib/json/version.rb
-- lib/vendor/multi_json/CHANGELOG.md
-- lib/vendor/multi_json/CONTRIBUTING.md
-- lib/vendor/multi_json/Gemfile
-- lib/vendor/multi_json/LICENSE.md
-- lib/vendor/multi_json/README.md
-- lib/vendor/multi_json/Rakefile
-- lib/vendor/multi_json/lib/multi_json.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/gson.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/json_common.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/json_gem.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/json_pure.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/nsjsonserialization.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/oj.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/ok_json.rb
-- lib/vendor/multi_json/lib/multi_json/adapters/yajl.rb
-- lib/vendor/multi_json/lib/multi_json/vendor/okjson.rb
-- lib/vendor/multi_json/lib/multi_json/version.rb
-- lib/vendor/multi_json/spec/adapter_shared_example.rb
-- lib/vendor/multi_json/spec/helper.rb
-- lib/vendor/multi_json/spec/json_common_shared_example.rb
-- lib/vendor/multi_json/spec/multi_json_spec.rb
 - lib/vendor/thor/LICENSE.md
 - lib/vendor/thor/README.md
 - lib/vendor/thor/bin/rake2thor
@@ -469,74 +392,71 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: A gem that deploys ruby applications on EY Cloud instances
 test_files:
-- spec/result_spec.rb
-- spec/railway_spec.rb
-- spec/engineyard-serverside/shell_spec.rb
-- spec/engineyard-serverside/source_spec.rb
-- spec/engineyard-serverside/callbacks/executor_spec.rb
-- spec/engineyard-serverside/callbacks/distributor_spec.rb
 - spec/engineyard-serverside/callbacks/collection/combined_spec.rb
 - spec/engineyard-serverside/callbacks/collection/deploy_hooks_spec.rb
-- spec/engineyard-serverside/callbacks/collection/service_hooks/combined_spec.rb
 - spec/engineyard-serverside/callbacks/collection/service_hooks/collection_spec.rb
+- spec/engineyard-serverside/callbacks/collection/service_hooks/combined_spec.rb
 - spec/engineyard-serverside/callbacks/collection/service_hooks_spec.rb
 - spec/engineyard-serverside/callbacks/collection_spec.rb
-- spec/engineyard-serverside/callbacks/distributor/viability_filter_spec.rb
 - spec/engineyard-serverside/callbacks/distributor/remote_spec.rb
+- spec/engineyard-serverside/callbacks/distributor/viability_filter_spec.rb
+- spec/engineyard-serverside/callbacks/distributor_spec.rb
 - spec/engineyard-serverside/callbacks/executor/executable_spec.rb
-- spec/engineyard-serverside/callbacks/executor/ruby/executor_spec.rb
 - spec/engineyard-serverside/callbacks/executor/ruby/context_spec.rb
+- spec/engineyard-serverside/callbacks/executor/ruby/executor_spec.rb
 - spec/engineyard-serverside/callbacks/executor/ruby_spec.rb
-- spec/engineyard-serverside/shell/helpers_spec.rb
-- spec/engineyard-serverside/shell/yieldio_spec.rb
+- spec/engineyard-serverside/callbacks/executor_spec.rb
 - spec/engineyard-serverside/callbacks_spec.rb
-- spec/engineyard-serverside/paths_spec.rb
-- spec/engineyard-serverside/slug/failure_handler_spec.rb
-- spec/engineyard-serverside/slug/restarter_spec.rb
-- spec/engineyard-serverside/slug/enabler_spec.rb
-- spec/engineyard-serverside/slug/source_spec.rb
-- spec/engineyard-serverside/slug/generator_spec.rb
-- spec/engineyard-serverside/slug/finalizer_spec.rb
-- spec/engineyard-serverside/slug/distributor_spec.rb
-- spec/engineyard-serverside/slug/source/updater_spec.rb
-- spec/engineyard-serverside/slug/migrator_spec.rb
-- spec/engineyard-serverside/propagator_spec.rb
-- spec/engineyard-serverside/server_spec.rb
-- spec/engineyard-serverside/cli/workflows_spec.rb
 - spec/engineyard-serverside/cli/workflows/base_spec.rb
-- spec/engineyard-serverside/cli/workflows/rolling_back_applications_spec.rb
+- spec/engineyard-serverside/cli/workflows/calling_deploy_hooks_spec.rb
+- spec/engineyard-serverside/cli/workflows/deploying_applications_spec.rb
 - spec/engineyard-serverside/cli/workflows/disabling_maintenance_spec.rb
+- spec/engineyard-serverside/cli/workflows/enabling_maintenance_spec.rb
 - spec/engineyard-serverside/cli/workflows/helpers_spec.rb
-- spec/engineyard-serverside/cli/workflows/deploying_applications_spec.rb
-- spec/engineyard-serverside/cli/workflows/calling_deploy_hooks_spec.rb
+- spec/engineyard-serverside/cli/workflows/rolling_back_applications_spec.rb
 - spec/engineyard-serverside/cli/workflows/showing_maintenance_status_spec.rb
-- spec/engineyard-serverside/cli/workflows/enabling_maintenance_spec.rb
+- spec/engineyard-serverside/cli/workflows_spec.rb
 - spec/engineyard-serverside/dependency_manager/base_spec.rb
-- spec/spec_helper.rb
-- spec/result/success_spec.rb
+- spec/engineyard-serverside/paths_spec.rb
+- spec/engineyard-serverside/propagator_spec.rb
+- spec/engineyard-serverside/server_spec.rb
+- spec/engineyard-serverside/shell/helpers_spec.rb
+- spec/engineyard-serverside/shell/yieldio_spec.rb
+- spec/engineyard-serverside/shell_spec.rb
+- spec/engineyard-serverside/slug/distributor_spec.rb
+- spec/engineyard-serverside/slug/enabler_spec.rb
+- spec/engineyard-serverside/slug/failure_handler_spec.rb
+- spec/engineyard-serverside/slug/finalizer_spec.rb
+- spec/engineyard-serverside/slug/generator_spec.rb
+- spec/engineyard-serverside/slug/migrator_spec.rb
+- spec/engineyard-serverside/slug/restarter_spec.rb
+- spec/engineyard-serverside/slug/source/updater_spec.rb
+- spec/engineyard-serverside/slug/source_spec.rb
+- spec/engineyard-serverside/source_spec.rb
+- spec/railway_spec.rb
 - spec/result/failure_spec.rb
-- features/version.feature
+- spec/result/success_spec.rb
+- spec/result_spec.rb
+- spec/spec_helper.rb
+- features/hook/running-a-deploy-hook.feature
+- features/hook/step_definitions/running-a-deploy-hook-steps.rb
 - features/step_definitions/command_steps.rb
-- features/step_definitions/server_steps.rb
 - features/step_definitions/version_steps.rb
-- features/step_definitions/app_steps.rb
-- features/enable_maintenance/step_definitions/enable_maintenance_steps.rb
-- features/hook/step_definitions/running-a-deploy-hook-steps.rb
-- features/hook/running-a-deploy-hook.feature
+- features/support/env.rb
+- features/support/error_codes.rb
 - features/support/fs_helpers.rb
-- features/support/runner.rb
 - features/support/output_helpers.rb
-- features/support/error_codes.rb
-- features/support/env.rb
+- features/support/runner.rb
+- features/version.feature

data/features/enable_maintenance/step_definitions/enable_maintenance_steps.rb

@@ -1,43 +0,0 @@
-def servers
-  recall_fact(:servers)
-end
-
-Then %{I see output indicating the enable_maintenance workflow was performed} do
-  expect(output_text).to include('maintenance page')
-end
-
-Given %{public/system is a symlink to the shared system} do
-  system_path.rmtree if system_path.exist?
-
-  setup_system_link
-end
-
-def instances
-  servers.map {|server| server[:hostname]}
-end
-
-def instance_names
-  servers.map {|server| "#{server[:hostname]}:#{server[:name]}"}
-end
-
-def instance_roles
-  servers.map {|server| "#{server[:hostname]}:#{server[:roles].join(',')}"}
-end
-
-When %{I run the enable_maintenance command} do
-  instances_flag = (['--instances'] + instances).join(' ')
-  instance_names_flag = (['--instance-names'] + instance_names).join(' ')
-  instance_roles_flag = (['--instance-roles'] + instance_roles).join(' ')
-
-  step %{I run `engineyard-serverside enable_maintenance --account-name #{account_name} --app #{app_name} --environment-name #{env_name} #{instances_flag} #{instance_names_flag} #{instance_roles_flag}`}
-end
-
-Then %{maintenance is enabled remotely on the solo server} do
-  servers.select {|x| x[:roles].include?('solo')}.each do |server|
-    expect(ExecutedCommands.maintenance_enabled?(server[:hostname])).to eql(true)
-  end
-end
-
-Then %{I see a notice that maintenance has been enabled} do
-  expect(output_text).to include('Maintenance page enabled')
-end

data/features/step_definitions/app_steps.rb

@@ -1,10 +0,0 @@
-def setup_release
-  setup_public_path
-  setup_system_link
-  setup_shared_system_path
-  setup_shared_app_path
-end
-
-Given %(I've previously deployed my app) do
-  setup_release
-end

data/features/step_definitions/server_steps.rb

@@ -1,14 +0,0 @@
-Given %{my environment has the following servers:} do |dataset|
-  servers = []
-  dataset.hashes.each do |row|
-    servers.push(
-      {
-        :hostname => row['Hostname'],
-        :name => row['Name'].strip,
-        :roles => row['Roles'].split(',').map{|s| s.strip},
-      }
-    )
-  end
-
-  memorize_fact(:servers, servers)
-end

data/lib/vendor/json_pure/COPYING

@@ -1,57 +0,0 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see GPL file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them,
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.