cf 4.2.10.rc1 → 4.2.10.rc2

data/lib/cf/cli/app/push.rb

@@ -54,6 +54,8 @@ module CF::App
       apply_changes(app)
       display_changes(app)
       commit_changes(app)
+
+      warn "\n#{c(app.name, :name)} is currently stopped, start it with 'cf start'" unless app.started?
     end
 
     def setup_new_app(path)

data/lib/cf/cli/app/start.rb

@@ -28,7 +28,7 @@ module CF::App
         stream_start_log(log) if log
         check_application(app)
 
-        if app.debug_mode && !quiet?
+        if !app.debug_mode.nil? && app.debug_mode != "none" && !quiet?
           line
           invoke :instances, :app => app
         end
@@ -64,14 +64,13 @@ module CF::App
 
     # set app debug mode, ensuring it's valid, and shutting it down
     def switch_mode(app, mode)
-      mode = nil if mode == "none"
       mode = "run" if mode == "" # no value given
 
       return false if app.debug == mode
 
-      if mode.nil?
+      if mode == "none"
         with_progress("Removing debug mode") do
-          app.debug = nil
+          app.debug = mode
           app.stop! if app.started?
         end
 

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.2.10.rc1".freeze
+  VERSION = "4.2.10.rc2".freeze
 end

data/lib/manifests/plugin.rb

@@ -74,6 +74,8 @@ class ManifestsPlugin < CF::App::Base
       return
     end
 
+    line(c("--path is ignored when using a manifest. Please specify the path in the manifest.", :warning)) if input.has?(:path)
+
     particular, external = apps_in_manifest(input)
 
     unless external.empty?

data/spec/cf/cli/app/push_spec.rb

@@ -40,6 +40,7 @@ module CF
         before do
           app.stub(:upload)
           app.changes = {}
+          push.stub(:warn)
         end
 
         subject do
@@ -72,6 +73,17 @@ module CF
           subject
         end
 
+        context "when the app is stopped" do
+          before do
+            app.stub(:started?).and_return(false)
+          end
+
+          it "warns the user" do
+            push.should_receive(:warn).with("\n#{app.name} is currently stopped, start it with 'cf start'")
+            subject
+          end
+        end
+
         context "when no inputs are given" do
           let(:inputs) { {} }
 

data/spec/cf/cli/app/start_spec.rb

@@ -235,7 +235,7 @@ module CF
             let(:mode) { "none" }
 
             it "removes the debug mode" do
-              expect { execute_start_app_with_mode }.to change { app.debug }.from("in_debug").to(nil)
+              expect { execute_start_app_with_mode }.to change { app.debug }.from("in_debug").to("none")
             end
           end
 

data/spec/manifests/plugin_spec.rb

@@ -316,6 +316,19 @@ describe ManifestsPlugin do
           end
         end
       end
+
+      context "and --path is specified too" do
+        let(:given_hash) { { :path => "/somewhere/else" } }
+
+        it "warns the user that --path will be ignored" do
+          plugin.stub(:line)
+          plugin.stub(:push_with_manifest)
+
+          subject
+
+          expect(plugin).to have_received(:line).with("--path is ignored when using a manifest. Please specify the path in the manifest.")
+        end
+      end
     end
 
     context "without a manifest" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.10.rc1
+  version: 4.2.10.rc2
   prerelease: 7
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -614,7 +614,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1557605910592806796
+      hash: -1580609269505927435
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: