vmc 0.5.0.rc1 → 0.5.0.rc2

data/spec/vmc/cli/user/delete_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+require "vmc/cli/user/delete"
+
+describe VMC::User::Delete do
+  let(:global) { { :color => false, :quiet => true } }
+  let(:inputs) { { :email => "user@example.com"} }
+  let(:given) { {} }
+  let(:client) { fake_client }
+  let(:app) {}
+
+  before do
+    any_instance_of(VMC::CLI) do |cli|
+      stub(cli).client { client }
+    end
+  end
+
+  subject { Mothership.new.invoke(:delete_user, inputs, given, global) }
+
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:delete_user] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Delete a user" }
+      it { expect(Mothership::Help.group(:admin, :user)).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 => :normal, :value => nil, :name => :email }
+        ])
+      end
+    end
+  end
+
+  describe "deleting a user" do
+    context "when targeting a V2 API" do
+      before do
+        stub(client).version { 2 }
+      end
+
+      it_behaves_like "an error that gets passed through",
+        :with_exception => VMC::UserError,
+        :with_message => "Not implemented for v2."
+    end
+  end
+end

data/spec/vmc/cli/user/passwd_spec.rb

@@ -39,7 +39,7 @@ describe VMC::User::Passwd do
       stub(client).logged_in? { true }
       stub(client).current_user { user }
       stub(client).register
-      stub(client).password_score(new_password) { score }
+      stub(client).base.stub!.password_score(new_password) { score }
     end
 
     subject { vmc %W[passwd --password #{old_password} --new-password #{new_password} --verify #{verify_password} --no-force --debug] }

data/spec/vmc/cli/user/register_spec.rb

@@ -37,7 +37,7 @@ describe VMC::User::Register do
         stub(cli).precondition { nil }
       end
       stub(client).register
-      stub(client).password_score(password) { score }
+      stub(client).base.stub!.password_score(password) { score }
     end
 
     subject { vmc %W[register --email #{email} --password #{password} --verify #{verify_password} --#{bool_flag(:login)} --#{bool_flag(:force)}] }

data/spec/vmc/cli_spec.rb

@@ -1,17 +1,10 @@
 require 'spec_helper'
 
-class NoWrapErrorsDummy < VMC::CLI
-  def wrap_errors
-    yield
-  end
-end
-
 describe VMC::CLI do
-  let(:context) { NoWrapErrorsDummy.new }
+  let(:context) { VMC::CLI.new }
   let(:command) { nil }
 
   describe "#wrap_errors" do
-    let(:context) { VMC::CLI.new }
     let(:inputs) { {} }
 
     subject do
@@ -21,33 +14,6 @@ describe VMC::CLI do
       end
     end
 
-    shared_examples_for "an error that's obvious to the user" do |options|
-      message = options[:with_message]
-
-      it "prints the message" do
-        subject
-        expect(stderr.string).to include message
-      end
-
-      it "sets the exit code to 1" do
-        mock(context).exit_status(1)
-        subject
-      end
-
-      it "does not mention ~/.vmc/crash" do
-        subject
-        expect(stderr.string).to_not include VMC::CRASH_FILE
-      end
-    end
-
-    shared_examples_for "an error that gets passed through" do |options|
-      exception = options[:with_exception]
-
-      it "reraises the error" do
-        expect { subject }.to raise_error(exception)
-      end
-    end
-
     context "with a CFoundry::Timeout" do
       let(:action) { proc { raise CFoundry::Timeout.new(123, "fizzbuzz") } }
 
@@ -177,7 +143,7 @@ describe VMC::CLI do
       let(:auth_token) { CFoundry::AuthToken.new("old-header") }
       let(:new_auth_token) { CFoundry::AuthToken.new("new-header") }
 
-      class TokenRefreshDummy < NoWrapErrorsDummy
+      class TokenRefreshDummy < VMC::CLI
         class << self
           attr_accessor :new_token
         end
@@ -443,6 +409,42 @@ describe VMC::CLI do
         expect(context.client).to eq(nil)
       end
     end
+
+    context "with a v1 cloud controller" do
+      before do
+        stub(context).target_info { { :version => 1} }
+      end
+
+      it "connects using the v1 api" do
+        expect(context.client).to be_a(CFoundry::V1::Client)
+      end
+
+      context "with a proxy user" do
+        before { stub(context).input { {:proxy => 'foo@example.com'} } }
+
+        it "uses the provided client proxy user" do
+          expect(context.client.proxy).to eq('foo@example.com')
+        end
+      end
+    end
+
+    context "with a v2 cloud controller" do
+      before do
+        stub(context).target_info { { :version => 2} }
+      end
+
+      it "connects using the v2 api" do
+        expect(context.client).to be_a(CFoundry::V2::Client)
+      end
+
+      context "with a proxy user" do
+        before { stub(context).input { {:proxy => 'foo@example.com'} } }
+
+        it "foo" do
+          expect {context.client}.to raise_error(VMC::UserError, "User switching not implemented for v2.")
+        end
+      end
+    end
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -237385856
+  hash: -31870830
   prerelease: 6
   segments: 
   - 0
   - 5
   - 0
   - rc
-  - 1
-  version: 0.5.0.rc1
+  - 2
+  version: 0.5.0.rc2
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,11 +18,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-21 00:00:00 Z
+date: 2013-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: json_pure
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +31,11 @@ dependencies:
         - 1
         - 6
         version: "1.6"
+  prerelease: false
   type: :runtime
+  name: json_pure
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: multi_json
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +46,11 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  prerelease: false
   type: :runtime
+  name: multi_json
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: interact
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,24 +61,24 @@ dependencies:
         - 0
         - 5
         version: "0.5"
+  prerelease: false
   type: :runtime
+  name: interact
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: cfoundry
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -237385842
+        hash: -31870828
         segments: 
         - 0
         - 5
         - 1
         - rc
-        - 2
-        version: 0.5.1.rc2
+        - 5
+        version: 0.5.1.rc5
     - - <
       - !ruby/object:Gem::Version 
         hash: 7
@@ -88,11 +86,11 @@ dependencies:
         - 0
         - 6
         version: "0.6"
+  prerelease: false
   type: :runtime
+  name: cfoundry
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: clouseau
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -103,11 +101,11 @@ dependencies:
         - 0
         - 0
         version: "0.0"
+  prerelease: false
   type: :runtime
+  name: clouseau
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: mothership
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +124,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  prerelease: false
   type: :runtime
+  name: mothership
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: manifests-vmc-plugin
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -141,11 +139,11 @@ dependencies:
         - 0
         - 6
         version: "0.6"
+  prerelease: false
   type: :runtime
+  name: manifests-vmc-plugin
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: tunnel-vmc-plugin
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -156,11 +154,11 @@ dependencies:
         - 0
         - 2
         version: "0.2"
+  prerelease: false
   type: :runtime
+  name: tunnel-vmc-plugin
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rake
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -171,11 +169,11 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  prerelease: false
   type: :development
+  name: rake
   requirement: *id009
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rspec
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -186,11 +184,11 @@ dependencies:
         - 2
         - 11
         version: "2.11"
+  prerelease: false
   type: :development
+  name: rspec
   requirement: *id010
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: webmock
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -201,11 +199,11 @@ dependencies:
         - 1
         - 9
         version: "1.9"
+  prerelease: false
   type: :development
+  name: webmock
   requirement: *id011
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rr
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -216,7 +214,9 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  prerelease: false
   type: :development
+  name: rr
   requirement: *id012
 description: 
 email: 
@@ -281,7 +281,7 @@ files:
 - lib/vmc/cli/space/rename.rb
 - lib/vmc/cli/space/space.rb
 - lib/vmc/cli/space/spaces.rb
-- lib/vmc/cli/space/take.rb
+- lib/vmc/cli/space/switch.rb
 - lib/vmc/cli/start/base.rb
 - lib/vmc/cli/start/colors.rb
 - lib/vmc/cli/start/info.rb
@@ -303,23 +303,29 @@ files:
 - lib/vmc/plugin.rb
 - lib/vmc/spacing.rb
 - lib/vmc/spec_helper.rb
-- lib/vmc/test_support/command_helper.rb
-- lib/vmc/test_support/common_input_examples.rb
-- lib/vmc/test_support/fake_home_dir.rb
-- lib/vmc/test_support/interact_helper.rb
 - lib/vmc/test_support.rb
 - lib/vmc/version.rb
 - lib/vmc.rb
 - spec/assets/hello-sinatra/Gemfile
+- spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
 - spec/assets/specker_runner/specker_runner_input.rb
 - spec/assets/specker_runner/specker_runner_pause.rb
 - spec/console_app_specker/console_app_specker_matchers_spec.rb
 - spec/console_app_specker/specker_runner_spec.rb
-- spec/features/new_user_flow_spec.rb
+- spec/features/v1/new_user_flow_spec.rb
+- spec/features/v2/account_lifecycle_spec.rb
+- spec/features/v2/push_flow_spec.rb
 - spec/spec_helper.rb
+- spec/support/command_helper.rb
+- spec/support/config_helper.rb
 - spec/support/console_app_specker_matchers.rb
+- spec/support/fake_home_dir.rb
+- spec/support/interact_helper.rb
+- spec/support/shared_examples/errors.rb
+- spec/support/shared_examples/input.rb
 - spec/support/specker_runner.rb
+- spec/support/tracking_expector.rb
 - spec/vmc/cli/app/base_spec.rb
 - spec/vmc/cli/app/delete_spec.rb
 - spec/vmc/cli/app/instances_spec.rb
@@ -327,6 +333,7 @@ files:
 - spec/vmc/cli/app/push_spec.rb
 - spec/vmc/cli/app/rename_spec.rb
 - spec/vmc/cli/app/scale_spec.rb
+- spec/vmc/cli/app/start_spec.rb
 - spec/vmc/cli/app/stats_spec.rb
 - spec/vmc/cli/domain/map_spec.rb
 - spec/vmc/cli/domain/unmap_spec.rb
@@ -339,12 +346,16 @@ files:
 - spec/vmc/cli/service/rename_spec.rb
 - spec/vmc/cli/service/service_spec.rb
 - spec/vmc/cli/service/unbind_spec.rb
+- spec/vmc/cli/space/create_spec.rb
 - spec/vmc/cli/space/rename_spec.rb
 - spec/vmc/cli/space/spaces_spec.rb
+- spec/vmc/cli/space/switch_space_spec.rb
 - spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/start/login_spec.rb
 - spec/vmc/cli/start/logout_spec.rb
+- spec/vmc/cli/start/target_spec.rb
 - spec/vmc/cli/user/create_spec.rb
+- spec/vmc/cli/user/delete_spec.rb
 - spec/vmc/cli/user/passwd_spec.rb
 - spec/vmc/cli/user/register_spec.rb
 - spec/vmc/cli_spec.rb
@@ -381,21 +392,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vmc
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files: 
 - spec/assets/hello-sinatra/Gemfile
+- spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
 - spec/assets/specker_runner/specker_runner_input.rb
 - spec/assets/specker_runner/specker_runner_pause.rb
 - spec/console_app_specker/console_app_specker_matchers_spec.rb
 - spec/console_app_specker/specker_runner_spec.rb
-- spec/features/new_user_flow_spec.rb
+- spec/features/v1/new_user_flow_spec.rb
+- spec/features/v2/account_lifecycle_spec.rb
+- spec/features/v2/push_flow_spec.rb
 - spec/spec_helper.rb
+- spec/support/command_helper.rb
+- spec/support/config_helper.rb
 - spec/support/console_app_specker_matchers.rb
+- spec/support/fake_home_dir.rb
+- spec/support/interact_helper.rb
+- spec/support/shared_examples/errors.rb
+- spec/support/shared_examples/input.rb
 - spec/support/specker_runner.rb
+- spec/support/tracking_expector.rb
 - spec/vmc/cli/app/base_spec.rb
 - spec/vmc/cli/app/delete_spec.rb
 - spec/vmc/cli/app/instances_spec.rb
@@ -403,6 +424,7 @@ test_files:
 - spec/vmc/cli/app/push_spec.rb
 - spec/vmc/cli/app/rename_spec.rb
 - spec/vmc/cli/app/scale_spec.rb
+- spec/vmc/cli/app/start_spec.rb
 - spec/vmc/cli/app/stats_spec.rb
 - spec/vmc/cli/domain/map_spec.rb
 - spec/vmc/cli/domain/unmap_spec.rb
@@ -415,12 +437,16 @@ test_files:
 - spec/vmc/cli/service/rename_spec.rb
 - spec/vmc/cli/service/service_spec.rb
 - spec/vmc/cli/service/unbind_spec.rb
+- spec/vmc/cli/space/create_spec.rb
 - spec/vmc/cli/space/rename_spec.rb
 - spec/vmc/cli/space/spaces_spec.rb
+- spec/vmc/cli/space/switch_space_spec.rb
 - spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/start/login_spec.rb
 - spec/vmc/cli/start/logout_spec.rb
+- spec/vmc/cli/start/target_spec.rb
 - spec/vmc/cli/user/create_spec.rb
+- spec/vmc/cli/user/delete_spec.rb
 - spec/vmc/cli/user/passwd_spec.rb
 - spec/vmc/cli/user/register_spec.rb
 - spec/vmc/cli_spec.rb