engineyard 2.0.8 → 2.0.9

data/README.rdoc

@@ -231,6 +231,22 @@ Log in and verify access to EY Cloud. Use logout first if you need to switch use
 Remove the current API key from ~/.eyrc or env variable $EYRC
 
 
+== Global Options
+
+All commands accept the following options.
+
+  --api-token=API_TOKEN                    # Use API-TOKEN to authenticate this command
+  --serverside-version=SERVERSIDE_VERSION  # Please use with care! Override deploy system version
+                                           # (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)
+
+Not all commands will make use of these options. For example,
+ey status does not use, and will ignore the --serverside-version flag.
+
+Also, please consider that it's usually not a good idea to override the
+version of serverside unless you know what you're doing. CLI and serverside
+versions are designed to work together and mixing them can cause errors.
+
+
 == API Client
 
 See https://github.com/engineyard/engineyard-cloud-client for the API client library.

data/lib/engineyard/cli.rb

@@ -36,6 +36,7 @@ module EY
     end
 
     class_option :api_token, :type => :string, :desc => "Use API-TOKEN to authenticate this command"
+    class_option :serverside_version, :type => :string, :desc => "Please use with care! Override deploy system version (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)"
 
     desc "deploy [--environment ENVIRONMENT] [--ref GIT-REF]",
       "Deploy specified branch, tag, or sha to specified environment."
@@ -81,13 +82,14 @@ module EY
       deploy_config = EY::DeployConfig.new(options, env_config, repo, ui)
 
       deployment = app_env.new_deployment({
-        :ref             => deploy_config.ref,
-        :migrate         => deploy_config.migrate,
-        :migrate_command => deploy_config.migrate_command,
-        :extra_config    => deploy_config.extra_config,
+        :ref                => deploy_config.ref,
+        :migrate            => deploy_config.migrate,
+        :migrate_command    => deploy_config.migrate_command,
+        :extra_config       => deploy_config.extra_config,
+        :serverside_version => serverside_version,
       })
 
-      runner = serverside_runner(app_env, deploy_config.verbose, options[:ignore_bad_master])
+      runner = serverside_runner(app_env, deploy_config.verbose, deployment.serverside_version, options[:ignore_bad_master])
 
       out = EY::CLI::UI::Tee.new(ui.out, deployment.out)
       err = EY::CLI::UI::Tee.new(ui.err, deployment.err)

data/lib/engineyard/serverside_runner.rb

@@ -4,13 +4,14 @@ require 'engineyard-serverside-adapter'
 
 module EY
   class ServersideRunner
-    def initialize(bridge, app, environment, verbose)
-      @verbose = verbose || ENV['DEBUG']
-      @adapter = load_adapter(bridge, app, environment)
-      @username = environment.username
-      @hostname = bridge
-      @command = nil
-      @acc_env_name = "#{app.account.name}/#{environment.name}"
+    def initialize(options)
+      @verbose        = options[:verbose] || !!ENV['DEBUG']
+      @hostname       = options[:bridge]
+      env             = options[:environment]
+      @adapter        = load_adapter(@hostname, options[:app], env, @verbose, options[:serverside_version])
+      @username       = env.username
+      @hierarchy_name = env.hierarchy_name
+      @command        = nil
     end
 
     def deploy(&block)
@@ -47,9 +48,9 @@ module EY
 
   private
 
-    def load_adapter(bridge, app, environment)
+    def load_adapter(bridge, app, environment, verbose, serverside_version)
       EY::Serverside::Adapter.new("/usr/local/ey_resin/ruby/bin") do |args|
-        args.serverside_version = EY::ENGINEYARD_SERVERSIDE_VERSION
+        args.serverside_version = serverside_version
         args.app              = app.name
         args.repo             = app.repository_uri
         args.instances        = instances_data(environment.deploy_to_instances, bridge)
@@ -57,7 +58,7 @@ module EY
         args.framework_env    = environment.framework_env
         args.environment_name = environment.name
         args.account_name     = app.account.name
-        args.verbose          = @verbose
+        args.verbose          = verbose
       end
     end
 
@@ -99,7 +100,7 @@ module EY
           raise EY::Error, <<-ERROR
 Authentication Failed. Things to fix:
   1. Add your SSH key to your local SSH agent with `ssh-add path/to/key`.
-  2. Add your SSH key to #{@acc_env_name} on Engine Yard Cloud and apply the changes.
+  2. Add your SSH key to #{@hierarchy_name} on Engine Yard Cloud and apply the changes.
   (https://support.cloud.engineyard.com/entries/20996846-set-up-ssh-keys)
           ERROR
         end

data/lib/engineyard/thor.rb

@@ -29,8 +29,18 @@ module EY
       @repo ||= EY::Repo.new
     end
 
-    def serverside_runner(app_env, verbose, ignore_bad_bridge = false)
-      ServersideRunner.new(app_env.environment.bridge!(ignore_bad_bridge).hostname, app_env.app, app_env.environment, verbose)
+    def serverside_version
+      respond_to?(:options) && options[:serverside_version] || EY::ENGINEYARD_SERVERSIDE_VERSION
+    end
+
+    def serverside_runner(app_env, verbose, serverside_version = serverside_version, ignore_bad_bridge = false)
+      ServersideRunner.new({
+        :bridge             => app_env.environment.bridge!(ignore_bad_bridge).hostname,
+        :app                => app_env.app,
+        :environment        => app_env.environment,
+        :verbose            => verbose,
+        :serverside_version => serverside_version
+      })
     end
 
     def use_default_environment

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
   ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.0.3'
 end

data/spec/ey/deploy_spec.rb

@@ -431,6 +431,26 @@ describe "ey deploy" do
     end
   end
 
+  context "setting a specific serverside version" do
+    use_git_repo("deploy test")
+
+    before(:all) do
+      login_scenario "one app, one environment"
+    end
+
+    it "should send the correct serverside version when specified" do
+      fast_ey %w[deploy --no-migrate --serverside-version 1.6.4]
+      deploy_command = @ssh_commands.find {|c| c =~ /engineyard-serverside.*deploy/ }
+      deploy_command.should =~ /engineyard-serverside _1.6.4_ deploy/
+    end
+
+    it "should send the default serverside version when unspecified" do
+      fast_ey %w[deploy --no-migrate]
+      deploy_command = @ssh_commands.find {|c| c =~ /engineyard-serverside.*deploy/ }
+      deploy_command.should =~ /engineyard-serverside _#{EY::ENGINEYARD_SERVERSIDE_VERSION}_ deploy/
+    end
+  end
+
   context "sending necessary information" do
     use_git_repo("deploy test")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -425,7 +425,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3271443734841409447
+      hash: 961483598276783294
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3271443734841409447
+      hash: 961483598276783294
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24