engineyard-serverside-adapter 2.0.3 → 2.0.4

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

@@ -13,6 +13,7 @@ module EY
           @arguments = options[:arguments] || Arguments.new
           block.call @arguments if block
           @serverside_version = @arguments[:serverside_version]
+          @serverside_version ||= Gem::Version.create(ENGINEYARD_SERVERSIDE_VERSION.dup)
           validate!
         end
 
@@ -37,24 +38,20 @@ module EY
       private
 
         def applicable_options
-          @applicable_options ||= self.class.options.select { |option| option.on_version?(engineyard_serverside_version) }
+          @applicable_options ||= self.class.options.select { |option| option.on_version?(@serverside_version) }
         end
 
         def check_and_install_command
           "(#{check_command}) || (#{install_command})"
         end
 
-        def engineyard_serverside_version
-          @serverside_version || ENGINEYARD_SERVERSIDE_VERSION
-        end
-
         def check_command
-          escaped_engineyard_serverside_version = engineyard_serverside_version.gsub(/\./, '\.')
+          escaped_serverside_version = @serverside_version.to_s.gsub(/\./, '\.')
 
           [
             Escape.shell_command([gem_path, "list", "engineyard-serverside"]),
             Escape.shell_command(["grep", "engineyard-serverside "]),
-            Escape.shell_command(["egrep", "-q", "#{escaped_engineyard_serverside_version}[,)]"]),
+            Escape.shell_command(["egrep", "-q", "#{escaped_serverside_version}[,)]"]),
           ].join(" | ")
         end
 
@@ -65,7 +62,7 @@ module EY
           #
           # rubygems help suggests that --remote will disable this
           # behavior, but it doesn't.
-          install_command = "cd `mktemp -d` && #{gem_path} install engineyard-serverside --no-rdoc --no-ri -v #{engineyard_serverside_version}"
+          install_command = "cd `mktemp -d` && #{gem_path} install engineyard-serverside --no-rdoc --no-ri -v #{@serverside_version}"
           Escape.shell_command(['sudo', 'sh', '-c', install_command])
         end
 
@@ -74,7 +71,7 @@ module EY
         end
 
         def action_command
-          cmd = Command.new(@gem_bin_path, engineyard_serverside_version, *task)
+          cmd = Command.new(@gem_bin_path, @serverside_version, *task)
           applicable_options.each do |option|
             cmd.send("#{option.type}_argument", option.to_switch, @arguments[option.name])
           end

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

@@ -64,7 +64,7 @@ module EY
         end
 
         def serverside_version=(value)
-          self[:serverside_version] = Gem::Version.create(value).to_s
+          self[:serverside_version] = Gem::Version.create(value.dup) # dup b/c Gem::Version sometimes modifies its argument :(
         end
 
         def method_missing(meth, *)

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

@@ -14,8 +14,8 @@ module EY
           "--#{@name}".gsub(/_/, '-')
         end
 
-        def on_version?(version)
-          !@version_requirement or @version_requirement.satisfied_by?(Gem::Version.create(version))
+        def on_version?(serverside_version)
+          !@version_requirement or @version_requirement.satisfied_by?(serverside_version)
         end
 
         def required?

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3663156867639779323
+      hash: -633305540513114072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: