vmc 0.5.0.beta.7 → 0.5.0.beta.10

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

@@ -2,10 +2,7 @@ require 'spec_helper'
 require 'stringio'
 
 describe VMC::Space::Spaces do
-  let(:global) { { :color => false } }
-  let(:inputs) { {} }
-  let(:given) { {} }
-  let(:output) { StringIO.new }
+  let(:full) { false }
   let!(:space_1) { fake(:space, :name => "bb_second", :apps => fake_list(:app, 2), :service_instances => [fake(:service_instance)]) }
   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)) }
@@ -14,18 +11,12 @@ describe VMC::Space::Spaces do
   let(:client) { fake_client(:spaces => spaces, :current_organization => organization) }
 
   before do
-    any_instance_of(VMC::CLI) do |cli|
+    any_instance_of described_class do |cli|
       stub(cli).client { client }
       stub(cli).precondition { nil }
     end
   end
 
-  subject do
-    with_output_to output do
-      Mothership.new.invoke(:spaces, inputs, given, global)
-    end
-  end
-
   describe 'metadata' do
     let(:command) { Mothership.commands[:spaces] }
 
@@ -45,19 +36,21 @@ describe VMC::Space::Spaces do
     end
   end
 
+  subject { vmc %W[spaces --#{bool_flag(:full)} --no-quiet] }
+
   it 'should have the correct first two lines' do
     subject
 
-    output.rewind
-    expect(output.readline).to match /Getting spaces.*OK/
-    expect(output.readline).to eq "\n"
+    stdout.rewind
+    expect(stdout.readline).to match /Getting spaces.*OK/
+    expect(stdout.readline).to eq "\n"
   end
 
   context 'when there are no spaces' do
     let(:spaces) { [] }
 
     context 'and the full flag is given' do
-      let(:inputs) { {:full => true} }
+      let(:full) { true }
 
       it 'displays yaml-style output with all space details' do
         any_instance_of VMC::Space::Spaces do |spaces|
@@ -71,16 +64,16 @@ describe VMC::Space::Spaces do
       it 'should show only the progress' do
         subject
 
-        output.rewind
-        expect(output.readline).to match /Getting spaces.*OK/
-        expect(output).to be_eof
+        stdout.rewind
+        expect(stdout.readline).to match /Getting spaces.*OK/
+        expect(stdout).to be_eof
       end
     end
   end
 
   context 'when there are spaces' do
     context 'and the full flag is given' do
-      let(:inputs) { {:full => true} }
+      let(:full) { true }
 
       it 'displays yaml-style output with all space details' do
         any_instance_of VMC::Space::Spaces do |spaces|
@@ -96,15 +89,15 @@ describe VMC::Space::Spaces do
       it 'displays tabular output with names, spaces and domains' do
         subject
 
-        output.rewind
-        output.readline
-        output.readline
+        stdout.rewind
+        stdout.readline
+        stdout.readline
 
-        expect(output.readline).to match /name\s+apps\s+services/
+        expect(stdout.readline).to match /name\s+apps\s+services/
         spaces.sort_by(&:name).each do |space|
-          expect(output.readline).to match /#{space.name}\s+#{name_list(space.apps)}\s+#{name_list(space.service_instances)}/
+          expect(stdout.readline).to match /#{space.name}\s+#{name_list(space.apps)}\s+#{name_list(space.service_instances)}/
         end
-        expect(output).to be_eof
+        expect(stdout).to be_eof
       end
     end
   end

data/spec/vmc/cli/start/info_spec.rb

@@ -1,36 +1,31 @@
 require 'spec_helper'
 
 describe VMC::Start::Info do
-  let(:global) { { :color => false } }
-  let(:inputs) { {} }
-  let(:given) { {} }
-  let(:output) { StringIO.new }
+  let(:frameworks) { false }
+  let(:runtimes) { false }
+  let(:services) { false }
+  let(:all) { false }
 
-  let(:client) {
+  let(:client) do
     fake_client :frameworks => fake_list(:framework, 3),
       :runtimes => fake_list(:runtime, 3),
-      :services => fake_list(:service, 3)
-  }
+      :services => fake_list(:service, 3),
+      :token => CFoundry::AuthToken.new("bearer some-access-token")
+  end
 
-  let(:target_info) {
-    { :description => "Some description",
+  let(:target_info) do
+    {:description => "Some description",
       :version => 2,
       :support => "http://example.com"
     }
-  }
+  end
 
   before do
-    any_instance_of(VMC::CLI) do |cli|
+    any_instance_of described_class do |cli|
       stub(cli).client { client }
     end
   end
 
-  subject do
-    with_output_to output do
-      Mothership.new.invoke(:info, inputs, given, global)
-    end
-  end
-
   describe 'metadata' do
     let(:command) { Mothership.commands[:info] }
 
@@ -57,23 +52,26 @@ describe VMC::Start::Info do
     end
   end
 
+
+  subject { vmc %W[info --#{bool_flag(:frameworks)} --#{bool_flag(:runtimes)} --#{bool_flag(:services)} --#{bool_flag(:all)} --no-force --no-quiet] }
+
   context 'when given no flags' do
     it "displays target information" do
       mock(client).info { target_info }
 
       subject
 
-      output.rewind
-      expect(output.readline).to eq "Some description\n"
-      expect(output.readline).to eq "\n"
-      expect(output.readline).to eq "target: #{client.target}\n"
-      expect(output.readline).to eq "  version: 2\n"
-      expect(output.readline).to eq "  support: http://example.com\n"
+      stdout.rewind
+      expect(stdout.readline).to eq "Some description\n"
+      expect(stdout.readline).to eq "\n"
+      expect(stdout.readline).to eq "target: #{client.target}\n"
+      expect(stdout.readline).to eq "  version: 2\n"
+      expect(stdout.readline).to eq "  support: http://example.com\n"
     end
   end
 
   context 'when given --frameworks' do
-    let(:inputs) { { :frameworks => true } }
+    let(:frameworks) { true }
 
     it 'does not grab /info' do
       dont_allow(client).info
@@ -83,19 +81,19 @@ describe VMC::Start::Info do
     it 'lists frameworks on the target' do
       subject
 
-      output.rewind
-      expect(output.readline).to match /Getting frameworks.*OK/
-      expect(output.readline).to eq "\n"
-      expect(output.readline).to match /framework\s+description/
+      stdout.rewind
+      expect(stdout.readline).to match /Getting frameworks.*OK/
+      expect(stdout.readline).to eq "\n"
+      expect(stdout.readline).to match /framework\s+description/
 
       client.frameworks.sort_by(&:name).each do |f|
-        expect(output.readline).to match /#{f.name}\s+#{f.description}/
+        expect(stdout.readline).to match /#{f.name}\s+#{f.description}/
       end
     end
   end
 
   context 'when given --runtimes' do
-    let(:inputs) { { :runtimes => true } }
+    let(:runtimes) { true }
 
     it 'does not grab /info' do
       dont_allow(client).info
@@ -105,19 +103,19 @@ describe VMC::Start::Info do
     it 'lists runtimes on the target' do
       subject
 
-      output.rewind
-      expect(output.readline).to match /Getting runtimes.*OK/
-      expect(output.readline).to eq "\n"
-      expect(output.readline).to match /runtime\s+description/
+      stdout.rewind
+      expect(stdout.readline).to match /Getting runtimes.*OK/
+      expect(stdout.readline).to eq "\n"
+      expect(stdout.readline).to match /runtime\s+description/
 
       client.runtimes.sort_by(&:name).each do |r|
-        expect(output.readline).to match /#{r.name}\s+#{r.description}/
+        expect(stdout.readline).to match /#{r.name}\s+#{r.description}/
       end
     end
   end
 
   context 'when given --services' do
-    let(:inputs) { { :services => true } }
+    let(:services) { true }
 
     it 'does not grab /info' do
       dont_allow(client).info
@@ -127,29 +125,29 @@ describe VMC::Start::Info do
     it 'lists services on the target' do
       subject
 
-      output.rewind
-      expect(output.readline).to match /Getting services.*OK/
-      expect(output.readline).to eq "\n"
-      expect(output.readline).to match /service\s+version\s+provider\s+plans\s+description/
+      stdout.rewind
+      expect(stdout.readline).to match /Getting services.*OK/
+      expect(stdout.readline).to eq "\n"
+      expect(stdout.readline).to match /service\s+version\s+provider\s+plans\s+description/
 
       client.services.sort_by(&:label).each do |s|
-        expect(output.readline).to match /#{s.label}\s+#{s.version}\s+#{s.provider}.+#{s.description}/
+        expect(stdout.readline).to match /#{s.label}\s+#{s.version}\s+#{s.provider}.+#{s.description}/
       end
     end
   end
 
   context 'when given --all' do
-    let(:inputs) { { :all => true } }
+    let(:all) { true }
 
     it 'combines --frameworks --runtimes and --services' do
       mock(client).info { target_info }
 
       subject
 
-      output.rewind
-      expect(output.readline).to match /Getting runtimes.*OK/
-      expect(output.readline).to match /Getting frameworks.*OK/
-      expect(output.readline).to match /Getting services.*OK/
+      stdout.rewind
+      expect(stdout.readline).to match /Getting runtimes.*OK/
+      expect(stdout.readline).to match /Getting frameworks.*OK/
+      expect(stdout.readline).to match /Getting services.*OK/
     end
   end
 end

data/spec/vmc/cli/start/login_spec.rb

@@ -28,4 +28,44 @@ describe VMC::Start::Login do
       end
     end
   end
+
+  describe "running the command" do
+    use_fake_home_dir { home_dir }
+
+    let(:home_dir) do
+      tmp_root = Dir.tmpdir
+      FileUtils.cp_r(File.expand_path("#{SPEC_ROOT}/fixtures/fake_home_dirs/new"), tmp_root)
+      "#{tmp_root}/new"
+    end
+
+    let(:auth_token) { CFoundry::AuthToken.new("bearer some-new-access-token", "some-new-refresh-token") }
+
+    after { FileUtils.rm_rf home_dir }
+
+    before do
+      any_instance_of(CFoundry::V2::Client) do |client|
+        stub(client).login("my-username", "my-password") { auth_token }
+        stub(client).login_prompts do
+          {
+            :username => ["text", "Username"],
+            :password => ["password", "8-digit PIN"]
+          }
+        end
+        stub(client).organizations { [] }
+      end
+    end
+
+    subject { vmc ["login", "--no-force"] }
+
+    it "logs in with the provided credentials and saves the token data to the YAML file" do
+      stub_ask("Username", {}) { "my-username" }
+      stub_ask("8-digit PIN", { :echo => "*", :forget => true}) { "my-password" }
+
+      subject
+
+      tokens_yaml = YAML.load_file(File.expand_path("~/.vmc/tokens.yml"))
+      expect(tokens_yaml["https://api.some-domain.com"][:token]).to eq("bearer some-new-access-token")
+      expect(tokens_yaml["https://api.some-domain.com"][:refresh_token]).to eq("some-new-refresh-token")
+    end
+  end
 end

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

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe VMC::User::Create do
+  let(:client) { fake_client }
+
+  before do
+    any_instance_of(described_class) { |cli| stub(cli).client { client } }
+    stub(client).register
+  end
+
+  subject { vmc %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 }
+    end
+
+    it "tells the user to log in" do
+      subject
+      expect(stderr.string).to include("Please log in")
+    end
+  end
+
+  context "when the user is logged in" do
+    let(:force) { false }
+
+    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 }
+    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
+      let(:confirmation) { "password1" }
+
+      it "creates a user" do
+        mock(client).register("some-angry-dude@example.com", "password1")
+        subject
+      end
+    end
+  end
+end

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

@@ -22,34 +22,27 @@ describe VMC::User::Passwd do
 
   describe '#passwd' do
     let(:client) { fake_client }
-    let(:output) { StringIO.new }
-    let(:out) { output.string }
     let(:old_password) { "old" }
     let(:new_password) { "password" }
     let(:verify_password) { new_password }
     let(:score) { :strong }
-
     let(:guid) { random_string("my-object-guid") }
     let(:user_model) { fake_model { attribute :password, :object } }
     let(:user_object) { user_model.new(guid, client) }
     let(:user) { user_object.fake(:password => 'foo') }
 
     before do
-      stub(VMC::CLI).exit { |code| code }
-      any_instance_of(VMC::CLI) do |cli|
+      any_instance_of described_class do |cli|
         stub(cli).client { client }
         stub(cli).precondition { nil }
       end
+      stub(client).logged_in? { true }
       stub(client).current_user { user }
       stub(client).register
       stub(client).base.stub!.uaa.stub!.password_score(new_password) { score }
     end
 
-    subject do
-      with_output_to output do
-        VMC::CLI.start %W(passwd --password #{old_password} --new-password #{new_password} --verify #{verify_password} --force --debug)
-      end
-    end
+    subject { vmc %W[passwd --password #{old_password} --new-password #{new_password} --verify #{verify_password} --no-force --debug] }
 
     context 'when the passwords dont match' do
       let(:verify_password) { "other_password" }
@@ -58,12 +51,12 @@ describe VMC::User::Passwd do
 
       it 'fails' do
         subject
-        expect(out).to include "Passwords do not match."
+        expect(stderr.string).to include "Passwords do not match."
       end
 
       it "doesn't print out the score" do
         subject
-        expect(out).not_to include "strength"
+        expect(stdout.string).not_to include "strength"
       end
 
       it "doesn't log in or register" do
@@ -81,7 +74,7 @@ describe VMC::User::Passwd do
 
       it 'prints out the password score' do
         subject
-        expect(out).to include "Your password strength is: strong"
+        expect(stdout.string).to include "Your password strength is: strong"
       end
 
       it 'changes the password' do
@@ -97,7 +90,7 @@ describe VMC::User::Passwd do
 
       it 'prints out the password score' do
         subject
-        expect(out).to include "Your password strength is: weak"
+        expect(stderr.string).to include "Your password strength is: weak"
       end
 
       it "doesn't change the password" do

data/spec/vmc/cli/{start → user}/register_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe VMC::Start::Register do
+describe VMC::User::Register do
   describe 'metadata' do
     let(:command) { Mothership.commands[:register] }
 
     describe 'command' do
       subject { command }
       its(:description) { should eq "Create a user and log in" }
-      it { expect(Mothership::Help.group(:start)).to include(subject) }
+      it { expect(Mothership::Help.group(:admin, :user)).to include(subject) }
     end
 
     include_examples 'inputs must have descriptions'
@@ -24,18 +24,15 @@ describe VMC::Start::Register do
 
   describe '#register' do
     let(:client) { fake_client }
-    let(:output) { StringIO.new }
-    let(:out) { output.string }
-    let(:email) { "a@b.com" }
-    let(:password) { "password" }
+    let(:email) { 'a@b.com' }
+    let(:password) { 'password' }
     let(:verify_password) { password }
     let(:force) { false }
     let(:login) { false }
     let(:score) { :strong }
 
     before do
-      stub(VMC::CLI).exit { |code| code }
-      any_instance_of(VMC::CLI) do |cli|
+      any_instance_of described_class do |cli|
         stub(cli).client { client }
         stub(cli).precondition { nil }
       end
@@ -43,11 +40,7 @@ describe VMC::Start::Register do
       stub(client).base.stub!.uaa.stub!.password_score(password) { score }
     end
 
-    subject do
-      with_output_to output do
-        VMC::CLI.start %W(register --email #{email} --password #{password} --verify #{verify_password} #{login ? '--login' : '--no-login'} #{force ? '--force' : '--no-force'} --debug)
-      end
-    end
+    subject { vmc %W[register --email #{email} --password #{password} --verify #{verify_password} --#{bool_flag(:login)} --#{bool_flag(:force)}] }
 
     context 'when the passwords dont match' do
       let(:verify_password) { "other_password" }
@@ -56,17 +49,17 @@ describe VMC::Start::Register do
 
       it 'fails' do
         subject
-        expect(out).to include "Passwords do not match."
+        expect(stderr.string).to include "Passwords do not match."
       end
 
       it "doesn't print out the score" do
         subject
-        expect(out).not_to include "strength"
+        expect(stdout.string).not_to include "strength"
       end
 
       it "doesn't log in or register" do
         dont_allow(client).register
-        any_instance_of VMC::Start::Register do |register|
+        any_instance_of(described_class) do |register|
           dont_allow(register).invoke
         end
         subject
@@ -78,7 +71,7 @@ describe VMC::Start::Register do
         it "doesn't verify the password" do
           mock(client).register(email, password)
           subject
-          expect(out).not_to include "Passwords do not match."
+          expect(stderr.string).not_to include "Passwords do not match."
         end
       end
     end
@@ -88,7 +81,7 @@ describe VMC::Start::Register do
 
       it 'prints out the password score' do
         subject
-        expect(out).to include "Your password strength is: strong"
+        expect(stdout.string).to include "Your password strength is: strong"
       end
 
       it 'registers the user' do
@@ -100,7 +93,7 @@ describe VMC::Start::Register do
         let(:login) { true }
 
         it 'logs in' do
-          any_instance_of VMC::Start::Register do |register|
+          any_instance_of(described_class) do |register|
             mock(register).invoke(:login, :username => email, :password => password)
           end
           subject
@@ -109,7 +102,7 @@ describe VMC::Start::Register do
 
       context 'and the login flag is false' do
         it "doesn't log in" do
-          any_instance_of VMC::Start::Register do |register|
+          any_instance_of(described_class) do |register|
             dont_allow(register).invoke(:login, :username => email, :password => password)
           end
           subject
@@ -125,7 +118,7 @@ describe VMC::Start::Register do
 
       it 'prints out the password score' do
         subject
-        expect(out).to include "Your password strength is: weak"
+        expect(stderr.string).to include "Your password strength is: weak"
       end
 
       it "doesn't register" do
@@ -134,11 +127,22 @@ describe VMC::Start::Register do
       end
 
       it "doesn't log in" do
-        any_instance_of VMC::Start::Register do |register|
+        any_instance_of(described_class) do |register|
           dont_allow(register).invoke(:login, :username => email, :password => password)
         end
         subject
       end
     end
+
+    context 'when arguments are not passed in the command line' do
+      subject { vmc %W[register --no-force --no-login] }
+
+      it 'asks for the email, password and confirm password' do
+        mock_ask("Email") { email }
+        mock_ask("Password", anything) { password }
+        mock_ask("Confirm Password", anything) { verify_password }
+        subject
+      end
+    end
   end
 end