engineyard-serverside 1.5.23.ruby19.2 → 1.5.23.ruby19.4

data/lib/engineyard-serverside/cli.rb

@@ -203,18 +203,20 @@ module EY
           !server.local?            # of course this machine has it
         end.map do |server|
           Celluloid::Future.new do
+            log = {}
             unless server.gem?(ey_server_side.name, ey_server_side.version)
               (dependencies + [ey_server_side]).each do |dependency|
                 unless server.gem?(dependency.name, dependency.version)
                   puts "~> Installing #{dependency.name} on #{server.hostname}"
                   server.copy(dependency.local_path, dependency.remote_path)
-                  server.install_gem(dependency.remote_path)
+                  log[dependency.name] = server.install_gem(dependency.remote_path)
                 end
               end
             end
+            log
           end
         end
-        futures.all?{|x| x.value == true } || raise(EY::Serverside::RemoteFailure.new("Error installing engineyard-serverside dependencies"))
+        futures.map {|f| f.value} unless futures.empty?
       end
 
       private
@@ -231,7 +233,6 @@ module EY
 
       def dependencies
         [Dependency.new('celluloid', Celluloid::VERSION),
-         Dependency.new('open4', Open4::VERSION),
          Dependency.new('thor', '0.13.3')]
       end
 

data/lib/engineyard-serverside/deploy.rb

@@ -146,7 +146,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       def push_code
         info "~> Pushing code to all servers"
         futures = EY::Serverside::Server.all.map do |server|
-          Celluloid:: Future.new { server.sync_directory(config.repository_cache) }
+          Celluloid::Future.new { server.sync_directory(config.repository_cache) }
         end
         futures.all? {|f| f.value == true}
       end

data/lib/engineyard-serverside/logged_output.rb

@@ -57,13 +57,9 @@ module EY
 
       def logged_system(cmd)
         with_logfile do |log|
-          out = verbose? ? Tee.new($stdout, log) : log
-          err = Tee.new($stderr, log)    # we always want to see errors
-
-          out <<  ":: running #{cmd}\n"
-
-          status = Open4.spawn(cmd, :out => out, :err => err)
-          status == 0
+          pid = Process.spawn(cmd, :out => log, :err => log)
+          Process.waitpid(pid)
+          $?.success?
         end
       end
 

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.23.ruby19.2'
+    VERSION = '1.5.23.ruby19.4'
   end
 end

data/lib/engineyard-serverside.rb

@@ -5,7 +5,6 @@ $LOAD_PATH.unshift File.expand_path('vendor/json_pure/lib', File.dirname(__FILE_
 
 require 'escape'
 require 'json'
-require 'open4'
 require 'tmpdir'
 require 'celluloid'
 require 'thor'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 1.5.23.ruby19.2
+  version: 1.5.23.ruby19.4
   prerelease: 7
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2154566720 !ruby/object:Gem::Requirement
+  requirement: &2163606220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154566720
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: &2154566220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2154566220
+  version_requirements: *2163606220
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2154565720 !ruby/object:Gem::Requirement
+  requirement: &2163605720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +32,10 @@ dependencies:
         version: 0.13.3
   type: :runtime
   prerelease: false
-  version_requirements: *2154565720
+  version_requirements: *2163605720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154565260 !ruby/object:Gem::Requirement
+  requirement: &2163605220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +43,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2154565260
+  version_requirements: *2163605220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154564800 !ruby/object:Gem::Requirement
+  requirement: &2163604760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2154564800
+  version_requirements: *2163604760
 description: 
 email: cloud@engineyard.com
 executables: