engineyard-serverside-adapter 2.0.5 → 2.0.7

data/.travis.yml

@@ -0,0 +1,12 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - ree
+notifications:
+  recipients:
+    - memde@engineyard.com
+branches:
+  only:
+    - master

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

@@ -26,8 +26,11 @@ module EY
         end
 
         def call(&block)
-          block.call check_and_install_command.to_s
-          block.call action_command.to_s
+          commands.all? { |cmd| block.call(cmd.to_s) }
+        end
+
+        def commands
+          @commands ||= [check_and_install_command, action_command]
         end
 
         def verbose

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

@@ -14,8 +14,12 @@ module EY
           yield self if block_given?
         end
 
+        def to_argv
+          [@binary, "_#{@version}_"] + @task + @arguments.sort_by { |x| x.first }.flatten
+        end
+
         def to_s
-          Escape.shell_command [@binary, "_#{@version}_"] + @task + @arguments.sort_by { |x| x.first }.flatten
+          Escape.shell_command to_argv
         end
 
         def array_argument(switch, values)

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

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

@@ -31,6 +31,30 @@ shared_examples_for "a serverside action" do
     command.should include('--verbose')
   end
 
+  it "returns true when all commands succeed in call" do
+    action = @adapter.send(@method) do |args|
+      args.verbose = true
+    end
+
+    commands = []
+    action.call { |cmd| commands << cmd; true }.should be_true
+    commands.should have(2).entries
+  end
+
+  it "returns false when any commands fail in call, short circuiting if first command fails" do
+    action = @adapter.send(@method) do |args|
+      args.verbose = true
+    end
+
+    commands = []
+    action.call { |cmd| commands << cmd; false }.should be_false
+    commands.should have(1).entries
+
+    commands = []
+    action.call { |cmd| commands << cmd; commands.size == 1 ? true : false }.should be_false
+    commands.should have(2).entries
+  end
+
   it "does not let arguments changes propagate back up to the adapter" do
     command1 = @adapter.send(@method) do |args|
       args.app = 'sporkr'

data/spec/spec_helper.rb

@@ -37,9 +37,7 @@ module ArgumentsHelpers
   end
 
   def all_commands(adapter)
-    commands = []
-    adapter.call { |command| commands << command }
-    commands
+    adapter.commands.map(&:to_s)
   end
 
   def last_command(adapter)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -86,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
@@ -127,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3338596083708066819
+      hash: -3196036238943305077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: engineyard-serverside-adapter
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Adapter for speaking to engineyard-serverside