engineyard-serverside-adapter 2.0.4 → 2.0.5

data/Gemfile

@@ -1,4 +1,9 @@
-source :gemcutter
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in engineyard-serverside-adapter.gemspec
 gemspec
+
+group :guard do
+  gem 'guard', :require => false
+  gem 'guard-rspec', :require => false
+  gem 'rb-fsevent', '~> 0.9.1', :require => false
+end

data/Guardfile

@@ -0,0 +1,13 @@
+guard 'rspec', :all_after_pass => true, :all_on_start => true, :cli => '--color' do
+
+  lib = "lib/engineyard-serverside-adapter"
+
+  watch(%r{^spec/(.+)_spec\.rb$})
+  watch(%r{^#{lib}.rb$})           { "spec" }
+  watch(%r{^#{lib}/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^#{lib}/action.rb$})    { "spec" }
+  watch(%r{^#{lib}/command.rb$})   { "spec" }
+  watch(%r{^#{lib}/option.rb$})    { "spec" }
+  watch('spec/spec_helper.rb')     { "spec" }
+
+end

data/engineyard-serverside-adapter.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "engineyard-serverside-adapter"
 
   s.add_dependency             "escape",     "~> 0.0.4"
-  s.add_dependency             "json_pure"
+  s.add_dependency             "multi_json", "~> 1.6"
   s.add_development_dependency "rspec",      "~> 2.0"
   s.add_development_dependency "rake"
 

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

@@ -8,12 +8,20 @@ module EY
     class Adapter
       class Action
 
+        GEM_NAME = 'engineyard-serverside'
+        BIN_NAME = GEM_NAME
+
         def initialize(options = {}, &block)
           @gem_bin_path = Pathname.new(options[:gem_bin_path] || "")
-          @arguments = options[:arguments] || Arguments.new
+
+          @arguments           = options[:arguments]           || Arguments.new
+          @serverside_gem_name = options[:serverside_gem_name] || GEM_NAME
+          @serverside_bin_name = options[:serverside_bin_name] || BIN_NAME
+
           block.call @arguments if block
-          @serverside_version = @arguments[:serverside_version]
-          @serverside_version ||= Gem::Version.create(ENGINEYARD_SERVERSIDE_VERSION.dup)
+
+          @serverside_version = Gem::Version.create(@arguments.serverside_version || ENGINEYARD_SERVERSIDE_VERSION.dup)
+
           validate!
         end
 
@@ -46,11 +54,11 @@ module EY
         end
 
         def check_command
-          escaped_serverside_version = @serverside_version.to_s.gsub(/\./, '\.')
+          escaped_serverside_version = Regexp.escape(@serverside_version.to_s)
 
           [
-            Escape.shell_command([gem_path, "list", "engineyard-serverside"]),
-            Escape.shell_command(["grep", "engineyard-serverside "]),
+            Escape.shell_command([gem_command_path, "list", @serverside_gem_name]),
+            Escape.shell_command(["grep", "#{@serverside_gem_name} "]), # trailing space for better matching
             Escape.shell_command(["egrep", "-q", "#{escaped_serverside_version}[,)]"]),
           ].join(" | ")
         end
@@ -62,20 +70,24 @@ 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 #{@serverside_version}"
+          install_command = "cd `mktemp -d` && #{gem_command_path} install #{@serverside_gem_name} --no-rdoc --no-ri -v #{@serverside_version}"
           Escape.shell_command(['sudo', 'sh', '-c', install_command])
         end
 
-        def gem_path
+        def gem_command_path
           @gem_bin_path.join('gem').to_s
         end
 
+        def serverside_command_path
+          @gem_bin_path.join(@serverside_bin_name).to_s
+        end
+
         def action_command
-          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])
+          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])
+            end
           end
-          cmd
         end
 
         def validate!

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

@@ -5,6 +5,10 @@ module EY
 
         def self.nonempty_writer(*names)
           names.each do |name|
+            define_method(name) do
+              self[name]
+            end
+
             define_method(:"#{name}=") do |value|
               if value.nil? || value.to_s.empty?
                 raise ArgumentError, "Value for '#{name}' must be non-empty."
@@ -16,6 +20,10 @@ module EY
 
         def self.writer(*names)
           names.each do |name|
+            define_method(name) do
+              self[name]
+            end
+
             define_method(:"#{name}=") do |value|
               self[name] = value
             end
@@ -63,14 +71,11 @@ module EY
           self[: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 :(
         end
 
-        def method_missing(meth, *)
-          key?(meth) ? self[meth] : super
-        end
-
       end
     end
   end

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

@@ -1,19 +1,21 @@
 require 'escape'
-require 'json'
+require 'multi_json'
 
 module EY
   module Serverside
     class Adapter
       class Command
-        def initialize(bin_path, serverside_version, *task)
-          @binary = bin_path.join('engineyard-serverside').to_s
-          @serverside_version = serverside_version
-          @task = task
+        def initialize(binary_path, version, *task)
+          @binary    = binary_path.to_s
+          @version   = version
+          @task      = task
           @arguments = []
+
+          yield self if block_given?
         end
 
         def to_s
-          Escape.shell_command [@binary, "_#{@serverside_version}_"] + @task + @arguments.sort_by { |x| x.first }.flatten
+          Escape.shell_command [@binary, "_#{@version}_"] + @task + @arguments.sort_by { |x| x.first }.flatten
         end
 
         def array_argument(switch, values)
@@ -51,7 +53,7 @@ module EY
 
         def json_argument(switch, value)
           if value
-            string_argument(switch, value.to_json)
+            string_argument(switch, MultiJson.dump(value))
           end
         end
 

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

@@ -1,7 +1,7 @@
 module EY
   module Serverside
     class Adapter
-      VERSION = "2.0.4"
+      VERSION = "2.0.5"
       # 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.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -29,21 +29,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -126,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -633305540513114072
+      hash: 3338596083708066819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: