engineyard-serverside 2.0.0.pre2 → 2.0.0.pre3

data/lib/engineyard-serverside/cli.rb

@@ -233,14 +233,21 @@ module EY
 
         servers = EY::Serverside::Server.all.find_all { |server| !server.local? }
 
+        shell.status "Propagating engineyard-serverside #{EY::Serverside::VERSION} to #{servers.size} server#{servers.size == 1 ? '' : 's' }."
+
         commands = servers.map do |server|
+          shell.debug "Building propagate commands for #{server.hostname}"
+
           egrep_escaped_version = EY::Serverside::VERSION.gsub(/\./, '\.')
           # the [,)] is to stop us from looking for e.g. 0.5.1, seeing
           # 0.5.11, and mistakenly thinking 0.5.1 is there
           has_gem_cmd = "#{gem_binary} list engineyard-serverside | grep \"engineyard-serverside\" | egrep -q '#{egrep_escaped_version}[,)]'"
 
           proc do
-            if !run_on_server(server,has_gem_cmd).success? # doesn't have this exact version
+            exists = shell.logged_system(server.command_on_server('sh -l -c', has_gem_cmd))
+            if exists.success?
+              exists # Future expects logged system result object
+            else # doesn't have this exact version
               shell.status "Installing engineyard-serverside on #{server.hostname}"
 
               shell.logged_system(Escape.shell_command([
@@ -249,13 +256,17 @@ module EY
                 local_gem_file,
                "#{config.user}@#{server.hostname}:#{remote_gem_file}",
               ]))
-              run_on_server(server,"sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
+              install_gem_cmd = "#{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'"
+              shell.logged_system(server.command_on_server('sudo sh -l -c', install_gem_cmd))
             end
           end
         end
 
         futures = EY::Serverside::Future.call(commands)
-        EY::Serverside::Future.success?(futures)
+        unless EY::Serverside::Future.success?(futures)
+          failures = futures.select {|f| f.error? }.map {|f| f.inspect}.join("\n")
+          raise EY::Serverside::RemoteFailure.new(failures)
+        end
       end
 
       def init_and_propagate(*args)
@@ -268,6 +279,7 @@ module EY
       def init(options, action)
         config = EY::Serverside::Deploy::Configuration.new(options)
         shell  = EY::Serverside::Shell.new(:verbose  => config.verbose, :log_path => File.join(ENV['HOME'], "#{config.app}-#{action}.log"))
+        shell.debug "Initializing engineyard-serverside #{EY::Serverside::VERSION}."
         [config, shell]
       end
 

data/lib/engineyard-serverside/configuration.rb

@@ -219,6 +219,10 @@ module EY
         @release_path ||= File.join(release_dir, Time.now.utc.strftime("%Y%m%d%H%M%S"))
       end
 
+      def precompile_assets_inferred?
+        !precompile_assets? && !skip_precompile_assets?
+      end
+
       def precompile_assets?
         configuration['precompile_assets'] == true
       end

data/lib/engineyard-serverside/deploy.rb

@@ -295,7 +295,7 @@ chmod 0700 #{path}
         run("mkdir -p #{c.release_path} #{c.failed_release_dir} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
 
         shell.status "Ensuring proper ownership."
-        sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
+        sudo("chown -R #{c.user}:#{c.group} #{c.release_path} #{c.failed_release_dir}")
       end
 
       def create_revision_file
@@ -388,7 +388,7 @@ WRAP
       # task
       def symlink(release_to_link=c.release_path)
         shell.status "Symlinking code."
-        run "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
+        run "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && find #{c.current_path} -not -user #{c.user} -or -not -group #{c.group} -exec chown #{c.user}:#{c.group} {} +"
         @symlink_changed = true
       rescue Exception
         sudo "rm -f #{c.current_path} && ln -nfs #{c.previous_release(release_to_link)} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"

data/lib/engineyard-serverside/rails_asset_support.rb

@@ -8,7 +8,7 @@ module EY
           keep_existing_assets
           cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile"
 
-          unless config.precompile_assets?
+          if config.precompile_assets_inferred?
             # If specifically requested, then we want to fail if compilation fails.
             # If we are implicitly precompiling, we want to fail non-destructively
             # because we don't know if the rake task exists or if the user
@@ -35,21 +35,25 @@ module EY
         end
 
         app_rb_path = File.join(c.release_path, 'config', 'application.rb')
-        return unless File.readable?(app_rb_path) # Not a Rails app in the first place.
+        unless File.readable?(app_rb_path) # Not a Rails app in the first place.
+          shell.status "Skipping asset precompilation. (not a Rails application)"
+          return false
+        end
 
-        if File.directory?(File.join(c.release_path, 'app', 'assets'))
+        if FileTest.exist?(File.join(c.release_path, 'app', 'assets'))
           shell.status "Attempting Rails asset precompilation. (found directory: 'app/assets')"
         else
+          shell.status "Skipping asset precompilation. (directory not found: 'app/assets')"
           return false
         end
 
         if app_builds_own_assets?
-          shell.status "Skipping asset compilation. (found directory: 'public/assets')"
-          return
+          shell.status "Skipping asset compilation. Already compiled. (found directory: 'public/assets')"
+          return false
         end
         if app_disables_assets?(app_rb_path)
           shell.status "Skipping asset compilation. (application.rb has disabled asset compilation)"
-          return
+          return false
         end
 # This check is very expensive, and has been deemed not worth the time.
 # Leaving this here in case someone comes up with a faster way.

data/lib/engineyard-serverside/shell/formatter.rb

@@ -33,6 +33,7 @@ module EY
           when "DEBUG"
             if @verbose
               @stdout << msg
+              @stdout.flush
             end
           when "INFO"
             # Need to differentiate info messages more when we're running in verbose mode

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.0.0.pre2'
+    VERSION = '2.0.0.pre3'
   end
 end

data/spec/support/integration.rb

@@ -115,12 +115,16 @@ class EY::Serverside::Strategies::IntegrationSpec
   def install_git_base
     repository_cache.mkpath
     git_base = FIXTURES_DIR.join('gitrepo.tar.gz')
-    system "tar xzf #{git_base} --strip-components 1 -C #{repository_cache}"
+    shell.substatus "Test helpers copying base repo into #{repository_cache}"
+    shell.logged_system "tar xzf #{git_base} --strip-components 1 -C #{repository_cache}"
   end
 
   def copy_fixture_repo_files
     if source_repo.exist?
-      system("cp -Rf #{source_repo.join('*')} #{repository_cache}")
+      shell.substatus "Test helpers copying repo fixture from #{source_repo}/ to #{repository_cache}"
+      # This uses a ruby method instead of shelling out because I was having
+      # trouble getting cp -R to behave consistently between distros.
+      FileUtils.cp_r Dir.glob("#{source_repo}/*"), repository_cache
     else
       raise "Mock repo #{source_repo.inspect} does not exist. Path should be absolute. e.g. FIXTURES_DIR.join('repos','example')"
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: -3789216136
+  hash: 74746199
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - pre
-  - 2
-  version: 2.0.0.pre2
+  - 3
+  version: 2.0.0.pre3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-30 00:00:00 Z
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec