cf 0.6.1.rc5 → 0.6.1.rc6

data/lib/cf/cli/populators/organization.rb

@@ -6,6 +6,10 @@ module CF
     class Organization < Base
       include PopulatorMethods
 
+      def changed
+        info[:space] = nil
+      end
+
       private
 
       def choices

data/lib/cf/cli/populators/populator_methods.rb

@@ -21,15 +21,27 @@ module CF
       private
 
       def get_object
+        previous_object = client.send(type, (info[type])) if info[type]
+
         if input.has?(type)
-          object = input[type]
+          if respond_to?(:finder_argument, true)
+            object = input[type, finder_argument]
+          else
+            object = input[type]
+          end
+
           with_progress("Switching to #{type} #{c(object.name, :name)}") {}
         elsif info[type]
-          previous_object = client.send(type, (info[type]))
           object = previous_object if valid?(previous_object)
         end
 
-        object || prompt_user
+        object ||= prompt_user
+
+        if (previous_object != object) && respond_to?(:changed, true)
+          changed
+        end
+
+        object
       end
 
       def prompt_user
@@ -49,4 +61,4 @@ module CF
       end
     end
   end
-end
+end

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

@@ -24,6 +24,10 @@ module CF
       def choices
         organization.spaces(:depth => 0)
       end
+
+      def finder_argument
+        organization
+      end
     end
   end
 end

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

@@ -37,7 +37,7 @@ module CF::Space
       if input[:target]
         invoke :target, :organization => space.organization, :space => space
       else
-        line c("Space created! Use #{b("switch-space #{space.name}")} to target it.", :good)
+        line c("Space created! Use #{b("`cf switch-space #{space.name}`")} to target it.", :good)
       end
     end
 

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

@@ -5,18 +5,18 @@ module CF::Space
     desc "Delete a space and its contents"
     group :spaces
     input :organization, :desc => "Space's organization",
-          :aliases => ["--org", "-o"], :from_given => by_name(:organization),
-          :default => proc { client.current_organization }
+      :aliases => ["--org", "-o"], :from_given => by_name(:organization),
+      :default => proc { client.current_organization }
     input :spaces, :desc => "Spaces to delete", :argument => :splat,
-          :singular => :space, :from_given => space_by_name
+      :singular => :space, :from_given => space_by_name
     input :recursive, :desc => "Delete recursively", :alias => "-r",
-          :default => false, :forget => true
+      :default => false, :forget => true
     input :warn, :desc => "Show warning if it was the last space",
-          :default => true
+      :default => true
     input :really, :type => :boolean, :forget => true, :hidden => true,
-          :default => proc { force? || interact }
+      :default => proc { force? || interact }
+
     def delete_space
-      org = input[:organization]
       spaces = input[:spaces, org]
 
       deleted_current = false
@@ -24,66 +24,27 @@ module CF::Space
       spaces.each do |space|
         next unless input[:really, space]
 
-        next unless clear_space(space)
-
-        deleted_current ||= space == client.current_space
+        deleted_current ||= (space == client.current_space)
 
-        with_progress("Deleting space #{c(space.name, :name)}") do
-          space.delete!
+        begin
+          with_progress("Deleting space #{c(space.name, :name)}") do
+            space.delete!
+          end
+        rescue CFoundry::APIError => boom
+          line
+          line c(boom.description, :bad)
+          line c("If you want to delete the space along with all dependent objects, rerun the command with the #{b("'--recursive'")} flag.", :bad)
         end
       end
 
-      org.invalidate!
-
-      if org.spaces.empty?
-        return unless input[:warn]
-
-        line
-        line c("There are no longer any spaces in #{b(org.name)}.", :warning)
-        line "You may want to create one with #{c("create-space", :good)}."
-      elsif deleted_current
-        invalidate_client
-        invoke :target, :organization => client.current_organization
-      end
-    end
-
-    def clear_space(space)
-      apps = space.apps
-      services = space.service_instances
-
-      return true if apps.empty? && services.empty?
-
-      unless force?
-        line "This space is not empty!"
+      if deleted_current
         line
-        line "apps: #{name_list(apps)}"
-        line "service: #{name_list(services)}"
-        line
-
-        return unless input[:recursive]
-      end
-
-      apps.each do |a|
-        invoke :delete, :app => a, :really => true
-      end
-
-      services.each do |i|
-        invoke :delete_service, :service => i, :really => true
+        line c("The space that you were targeting has now been deleted. Please use #{b("`cf target -s SPACE_NAME`")} to target a different one.", :warning)
       end
-
-      true
     end
 
     private
 
-    def ask_spaces(org)
-      spaces = org.spaces
-      fail "No spaces." if spaces.empty?
-
-      [ask("Which space in #{c(org.name, :name)}?", :choices => spaces,
-           :display => proc(&:name))]
-    end
-
     def ask_really(space)
       ask("Really delete #{c(space.name, :name)}?", :default => false)
     end

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

@@ -7,7 +7,13 @@ module CF::User
     input :email, :desc => "User email", :argument => :optional
     input :password, :desc => "User password"
     input :verify, :desc => "Repeat password"
+    input :organization, :desc => "User organization",
+      :aliases => %w{--org -o},
+      :default => proc { client.current_organization },
+      :from_given => by_name(:organization)
+
     def create_user
+      org = CF::Populators::Organization.new(input).populate_and_save!
       email = input[:email]
       password = input[:password]
 
@@ -15,8 +21,14 @@ module CF::User
         fail "Passwords don't match."
       end
 
+      user = nil
       with_progress("Creating user") do
-        client.register(email, password)
+        user = client.register(email, password)
+      end
+
+      with_progress("Adding user to #{org.name}") do
+        user.audited_organizations = user.managed_organizations = user.organizations = [org]
+        user.update!
       end
     end
 

data/lib/cf/version.rb

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

data/spec/cf/cli/populators/organization_spec.rb

@@ -6,7 +6,7 @@ describe CF::Populators::Organization do
   stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
   describe "#populate_and_save!" do
-    let(:tokens_file_path) { "~/.cf/tokens.yml" }
+    let(:tokens_file_path) { CF::TOKENS_FILE }
     let(:user) { stub! }
     let(:organizations) do
       [
@@ -25,6 +25,7 @@ describe CF::Populators::Organization do
       stub(client).current_user { user }
       stub(client).organization { organization }
       stub(client).current_organization { organization }
+      stub(client).target { 'https://api.some-domain.com' }
       any_instance_of(described_class) do |instance|
         stub(instance).client { client }
       end
@@ -74,6 +75,33 @@ describe CF::Populators::Organization do
         subject
         expect(output).to say("Switching to organization #{organization.name}")
       end
+
+      context "and a different organization and space in the token file" do
+        let(:input) { {:organization => organizations.last} }
+
+        before do
+          write_token_file({:organization => "organization-id-1", :space => "should-be-removed"})
+        end
+
+        it "removes the space from the token file" do
+          subject
+          refreshed_tokens = YAML.load_file(File.expand_path(tokens_file_path))
+          expect(refreshed_tokens["https://api.some-domain.com"][:space]).to be_nil
+        end
+
+      end
+
+      context "and the same organization and a space in the token file" do
+        before do
+          write_token_file({:organization => "organization-id-1", :space => "should-not-be-removed"})
+        end
+
+        it "does not remove the space from the token file" do
+          subject
+          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "should-not-be-removed"
+        end
+      end
+
     end
 
     context "without an organization in the input" do
@@ -127,4 +155,4 @@ describe CF::Populators::Organization do
       end
     end
   end
-end
+end

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

@@ -19,9 +19,10 @@ describe CF::Populators::Space do
       fake_client :organizations => [organization]
     end
 
-    let(:input) { {:space => space} }
+    let(:input_hash) { {:space => space} }
+    let(:inputs) { Mothership::Inputs.new(nil, nil, input_hash) }
     let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
-    let(:populator) { populator = CF::Populators::Space.new(Mothership::Inputs.new(nil, nil, input), organization) }
+    let(:populator) { CF::Populators::Space.new(inputs, organization) }
 
     before do
       stub(client).current_user { user }
@@ -53,8 +54,21 @@ describe CF::Populators::Space do
       subject.should == space
     end
 
+    describe "mothership input arguments" do
+      let(:inputs) do
+        Mothership::Inputs.new(nil, nil, input_hash).tap do |input|
+          mock(input).[](:space, organization) { space }
+          stub(input).[](anything) { space }
+        end
+      end
+
+      it "passes through extra arguments to the input call" do
+        subject
+      end
+    end
+
     context "with a space in the input" do
-      let(:input) { {:space => space} }
+      let(:input_hash) { {:space => space} }
       before { write_token_file({:space => "space-id-2"}) }
 
       it "uses that space" do
@@ -78,7 +92,7 @@ describe CF::Populators::Space do
     end
 
     context "without a space in the input" do
-      let(:input) { {} }
+      let(:input_hash) { {} }
 
       context "with a space in the config file" do
         it "should not reprompt for space" do
@@ -128,4 +142,4 @@ describe CF::Populators::Space do
       end
     end
   end
-end
+end

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

@@ -63,7 +63,7 @@ describe CF::Space::Create do
 
       it "tells the user how they can switch to the new space" do
         subject
-        expect(output).to say("Space created! Use switch-space #{new_space.name} to target it.")
+        expect(output).to say("Space created! Use `cf switch-space #{new_space.name}` to target it.")
       end
     end
   end

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

@@ -0,0 +1,91 @@
+require 'spec_helper'
+require "cf/cli/space/delete"
+
+describe CF::Space::Delete do
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:delete_space] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Delete a space and its contents" }
+      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
+    end
+
+    include_examples 'inputs must have descriptions'
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has the correct argument order' do
+        should eq([
+          {:type => :splat, :value => nil, :name => :spaces}
+        ])
+      end
+    end
+  end
+
+  describe "running the command" do
+    let(:space) { fake :space, :name => "some_space_name" }
+    let(:space_2) { fake :space, :name => "some_other_space_name" }
+    let(:spaces) { [space, space_2] }
+    let(:organization) { fake(:organization, :spaces => spaces, :name => "MyOrg") }
+
+    let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
+
+    subject { capture_output { cf %W[delete-space some_space_name some_other_space_name --quiet --force] } }
+
+    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)
+      end
+      stub(space).delete!
+      stub(space_2).delete!
+    end
+
+    it "deletes all named spaces" do
+      mock(space).delete!
+      mock(space_2).delete!
+
+      subject
+    end
+
+    context "without the force parameter" do
+      subject { cf %W[delete-space some_space_name some_other_space_name --quiet] }
+      it "confirms deletion of each space and deletes them" do
+        mock(space).delete!
+        dont_allow(space_2).delete!
+        mock_ask("Really delete #{space.name}?", {:default => false}) { true }
+        mock_ask("Really delete #{space_2.name}?", {:default => false}) { false }
+
+        subject
+      end
+    end
+
+    context "when deleting the current space" do
+      it "warns the user what they've done" do
+        stub(client).current_space { space }
+
+        subject
+        expect(output).to say("The space that you were targeting has now been deleted. Please use `cf target -s SPACE_NAME` to target a different one.")
+      end
+    end
+
+    context "when a space fails to delete" do
+      before do
+        stub(space).delete! { raise CFoundry::APIError.new("We don't delete children.", 40005) }
+        subject
+      end
+
+      it "shows the error message" do
+        expect(output).to say "We don't delete children."
+      end
+
+      it "informs the user of how to recursively delete" do
+        expect(output).to say "If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag."
+      end
+    end
+  end
+end

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

@@ -2,56 +2,79 @@ 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)
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:space] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Show space information" }
+      it { expect(Mothership::Help.group(:spaces)).to include(subject) }
     end
-  end
 
-  context "with --quiet" do
-    subject { cf %W[space some_space_name --quiet] }
+    include_examples 'inputs must have descriptions'
 
-    it "shows only the name" do
-      subject
-      expect(stdout.read).to eq("some_space_name\n")
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has the correct argument order' do
+        should eq([
+          { :type => :optional, :value => nil, :name => :space }
+        ])
+      end
     end
   end
 
-  context "with --no-quiet" do
-    subject { cf %W[space some_space_name --no-quiet] }
-
-    before { subject }
+  describe "running the command" 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) }
 
-    it "shows the space's name" do
-      expect(stdout.read).to include("some_space_name:")
+    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
 
-    it "shows the space's org" do
-      expect(stdout.read).to include("organization: Spacey Org")
-    end
+    context "with --quiet" do
+      subject { cf %W[space some_space_name --quiet] }
 
-    it "shows apps" do
-      expect(stdout.read).to include("apps: #{apps.first.name}, #{apps.last.name}")
+      it "shows only the name" do
+        subject
+        expect(stdout.read).to eq("some_space_name\n")
+      end
     end
 
-    it "shows services" do
-      expect(stdout.read).to include("services: #{services.first.name}, #{services.last.name}")
-    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}")
+      it "shows domains" do
+        expect(stdout.read).to include("domains: #{domains.first.name}, #{domains.last.name}")
+      end
     end
   end
 end

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

@@ -1,54 +1,100 @@
 require 'spec_helper'
 
 describe CF::User::Create do
-  let(:client) { fake_client }
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:create_user] }
 
-  before do
-    any_instance_of(described_class) { |cli| stub(cli).client { client } }
-    stub(client).register
-  end
-
-  subject { cf %W[create-user --#{bool_flag(:force)}] }
-
-  context "when the user is not logged in" do
-    let(:force) { true }
-
-    before do
-      stub(client).logged_in? { false }
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Create a user" }
+      it { expect(Mothership::Help.group(:admin, :user)).to include(subject) }
     end
 
-    it "tells the user to log in" do
-      subject
-      expect(stderr.string).to include("Please log in")
+    include_examples 'inputs must have descriptions'
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has the correct argument order' do
+        should eq([
+          { :type => :optional, :value => nil, :name => :email }
+        ])
+      end
     end
   end
 
-  context "when the user is logged in" do
-    let(:force) { false }
+  describe "running the command" do
+    let(:client) { fake_client }
+    let(:org) { fake(:organization) }
+    let(:user) { fake(:user) }
 
     before do
-      stub(client).logged_in? { true }
-      stub_ask("Email") { "some-angry-dude@example.com" }
-      stub_ask("Password", anything) { "password1" }
-      stub_ask("Verify Password", anything) { confirmation }
+      any_instance_of(described_class) { |cli| stub(cli).client { client } }
+      stub(client).register
     end
 
-    context "when the password does not match its confirmation" do
-      let(:confirmation) { "wrong" }
+    subject { cf %W[create-user --#{bool_flag(:force)}] }
+
+    context "when the user is not logged in" do
+      let(:force) { true }
 
-      it "displays an error message" do
+      before do
+        stub(client).logged_in? { false }
+      end
+
+      it "tells the user to log in" do
         subject
-        expect(stderr.string).to include("Passwords don't match")
+        expect(stderr.string).to include("Please log in")
       end
     end
 
-    context "when the password matches its confirmation" do
+    context "when the user is logged in" do
+      let(:force) { false }
       let(:confirmation) { "password1" }
 
-      it "creates a user" do
-        mock(client).register("some-angry-dude@example.com", "password1")
+      before do
+        stub(client).logged_in? { true }
+        stub_ask("Email") { "some-angry-dude@example.com" }
+        stub_ask("Password", anything) { "password1" }
+        stub_ask("Verify Password", anything) { confirmation }
+        stub(CF::Populators::Organization).new(instance_of(Mothership::Inputs)) { stub!.populate_and_save! { org } }
+
+        stub(client).register("some-angry-dude@example.com", "password1") { user }
+        stub(user).update!
+      end
+
+      it "ensures that an org is present" do
+        mock(CF::Populators::Organization).new(instance_of(Mothership::Inputs)) { stub!.populate_and_save! { org } }
         subject
       end
+
+      context "when the password does not match its confirmation" do
+        let(:confirmation) { "wrong" }
+
+        it "displays an error message" do
+          subject
+          expect(stderr.string).to include("Passwords don't match")
+        end
+      end
+
+      context "when the password matches its confirmation" do
+        it "creates a user" do
+          mock(client).register("some-angry-dude@example.com", "password1") { user }
+          stub(user).update!
+          subject
+        end
+
+        it "adds the user to the current org" do
+          stub(client).register(anything, anything) { user }
+          mock(user).update!
+
+          subject
+
+          user.organizations.should == [org]
+          user.managed_organizations.should == [org]
+          user.audited_organizations.should == [org]
+        end
+
+      end
     end
   end
 end

data/spec/features/account_lifecycle_spec.rb

@@ -25,39 +25,16 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     before do
       Interact::Progress::Dots.start!
+      login
     end
 
     after do
+      logout
       Interact::Progress::Dots.stop!
     end
 
     it "registers a new account and deletes it" do
       email = Faker::Internet.email
-      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
-        runner.wait_for_exit
-      end
-
-      BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
-        runner.wait_for_exit
-      end
-
-      BlueShell::Runner.run("#{cf_bin} login #{username} --password #{password}") do |runner|
-        expect(runner).to say(
-          "Organization>" => proc {
-            runner.send_keys organization
-            expect(runner).to say /Switching to organization .*\.\.\. OK/
-          },
-          "Switching to organization" => proc {}
-        )
-
-        expect(runner).to say(
-          "Space>" => proc {
-            runner.send_keys "1"
-            expect(runner).to say /Switching to space .*\.\.\. OK/
-          },
-          "Switching to space" => proc {}
-        )
-      end
 
       BlueShell::Runner.run("#{cf_bin} register #{email} --password p") do |runner|
         expect(runner).to say "Confirm Password>"
@@ -67,16 +44,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
         expect(runner).to say "Authenticating... OK"
       end
 
-      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
-        runner.wait_for_exit
-      end
-
-      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>"
-        runner.send_keys "1"
-      end
+      login
 
       # TODO: do this when cf delete-user is implemented
       #BlueShell::Runner.run("#{cf_bin} delete-user #{email}") do |runner|
@@ -99,7 +67,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
         expect(runner).to say "Password>"
         runner.send_keys "another_password"
         expect(runner).to say "Password>"
-        runner.send_keys "passwords_for_everyone"
+        runner.send_keys "passwords_for_everyone!"
         expect(runner).to say "FAILED"
         runner.output.should_not =~ /CFoundry::/
         runner.output.should_not =~ %r{~/\.cf/crash}

data/spec/features/create_user_spec.rb

@@ -0,0 +1,80 @@
+require "spec_helper"
+require "webmock/rspec"
+require "ffaker"
+
+if ENV['CF_V2_RUN_INTEGRATION']
+  describe 'A new user tries to use CF against v2 production', :ruby19 => true do
+    before(:all) do
+      WebMock.allow_net_connect!
+    end
+
+    after(:all) do
+      WebMock.disable_net_connect!
+    end
+
+    let(:target) { ENV['CF_V2_TEST_TARGET'] }
+    let(:username) { ENV['CF_V2_TEST_USER'] }
+    let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
+    let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
+
+    let(:client) do
+      client = CFoundry::V2::Client.new("https://#{target}")
+      client.login(username, password)
+      client
+    end
+
+    let(:new_user) { Faker::Internet.email }
+
+    before do
+      Interact::Progress::Dots.start!
+      login
+    end
+
+    after do
+      # TODO: do this when cf delete-user is implemented
+      #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"
+      #end
+
+      # TODO: not this.
+      client.login(new_user, "p")
+      user = client.current_user
+      guid = user.guid
+      client.login(username, password)
+      user.delete!
+      client.base.uaa.delete_user(guid)
+
+      logout
+      Interact::Progress::Dots.stop!
+    end
+
+    it "creates a new user" do
+      BlueShell::Runner.run("#{cf_bin} create-user") do |runner|
+        expect(runner).to say "Email>"
+        runner.send_keys new_user
+
+        expect(runner).to say "Password>"
+        runner.send_keys "p"
+
+        expect(runner).to say "Verify Password>"
+        runner.send_keys "p"
+
+        expect(runner).to say "Creating user... OK"
+        expect(runner).to say "Adding user to #{organization}... OK"
+      end
+
+      BlueShell::Runner.run("#{cf_bin} login #{new_user} --password p") do |runner|
+        expect(runner).to say "Authenticating... OK"
+
+        expect(runner).to say "Space>"
+        runner.send_keys "1"
+
+        expect(runner).to say /Switching to space.*OK/
+      end
+    end
+  end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide environment variables'
+end

data/spec/features/login_spec.rb

@@ -21,12 +21,11 @@ if ENV['CF_V2_RUN_INTEGRATION']
         runner.wait_for_exit
       end
 
-      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
-        runner.wait_for_exit
-      end
+      logout
     end
 
     after do
+      logout
       Interact::Progress::Dots.stop!
     end
 

data/spec/features/push_flow_spec.rb

@@ -19,50 +19,16 @@ if ENV['CF_V2_RUN_INTEGRATION']
       FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
       WebMock.allow_net_connect!
       Interact::Progress::Dots.start!
+      login
     end
 
     after do
       `#{cf_bin} delete #{app} -f -o --no-script`
+      logout
       Interact::Progress::Dots.stop!
     end
 
     it 'pushes a simple sinatra app using defaults as much as possible' do
-      BlueShell::Runner.run("#{cf_bin} logout") do |runner|
-        runner.wait_for_exit
-      end
-
-      BlueShell::Runner.run("#{cf_bin} target http://#{target}") do |runner|
-        expect(runner).to say %r{Setting target to http://#{target}... OK}
-      end
-
-      BlueShell::Runner.run("#{cf_bin} login") do |runner|
-        expect(runner).to say %r{target: https?://#{target}}
-
-        expect(runner).to say "Email>"
-        runner.send_keys username
-
-        expect(runner).to say "Password>"
-        runner.send_keys password
-
-        expect(runner).to say "Authenticating... OK"
-
-        expect(runner).to say(
-          "Organization>" => proc {
-            runner.send_keys organization
-            expect(runner).to say /Switching to organization .*\.\.\. OK/
-          },
-          "Switching to organization" => proc {}
-        )
-
-        expect(runner).to say(
-          "Space>" => proc {
-            runner.send_keys "1"
-            expect(runner).to say /Switching to space .*\.\.\. OK/
-          },
-          "Switching to space" => proc {}
-        )
-      end
-
       BlueShell::Runner.run("#{cf_bin} app #{app}") do |runner|
         expect(runner).to say "Unknown app '#{app}'."
       end

data/spec/features/space_spec.rb

@@ -0,0 +1,73 @@
+require "spec_helper"
+require "webmock/rspec"
+require "ffaker"
+
+if ENV['CF_V2_RUN_INTEGRATION']
+  describe 'A new user tries to use CF against v2 production', :ruby19 => true do
+    before(:all) do
+      WebMock.allow_net_connect!
+    end
+
+    after(:all) do
+      WebMock.disable_net_connect!
+    end
+
+    let(:target) { ENV['CF_V2_TEST_TARGET'] }
+    let(:username) { ENV['CF_V2_TEST_USER'] }
+    let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
+    let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
+    let(:space) { ENV['CF_V2_TEST_SPACE'] }
+
+    let(:client) do
+      client = CFoundry::V2::Client.new("https://#{target}")
+      client.login(username, password)
+      client
+    end
+
+    before do
+      Interact::Progress::Dots.start!
+      login
+    end
+
+    after do
+      logout
+      Interact::Progress::Dots.stop!
+    end
+
+    it "can get space info" do
+      BlueShell::Runner.run("#{cf_bin} space #{space} --no-quiet") do |runner|
+        expect(runner).to say("#{space}:\n")
+        expect(runner).to say("organization: #{organization}")
+      end
+    end
+
+    it "can create, switch, rename, and delete spaces" do
+      new_space = "test-space-#{rand(10000)}"
+      new_space_two = "test-space-renamed-#{rand(10000)}"
+      BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") do |runner|
+        expect(runner).to say("Creating space #{new_space}... OK")
+      end
+
+      BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") do |runner|
+        expect(runner).to say("Switching to space #{new_space}... OK")
+      end
+
+      BlueShell::Runner.run("#{cf_bin} rename-space #{new_space} #{new_space_two}") do |runner|
+        expect(runner).to say("Renaming to #{new_space_two}... OK")
+      end
+
+      BlueShell::Runner.run("#{cf_bin} delete-space #{new_space_two}") do |runner|
+        expect(runner).to say("Really delete")
+        runner.send_keys "y"
+
+        expect(runner).to say("Deleting space #{new_space_two}... OK")
+      end
+    end
+
+    it "shows all the spaces in the org" do
+      BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
+        expect(runner).to say(space)
+      end
+    end
+  end
+end

data/spec/features/switching_targets_spec.rb

@@ -9,12 +9,17 @@ if ENV['CF_V2_RUN_INTEGRATION']
     let(:space) { ENV['CF_V2_TEST_SPACE'] }
     let(:space2) { "#{ENV['CF_V2_TEST_SPACE']}-2"}
     let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
+    let(:organization_two) { ENV['CF_V2_TEST_ORGANIZATION_TWO'] }
+
+    let(:created_space_1) { "space-#{rand(10000)}"}
+    let(:created_space_2) { "space-#{rand(10000)}"}
 
     before do
       Interact::Progress::Dots.start!
     end
 
     after do
+      logout
       Interact::Progress::Dots.stop!
     end
 
@@ -31,37 +36,29 @@ if ENV['CF_V2_RUN_INTEGRATION']
       end
     end
 
-    it "can switch organizations and spaces" do
-      BlueShell::Runner.run("#{cf_bin} target #{target}")
-      BlueShell::Runner.run("#{cf_bin} logout")
-
-      BlueShell::Runner.run("#{cf_bin} login") do |runner|
-        expect(runner).to say "Email>"
-        runner.send_keys username
-
-        expect(runner).to say "Password>"
-        runner.send_keys password
-
-        expect(runner).to say "Authenticating... OK"
-      end
+    context "with created spaces in the second org" do
+      it "can switch organizations and spaces" do
+        login
 
-      BlueShell::Runner.run("#{cf_bin} target -o #{organization}") do |runner|
-        expect(runner).to say("Switching to organization #{organization}")
+        BlueShell::Runner.run("#{cf_bin} target -o #{organization_two}") do |runner|
+          expect(runner).to say("Switching to organization #{organization_two}")
+          expect(runner).to say("Space>")
+          runner.send_keys space2
 
-        expect(runner).to say("Space>")
-        runner.send_keys space2
+          expect(runner).to say(/Switching to space #{space2}/)
 
-        runner.wait_for_exit
-      end
+          runner.wait_for_exit
+        end
 
-      BlueShell::Runner.run("#{cf_bin} target -s #{space}") do |runner|
-        expect(runner).to say("Switching to space #{space}")
-        runner.wait_for_exit
-      end
+        BlueShell::Runner.run("#{cf_bin} target -s #{space}") do |runner|
+          expect(runner).to say("Switching to space #{space}")
+          runner.wait_for_exit
+        end
 
-      BlueShell::Runner.run("#{cf_bin} target -s #{space2}") do |runner|
-        expect(runner).to say("Switching to space #{space2}")
-        runner.wait_for_exit
+        BlueShell::Runner.run("#{cf_bin} target -s #{space2}") do |runner|
+          expect(runner).to say("Switching to space #{space2}")
+          runner.wait_for_exit
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -48,6 +48,7 @@ RSpec.configure do |c|
   c.include CliHelper
   c.include InteractHelper
   c.include ConfigHelper
+  c.include FeaturesHelper
 
   c.before(:all) do
     WebMock.disable_net_connect!

data/spec/support/features_helper.rb

@@ -0,0 +1,20 @@
+module FeaturesHelper
+  def login
+    set_target
+    logout
+
+    cmd = "yes 1 | #{cf_bin} login #{username} --password #{password} -o #{organization}"
+    cmd += " -s #{space}" if respond_to?(:space)
+    BlueShell::Runner.run(cmd) do |runner|
+      runner.wait_for_exit 30
+    end
+  end
+
+  def logout
+    BlueShell::Runner.run("#{cf_bin} logout")
+  end
+
+  def set_target
+    BlueShell::Runner.run("#{cf_bin} target #{target}")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc5
+  version: 0.6.1.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -335,6 +335,7 @@ files:
 - spec/cf/cli/service/unbind_spec.rb
 - spec/cf/cli/space/base_spec.rb
 - spec/cf/cli/space/create_spec.rb
+- spec/cf/cli/space/delete_spec.rb
 - spec/cf/cli/space/rename_spec.rb
 - spec/cf/cli/space/space_spec.rb
 - spec/cf/cli/space/spaces_spec.rb
@@ -348,13 +349,16 @@ files:
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
 - spec/features/account_lifecycle_spec.rb
+- spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
 - spec/features/push_flow_spec.rb
+- spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/config_helper.rb
 - spec/support/fake_home_dir.rb
+- spec/support/features_helper.rb
 - spec/support/interact_helper.rb
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb
@@ -373,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 544715593409945959
+      hash: -4051249069800079153
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -418,6 +422,7 @@ test_files:
 - spec/cf/cli/service/unbind_spec.rb
 - spec/cf/cli/space/base_spec.rb
 - spec/cf/cli/space/create_spec.rb
+- spec/cf/cli/space/delete_spec.rb
 - spec/cf/cli/space/rename_spec.rb
 - spec/cf/cli/space/space_spec.rb
 - spec/cf/cli/space/spaces_spec.rb
@@ -431,13 +436,16 @@ test_files:
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
 - spec/features/account_lifecycle_spec.rb
+- spec/features/create_user_spec.rb
 - spec/features/login_spec.rb
 - spec/features/push_flow_spec.rb
+- spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli_helper.rb
 - spec/support/config_helper.rb
 - spec/support/fake_home_dir.rb
+- spec/support/features_helper.rb
 - spec/support/interact_helper.rb
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb