engineyard-serverside-adapter 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQ0Mzk3ZTIyMjc5NzcyY2YyNTU5MDg4NjI5YzhlNDQyYjRkNjNiOQ==
+    YjY3NzdlMzA1N2I0NmZhYjg1MmFkY2I2ZGM4NDJjYTY5OTJiNzI4Zg==
   data.tar.gz: !binary |-
-    MGEzZDk5NzlkZDkzMWRjOTk2YWIwZTVmM2U4NDBmNjFkMWJjNTBhNQ==
+    NTBlOTYyN2VlMjFmNzM3ZmFkNTdmMzU5MGNmYjk0YjI0OTI4ZWE4MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDM2ODRjOWMwMzdkMGEyMTEzNTI4OGY5YzExMzhhOWQyODIwYjE2ODZmYzNi
-    ZTg3NWZmMzIxOTM5YjA2NmE1NjUzMDc2N2YzYWMyYzMwOWNmYzY0MjdjZjVl
-    YzRkZGJkNWZjY2U1ZjE4MjNhZTMxMTI5MGJiMmM0MDg5OGVjMDc=
+    MzU4MzAxMmY3YTQ4ZWZkMzhmNmMyNjVlMTYzODMxZTIyNjExNjVhN2Q2ZWNm
+    MDgyNDRmZDI4Mjc5MDI4M2IyYTZmMGM5MTkzNjdlNTkwYmM0Y2JmZWRkNjY0
+    ODI5OWJlMmI4ZGVlNDEwMzVhN2FhODU4ZjllN2MzZjc4ZjRiYTU=
   data.tar.gz: !binary |-
-    YWU5NzM5YzA1Y2ZiYzljYzcyYzk3NmQ3NzhkMmQ5YTNkNzE1Yzk4NTIzOTJk
-    ZDcwOGIzMmI0ODQ0ZDE4OWYwYjRmYzNkNjExNDM0ZThkNjA5ZmM5OWVmMWUx
-    YzAwOGQ1ODYzZTY2YzliMGQzOTFjZGNmY2M1ZjFmYTljMGE0ZGY=
+    NmY1Yjk5NWY0MjIzMzUwMzQxNjg2OTJmZDEwNTk3YTgxYTE1NDNkZmE5NjQ3
+    ZDcxYmFmMjA4YTAwZGQxODZiYzliNTAyNDMzMzE2YTg2NTA5ZGFjZmE1MmI0
+    NDBmYjg5NTcxYjk5NWE0NTlhNjE1ZTllNTM1ZTdjNDcyZWEyNWQ=

data/ChangeLog.md

@@ -0,0 +1,9 @@
+# ChangeLog
+
+## NEXT
+
+  *
+
+## v2.2.0 (2013-09-30)
+
+  * Require serverside_version for all commands.

data/Rakefile

@@ -1,4 +1,6 @@
 require 'rspec/core/rake_task'
+require 'date'
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ['-cfs']
 end
@@ -9,12 +11,22 @@ task :release do
   puts "Adapter DOES NOT bump serverside automatically anymore."
   puts "Please reference the serverside_version in the client."
   puts
+
   new_version = remove_pre
+  write_version new_version
+  release_changelog(new_version)
 
-  run_commands("git tag v#{new_version}",
+  run_commands(
+    "git add ChangeLog.md #{version_path}",
+    "git commit -m 'Bump versions for release #{new_version}'",
     "gem build engineyard-serverside-adapter.gemspec")
 
-  next_pre(new_version)
+  write_version next_pre(new_version)
+
+  run_commands(
+    "git add #{version_path}",
+    "git commit -m 'Add .pre for next release'",
+    "git tag v#{new_version} HEAD^")
 
   puts <<-PUSHGEM
 ## To publish the gem: #########################################################
@@ -36,27 +48,32 @@ def run_commands(*cmds)
   end
 end
 
+def release_changelog(version)
+  clog = Pathname.new('ChangeLog.md')
+  new_clog = clog.read.sub(/^## NEXT$/, <<-SUB.chomp)
+## NEXT
+
+  *
+
+## v#{version} (#{Date.today})
+  SUB
+  clog.open('w') { |f| f.puts new_clog }
+end
+
 def remove_pre
   require 'engineyard-serverside-adapter/version'
-  new_version = Gem::Version.create(EY::Serverside::Adapter::VERSION).release
-  puts "New version is #{new_version}"
-  bump(new_version, "Bump to version #{new_version}")
-  new_version.to_s
+  Gem::Version.create(EY::Serverside::Adapter::VERSION).release
 end
 
 def next_pre(version)
-  digits = version.scan(/(\d+)/).map { |x| x.first.to_i }
+  digits = version.to_s.scan(/(\d+)/).map { |x| x.first.to_i }
   digits[-1] += 1
   new_version = digits.join('.') + ".pre"
-  puts "Next version is #{new_version}"
-  bump(new_version, "Add .pre for next release")
 end
 
-def bump(new_version, commit_msg)
+def write_version(new_version)
   contents = version_path.read.sub(/VERSION = "[^"]+"/, %|VERSION = "#{new_version}"|)
+  puts "engineyard-serverside-adapter (#{new_version})"
   version_path.unlink
   version_path.open('w') { |f| f.write contents }
-  run_commands(
-    "git add #{version_path}",
-    "git commit -m '#{commit_msg}'")
 end

data/lib/engineyard-serverside-adapter.rb

@@ -1,9 +1,9 @@
 require 'pathname'
+require 'engineyard-serverside-adapter/version'
 
 module EY
   module Serverside
     class Adapter
-      require 'engineyard-serverside-adapter/version'
       autoload :Action,                 'engineyard-serverside-adapter/action'
       autoload :Arguments,              'engineyard-serverside-adapter/arguments'
       autoload :Command,                'engineyard-serverside-adapter/command'

data/lib/engineyard-serverside-adapter/action.rb

@@ -29,7 +29,7 @@ module EY
 
           block.call @arguments if block
 
-          @serverside_version = Gem::Version.create(@arguments.serverside_version || ENGINEYARD_SERVERSIDE_VERSION.dup)
+          @serverside_version = @arguments.serverside_version
 
           validate!
         end
@@ -120,6 +120,10 @@ module EY
         end
 
         def validate!
+          unless @serverside_version
+            raise ArgumentError, "Required field [serverside_version] not provided."
+          end
+
           missing = required_options - given_options
           unless missing.empty?
             options_s = missing.map{|option| option.name}.join(', ')

data/lib/engineyard-serverside-adapter/arguments.rb

@@ -18,16 +18,9 @@ module EY
           end
         end
 
-        def self.aliased_attribute(pairs)
-          pairs.each do |from, to|
-            alias_method from, to
-            alias_method :"#{from}=", "#{to}="
-          end
-        end
-
         nonempty_attr_accessor :app, :account_name, :archive, :environment_name
-        nonempty_attr_accessor :framework_env, :git, :ref, :serverside_version, :stack
-        attr_accessor :config, :migrate, :verbose
+        nonempty_attr_accessor :framework_env, :git, :ref, :stack
+        attr_accessor :clean, :config, :migrate, :serverside_version, :verbose
         attr_reader :instances
         alias repo git # for versions where --repo is required, it is accessed via this alias
 
@@ -49,8 +42,10 @@ module EY
           @instances = instances
         end
 
-        # Uses Gem::Version.create to validate the version string
         def serverside_version=(value)
+          if value.nil? || value.to_s.empty?
+            raise ArgumentError, "Value for 'serverside_version' must be non-empty."
+          end
           @serverside_version = Gem::Version.create(value.dup) # dup b/c Gem::Version sometimes modifies its argument :(
         end
 

data/lib/engineyard-serverside-adapter/deploy.rb

@@ -6,6 +6,7 @@ module EY
         option :app,              :string,    :required => true
         option :account_name,     :string,    :required => true,      :version => '>= 2.0.0'
         option :archive,          :string,                            :version => '>= 2.3.0'
+        option :clean,            :boolean,                           :version => '>= 2.3.1'
         option :config,           :json
         option :environment_name, :string,    :required => true,      :version => '>= 2.0.0'
         option :git,              :string,                            :version => '>= 2.3.0'

data/lib/engineyard-serverside-adapter/version.rb

@@ -1,11 +1,7 @@
 module EY
   module Serverside
     class Adapter
-      VERSION = "2.1.0"
-      # For backwards compatibility, the serverside version default will be maintained until 2.1
-      # It is recommended that you supply a serverside_version to engineyard-serverside-adapter
-      # rather than relying on the default version here. This default will go away soon.
-      ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || "2.3.0"
+      VERSION = "2.2.0"
     end
   end
 end

data/spec/adapter_spec.rb

@@ -11,6 +11,7 @@ shared_examples_for "a serverside action" do
       args.ref              = 'master'
       args.git              = 'git@github.com:engineyard/engineyard-serverside.git'
       args.stack            = 'nginx_unicorn'
+      args.serverside_version = serverside_version
       args
     end
   end
@@ -88,6 +89,7 @@ shared_examples_for "a serverside action" do
         args.ref              = 'master'
         args.git              = 'git@github.com:engineyard/engineyard-serverside.git'
         args.stack            = 'nginx_unicorn'
+        args.serverside_version = serverside_version
         args
       end
 
@@ -154,6 +156,7 @@ describe EY::Serverside::Adapter do
         args.ref              = 'master'
         args.git              = 'git@github.com:engineyard/engineyard-serverside.git'
         args.stack            = 'nginx_unicorn'
+        args.serverside_version = serverside_version
       end
     end
 

data/spec/arguments_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe EY::Serverside::Adapter::Arguments do
   def raises_argument_error(message = nil, &block)
-    lambda {
+    expect {
       block.call(described_class.new)
-    }.should raise_error(ArgumentError, message)
+    }.to raise_error(ArgumentError, message)
   end
 
   it "raises an ArgumentError immediately when instances is empty" do
@@ -31,4 +31,13 @@ describe EY::Serverside::Adapter::Arguments do
     end
   end
 
+  it "raises an ArgumentError immediately when serverside_version is empty" do
+    raises_argument_error(/Value for 'serverside_version' must be non-empty/) do |arguments|
+      arguments.serverside_version = nil
+    end
+
+    raises_argument_error(/Value for 'serverside_version' must be non-empty/) do |arguments|
+      arguments.serverside_version = ''
+    end
+  end
 end

data/spec/deploy_spec.rb

@@ -6,6 +6,7 @@ describe EY::Serverside::Adapter::Deploy do
   it_should_behave_like "it accepts app"
   it_should_behave_like "it accepts account_name"
   it_should_behave_like "it accepts archive"
+  it_should_behave_like "it accepts clean"
   it_should_behave_like "it accepts environment_name"
   it_should_behave_like "it accepts framework_env"
   it_should_behave_like "it accepts git"
@@ -24,6 +25,7 @@ describe EY::Serverside::Adapter::Deploy do
   it_should_require :stack
   it_should_require :ref,  %w[1.6.4 2.0.0 2.1.0 2.2.0]
   it_should_require :git,  %w[1.6.4 2.0.0 2.1.0 2.2.0]
+  it_should_require :serverside_version
 
   it_should_ignore_requirement :environment_name, '1.6.4'
   it_should_ignore_requirement :account_name,     '1.6.4'
@@ -51,7 +53,7 @@ describe EY::Serverside::Adapter::Deploy do
         arguments.ref                = 'master'
         arguments.git                = 'git@github.com:engineyard/engineyard-serverside.git'
         arguments.stack              = "nginx_unicorn"
-        arguments.serverside_version = '2.3.0'
+        arguments.serverside_version = serverside_version
         block.call arguments if block
       end
       last_command(adapter)
@@ -68,7 +70,7 @@ describe EY::Serverside::Adapter::Deploy do
         arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
         arguments.migrate            = 'rake db:migrate'
         arguments.stack              = "nginx_unicorn"
-        arguments.serverside_version = '2.3.0'
+        arguments.serverside_version = serverside_version
         block.call arguments if block_given?
       end
       last_command(adapter)
@@ -81,7 +83,7 @@ describe EY::Serverside::Adapter::Deploy do
     it "invokes exactly the right command" do
       deploy_command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_#{serverside_version}_",
         "deploy",
         "--account-name ey",
         "--app rackapp",
@@ -174,16 +176,17 @@ describe EY::Serverside::Adapter::Deploy do
   context "with git deploy" do
     let(:command) do
       adapter = described_class.new do |arguments|
-        arguments.app              = "rackapp"
-        arguments.environment_name = 'rackapp_production'
-        arguments.account_name     = 'ey'
-        arguments.framework_env    = 'production'
-        arguments.config           = {'a' => 1}
-        arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
-        arguments.migrate          = 'rake db:migrate'
-        arguments.ref              = 'master'
-        arguments.git              = 'git@github.com:engineyard/engineyard-serverside.git'
-        arguments.stack            = "nginx_unicorn"
+        arguments.app                = "rackapp"
+        arguments.environment_name   = 'rackapp_production'
+        arguments.account_name       = 'ey'
+        arguments.framework_env      = 'production'
+        arguments.config             = {'a' => 1}
+        arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.migrate            = 'rake db:migrate'
+        arguments.ref                = 'master'
+        arguments.git                = 'git@github.com:engineyard/engineyard-serverside.git'
+        arguments.stack              = "nginx_unicorn"
+        arguments.serverside_version = '2.3.0'
       end
       last_command(adapter)
     end
@@ -191,7 +194,7 @@ describe EY::Serverside::Adapter::Deploy do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_2.3.0_",
         "deploy",
         "--account-name ey",
         "--app rackapp",
@@ -220,7 +223,7 @@ describe EY::Serverside::Adapter::Deploy do
         args.migrate          = false
         args.stack            = "nginx_unicorn"
         args.archive          = 'https://github.com/engineyard/engineyard-serverside/archive/master.zip'
-        args.serverside_version = EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION
+        args.serverside_version = '2.3.0'
       end
 
       last_command(adapter)
@@ -229,7 +232,7 @@ describe EY::Serverside::Adapter::Deploy do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_2.3.0_",
         "deploy",
         "--account-name ey",
         "--app rackapp",
@@ -259,6 +262,7 @@ describe EY::Serverside::Adapter::Deploy do
         arguments.ref              = 'master'
         arguments.git              = 'git@github.com:engineyard/engineyard-serverside.git'
         arguments.stack            = "nginx_unicorn"
+        arguments.serverside_version = '2.3.0'
       end
       last_command(adapter)
     end
@@ -270,7 +274,7 @@ describe EY::Serverside::Adapter::Deploy do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_2.3.0_",
         "deploy",
         "--account-name ey",
         "--app rackapp",

data/spec/disable_maintenance_spec.rb

@@ -14,6 +14,7 @@ describe EY::Serverside::Adapter::DisableMaintenance do
   it_should_require :environment_name, %w[2.0.0 2.1.0 2.2.0 2.3.0]
   it_should_require :account_name,     %w[2.0.0 2.1.0 2.2.0 2.3.0]
   it_should_require :instances
+  it_should_require :serverside_version
 
   it_should_ignore_requirement :environment_name, '1.6.4'
   it_should_ignore_requirement :account_name,     '1.6.4'
@@ -24,10 +25,11 @@ describe EY::Serverside::Adapter::DisableMaintenance do
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|
-        arguments.app              = "rackapp"
-        arguments.environment_name = "rackapp_production"
-        arguments.account_name     = "ey"
-        arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.app                = "rackapp"
+        arguments.environment_name   = "rackapp_production"
+        arguments.account_name       = "ey"
+        arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.serverside_version = serverside_version
       end
       last_command(adapter)
     end
@@ -35,7 +37,7 @@ describe EY::Serverside::Adapter::DisableMaintenance do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_#{serverside_version}_",
         "disable_maintenance",
         "--account-name ey",
         "--app rackapp",

data/spec/enable_maintenance_spec.rb

@@ -14,6 +14,7 @@ describe EY::Serverside::Adapter::EnableMaintenance do
   it_should_require :environment_name, %w[2.0.0 2.1.0 2.2.0 2.3.0]
   it_should_require :account_name,     %w[2.0.0 2.1.0 2.2.0 2.3.0]
   it_should_require :instances
+  it_should_require :serverside_version
 
   it_should_ignore_requirement :environment_name, '1.6.4'
   it_should_ignore_requirement :account_name,     '1.6.4'
@@ -25,10 +26,11 @@ describe EY::Serverside::Adapter::EnableMaintenance do
 
     let(:command) do
       adapter = described_class.new do |arguments|
-        arguments.app              = "rackapp"
-        arguments.environment_name = "rackapp_production"
-        arguments.account_name     = "ey"
-        arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.app                = "rackapp"
+        arguments.environment_name   = "rackapp_production"
+        arguments.account_name       = "ey"
+        arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.serverside_version = serverside_version
       end
       last_command(adapter)
     end
@@ -36,7 +38,7 @@ describe EY::Serverside::Adapter::EnableMaintenance do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_#{serverside_version}_",
         "enable_maintenance",
         "--account-name ey",
         "--app rackapp",

data/spec/integrate_spec.rb

@@ -18,6 +18,7 @@ describe EY::Serverside::Adapter::Integrate do
   it_should_require :stack
   it_should_require :instances
   it_should_require :framework_env
+  it_should_require :serverside_version
 
   it_should_ignore_requirement :environment_name, '1.6.4'
   it_should_ignore_requirement :account_name,     '1.6.4'
@@ -28,12 +29,13 @@ describe EY::Serverside::Adapter::Integrate do
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|
-        arguments.app              = "rackapp"
-        arguments.environment_name = "rackapp_production"
-        arguments.account_name     = "ey"
-        arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
-        arguments.stack            = "nginx_unicorn"
-        arguments.framework_env    = "production"
+        arguments.app                = "rackapp"
+        arguments.environment_name   = "rackapp_production"
+        arguments.account_name       = "ey"
+        arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.stack              = "nginx_unicorn"
+        arguments.framework_env      = "production"
+        arguments.serverside_version = serverside_version
       end
       last_command(adapter)
     end
@@ -41,7 +43,7 @@ describe EY::Serverside::Adapter::Integrate do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_#{serverside_version}_",
         "integrate",
         "--account-name ey",
         "--app rackapp",

data/spec/restart_spec.rb

@@ -16,6 +16,7 @@ describe EY::Serverside::Adapter::Restart do
   it_should_require :account_name,     %w[2.0.0 2.1.0 2.2.0 2.3.0]
   it_should_require :instances
   it_should_require :stack
+  it_should_require :serverside_version
 
   it_should_ignore_requirement :environment_name, '1.6.4'
   it_should_ignore_requirement :account_name,     '1.6.4'
@@ -26,11 +27,12 @@ describe EY::Serverside::Adapter::Restart do
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|
-        arguments.app              = "rackapp"
-        arguments.environment_name = "rackapp_production"
-        arguments.account_name     = "ey"
-        arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
-        arguments.stack            = "nginx_unicorn"
+        arguments.app                = "rackapp"
+        arguments.environment_name   = "rackapp_production"
+        arguments.account_name       = "ey"
+        arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.stack              = "nginx_unicorn"
+        arguments.serverside_version = serverside_version
       end
       last_command(adapter)
     end
@@ -38,7 +40,7 @@ describe EY::Serverside::Adapter::Restart do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_#{serverside_version}_",
         "restart",
         "--account-name ey",
         "--app rackapp",

data/spec/rollback_spec.rb

@@ -18,6 +18,7 @@ describe EY::Serverside::Adapter::Rollback do
   it_should_require :framework_env
   it_should_require :instances
   it_should_require :stack
+  it_should_require :serverside_version
 
   it_should_ignore_requirement :environment_name, '1.6.4'
   it_should_ignore_requirement :account_name,     '1.6.4'
@@ -28,13 +29,14 @@ describe EY::Serverside::Adapter::Rollback do
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|
-        arguments.app              = "rackapp"
-        arguments.environment_name = "rackapp_production"
-        arguments.account_name     = "ey"
-        arguments.framework_env    = 'production'
-        arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
-        arguments.stack            = "nginx_unicorn"
-        arguments.config           = {'a' => 1}
+        arguments.app                = "rackapp"
+        arguments.environment_name   = "rackapp_production"
+        arguments.account_name       = "ey"
+        arguments.framework_env      = 'production'
+        arguments.instances          = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        arguments.stack              = "nginx_unicorn"
+        arguments.config             = {'a' => 1}
+        arguments.serverside_version = serverside_version
       end
       last_command(adapter)
     end
@@ -46,7 +48,7 @@ describe EY::Serverside::Adapter::Rollback do
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
-        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "_#{serverside_version}_",
         "deploy rollback",
         "--account-name ey",
         "--app rackapp",

data/spec/spec_helper.rb

@@ -4,18 +4,30 @@ require 'bundler/setup'
 require 'engineyard-serverside-adapter'
 require 'pp'
 
+begin
+  specs = Gem::SpecFetcher.fetcher.fetch(Gem::Dependency.new("engineyard-serverside"))
+  ENGINEYARD_SERVERSIDE_VERSION = specs.map {|spec,| spec.version}.sort.last.to_s
+rescue
+  ENGINEYARD_SERVERSIDE_VERSION = '2.3.1'
+end
+
 module ArgumentsHelpers
+  def serverside_version
+    ENGINEYARD_SERVERSIDE_VERSION
+  end
+
   def valid_options
     {
-      :app              => 'rackapp',
-      :account_name     => 'ey',
-      #:archive          => 'https://github.com/engineyard/engineyard-serverside/archive/master.zip',
-      :environment_name => 'rackapp_production',
-      :framework_env    => 'production',
-      :git              => 'git@github.com:engineyard/engineyard-serverside.git',
-      :instances        => [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}],
-      :ref              => 'master',
-      :stack            => 'nginx_unicorn',
+      :app                => 'rackapp',
+      :account_name       => 'ey',
+      #:archive            => 'https://github.com/engineyard/engineyard-serverside/archive/master.zip',
+      :environment_name   => 'rackapp_production',
+      :framework_env      => 'production',
+      :git                => 'git@github.com:engineyard/engineyard-serverside.git',
+      :instances          => [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}],
+      :ref                => 'master',
+      :stack              => 'nginx_unicorn',
+      :serverside_version => serverside_version,
     }
   end
 
@@ -110,14 +122,33 @@ RSpec.configure do |config|
 
       # of course, the only way to be sure is to actually run it, but
       # this gives us regression-proofing
-      version = EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION
+      version = serverside_version
       escaped_version = version.gsub(/\./, '\\.')
       installation_command.should == "(gem list engineyard-serverside | grep 'engineyard-serverside ' | egrep -q '#{escaped_version}[,)]') || (sudo sh -c 'cd `mktemp -d` && gem install engineyard-serverside --no-rdoc --no-ri -v #{version}')"
 
 
       installation_command.should =~ /gem list engineyard-serverside/
       installation_command.should =~ /egrep -q /
-      installation_command.should =~ /gem install engineyard-serverside.*-v #{Regexp.quote EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}/
+      installation_command.should =~ /gem install engineyard-serverside.*-v #{Regexp.quote serverside_version}/
+    end
+  end
+
+  shared_examples_for "it accepts clean" do
+    context "the --clean arg" do
+      it "is present when you set clean to true" do
+        adapter = described_class.new(:arguments => arguments_with(:clean => true))
+        last_command(adapter).should =~ /--clean/
+      end
+
+      it "is absent when you set clean to false" do
+        adapter = described_class.new(:arguments => arguments_with(:clean => false))
+        last_command(adapter).should_not =~ /--clean/
+      end
+
+      it "is absent when you omit clean" do
+        adapter = described_class.new(:arguments => valid_arguments)
+        last_command(adapter).should_not =~ /--clean/
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Martin Emde
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -78,6 +78,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- ChangeLog.md
 - Gemfile
 - Guardfile
 - LICENSE