engineyard-serverside 2.2.0.pre3 → 2.2.0.rc1

data/lib/engineyard-serverside/cli.rb

@@ -30,7 +30,7 @@ module EY
       stack_option
       verbose_option
 
-      desc "deploy", "Deploy code from /data/<app>"
+      desc "deploy", "Deploy code to /data/<app>"
       def deploy(default_task=:deploy)
         init_and_propagate(options, default_task.to_s) do |servers, config, shell|
           EY::Serverside::Deploy.new(servers, config, shell).send(default_task)

data/lib/engineyard-serverside/dependency_manager/bundler.rb

@@ -4,7 +4,7 @@ module EY
   module Serverside
     class DependencyManager
       class Bundler < Base
-        DEFAULT_VERSION = "1.3.4"
+        DEFAULT_VERSION = "1.3.5"
 
         def self.default_version
           DEFAULT_VERSION

data/lib/engineyard-serverside/deploy.rb

@@ -393,6 +393,7 @@ YML
         cmd
       end
 
+      # FIXME: Legacy method, warn and remove.
       def serverside_bin
         About.binary
       end

data/lib/engineyard-serverside/maintenance.rb

@@ -19,7 +19,7 @@ module EY
           enable
           shell.status "Maintenance page enabled"
         else
-          shell.fatal "Cannot enabled maintenance page. Application #{config.app_name} has never been deployed."
+          shell.fatal "Cannot enable maintenance page. Application #{config.app_name} has never been deployed."
           false
         end
       end
@@ -29,7 +29,7 @@ module EY
           disable
           shell.status "Maintenance page disabled"
         else
-          shell.fatal "Cannot enabled maintenance page. Application #{config.app_name} has never been deployed."
+          shell.fatal "Cannot disable maintenance page. Application #{config.app_name} has never been deployed."
           false
         end
       end

data/lib/engineyard-serverside/rails_assets.rb

@@ -43,6 +43,7 @@ module EY
           elsif paths.public_assets.exist?
             shell.status "Skipping asset precompilation. ('public/assets' directory already exists.)"
           else
+            shell.status "Precompiling assets. ('#{app_assets}' exists, 'public/assets' not found, not disabled in config.)"
             precompile_detected_assets
           end
         end
@@ -78,7 +79,6 @@ module EY
       end
 
       def precompile_detected_assets
-        shell.status "Precompiling assets. ('#{app_assets}' exists, 'public/assets' not found, not disabled in config.)"
         if !runner.rails_application?
           shell.warning "Precompiling assets even though Rails was not bundled."
         end
@@ -86,15 +86,15 @@ module EY
         run_precompile_assets_task
 
         shell.warning <<-WARN
-Assets were detected and precompiled for this application, but asset precompile
-failures may be silently ignored in the future without updating config/ey.yml.
+Assets were detected and precompiled for this application,
+but asset precompile failures may be silently ignored in the future.
 
-ACTION REQUIRED: Add this line to config/ey.yml to ensure assets are compiled
-every deploy and deploys are halted if there is an asset compilation failure.
+ACTION REQUIRED: Add or update config/ey.yml in your project to
+ensure assets are compiled every deploy and halted on failure.
 
-  precompile_assets: true  # precompile assets when assets are changed.
+  precompile_assets: true  # precompile assets
 
-This warning will continue to show until you update and commit config/ey.yml.
+This warning will continue until you update and commit config/ey.yml.
         WARN
       rescue EY::Serverside::RemoteFailure => e
         # If we are implicitly precompiling, we want to fail non-destructively

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.2.0.pre3'
+    VERSION = '2.2.0.rc1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre3
+  version: 2.2.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec