ey-core 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7cd69781a4eb3275ce1a1326c7ea79279dcff1c6de8a663d95e0276d318e36e
-  data.tar.gz: e60e683abec4d85850bf11d7368c3ec501cd9c4d96af07ed5fc6613988fe4f69
+  metadata.gz: 301123fdb0da2d489face06c5ff98f5a7468c87567931d6bf3a7a9c5487d7d76
+  data.tar.gz: cf368989a95109d155d2e6594a52dc4e49f4c8791fbc8a1a63cd6e749cbf8c1d
 SHA512:
-  metadata.gz: d8d9bf7f44d69e2de4a71d393aa29e6e88cc851ebd99177c091388975bbe006d2cf4f9ccde6ab7d291dc200cbac0c26aa57ec96ba7322a5386e83d49df76a567
-  data.tar.gz: bbf84bfa83d24a4f293c14b928614b68846d988a30835d2973251f2a5caf6c85ad49703c1dc12b3e2e1478fec01003d9a14d8057f6a1f03ecf43e7ed93dc947f
+  metadata.gz: ddaf5291676659eb5f0dc2cac60ff76320c3af82eb1fd3bc40cac4ec01ceb18ba8b549da610be189ef69110d010b9c3ec5d1d3f7d4728d9f1dc20ee3eb4bc37a
+  data.tar.gz: 01c05f180816f015752983109e27ac01e9b9e3f9826a29524754fb728b1b85ebf2099e1cd757600b35ae22129d1b9000ebb44ca39a44275548caa317254fddc7

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ey-core.gemspec
 gemspec
 
-gem "rack", "<= 2.0"
+gem "rack", "<= 2.1.4"
 
 group :doc do
   gem 'yard'

data/lib/ey-core/cli/deploy.rb

@@ -32,6 +32,11 @@ module Ey
           long: "migrate",
           description: "The migration command to run.  This option has a 50 character limit.",
           argument: "migrate"
+        option :serverside_version,
+          short: "S",
+          long: "serverside_version",
+          description: "Override the default version of engineyard-serverside. The version must match a released version. Use with care.",
+          argument: "serverside_version"
 
         option :app,
           short: "a",
@@ -43,11 +48,6 @@ module Ey
           long: "no-wait",
           description: "Don't wait for deploy to finish, exit after deploy is started"
 
-        switch :verbose,
-          short: "v",
-          long: "verbose",
-          description: "Deploy with verbose output"
-
         switch :verbose,
           short: "v",
           long: "verbose",
@@ -63,7 +63,7 @@ module Ey
             abort <<-EOF
 Found account #{operator.name} but requested account #{option(:account)}.
 Use the ID of the account instead of the name.
-This can be retrieved by running "ey accounts".
+This can be retrieved by running "ey-core accounts".
 EOF
             .red unless operator.name == option(:account) || operator.id == option(:account)
           end
@@ -78,8 +78,11 @@ EOF
 
           app = core_application_for(environment, self.options)
 
-          deploy_options = {verbose: options[:verbose], cli_args: ARGV}
+          deploy_options = {verbose: switch_active?(:verbose), cli_args: ARGV}
           latest_deploy = nil
+	  if options[:serverside_version]
+            deploy_options.merge!(serverside_version: option(:serverside_version))
+          end
           if options[:ref]
             deploy_options.merge!(ref: option(:ref))
           else

data/lib/ey-core/cli/helpers/chef.rb

@@ -28,7 +28,7 @@ module Ey
               puts "#{type.capitalize} chef run failed".red
               ap request
               if server = environment.servers.first
-                puts "For logs try `ey logs --server #{server.provisioned_id}` --environment #{environment.name}"
+                puts "For logs try `ey-core logs --server #{server.provisioned_id}` --environment #{environment.name}"
               end
             end
           end

data/lib/ey-core/cli/helpers/core.rb

@@ -45,7 +45,7 @@ module Ey
 
           def core_operator_and_environment_for(options={})
             unless options[:environment]
-              raise "--environment is required (for a list of environments, try `ey environments`)"
+              raise "--environment is required (for a list of environments, try `ey-core environments`)"
             end
             operator = operator(options)
             environment = nil
@@ -61,7 +61,7 @@ module Ey
               end
             end
             unless environment
-              raise "environment '#{options[:environment]}' not found (for a list of environments, try `ey environments`)"
+              raise "environment '#{options[:environment]}' not found (for a list of environments, try `ey-core environments`)"
             end
             [operator, environment]
           end
@@ -131,7 +131,7 @@ module Ey
               write_core_yaml(legacy_token)
               retry
             elsif e.message.match(/missing token/i)
-              abort "Missing credentials: Run 'ey login' to retrieve your Engine Yard Cloud API token.".yellow
+              abort "Missing credentials: Run 'ey-core login' to retrieve your Engine Yard Cloud API token.".yellow
             else
               raise e
             end

data/lib/ey-core/cli/helpers/server_sieve.rb

@@ -6,6 +6,7 @@ module Ey
           ROLES = [
             :app_servers,
             :db_servers,
+            :app_master,
             :db_master,
             :utilities
           ]
@@ -56,6 +57,12 @@ module Ey
           def db_servers
             db_master + servers_api.all(role: 'db_slave').to_a
           end
+          
+          def app_master
+            ['app_master', 'solo'].
+              map {|role| servers_api.all(role:role).to_a}.
+              flatten
+          end
 
           def db_master
             ['db_master', 'solo'].

data/lib/ey-core/cli/ssh.rb

@@ -54,6 +54,10 @@ module Ey
           long: "app_servers",
           description: "Run command on all application servers"
 
+	switch :app_master,
+	  long: "app_master",
+	  description: "Run command on app master"
+
         switch :db_servers,
           long: "db_servers",
           description: "Run command on all database servers"
@@ -97,6 +101,7 @@ module Ey
               environment.servers,
               all: switch_active?(:all),
               app_servers: switch_active?(:app_servers),
+              app_master: switch_active?(:app_master),
               db_servers: switch_active?(:db_servers),
               db_master: switch_active?(:db_master),
               utilities: option(:utilities)
@@ -113,6 +118,7 @@ module Ey
                 environment.servers,
                 all: switch_active?(:all),
                 app_servers: switch_active?(:app_servers),
+                app_master: switch_active?(:app_master),
                 db_servers: switch_active?(:db_servers),
                 db_master: switch_active?(:db_master),
                 utilities: option(:utilities)

data/lib/ey-core/models/deployment.rb

@@ -9,6 +9,7 @@ class Ey::Core::Client::Deployment < Ey::Core::Model
   attribute :migrate_command
   attribute :ref
   attribute :resolved_ref
+  attribute :serverside_version
   attribute :started_at,     type: :time
   attribute :successful,     type: :boolean
   attribute :verbose

data/lib/ey-core/requests/deploy_environment_application.rb

@@ -30,6 +30,7 @@ class Ey::Core::Client
         "migrate_command" => options["deploy"]["migrate"] ? (options["deploy"]["migrate_command"] || "rake db:migrate") : nil,
         "migrate"         => options["deploy"]["migrate"] || false,
         "resolved_ref"    => options["deploy"]["ref"],
+        "serverside_version"    => options["deploy"]["serverside_version"],
         "started_at"      => Time.now,
         "successful"      => true
       }

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.6.1"
+    VERSION = "3.6.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.3
 platform: ruby
 authors:
 - Engine Yard Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -954,7 +954,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Client library providing real and mock functionality for accessing Engine