engineyard-serverside-adapter 2.0.7 → 2.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzQ0Mzk3ZTIyMjc5NzcyY2YyNTU5MDg4NjI5YzhlNDQyYjRkNjNiOQ==
+  data.tar.gz: !binary |-
+    MGEzZDk5NzlkZDkzMWRjOTk2YWIwZTVmM2U4NDBmNjFkMWJjNTBhNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDM2ODRjOWMwMzdkMGEyMTEzNTI4OGY5YzExMzhhOWQyODIwYjE2ODZmYzNi
+    ZTg3NWZmMzIxOTM5YjA2NmE1NjUzMDc2N2YzYWMyYzMwOWNmYzY0MjdjZjVl
+    YzRkZGJkNWZjY2U1ZjE4MjNhZTMxMTI5MGJiMmM0MDg5OGVjMDc=
+  data.tar.gz: !binary |-
+    YWU5NzM5YzA1Y2ZiYzljYzcyYzk3NmQ3NzhkMmQ5YTNkNzE1Yzk4NTIzOTJk
+    ZDcwOGIzMmI0ODQ0ZDE4OWYwYjRmYzNkNjExNDM0ZThkNjA5ZmM5OWVmMWUx
+    YzAwOGQ1ODYzZTY2YzliMGQzOTFjZGNmY2M1ZjFmYTljMGE0ZGY=

data/.travis.yml

@@ -7,6 +7,9 @@ rvm:
 notifications:
   recipients:
     - memde@engineyard.com
-branches:
-  only:
-    - master
+  webhooks:
+    urls:
+      - https://ensemble.engineyard.com/travis
+    on_success: always
+    on_failure: always
+    on_start: true

data/README.md

@@ -27,8 +27,8 @@ This example is adapted from the engineyard gem:
     def adapter(app, verbose)
       EY::Serverside::Adapter.new("/usr/local/ey_resin/ruby/bin") do |args|
         args.app           = app.name
-        args.repo          = app.repository_uri
-        args.instances     = environment.instances.map { |i| {:hostname => i.public_hostname, :role => i.role, :name => i.name} }
+        args.git           = app.repository_uri
+        args.instances     = environment.instances.map { |i| {:hostname => i.public_hostname, :roles => [i.role], :name => i.name} }
         args.verbose       = verbose || ENV['DEBUG']
         args.stack         = environment.stack_name
         args.framework_env = environment.framework_env

data/engineyard-serverside-adapter.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/engineyard/engineyard-serverside-adapter"
   s.summary     = "Adapter for speaking to engineyard-serverside"
   s.description = "A separate adapter for speaking the CLI language of the engineyard-serverside gem."
+  s.license = 'MIT'
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "engineyard-serverside-adapter"

data/lib/engineyard-serverside-adapter.rb

@@ -14,11 +14,11 @@ module EY
       autoload :Restart,                'engineyard-serverside-adapter/restart'
       autoload :Rollback,               'engineyard-serverside-adapter/rollback'
 
-      def initialize(gem_bin_path = "")
+      def initialize(gem_bin_path = "", &block)
         @gem_bin_path = Pathname.new(gem_bin_path)
         @arguments    = Arguments.new
 
-        yield @arguments if block_given?
+        block.call(@arguments) if block
       end
 
       def deploy(&b)

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

@@ -8,6 +8,15 @@ module EY
     class Adapter
       class Action
 
+        class << self
+          attr_accessor :options
+
+          def option(*args)
+            self.options ||= []
+            options << Option.new(*args)
+          end
+        end
+
         GEM_NAME = 'engineyard-serverside'
         BIN_NAME = GEM_NAME
 
@@ -34,16 +43,7 @@ module EY
         end
 
         def verbose
-          @arguments[:verbose]
-        end
-
-        class << self
-          attr_accessor :options
-
-          def option(*args)
-            self.options ||= []
-            options << Option.new(*args)
-          end
+          @arguments.verbose
         end
 
       private
@@ -85,19 +85,45 @@ module EY
           @gem_bin_path.join(@serverside_bin_name).to_s
         end
 
+        # Initialize a command from arguments.
+        #
+        # Returns an instance of Command.
         def action_command
           Command.new(serverside_command_path, @serverside_version, *task) do |cmd|
-            applicable_options.each do |option|
-              cmd.send("#{option.type}_argument", option.to_switch, @arguments[option.name])
+            given_applicable_options = given_options & applicable_options
+            given_applicable_options.each do |option|
+              cmd.send("#{option.type}_argument", option.to_switch, @arguments.send(option.name))
             end
           end
         end
 
+        # only options with a value or with `:include` are used as command flags.
+        #
+        # This is not constrained to applicable options because we need to
+        # error if there are duplicate options given even if the version does
+        # not support those options.
+        #
+        # Primarily, this is for :git and :archive. If both are given for a
+        # version that doesn't support it, it's still an error. We don't want
+        # to exclude archive from a older version and then perform a git
+        # deploy, which really we should have errored for receiving both.
+        def given_options
+          @given_options ||= self.class.options.select do |option|
+            @arguments.send(option.name) || option.include?
+          end
+        end
+
+        def required_options
+          applicable_options.select do |option|
+            option.required_on_version?(@serverside_version)
+          end
+        end
+
         def validate!
-          applicable_options.each do |option|
-            if option.required? && !@arguments[option.name]
-              raise ArgumentError, "Required field '#{option.name}' not provided."
-            end
+          missing = required_options - given_options
+          unless missing.empty?
+            options_s = missing.map{|option| option.name}.join(', ')
+            raise ArgumentError, "Required fields [#{options_s}] not provided."
           end
         end
 

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

@@ -3,55 +3,33 @@ module EY
     class Adapter
       class Arguments
 
-        def self.nonempty_writer(*names)
+        def self.nonempty_attr_accessor(*names)
           names.each do |name|
             define_method(name) do
-              self[name]
+              instance_variable_get("@#{name}")
             end
 
             define_method(:"#{name}=") do |value|
               if value.nil? || value.to_s.empty?
                 raise ArgumentError, "Value for '#{name}' must be non-empty."
               end
-              self[name] = value
+              instance_variable_set("@#{name}", value)
             end
           end
         end
 
-        def self.writer(*names)
-          names.each do |name|
-            define_method(name) do
-              self[name]
-            end
-
-            define_method(:"#{name}=") do |value|
-              self[name] = value
-            end
+        def self.aliased_attribute(pairs)
+          pairs.each do |from, to|
+            alias_method from, to
+            alias_method :"#{from}=", "#{to}="
           end
         end
 
-        nonempty_writer :app, :environment_name, :account_name, :framework_env, :ref, :repo, :serverside_version, :stack
-        writer :config, :migrate, :verbose
-
-        def initialize(data={})
-          @data = data
-        end
-
-        def dup
-          self.class.new(@data.dup)
-        end
-
-        def []=(key, val)
-          @data[key.to_sym] = val
-        end
-
-        def [](key)
-          @data[key.to_sym]
-        end
-
-        def key?(key)
-          @data.key?(key.to_sym)
-        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
+        attr_reader :instances
+        alias repo git # for versions where --repo is required, it is accessed via this alias
 
         def instances=(instances)
           unless instances.respond_to?(:each)
@@ -68,12 +46,12 @@ module EY
             end
           end
 
-          self[:instances] = instances
+          @instances = instances
         end
 
         # Uses Gem::Version.create to validate the version string
         def serverside_version=(value)
-          self[:serverside_version] = Gem::Version.create(value.dup) # dup b/c Gem::Version sometimes modifies its argument :(
+          @serverside_version = Gem::Version.create(value.dup) # dup b/c Gem::Version sometimes modifies its argument :(
         end
 
       end

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

@@ -4,16 +4,18 @@ module EY
       class Deploy < Action
 
         option :app,              :string,    :required => true
-        option :account_name,     :string,    :required => true, :version => '>=2.0.0'
-        option :environment_name, :string,    :required => true, :version => '>=2.0.0'
-        option :stack,            :string,    :required => true
-        option :instances,        :instances, :required => true
+        option :account_name,     :string,    :required => true,      :version => '>= 2.0.0'
+        option :archive,          :string,                            :version => '>= 2.3.0'
         option :config,           :json
-        option :verbose,          :boolean
+        option :environment_name, :string,    :required => true,      :version => '>= 2.0.0'
+        option :git,              :string,                            :version => '>= 2.3.0'
         option :framework_env,    :string,    :required => true
-        option :ref,              :string,    :required => true
-        option :repo,             :string,    :required => true
-        option :migrate,          :string
+        option :instances,        :instances, :required => true
+        option :migrate,          :string,                            :include => true
+        option :ref,              :string,    :required => '< 2.3.0'
+        option :repo,             :string,    :required => '< 2.3.0', :version => '< 2.3.0'
+        option :stack,            :string,    :required => true
+        option :verbose,          :boolean
 
       private
 
@@ -21,6 +23,17 @@ module EY
           ['deploy']
         end
 
+        def validate!
+          super
+          given = given_options.map{|opt| opt.name}
+          if given.include?(:archive) && (given.include?(:git) || given.include?(:repo))
+            raise ArgumentError, "Both :git & :archive options given. No precedence order is defined. Specify only one."
+          elsif ([:git,:repo,:archive] & given).empty?
+            raise ArgumentError, "Either :git or :archive options must be given."
+          else
+            # archive xor git
+          end
+        end
       end
     end
   end

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

@@ -18,8 +18,21 @@ module EY
           !@version_requirement or @version_requirement.satisfied_by?(serverside_version)
         end
 
-        def required?
-          @options[:required]
+        # Check if the option should always be included.
+        #
+        # Returns a boolean.
+        def include?
+          @options[:include]
+        end
+
+        def required_on_version?(serverside_version)
+          case @options[:required]
+          when true
+            true
+          when String
+            requirement = Gem::Requirement.create(@options[:required])
+            requirement.satisfied_by?(serverside_version)
+          end
         end
 
       end

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

@@ -1,11 +1,11 @@
 module EY
   module Serverside
     class Adapter
-      VERSION = "2.0.7"
+      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.0.1"
+      ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || "2.3.0"
     end
   end
 end

data/spec/adapter_spec.rb

@@ -9,14 +9,14 @@ shared_examples_for "a serverside action" do
       args.instances        = [{:hostname => 'localhost', :roles => %w[a b c]}]
       args.framework_env    = 'production'
       args.ref              = 'master'
-      args.repo             = 'git@github.com:engineyard/engineyard-serverside.git'
+      args.git              = 'git@github.com:engineyard/engineyard-serverside.git'
       args.stack            = 'nginx_unicorn'
       args
     end
   end
 
   it "gives you an Arguments already set up from when you instantiated the adapter" do
-    command = @adapter.send(@method) do |args|
+    @adapter.send(@method) do |args|
       args.app.should == 'app-from-adapter-new'
     end
   end
@@ -56,12 +56,12 @@ shared_examples_for "a serverside action" do
   end
 
   it "does not let arguments changes propagate back up to the adapter" do
-    command1 = @adapter.send(@method) do |args|
+    @adapter.send(@method) do |args|
       args.app = 'sporkr'
     end
 
     @adapter.send(@method) do |args|
-      args[:app].should == 'app-from-adapter-new'
+      args.app.should == 'app-from-adapter-new'
     end
   end
 
@@ -86,7 +86,7 @@ shared_examples_for "a serverside action" do
         args.instances        = [{:hostname => 'localhost', :roles => %w[a b c]}]
         args.framework_env    = 'production'
         args.ref              = 'master'
-        args.repo             = 'git@github.com:engineyard/engineyard-serverside.git'
+        args.git              = 'git@github.com:engineyard/engineyard-serverside.git'
         args.stack            = 'nginx_unicorn'
         args
       end
@@ -119,7 +119,7 @@ end
 describe EY::Serverside::Adapter do
   context ".new" do
     it "lets you access the arguments" do
-      adapter = described_class.new do |args|
+      described_class.new do |args|
         args.app = 'myapp'
       end
     end
@@ -152,9 +152,8 @@ describe EY::Serverside::Adapter do
         args.instances        = [{:hostname => 'localhost', :roles => %w[a b c]}]
         args.framework_env    = 'production'
         args.ref              = 'master'
-        args.repo             = 'git@github.com:engineyard/engineyard-serverside.git'
+        args.git              = 'git@github.com:engineyard/engineyard-serverside.git'
         args.stack            = 'nginx_unicorn'
-        args
       end
     end
 

data/spec/deploy_spec.rb

@@ -4,33 +4,174 @@ describe EY::Serverside::Adapter::Deploy do
   it_should_behave_like "it installs engineyard-serverside"
 
   it_should_behave_like "it accepts app"
-  it_should_behave_like "it accepts environment_name"
   it_should_behave_like "it accepts account_name"
+  it_should_behave_like "it accepts archive"
+  it_should_behave_like "it accepts environment_name"
   it_should_behave_like "it accepts framework_env"
+  it_should_behave_like "it accepts git"
   it_should_behave_like "it accepts instances"
   it_should_behave_like "it accepts migrate"
   it_should_behave_like "it accepts ref"
-  it_should_behave_like "it accepts repo"
   it_should_behave_like "it accepts stack"
   it_should_behave_like "it accepts verbose"
   it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
-  it_should_require :environment_name
-  it_should_require :account_name
+  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 :framework_env
-  it_should_require :ref
-  it_should_require :repo
   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_ignore_requirement :environment_name, '1.6.4'
+  it_should_ignore_requirement :account_name,     '1.6.4'
+  it_should_ignore_requirement :ref,              '2.3.0'
 
-  it_should_ignore_requirement_for_version :environment_name, '1.6.4'
-  it_should_ignore_requirement_for_version :account_name,     '1.6.4'
+  it_should_exclude_from_command :environment_name, %w[1.6.4]
+  it_should_exclude_from_command :account_name,     %w[1.6.4]
+  it_should_exclude_from_command :repo,             %w[2.3.0]
+  it_should_exclude_from_command :git,              %w[1.6.4 2.0.0 2.1.0 2.2.0]
+  it_should_exclude_from_command :archive,          %w[1.6.4 2.0.0 2.1.0 2.2.0]
 
   it_should_behave_like "it treats config as optional"
   it_should_behave_like "it treats migrate as optional"
 
   context "with valid arguments" do
+    def deploy_command(&block)
+      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.serverside_version = '2.3.0'
+        block.call arguments if block
+      end
+      last_command(adapter)
+    end
+
+    def archive_deploy_command(&block)
+      adapter = described_class.new do |arguments|
+        arguments.archive            = 'https://github.com/engineyard/engineyard-serverside/archive/master.zip'
+        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.stack              = "nginx_unicorn"
+        arguments.serverside_version = '2.3.0'
+        block.call arguments if block_given?
+      end
+      last_command(adapter)
+    end
+
+    it "puts the config in the command line as json" do
+      deploy_command.should =~ /--config '#{Regexp.quote '{"a":1}'}'/
+    end
+
+    it "invokes exactly the right command" do
+      deploy_command.should == [
+        "engineyard-serverside",
+        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "deploy",
+        "--account-name ey",
+        "--app rackapp",
+        "--config '{\"a\":1}'",
+        "--environment-name rackapp_production",
+        "--framework-env production",
+        "--git git@github.com:engineyard/engineyard-serverside.git",
+        "--instance-names localhost:chewie",
+        "--instance-roles localhost:han,solo",
+        "--instances localhost",
+        "--migrate 'rake db:migrate'",
+        "--ref master",
+        "--stack nginx_unicorn",
+      ].join(' ')
+    end
+
+    %w[1.6.4 2.0.0 2.1.0 2.2.0].each do |version|
+      context "on version ~> #{version}" do
+        it "sets --repo instead of --git flag" do
+          git_repo = 'git@github.com:engineyard/engineyard-serverside.git'
+          command = deploy_command do |args|
+            args.serverside_version = version
+            args.git = git_repo
+          end
+
+          expect(command).to match(/--repo #{Regexp.escape(git_repo)}/)
+          expect(command).not_to match(/--git/)
+        end
+
+        it "raises if both --archive and --git are set (you must specify git)" do
+          expect do
+            command = deploy_command do |args|
+              args.archive            = "url"
+              args.serverside_version = version
+            end
+          end.to raise_error(ArgumentError)
+        end
+      end
+    end
+
+    context "on version ~> 2.3.0" do
+      let(:version) { "2.3.0" }
+
+      it "sets --git and not --repo flag" do
+        git_repo = 'git@github.com:engineyard/engineyard-serverside.git'
+        command = deploy_command do |args|
+          args.serverside_version = version
+          args.git = git_repo
+        end
+        expect(command).to match(/--git #{Regexp.escape(git_repo)}/)
+        expect(command).not_to match(/--repo/)
+      end
+
+      it "raises if both --archive and --git are set" do
+        expect do
+          deploy_command do |args|
+            args.serverside_version = version
+            args.archive = "url"
+          end
+        end.to raise_error(ArgumentError)
+      end
+
+      it "raises if neither --archive nor --git are set" do
+        expect do
+          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.stack              = "nginx_unicorn"
+            arguments.serverside_version = version
+          end
+        end.to raise_error(ArgumentError)
+      end
+
+      it "sets --archive" do
+        command = archive_deploy_command do |args|
+          args.serverside_version = version
+          args.archive = "url"
+        end
+        expect(command).to match(/--archive url/)
+      end
+    end
+  end
+
+  context "with git deploy" do
     let(:command) do
       adapter = described_class.new do |arguments|
         arguments.app              = "rackapp"
@@ -41,16 +182,12 @@ describe EY::Serverside::Adapter::Deploy do
         arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
         arguments.migrate          = 'rake db:migrate'
         arguments.ref              = 'master'
-        arguments.repo             = 'git@github.com:engineyard/engineyard-serverside.git'
+        arguments.git              = 'git@github.com:engineyard/engineyard-serverside.git'
         arguments.stack            = "nginx_unicorn"
       end
       last_command(adapter)
     end
 
-    it "puts the config in the command line as json" do
-      command.should =~ /--config '#{Regexp.quote '{"a":1}'}'/
-    end
-
     it "invokes exactly the right command" do
       command.should == [
         "engineyard-serverside",
@@ -61,17 +198,54 @@ describe EY::Serverside::Adapter::Deploy do
         "--config '{\"a\":1}'",
         "--environment-name rackapp_production",
         "--framework-env production",
+        "--git git@github.com:engineyard/engineyard-serverside.git",
         "--instance-names localhost:chewie",
         "--instance-roles localhost:han,solo",
         "--instances localhost",
         "--migrate 'rake db:migrate'",
         "--ref master",
-        "--repo git@github.com:engineyard/engineyard-serverside.git",
-        "--stack nginx_unicorn",
+        "--stack nginx_unicorn"
       ].join(' ')
     end
   end
 
+  context "with package deploy" do
+    let(:command) do
+      adapter = described_class.new do |args|
+        args.app              = "rackapp"
+        args.environment_name = 'rackapp_production'
+        args.account_name     = 'ey'
+        args.framework_env    = 'production'
+        args.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
+        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
+      end
+
+      last_command(adapter)
+    end
+
+    it "invokes exactly the right command" do
+      command.should == [
+        "engineyard-serverside",
+        "_#{EY::Serverside::Adapter::ENGINEYARD_SERVERSIDE_VERSION}_",
+        "deploy",
+        "--account-name ey",
+        "--app rackapp",
+        "--archive https://github.com/engineyard/engineyard-serverside/archive/master.zip",
+        "--environment-name rackapp_production",
+        "--framework-env production",
+        "--instance-names localhost:chewie",
+        "--instance-roles localhost:han,solo",
+        "--instances localhost",
+        "--no-migrate",
+        "--stack nginx_unicorn"
+      ].join(' ')
+    end
+
+  end
+
   context "with no migrate argument" do
     let(:command) do
       adapter = described_class.new do |arguments|
@@ -83,7 +257,7 @@ describe EY::Serverside::Adapter::Deploy do
         arguments.instances        = [{:hostname => 'localhost', :roles => %w[han solo], :name => 'chewie'}]
         arguments.migrate          = false
         arguments.ref              = 'master'
-        arguments.repo             = 'git@github.com:engineyard/engineyard-serverside.git'
+        arguments.git              = 'git@github.com:engineyard/engineyard-serverside.git'
         arguments.stack            = "nginx_unicorn"
       end
       last_command(adapter)
@@ -103,12 +277,12 @@ describe EY::Serverside::Adapter::Deploy do
         "--config '{\"a\":1}'",
         "--environment-name rackapp_production",
         "--framework-env production",
+        "--git git@github.com:engineyard/engineyard-serverside.git",
         "--instance-names localhost:chewie",
         "--instance-roles localhost:han,solo",
         "--instances localhost",
         "--no-migrate",
         "--ref master",
-        "--repo git@github.com:engineyard/engineyard-serverside.git",
         "--stack nginx_unicorn",
       ].join(' ')
     end

data/spec/disable_maintenance_spec.rb

@@ -11,12 +11,15 @@ describe EY::Serverside::Adapter::DisableMaintenance do
   it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
-  it_should_require :environment_name
-  it_should_require :account_name
+  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_ignore_requirement_for_version :environment_name, '1.6.4'
-  it_should_ignore_requirement_for_version :account_name,     '1.6.4'
+  it_should_ignore_requirement :environment_name, '1.6.4'
+  it_should_ignore_requirement :account_name,     '1.6.4'
+
+  it_should_exclude_from_command :environment_name, %w[1.6.4]
+  it_should_exclude_from_command :account_name,     %w[1.6.4]
 
   context "with valid arguments" do
     let(:command) do

data/spec/enable_maintenance_spec.rb

@@ -11,12 +11,15 @@ describe EY::Serverside::Adapter::EnableMaintenance do
   it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
-  it_should_require :environment_name
-  it_should_require :account_name
+  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_ignore_requirement_for_version :environment_name, '1.6.4'
-  it_should_ignore_requirement_for_version :account_name,     '1.6.4'
+  it_should_ignore_requirement :environment_name, '1.6.4'
+  it_should_ignore_requirement :account_name,     '1.6.4'
+
+  it_should_exclude_from_command :environment_name, %w[1.6.4]
+  it_should_exclude_from_command :account_name,     %w[1.6.4]
 
   context "with valid arguments" do
 

data/spec/integrate_spec.rb

@@ -13,14 +13,17 @@ describe EY::Serverside::Adapter::Integrate do
   it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
-  it_should_require :environment_name
-  it_should_require :account_name
+  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 :stack
   it_should_require :instances
   it_should_require :framework_env
 
-  it_should_ignore_requirement_for_version :environment_name, '1.6.4'
-  it_should_ignore_requirement_for_version :account_name,     '1.6.4'
+  it_should_ignore_requirement :environment_name, '1.6.4'
+  it_should_ignore_requirement :account_name,     '1.6.4'
+
+  it_should_exclude_from_command :environment_name, %w[1.6.4]
+  it_should_exclude_from_command :account_name,     %w[1.6.4]
 
   context "with valid arguments" do
     let(:command) do

data/spec/restart_spec.rb

@@ -12,13 +12,16 @@ describe EY::Serverside::Adapter::Restart do
   it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
-  it_should_require :environment_name
-  it_should_require :account_name
+  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 :stack
 
-  it_should_ignore_requirement_for_version :environment_name, '1.6.4'
-  it_should_ignore_requirement_for_version :account_name,     '1.6.4'
+  it_should_ignore_requirement :environment_name, '1.6.4'
+  it_should_ignore_requirement :account_name,     '1.6.4'
+
+  it_should_exclude_from_command :environment_name, %w[1.6.4]
+  it_should_exclude_from_command :account_name,     %w[1.6.4]
 
   context "with valid arguments" do
     let(:command) do

data/spec/rollback_spec.rb

@@ -13,14 +13,17 @@ describe EY::Serverside::Adapter::Rollback do
   it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
-  it_should_require :environment_name
-  it_should_require :account_name
+  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 :framework_env
   it_should_require :instances
   it_should_require :stack
 
-  it_should_ignore_requirement_for_version :environment_name, '1.6.4'
-  it_should_ignore_requirement_for_version :account_name,     '1.6.4'
+  it_should_ignore_requirement :environment_name, '1.6.4'
+  it_should_ignore_requirement :account_name,     '1.6.4'
+
+  it_should_exclude_from_command :environment_name, %w[1.6.4]
+  it_should_exclude_from_command :account_name,     %w[1.6.4]
 
   context "with valid arguments" do
     let(:command) do

data/spec/spec_helper.rb

@@ -8,12 +8,13 @@ module ArgumentsHelpers
   def valid_options
     {
       :app              => 'rackapp',
-      :environment_name => 'rackapp_production',
       :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',
-      :repo             => 'git@github.com:engineyard/engineyard-serverside.git',
       :stack            => 'nginx_unicorn',
     }
   end
@@ -46,32 +47,51 @@ module ArgumentsHelpers
 end
 
 module RequiredFieldHelpers
-  def it_should_require(field)
+  def it_should_require(field, versions=[:all])
     context "field #{field}" do
-      it "is just fine when #{field} is there" do
-        lambda { described_class.new(:arguments => valid_arguments) }.should_not raise_error
-      end
-
-      it "raises an error if #{field} is missing" do
-        lambda { described_class.new(:arguments => arguments_without(field)) }.should raise_error(ArgumentError)
+      versions.each do |version|
+        on_versions = version == :all ? "on all versions" : "on version ~> #{version}"
+        context on_versions do
+          it "is fine when #{field} is there" do
+            arguments = valid_arguments
+            arguments.serverside_version = version unless version == :all
+            expect { described_class.new(:arguments => arguments) }.to_not raise_error
+          end
+
+          it "raises an error if #{field} is missing" do
+            arguments = arguments_without(field)
+            arguments.serverside_version = version unless version == :all
+            expect { described_class.new(:arguments => arguments) }.to raise_error(ArgumentError)
+          end
+        end
       end
     end
   end
 
-  def it_should_ignore_requirement_for_version(field, version)
-    context "field #{field} on version #{version}" do
-      it "is does not require #{field}" do
-        arguments = arguments_without(field)
-        arguments.serverside_version = version
-        lambda { described_class.new(:arguments => arguments) }.should_not raise_error
+  def it_should_ignore_requirement(field, version)
+    context "field #{field}" do
+      context "on version ~> #{version}" do
+        it "is not required" do
+          arguments = arguments_without(field)
+          arguments.serverside_version = version
+          lambda { described_class.new(:arguments => arguments) }.should_not raise_error
+        end
       end
+    end
+  end
 
-      it "it does not include #{field} in the command, even if it is set" do
-        arguments = valid_arguments
-        arguments.serverside_version = version
-        action = described_class.new(:arguments => arguments)
-        commands = all_commands(action)
-        commands.last.should_not include(EY::Serverside::Adapter::Option.new(field, :string).to_switch)
+  def it_should_exclude_from_command(field, versions)
+    context "field #{field}" do
+      versions.each do |version|
+        context "on version ~> #{version}" do
+          it "is not included #{field} in the command" do
+            arguments = valid_arguments
+            arguments.serverside_version = version
+            action = described_class.new(:arguments => arguments)
+            commands = all_commands(action)
+            commands.last.should_not include(EY::Serverside::Adapter::Option.new(field, :string).to_switch)
+          end
+        end
       end
     end
   end
@@ -127,7 +147,7 @@ RSpec.configure do |config|
     :stack            => '--stack',
     :framework_env    => '--framework-env',
     :ref              => '--ref',
-    :repo             => '--repo',
+    :git              => '--git',
     :migrate          => '--migrate',
   }.each do |arg, switch|
     shared_examples_for "it accepts #{arg}" do
@@ -158,6 +178,15 @@ RSpec.configure do |config|
     end
   end
 
+  shared_examples_for "it accepts archive" do
+    it "puts the --archive arg in the command line" do
+      arguments = arguments_without(:git)
+      arguments.archive = 'word'
+      adapter = described_class.new(:arguments => arguments)
+      last_command(adapter).should =~ /--archive word/
+    end
+  end
+
   shared_examples_for "it accepts serverside_version" do
     it "puts the _VERSION_ command part in the command line" do
       adapter = described_class.new(:arguments => arguments_with(:serverside_version => '1.2.3'))

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.7
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Martin Emde
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -115,30 +106,27 @@ files:
 - spec/rollback_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/engineyard/engineyard-serverside-adapter
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3196036238943305077
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: engineyard-serverside-adapter
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adapter for speaking to engineyard-serverside
 test_files: []