engineyard 1.3.0 → 1.3.1

data/lib/engineyard.rb

@@ -1,7 +1,6 @@
 module EY
   require 'engineyard/ruby_ext'
   require 'engineyard/version'
-  require 'engineyard/serverside_version'
 
   autoload :API,        'engineyard/api'
   autoload :Collection, 'engineyard/collection'

data/lib/engineyard/api.rb

@@ -51,7 +51,7 @@ module EY
 
     def self.request(path, opts={})
       require 'rest_client'
-      require 'json/pure'
+      require 'json'
 
       url = EY.config.endpoint + "api/v2#{path}"
       method = ((meth = opts.delete(:method)) && meth.to_s || "get").downcase.to_sym

data/lib/engineyard/cli.rb

@@ -61,10 +61,6 @@ module EY
                         raise(DeployArgumentError)
                     end
 
-      EY.ui.info "Connecting to the server..."
-
-      loudly_check_engineyard_serverside(environment)
-
       EY.ui.info "Beginning deploy for '#{app.name}' in '#{environment.name}' on server..."
 
       deploy_options = {'extras' => options[:extra_deploy_hook_options]}
@@ -148,8 +144,6 @@ module EY
       app = fetch_app(options[:app])
       env = fetch_environment(options[:environment], app)
 
-      loudly_check_engineyard_serverside(env)
-
       EY.ui.info("Rolling back '#{app.name}' in '#{env.name}'")
       if env.rollback(app,
           options[:extra_deploy_hook_options],

data/lib/engineyard/cli/web.rb

@@ -12,7 +12,6 @@ module EY
       def enable
         app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
-        loudly_check_engineyard_serverside(environment)
         EY.ui.info "Taking down maintenance page for '#{app.name}' in '#{environment.name}'"
         environment.take_down_maintenance_page(app, options[:verbose])
       end
@@ -39,7 +38,6 @@ module EY
       def disable
         app         = fetch_app(options[:app])
         environment = fetch_environment(options[:environment], app)
-        loudly_check_engineyard_serverside(environment)
         EY.ui.info "Putting up maintenance page for '#{app.name}' in '#{environment.name}'"
         environment.put_up_maintenance_page(app, options[:verbose])
       end

data/lib/engineyard/model/api_struct.rb

@@ -14,8 +14,10 @@ module EY
 
           def self.from_hash(hash)
             return nil unless hash
-            members = new.members
-            values = members.map{|a| hash.has_key?(a.to_sym) ? hash[a.to_sym] : hash[a] }
+            # in ruby 1.8, #members is an array of strings
+            # in ruby 1.9, #members is an array of symbols
+            members = new.members.map {|m| m.to_sym}
+            values = members.map{|a| hash.has_key?(a) ? hash[a] : hash[a.to_s] }
             new(*values)
           end
 

data/lib/engineyard/model/environment.rb

@@ -31,10 +31,6 @@ module EY
         master
       end
 
-      def ensure_engineyard_serverside_present(&blk)
-        app_master!.ensure_engineyard_serverside_present(&blk)
-      end
-
       def deploy(app, ref, deploy_options={})
         app_master!.deploy(app,
           ref,

data/lib/engineyard/model/instance.rb

@@ -3,99 +3,51 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "engineyard-serverside version checker exited with unknown status code #{k}" }
-      EXIT_STATUS.merge!({
-        255 => :ssh_failed,
-        1   => :engineyard_serverside_missing,
-        0   => :ok,
-      })
-
       alias :hostname :public_hostname
 
-
-      def deploy(app, ref, migration_command=nil, extra_configuration=nil, verbose=false)
-        deploy_args = [
-          '--app',    app.name,
-          '--repo',   app.repository_uri,
-          '--stack',  environment.stack_name,
-          '--branch', ref,
-        ]
-
-        if extra_configuration
-          deploy_args << '--config' << extra_configuration.to_json
+      def adapter(app, verbose)
+        require 'engineyard-serverside-adapter'
+        EY::Serverside::Adapter.new("/usr/local/ey_resin/ruby/bin") do |args|
+          args.app           = app.name
+          args.repo          = app.repository_uri
+          args.instances     = instances_data
+          args.verbose       = verbose || ENV['DEBUG']
+          args.stack         = environment.stack_name
+          args.framework_env = environment.framework_env
         end
+      end
+      private :adapter
 
-        if migration_command
-          deploy_args << "--migrate" << migration_command
+      def deploy(app, ref, migration_command=nil, extra_configuration=nil, verbose=false)
+        deploy_command = adapter(app, verbose).deploy do |args|
+          args.config  = extra_configuration if extra_configuration
+          args.migrate = migration_command if migration_command
+          args.ref     = ref
         end
 
-        invoke_engineyard_serverside(deploy_args, verbose)
+        invoke deploy_command
       end
 
       def rollback(app, extra_configuration=nil, verbose=false)
-        deploy_args = ['rollback',
-          '--app',   app.name,
-          '--stack', environment.stack_name,
-        ]
-
-        if extra_configuration
-          deploy_args << '--config' << extra_configuration.to_json
+        rollback = adapter(app, verbose).rollback do |args|
+          args.config = extra_configuration if extra_configuration
         end
-
-        invoke_engineyard_serverside(deploy_args, verbose)
+        invoke rollback
       end
 
 
       def put_up_maintenance_page(app, verbose=false)
-        invoke_engineyard_serverside(['enable_maintenance_page', '--app', app.name], verbose)
+        invoke adapter(app, verbose).enable_maintenance_page
       end
 
       def take_down_maintenance_page(app, verbose=false)
-        invoke_engineyard_serverside(['disable_maintenance_page', '--app', app.name], verbose)
+        invoke adapter(app, verbose).disable_maintenance_page
       end
 
-
       def has_app_code?
         !["db_master", "db_slave"].include?(role.to_s)
       end
 
-      def ensure_engineyard_serverside_present
-        case engineyard_serverside_status = engineyard_serverside_check
-        when :ssh_failed
-          raise EnvironmentError, "SSH connection to #{hostname} failed"
-        when :engineyard_serverside_missing
-          yield :installing if block_given?
-          install_engineyard_serverside
-        when :ok
-          # no action needed
-        else
-          raise EY::Error, "Internal error: Unexpected status from Instance#engineyard_serverside_check; got #{engineyard_serverside_status.inspect}"
-        end
-      end
-
-      def engineyard_serverside_check
-        escaped_engineyard_serverside_version = ENGINEYARD_SERVERSIDE_VERSION.gsub(/\./, '\.')
-
-        if ENV["NO_SSH"]
-          :ok
-        else
-          ssh "#{gem_path} list engineyard-serverside | grep \"engineyard-serverside\" | egrep -q '#{escaped_engineyard_serverside_version}[,)]'", false
-          EXIT_STATUS[$?.exitstatus]
-        end
-      end
-
-      def install_engineyard_serverside
-        ssh(Escape.shell_command([
-              'sudo', 'sh', '-c',
-              # rubygems looks at *.gem in its current directory for
-              # installation candidates, so we have to make sure it
-              # runs from a directory with no gem files in it.
-              #
-              # rubygems help suggests that --remote will disable this
-              # behavior, but it doesn't.
-              "cd `mktemp -d` && #{gem_path} install engineyard-serverside --no-rdoc --no-ri -v #{ENGINEYARD_SERVERSIDE_VERSION}"]))
-      end
-
     protected
 
       def engineyard_serverside_hostname
@@ -123,50 +75,26 @@ module EY
         end
       end
 
-      def invoke_engineyard_serverside(deploy_args, verbose=false)
-        start = [engineyard_serverside_path, "_#{ENGINEYARD_SERVERSIDE_VERSION}_", 'deploy']
-
-        instances = environment.instances.select { |inst| inst.has_app_code? }
-        instance_args = ['']
-        if !instances.empty?
-          instance_args << '--instances'
-          instance_args += instances.collect { |i| i.engineyard_serverside_hostname }
-
-          instance_args << '--instance-roles'
-          instance_args += instances.collect { |i| [i.engineyard_serverside_hostname, i.role].join(':') }
-
-          instance_names = instances.collect { |i| i.name ? [i.engineyard_serverside_hostname, i.name].join(':') : nil }.compact
-          unless instance_names.empty?
-            instance_args << '--instance-names'
-            instance_args += instance_names
-          end
+      def invoke(action)
+        action.call do |cmd|
+          puts cmd if action.verbose
+          ssh cmd
         end
-
-        framework_arg = ['--framework-env', environment.framework_env]
-
-        verbose_arg = (verbose || ENV['DEBUG']) ? ['--verbose'] : []
-
-        cmd = Escape.shell_command(start + deploy_args + framework_arg + instance_args + verbose_arg)
-        puts cmd if verbose
-        ssh cmd
       end
 
-      def engineyard_serverside_path
-        "/usr/local/ey_resin/ruby/bin/engineyard-serverside"
+      def instances_data
+        environment.instances.select { |inst| inst.has_app_code? }.map do |i|
+          {
+            :hostname => i.engineyard_serverside_hostname,
+            :roles    => [i.role],
+            :name     => i.name,
+          }
+        end
       end
 
       def app_master?
         environment.app_master == self
       end
-
-      def gem_path
-        "/usr/local/ey_resin/ruby/bin/gem"
-      end
-
-      def ruby_path
-        "/usr/local/ey_resin/ruby/bin/ruby"
-      end
-
     end
   end
 end

data/lib/engineyard/repo.rb

@@ -21,7 +21,7 @@ module EY
     end
 
     def urls
-      lines = `git config -f #{Escape.shell_command(@path)}/.git/config --get-regexp 'remote.*.url'`.split(/\n/)
+      lines = `git config -f #{Escape.shell_command([@path])}/.git/config --get-regexp 'remote.*.url'`.split(/\n/)
       raise NoRemotesError.new(@path) if lines.empty?
       lines.map { |c| c.split.last }
     end

data/lib/engineyard/thor.rb

@@ -11,20 +11,6 @@ module EY
       @repo ||= EY::Repo.new
     end
 
-    def loudly_check_engineyard_serverside(environment)
-      environment.ensure_engineyard_serverside_present do |action|
-        case action
-        when :installing
-          EY.ui.warn "Instance does not have server-side component installed"
-          EY.ui.info "Installing server-side component..."
-        when :upgrading
-          EY.ui.info "Upgrading server-side component..."
-        else
-          # nothing slow is happening, so there's nothing to say
-        end
-      end
-    end
-
     # if an app is supplied, it is used as a constraint for implied environment lookup
     def fetch_environment(env_name, app = nil)
       env_name ||= EY.config.default_environment

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/ey/deploy_spec.rb

@@ -165,6 +165,17 @@ describe "ey deploy" do
     end
   end
 
+  context "the --framework-env option" do
+    before(:each) do
+      api_scenario "one app, one environment"
+    end
+
+    it "passes the framework environment" do
+      ey "deploy"
+      @ssh_commands.last.should match(/--framework-env production/)
+    end
+  end
+
   context "choosing something to deploy" do
     define_git_repo('deploy test') do
       # we'll have one commit on master
@@ -188,27 +199,27 @@ describe "ey deploy" do
     context "without a configured default branch" do
       it "defaults to the checked-out local branch" do
         ey "deploy"
-        @ssh_commands.last.should =~ /--branch current-branch/
+        @ssh_commands.last.should =~ /--ref current-branch/
       end
 
       it "deploys another branch if given" do
         ey "deploy --ref master"
-        @ssh_commands.last.should =~ /--branch master/
+        @ssh_commands.last.should =~ /--ref master/
       end
 
       it "deploys a tag if given" do
         ey "deploy --ref v1"
-        @ssh_commands.last.should =~ /--branch v1/
+        @ssh_commands.last.should =~ /--ref v1/
       end
 
       it "allows using --branch to specify a branch" do
         ey "deploy --branch master"
-        @ssh_commands.last.should match(/--branch master/)
+        @ssh_commands.last.should match(/--ref master/)
       end
 
       it "allows using --tag to specify the tag" do
         ey "deploy --tag v1"
-        @ssh_commands.last.should match(/--branch v1/)
+        @ssh_commands.last.should match(/--ref v1/)
       end
     end
 
@@ -238,7 +249,7 @@ describe "ey deploy" do
 
       it "deploys the default branch by default" do
         ey "deploy"
-        @ssh_commands.last.should =~ /--branch master/
+        @ssh_commands.last.should =~ /--ref master/
       end
 
       it "complains about a non-default branch without --ignore-default_branch" do
@@ -248,7 +259,7 @@ describe "ey deploy" do
 
       it "deploys a non-default branch with --ignore-default-branch" do
         ey "deploy -r current-branch --ignore-default-branch"
-        @ssh_commands.last.should =~ /--branch current-branch/
+        @ssh_commands.last.should =~ /--ref current-branch/
       end
     end
   end
@@ -315,7 +326,7 @@ describe "ey deploy" do
     it "allows you to specify an app when not in a directory" do
       ey "deploy --app rails232app --ref master"
       @ssh_commands.last.should match(/--app rails232app/)
-      @ssh_commands.last.should match(/--branch master/)
+      @ssh_commands.last.should match(/--ref master/)
     end
 
     it "requires that you specify a ref when specifying the application" do

data/spec/ey/rollback_spec.rb

@@ -55,7 +55,7 @@ describe "ey rollback" do
       after { File.unlink("ey.yml") }
 
       it "overrides what's in ey.yml" do
-        ey "deploy --extra-deploy-hook-options beer:esb"
+        ey "rollback --extra-deploy-hook-options beer:esb"
         extra_deploy_hook_options['beer'].should == 'esb'
       end
     end

data/spec/support/shared_behavior.rb

@@ -150,8 +150,8 @@ shared_examples_for "it invokes engineyard-serverside" do
 
     it "passes along instance information to engineyard-serverside" do
       instance_args = [
-        /--instances localhost app_hostname[^\s]+ util_fluffy/,
-        /--instance-roles localhost:app_master app_hostname[^\s]+:app util_fluffy[^\s]+:util/,
+        /--instances app_hostname[^\s]+ localhost util_fluffy/,
+        /--instance-roles app_hostname[^\s]+:app localhost:app_master util_fluffy[^\s]+:util/,
         /--instance-names util_fluffy_hostname[^\s]+:fluffy/
       ]
 
@@ -166,9 +166,6 @@ shared_examples_for "it invokes engineyard-serverside" do
       @ssh_commands.last.should_not =~ /#{db_instance}/
     end
 
-    it "passes the framework environment" do
-      @ssh_commands.last.should match(/--framework-env production/)
-    end
   end
 
   context "when no instances have names" do
@@ -181,48 +178,6 @@ shared_examples_for "it invokes engineyard-serverside" do
       @ssh_commands.last.should_not include("--instance-names")
     end
   end
-
-
-  context "engineyard-serverside installation" do
-    before(:all) do
-      api_scenario "one app, one environment"
-    end
-
-    before(:each) do
-      ENV.delete "NO_SSH"
-    end
-
-    after(:each) do
-      ENV['NO_SSH'] = "true"
-    end
-
-    def exiting_ssh(exit_code)
-      "#!/usr/bin/env ruby\n exit!(#{exit_code}) if ARGV.to_s =~ /gem list engineyard-serverside/"
-    end
-
-    it "raises an error if SSH fails" do
-      run_ey({:env => 'giblets'},
-        {:prepend_to_path => {'ssh' => exiting_ssh(255)}, :expect_failure => true})
-      @err.should =~ /SSH connection to \S+ failed/
-    end
-
-    it "installs engineyard-serverside if it's missing" do
-      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(1)}})
-
-      gem_install_command = @ssh_commands.find do |command|
-        command =~ /gem install engineyard-serverside/
-      end
-      gem_install_command.should_not be_nil
-      gem_install_command.should =~ %r{/usr/local/ey_resin/ruby/bin/gem install.*engineyard-serverside}
-    end
-
-    it "does not try to install engineyard-serverside if it's already there" do
-      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(0)}})
-      @ssh_commands.should_not have_command_like(/gem install engineyard-serverside/)
-      ver = Regexp.quote(EY::ENGINEYARD_SERVERSIDE_VERSION)
-      @ssh_commands.should have_command_like(/engineyard-serverside _#{ver}_ deploy/)
-    end
-  end  
 end
 
 shared_examples_for "model collections" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -07:00
+date: 2010-09-20 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,22 @@ dependencies:
   type: :runtime
   name: escape
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
+        version: 1.3.3
+  requirement: *id007
+  type: :runtime
+  name: engineyard-serverside-adapter
+  prerelease: false
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
 executables: 
@@ -139,7 +155,6 @@ files:
 - lib/engineyard/model.rb
 - lib/engineyard/repo.rb
 - lib/engineyard/ruby_ext.rb
-- lib/engineyard/serverside_version.rb
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
 - lib/engineyard.rb

data/lib/engineyard/serverside_version.rb

@@ -1,3 +0,0 @@
-module EY
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '1.3.1'
-end