cf 3.0.0 → 3.0.1.rc1

data/lib/cf/cli.rb

@@ -132,18 +132,28 @@ module CF
       log_error(e)
 
       err "Denied: #{e.description}"
+    rescue CFoundry::StagingError => e
+      message = "Application failed to stage"
+      formatted_exception_output(e, message)
 
     rescue Exception => e
-      log_error(e)
+      formatted_exception_output(e, add_exception_name_to_msg(e))
+    end
 
-      msg = e.class.name
-      msg << ": #{e}" unless e.to_s.empty?
-      msg << "\nFor more information, see #{CF::CRASH_FILE}"
+    def formatted_exception_output(e, msg)
+      log_error(e)
+      msg << "\ncat #{CF::CRASH_FILE} # for more details"
       err msg
 
       raise if debug?
     end
 
+    def add_exception_name_to_msg(e)
+      msg = e.class.name
+      msg << ": #{e}" unless e.to_s.empty?
+      msg
+    end
+
     def execute(cmd, argv, global = {})
       if input[:help]
         invoke :help, :command => cmd.name.to_s

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

@@ -31,28 +31,8 @@ module CF
         end
       end
 
-      def memory_choices(exclude = 0)
-        info = client.info
-
-        usage = info[:usage]
-        limit = info[:limits][:memory]
-
-        ceiling =
-          if usage
-            used = usage[:memory]
-            limit - used + exclude
-          else
-            limit
-          end
-
-        mem = 64
-        choices = []
-        until mem > ceiling
-          choices << human_mb(mem)
-          mem *= 2
-        end
-
-        choices
+      def memory_choices
+        [128, 256, 512, 1024].map{|n| human_mb(n)}
       end
 
       def human_mb(num)

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

@@ -15,11 +15,11 @@ module CF::App
 
       options = {
         :choices => choices + ["none"],
-        :display => proc { |d| d.is_a?(String) ? d : d.name },
+        :display => proc { |choice| choice.is_a?(String) ? choice : choice.name },
         :allow_other => true
       }
 
-      options[:default] = choices.first if choices.size == 1
+      options[:default] = choices.first
 
       ask "Domain", options
     end
@@ -28,7 +28,7 @@ module CF::App
       ask("Memory Limit",
           :choices => memory_choices,
           :allow_other => true,
-          :default => default || "64M")
+          :default => default || "128M")
     end
 
     def ask_instances

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

@@ -56,7 +56,7 @@ module CF::App
     end
 
     def ask_memory(default)
-      ask("Memory Limit", :choices => memory_choices(default),
+      ask("Memory Limit", :choices => memory_choices,
           :default => human_mb(default), :allow_other => true)
     end
   end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.1.rc1".freeze
 end

data/spec/cf/cli/app/push/create_spec.rb

@@ -439,34 +439,6 @@ module CF
           end
         end
       end
-
-      describe "#memory_choices" do
-        let(:info) { {} }
-
-        before do
-          client.stub(:info).and_return(info)
-        end
-
-        context "when the user has usage information" do
-          let(:info) do
-            {:usage => {:memory => 512},
-              :limits => {:memory => 2048}
-            }
-          end
-
-          it "asks for the memory with the ceiling taking the memory usage into account" do
-            expect(push_command.memory_choices).to eq(%w[64M 128M 256M 512M 1G])
-          end
-        end
-
-        context "when the user does not have usage information" do
-          let(:info) { {:limits => {:memory => 2048}} }
-
-          it "asks for the memory with the ceiling as their overall limit" do
-            expect(push_command.memory_choices).to eq(%w[64M 128M 256M 512M 1G 2G])
-          end
-        end
-      end
     end
   end
 end

data/spec/cf/cli/app/push/interactions_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+
+module CF::App
+  class PushInteractionClass
+    include PushInteractions
+    def ask(question, options); end
+  end
+
+  describe PushInteractionClass do
+    let(:domains) { [build(:domain), build(:domain)]}
+    let(:app){ build(:app, :space => build(:space, :domains => domains)) }
+
+    describe "#ask_domain" do
+      it "uses all space domains as choices with optional none" do
+        subject.should_receive(:ask).with("Domain", anything) do |_, options|
+          expect(options[:choices]).to eq(domains + ["none"])
+        end
+
+        subject.ask_domain(app)
+      end
+
+      it "has always a default value" do
+        subject.should_receive(:ask).with("Domain", anything) do |_, options|
+          expect(options[:default]).to eq domains.first
+        end
+
+        subject.ask_domain(app)
+      end
+    end
+  end
+end

data/spec/cf/cli_spec.rb

@@ -43,6 +43,32 @@ module CF
           :with_message => "user friendly"
       end
 
+      context "with a CFoundry::StagingError" do
+        let(:exception) { CFoundry::StagingError.new("whatever", 170001, nil, nil) }
+        let(:action) { proc { raise exception } }
+        before { exception.should_receive(:backtrace).at_least(1).times.and_return([]) }
+
+        it "prints the message" do
+          subject
+          expect(stderr.string).to include "Application failed to stage"
+        end
+
+        it "sets the exit code to 1" do
+          context.should_receive(:exit_status).with(1)
+          subject
+        end
+
+        it "does mention ~/.cf/crash" do
+          subject
+          expect(stderr.string).to include CF::CRASH_FILE
+        end
+
+        it "logs the error" do
+          context.should_receive(:log_error).with(anything)
+          subject
+        end
+      end
+
       context "with a SystemExit" do
         let(:action) { proc { exit 1 } }
 

data/spec/factories/cfoundry/v2/spaces_factory.rb

@@ -2,6 +2,7 @@ FactoryGirl.define do
   factory :space, :class => CFoundry::V2::Space do
     sequence(:guid) { |n| "space-guid-#{n}" }
     sequence(:name) { |n| "space-name-#{n}" }
+    domains { [build(:domain)] }
 
     ignore do
       client { FactoryGirl.build(:client) }
@@ -9,4 +10,4 @@ FactoryGirl.define do
 
     initialize_with { new(guid, client) }
   end
-end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 3.0.0
-  prerelease: 
+  version: 3.0.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.2.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.2.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -476,6 +476,7 @@ files:
 - spec/cf/cli/app/delete_spec.rb
 - spec/cf/cli/app/instances_spec.rb
 - spec/cf/cli/app/push/create_spec.rb
+- spec/cf/cli/app/push/interactions_spec.rb
 - spec/cf/cli/app/push_spec.rb
 - spec/cf/cli/app/rename_spec.rb
 - spec/cf/cli/app/scale_spec.rb
@@ -565,15 +566,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 428685765814888758
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
@@ -635,6 +639,7 @@ test_files:
 - spec/cf/cli/app/delete_spec.rb
 - spec/cf/cli/app/instances_spec.rb
 - spec/cf/cli/app/push/create_spec.rb
+- spec/cf/cli/app/push/interactions_spec.rb
 - spec/cf/cli/app/push_spec.rb
 - spec/cf/cli/app/rename_spec.rb
 - spec/cf/cli/app/scale_spec.rb