engineyard-serverside-adapter 2.0.2 → 2.0.3

data/Rakefile

@@ -38,14 +38,10 @@ end
 
 def remove_pre
   require 'engineyard-serverside-adapter/version'
-  version = EY::Serverside::Adapter::VERSION
-  unless version =~ /\.pre$/
-    raise "Version #{version.inspect} does not end with .pre, you should release manually if you want a custom version name."
-  end
-  new_version = version.gsub(/\.pre$/, '')
+  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
+  new_version.to_s
 end
 
 def next_pre(version)

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

@@ -1,5 +1,7 @@
 require 'escape'
 require 'pathname'
+require 'engineyard-serverside-adapter/option'
+require 'engineyard-serverside-adapter/arguments'
 
 module EY
   module Serverside
@@ -8,11 +10,9 @@ module EY
 
         def initialize(options = {}, &block)
           @gem_bin_path = Pathname.new(options[:gem_bin_path] || "")
-          arguments = options[:arguments] || Arguments.new
-          block.call arguments if block
-          @serverside_version = arguments.serverside_version
-
-          extract_state_from_arguments(arguments)
+          @arguments = options[:arguments] || Arguments.new
+          block.call @arguments if block
+          @serverside_version = @arguments[:serverside_version]
           validate!
         end
 
@@ -22,24 +22,22 @@ module EY
         end
 
         def verbose
-          @state[:verbose]
+          @arguments[:verbose]
         end
 
         class << self
           attr_accessor :options
 
-          def option(name, type, extra={:required => false})
-            self.options ||= {}
-            options[name] = extra.merge({:type => type})
+          def option(*args)
+            self.options ||= []
+            options << Option.new(*args)
           end
         end
 
       private
 
-        def extract_state_from_arguments(arguments)
-          @state = self.class.options.inject({}) do |acc, (option_name, option_attrs)|
-            acc.merge(option_name => arguments.send(option_name))
-          end
+        def applicable_options
+          @applicable_options ||= self.class.options.select { |option| option.on_version?(engineyard_serverside_version) }
         end
 
         def check_and_install_command
@@ -77,18 +75,16 @@ module EY
 
         def action_command
           cmd = Command.new(@gem_bin_path, engineyard_serverside_version, *task)
-          @state.each do |option_name, value|
-            option_type = self.class.options[option_name][:type]
-            switch = "--" + option_name.to_s.gsub(/_/, '-')
-            cmd.send("#{option_type}_argument", switch, value)
+          applicable_options.each do |option|
+            cmd.send("#{option.type}_argument", option.to_switch, @arguments[option.name])
           end
           cmd
         end
 
         def validate!
-          self.class.options.each do |option_name, option_attrs|
-            if option_attrs[:required] && !@state[option_name]
-              raise ArgumentError, "Required field '#{option_name}' not provided."
+          applicable_options.each do |option|
+            if option.required? && !@arguments[option.name]
+              raise ArgumentError, "Required field '#{option.name}' not provided."
             end
           end
         end

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

@@ -6,17 +6,44 @@ module EY
         def self.nonempty_writer(*names)
           names.each do |name|
             define_method(:"#{name}=") do |value|
-              if value.to_s.empty?
+              if value.nil? || value.to_s.empty?
                 raise ArgumentError, "Value for '#{name}' must be non-empty."
               end
-              instance_variable_set("@#{name}", value)
+              self[name] = value
+            end
+          end
+        end
+
+        def self.writer(*names)
+          names.each do |name|
+            define_method(:"#{name}=") do |value|
+              self[name] = value
             end
           end
         end
 
-        attr_reader     :app, :environment_name, :account_name, :config, :framework_env, :instances, :migrate, :ref, :repo, :serverside_version, :stack, :verbose
         nonempty_writer :app, :environment_name, :account_name, :framework_env, :ref, :repo, :serverside_version, :stack
-        attr_writer     :config, :migrate, :verbose
+        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
 
         def instances=(instances)
           unless instances.respond_to?(:each)
@@ -33,11 +60,15 @@ module EY
             end
           end
 
-          @instances = instances
+          self[:instances] = instances
         end
 
         def serverside_version=(value)
-          @serverside_version = Gem::Version.new(value).to_s
+          self[:serverside_version] = Gem::Version.create(value).to_s
+        end
+
+        def method_missing(meth, *)
+          key?(meth) ? self[meth] : super
         end
 
       end

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

@@ -4,8 +4,8 @@ module EY
       class Deploy < Action
 
         option :app,              :string,    :required => true
-        option :account_name,     :string,    :required => true
-        option :environment_name, :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 :config,           :json

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

@@ -4,8 +4,8 @@ module EY
       class DisableMaintenance < Action
 
         option :app,              :string,    :required => true
-        option :account_name,     :string,    :required => true
-        option :environment_name, :string,    :required => true
+        option :account_name,     :string,    :required => true, :version => '>=2.0.0'
+        option :environment_name, :string,    :required => true, :version => '>=2.0.0'
         option :instances,        :instances, :required => true
         option :verbose,          :boolean
 

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

@@ -4,8 +4,8 @@ module EY
       class EnableMaintenance < Action
 
         option :app,              :string,    :required => true
-        option :account_name,     :string,    :required => true
-        option :environment_name, :string,    :required => true
+        option :account_name,     :string,    :required => true, :version => '>=2.0.0'
+        option :environment_name, :string,    :required => true, :version => '>=2.0.0'
         option :instances,        :instances, :required => true
         option :verbose,          :boolean
 

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

@@ -4,8 +4,8 @@ module EY
       class Integrate < Action
 
         option :app,              :string,    :required => true
-        option :account_name,     :string,    :required => true
-        option :environment_name, :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 :framework_env,    :string,    :required => true

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

@@ -0,0 +1,28 @@
+module EY
+  module Serverside
+    class Adapter
+      class Option
+        attr_reader :name, :type
+
+        def initialize(name, type, options={:required => false})
+          @name, @type = name, type
+          @version_requirement = Gem::Requirement.create(options[:version]) if options[:version]
+          @options = options
+        end
+
+        def to_switch
+          "--#{@name}".gsub(/_/, '-')
+        end
+
+        def on_version?(version)
+          !@version_requirement or @version_requirement.satisfied_by?(Gem::Version.create(version))
+        end
+
+        def required?
+          @options[:required]
+        end
+
+      end
+    end
+  end
+end

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

@@ -4,8 +4,8 @@ module EY
       class Restart < Action
 
         option :app,              :string,    :required => true
-        option :account_name,     :string,    :required => true
-        option :environment_name, :string,    :required => true
+        option :account_name,     :string,    :required => true, :version => '>=2.0.0'
+        option :environment_name, :string,    :required => true, :version => '>=2.0.0'
         option :instances,        :instances, :required => true
         option :stack,            :string,    :required => true
         option :verbose,          :boolean

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

@@ -4,8 +4,8 @@ module EY
       class Rollback < Action
 
         option :app,              :string,    :required => true
-        option :account_name,     :string,    :required => true
-        option :environment_name, :string,    :required => true
+        option :account_name,     :string,    :required => true, :version => '>=2.0.0'
+        option :environment_name, :string,    :required => true, :version => '>=2.0.0'
         option :config,           :json
         option :framework_env,    :string,    :required => true
         option :instances,        :instances, :required => true

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

@@ -1,7 +1,7 @@
 module EY
   module Serverside
     class Adapter
-      VERSION = "2.0.2"
+      VERSION = "2.0.3"
       # 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.

data/spec/adapter_spec.rb

@@ -37,7 +37,7 @@ shared_examples_for "a serverside action" do
     end
 
     @adapter.send(@method) do |args|
-      args.app.should == 'app-from-adapter-new'
+      args[:app].should == 'app-from-adapter-new'
     end
   end
 
@@ -86,6 +86,8 @@ shared_examples_for "a serverside action" do
       commands = all_commands(action)
       commands.first.should == "(gem list engineyard-serverside | grep 'engineyard-serverside ' | egrep -q '1\\.6\\.4[,)]') || (sudo sh -c 'cd `mktemp -d` && gem install engineyard-serverside --no-rdoc --no-ri -v 1.6.4')"
       commands.last.should =~ /engineyard-serverside _1\.6\.4_/
+      commands.last.should_not =~ /--environment-name/ # 2.0.0 and above only
+      commands.last.should_not =~ /--account-name/ # 2.0.0 and above only
     end
   end
 end

data/spec/deploy_spec.rb

@@ -24,6 +24,9 @@ describe EY::Serverside::Adapter::Deploy do
   it_should_require :repo
   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_behave_like "it treats config as optional"
   it_should_behave_like "it treats migrate as optional"
 

data/spec/disable_maintenance_spec.rb

@@ -15,6 +15,9 @@ describe EY::Serverside::Adapter::DisableMaintenance do
   it_should_require :account_name
   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'
+
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|

data/spec/enable_maintenance_spec.rb

@@ -15,6 +15,9 @@ describe EY::Serverside::Adapter::EnableMaintenance do
   it_should_require :account_name
   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'
+
   context "with valid arguments" do
 
     let(:command) do

data/spec/integrate_spec.rb

@@ -19,6 +19,9 @@ describe EY::Serverside::Adapter::Integrate do
   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'
+
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|

data/spec/restart_spec.rb

@@ -17,6 +17,9 @@ describe EY::Serverside::Adapter::Restart do
   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'
+
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|

data/spec/rollback_spec.rb

@@ -19,6 +19,9 @@ describe EY::Serverside::Adapter::Rollback do
   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'
+
   context "with valid arguments" do
     let(:command) do
       adapter = described_class.new do |arguments|

data/spec/spec_helper.rb

@@ -59,6 +59,24 @@ module RequiredFieldHelpers
       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
+      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)
+      end
+    end
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -99,6 +99,7 @@ files:
 - lib/engineyard-serverside-adapter/disable_maintenance.rb
 - lib/engineyard-serverside-adapter/enable_maintenance.rb
 - lib/engineyard-serverside-adapter/integrate.rb
+- lib/engineyard-serverside-adapter/option.rb
 - lib/engineyard-serverside-adapter/restart.rb
 - lib/engineyard-serverside-adapter/rollback.rb
 - lib/engineyard-serverside-adapter/version.rb
@@ -125,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3765689580942820898
+      hash: -3663156867639779323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: