cf 0.6.1.rc4 → 0.6.1.rc5

data/lib/cf/cli.rb

@@ -111,7 +111,7 @@ module CF
       err e.message
     rescue CFoundry::InvalidAuthToken => e
       line
-      line c("Invalid authentication token. Try logging in again with 'cf login'", :warning)
+      line c("Invalid authentication token. Try logging in again with 'cf login'. If problems continue, please contact your Cloud Operator.", :warning)
     rescue CFoundry::Forbidden => e
       if !$cf_asked_auth
         $cf_asked_auth = true

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

@@ -4,14 +4,16 @@ require "cf/cli/populators/organization"
 module CF
   module Space
     class Base < CLI
+      attr_reader :org
+
       def precondition
         check_target
         check_logged_in
-        check_organization
       end
 
-      def check_organization
-        CF::Populators::Organization.new(input).populate_and_save!
+      def run(name)
+        @org = CF::Populators::Organization.new(input).populate_and_save!
+        super(name)
       end
 
       def self.space_by_name

data/lib/cf/cli/space/create.rb

@@ -16,39 +16,26 @@ module CF::Space
     input :auditor, :desc => "Add yourself as auditor", :default => false
 
     def create_space
-      # TODO: ask org instead
-      return invoke :help,
-        :command => "create-space" if input[:organization].nil?
-
       space = client.space
-      space.organization = input[:organization]
+      space.organization = org
       space.name = input[:name]
 
-      with_progress("Creating space #{c(space.name, :name)}") do
-        space.create!
-      end
+      with_progress("Creating space #{c(space.name, :name)}") { space.create! }
 
       if input[:manager]
-        with_progress("Adding you as a manager") do
-          space.add_manager client.current_user
-        end
+        with_progress("Adding you as a manager") { space.add_manager client.current_user }
       end
 
       if input[:developer]
-        with_progress("Adding you as a developer") do
-          space.add_developer client.current_user
-        end
+        with_progress("Adding you as a developer") { space.add_developer client.current_user }
       end
 
       if input[:auditor]
-        with_progress("Adding you as an auditor") do
-          space.add_auditor client.current_user
-        end
+        with_progress("Adding you as an auditor") { space.add_auditor client.current_user }
       end
 
       if input[:target]
-        invoke :target, :organization => space.organization,
-          :space => space
+        invoke :target, :organization => space.organization, :space => space
       else
         line c("Space created! Use #{b("switch-space #{space.name}")} to target it.", :good)
       end

data/lib/cf/cli/space/rename.rb

@@ -11,7 +11,6 @@ module CF::Space
           :from_given => by_name(:space)
     input :name, :desc => "New space name", :argument => :optional
     def rename_space
-      org = input[:organization]
       space = input[:space, org]
       name = input[:name]
 

data/lib/cf/cli/space/space.rb

@@ -14,8 +14,7 @@ module CF::Space
     input :full, :desc => "Show full information for apps, services, etc.",
           :default => false
     def space
-      org = input[:organization]
-      space = input[:space, org]
+      space = CF::Populators::Space.new(input, org).populate_and_save!
 
       unless space
         return if quiet?

data/lib/cf/cli/space/spaces.rb

@@ -12,8 +12,8 @@ module CF
       input :name, :desc => "Filter by name"
       input :full, :desc => "Show full information for apps, services, etc.",
         :default => false
+
       def spaces
-        org = input[:organization]
         spaces =
           with_progress("Getting spaces in #{c(org.name, :name)}") do
             org.spaces(:depth => quiet? ? 0 : 1).sort_by(&:name)

data/lib/cf/cli/space/switch.rb

@@ -6,7 +6,9 @@ module CF::Space
     group :spaces, :hidden => true
     input :name, :desc => "Space name", :argument => true
     def switch_space
-      if (space = client.space_by_name(input[:name]))
+      space = client.space_by_name(input[:name])
+
+      if space
         invoke :target, :space => space
       else
         raise CF::UserError, "The space #{input[:name]} does not exist, please create the space first."

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.1.rc4".freeze
+  VERSION = "0.6.1.rc5".freeze
 end

data/spec/cf/cli/space/base_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require "cf/cli/app/base"
+
+describe CF::Space::Base do
+  describe '#run' do
+    subject { CF::Space::Base.new }
+
+    it "uses a populator to set organization" do
+      org = stub
+      mock(CF::Populators::Organization).new(instance_of(Mothership::Inputs)) { stub!.populate_and_save! { org } }
+      stub(subject).send()
+
+      subject.run(:some_command)
+      subject.org.should == org
+    end
+  end
+
+  describe '.space_by_name' do
+    subject { CF::Space::Base::space_by_name }
+    let(:org) do
+      Object.new.tap do |o|
+        mock(o).space_by_name("mySpace").returns(space)
+      end
+    end
+
+    context "with a space" do
+      let(:space) { mock }
+      it "returns a space matching the name from the given org" do
+        subject.call("mySpace", org).should == space
+      end
+    end
+
+    context "with no matching space" do
+      let(:space) { nil }
+      it "fails when no space matches the name" do
+        expect {
+          subject.call("mySpace", org)
+        }.to raise_exception
+      end
+    end
+  end
+end

data/spec/cf/cli/space/create_spec.rb

@@ -33,8 +33,6 @@ describe CF::Space::Create do
 
     let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
 
-
-
     before do
       stub(client).space { new_space }
       stub(new_space).create!
@@ -46,7 +44,7 @@ describe CF::Space::Create do
 
         stub(cli).check_logged_in
         stub(cli).check_target
-        stub(cli).check_organization
+        any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
       end
     end
 
@@ -67,44 +65,6 @@ describe CF::Space::Create do
         subject
         expect(output).to say("Space created! Use switch-space #{new_space.name} to target it.")
       end
-
-      it_should_behave_like "a_command_that_populates_organization" do
-        before do
-          any_instance_of described_class do |cli|
-            stub.proxy(cli).check_organization
-          end
-        end
-      end
-
-    end
-
-    context "when we don't specify an organization" do
-      subject { cf %W[create-space #{new_space.name}] }
-
-      context "when we have a default organization" do
-        it "uses that organization to create a space" do
-          subject
-
-          stdout.rewind
-          expect(stdout.readline).to include "Creating space"
-        end
-      end
-
-      context "when we don't have a default organization" do
-        let(:organization) { nil }
-
-        it "shows the help for the command" do
-          subject
-
-          stdout.rewind
-          expect(stdout.readline).to include "Create a space in an organization"
-        end
-
-        it "does not try to create the space" do
-          new_space.create! { raise "should not call this method" } # rr not behaving
-          subject
-        end
-      end
     end
   end
 end

data/spec/cf/cli/space/rename_spec.rb

@@ -13,7 +13,7 @@ describe CF::Space::Rename do
 
       stub(cli).check_logged_in
       stub(cli).check_target
-      stub(cli).check_organization
+      any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
     end
   end
 
@@ -76,15 +76,6 @@ describe CF::Space::Rename do
     context 'when no name is provided, but a space is' do
       subject { cf %W[rename-space --space #{renamed_space.name} --no-force] }
 
-      it_should_behave_like "a_command_that_populates_organization" do
-        subject { cf %W[rename-space --no-force --no-quiet #{renamed_space}] }
-        before do
-          any_instance_of described_class do |cli|
-            stub.proxy(cli).check_organization
-          end
-        end
-      end
-
       it 'asks for the new name and renames' do
         dont_allow_ask("Rename which space?", anything)
         mock_ask("New name") { new_name }

data/spec/cf/cli/space/space_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'stringio'
+
+describe CF::Space::Space do
+  let(:apps) { fake_list(:app, 2) }
+  let(:domains) { fake_list(:domain, 2) }
+  let(:services) { fake_list(:service_instance, 2) }
+  let!(:space_1) { fake(:space, :name => "some_space_name", :apps => apps, :service_instances => services, :domains => domains) }
+  let(:spaces) { [space_1] }
+  let(:organization) { fake(:organization, :name => "Spacey Org", :spaces => spaces) }
+  let(:client) { fake_client(:spaces => spaces, :current_organization => organization) }
+
+  before do
+    any_instance_of described_class do |cli|
+      stub(cli).client { client }
+      stub(cli).check_logged_in
+      stub(cli).check_target
+      any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
+      any_instance_of(CF::Populators::Space, :populate_and_save! => space_1)
+    end
+  end
+
+  context "with --quiet" do
+    subject { cf %W[space some_space_name --quiet] }
+
+    it "shows only the name" do
+      subject
+      expect(stdout.read).to eq("some_space_name\n")
+    end
+  end
+
+  context "with --no-quiet" do
+    subject { cf %W[space some_space_name --no-quiet] }
+
+    before { subject }
+
+    it "shows the space's name" do
+      expect(stdout.read).to include("some_space_name:")
+    end
+
+    it "shows the space's org" do
+      expect(stdout.read).to include("organization: Spacey Org")
+    end
+
+    it "shows apps" do
+      expect(stdout.read).to include("apps: #{apps.first.name}, #{apps.last.name}")
+    end
+
+    it "shows services" do
+      expect(stdout.read).to include("services: #{services.first.name}, #{services.last.name}")
+    end
+
+    it "shows domains" do
+      expect(stdout.read).to include("domains: #{domains.first.name}, #{domains.last.name}")
+    end
+  end
+end

data/spec/cf/cli/space/spaces_spec.rb

@@ -7,7 +7,7 @@ describe CF::Space::Spaces do
   let!(:space_2) { fake(:space, :name => "aa_first", :apps => [fake(:app)], :service_instances => fake_list(:service_instance, 3), :domains => [fake(:domain)]) }
   let!(:space_3) { fake(:space, :name => "cc_last", :apps => fake_list(:app, 2), :service_instances => fake_list(:service_instance, 2), :domains => fake_list(:domain, 2)) }
   let(:spaces) { [space_1, space_2, space_3]}
-  let(:organization) { fake(:organization, :spaces => spaces) }
+  let(:organization) { fake(:organization, :spaces => spaces, :name => 'foo') }
   let(:client) { fake_client(:spaces => spaces, :current_organization => organization) }
 
   before do
@@ -15,7 +15,7 @@ describe CF::Space::Spaces do
       stub(cli).client { client }
       stub(cli).check_logged_in
       stub(cli).check_target
-      stub(cli).check_organization
+      any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
     end
   end
 
@@ -74,14 +74,6 @@ describe CF::Space::Spaces do
   end
 
   context 'when there are spaces' do
-    it_should_behave_like "a_command_that_populates_organization" do
-      before do
-        any_instance_of described_class do |cli|
-          stub.proxy(cli).check_organization
-        end
-      end
-    end
-
     context 'and the full flag is given' do
       let(:full) { true }
 

data/spec/cf/cli/space/switch_space_spec.rb

@@ -13,9 +13,8 @@ describe CF::Space::Switch do
 
       stub(cli).check_logged_in
       stub(cli).check_target
-      stub(cli).check_organization
+      any_instance_of(CF::Populators::Organization, :populate_and_save! => organization)
     end
-
   end
 
   describe 'metadata' do
@@ -39,7 +38,6 @@ describe CF::Space::Switch do
 
   subject { cf %W[--no-quiet switch-space #{space_to_switch_to.name} --no-color] }
 
-
   context "when the space exists" do
     before do
       any_instance_of(Mothership) do |m|
@@ -50,14 +48,6 @@ describe CF::Space::Switch do
     it "switches to that space" do
       subject
     end
-
-    it_should_behave_like "a_command_that_populates_organization" do
-      before do
-        any_instance_of described_class do |cli|
-          stub.proxy(cli).check_organization
-        end
-      end
-    end
   end
 
   context "when the space does not exist" do

data/spec/cf/cli_spec.rb

@@ -76,7 +76,7 @@ describe CF::CLI do
 
       it "tells the user they are not authenticated" do
         subject
-        expect(stdout.string).to include "Invalid authentication token. Try logging in again with 'cf login'"
+        expect(stdout.string).to include "Invalid authentication token. Try logging in again with 'cf login'. If problems continue, please contact your Cloud Operator."
       end
 
       it "exits without attempting to login again" do

data/spec/features/account_lifecycle_spec.rb

@@ -33,15 +33,15 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     it "registers a new account and deletes it" do
       email = Faker::Internet.email
-      run("#{cf_bin} logout") do |runner|
+      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} target #{target}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} login #{username} --password #{password}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} login #{username} --password #{password}") do |runner|
         expect(runner).to say(
           "Organization>" => proc {
             runner.send_keys organization
@@ -59,7 +59,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
         )
       end
 
-      run("#{cf_bin} register #{email} --password p") do |runner|
+      BlueShell::Runner.run("#{cf_bin} register #{email} --password p") do |runner|
         expect(runner).to say "Confirm Password>"
         runner.send_keys 'p'
         expect(runner).to say "Your password strength is: good"
@@ -67,11 +67,11 @@ if ENV['CF_V2_RUN_INTEGRATION']
         expect(runner).to say "Authenticating... OK"
       end
 
-      run("#{cf_bin} logout") do |runner|
+      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
         runner.wait_for_exit
       end
 
-      run("#{cf_bin} login #{username} --password #{password}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} login #{username} --password #{password}") do |runner|
         expect(runner).to say "Organization>"
         runner.send_keys "1"
         expect(runner).to say "Space>"
@@ -79,7 +79,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
       end
 
       # TODO: do this when cf delete-user is implemented
-      #run("#{cf_bin} delete-user #{email}") do |runner|
+      #BlueShell::Runner.run("#{cf_bin} delete-user #{email}") do |runner|
       #  expect(runner).to say "Really delete user #{email}?>"
       #  runner.send_keys "y"
       #  expect(runner).to say "Deleting #{email}... OK"
@@ -93,7 +93,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
       user.delete!
       client.base.uaa.delete_user(guid)
 
-      run("#{cf_bin} login #{email} --password p") do |runner|
+      BlueShell::Runner.run("#{cf_bin} login #{email} --password p") do |runner|
         expect(runner).to say "Authenticating... FAILED"
 
         expect(runner).to say "Password>"