vmc 0.4.7 → 0.5.0.beta.1

data/lib/vmc/cli/start/login.rb

@@ -1,54 +1,25 @@
-require "vmc/detect"
 require "vmc/cli/start/base"
+require "vmc/cli/start/target_interactions"
 
 module VMC::Start
   class Login < Base
     desc "Authenticate with the target"
     group :start
-    input :username, :alias => "--email", :argument => :optional,
-          :desc => "Account email"
+    input :username, :value => :email, :desc => "Account email",
+          :alias => "--email", :argument => :optional
     input :password, :desc => "Account password"
-    input(:organization, :aliases => ["--org", "-o"],
-          :from_given => by_name("organization"),
-          :desc => "Organization") {
-      orgs = client.organizations(:depth => 0)
-
-      if orgs.empty?
-        unless quiet?
-          line
-          line c("There are no organizations.", :warning)
-          line "You may want to create one with #{c("create-org", :good)}."
-        end
-      elsif orgs.size == 1 && !input.interactive?(:organization)
-        orgs.first
-      else
-        ask("Organization",
-            :choices => orgs.sort_by(&:name),
-            :display => proc(&:name))
-      end
-    }
-    input(:space, :alias => "-s",
-          :from_given => by_name("space"),
-          :desc => "Space") { |org|
-      spaces = org.spaces(:depth => 0)
-
-      if spaces.empty?
-        unless quiet?
-          line
-          line c("There are no spaces in #{b(org.name)}.", :warning)
-          line "You may want to create one with #{c("create-space", :good)}."
-        end
-      else
-        ask("Space", :choices => spaces, :display => proc(&:name))
-      end
-    }
+    input :organization, :desc => "Organization" , :aliases => %w{--org -o},
+          :from_given => by_name(:organization)
+    input :space, :desc => "Space", :alias => "-s",
+          :from_given => by_name(:space)
+    interactions TargetInteractions
     def login
       show_context
 
       credentials =
-          { :username => input[:username],
-            :password => input[:password]
-          }
+        { :username => input[:username],
+          :password => input[:password]
+        }
 
       prompts = client.login_prompts
 

data/lib/vmc/cli/start/logout.rb

@@ -1,4 +1,3 @@
-require "vmc/detect"
 require "vmc/cli/start/base"
 
 module VMC::Start

data/lib/vmc/cli/start/register.rb

@@ -1,21 +1,13 @@
-require "vmc/detect"
 require "vmc/cli/start/base"
 
 module VMC::Start
   class Register < Base
     desc "Create a user and log in"
     group :start, :hidden => true
-    input(:email, :argument => true, :desc => "Desired email") {
-      ask("Email")
-    }
-    input(:password, :desc => "Desired password") {
-      ask("Password", :echo => "*", :forget => true)
-    }
-    input(:verify, :desc => "Repeat password") {
-      ask("Confirm Password", :echo => "*", :forget => true)
-    }
-    input :login, :type => :boolean, :default => true,
-      :desc => "Automatically log in?"
+    input :email, :desc => "Desired email", :argument => :optional
+    input :password, :desc => "Desired password"
+    input :verify, :desc => "Repeat password"
+    input :login, :desc => "Automatically log in?", :default => true
     def register
       show_context
 
@@ -34,5 +26,19 @@ module VMC::Start
         invoke :login, :username => email, :password => password
       end
     end
+
+    private
+
+    def ask_email
+      ask("Email")
+    end
+
+    def ask_passsword
+      ask("Password", :echo => "*", :forget => true)
+    end
+
+    def ask_verify
+      ask("Confirm Password", :echo => "*", :forget => true)
+    end
   end
 end

data/lib/vmc/cli/start/target.rb

@@ -1,45 +1,16 @@
-require "vmc/detect"
 require "vmc/cli/start/base"
+require "vmc/cli/start/target_interactions"
 
 module VMC::Start
   class Target < Base
     desc "Set or display the target cloud, organization, and space"
     group :start
-    input :url, :argument => :optional, :desc => "Target URL to switch to"
-    input(:organization, :aliases => ["--org", "-o"],
-          :from_given => by_name("organization"),
-          :desc => "Organization") {
-      orgs = client.organizations(:depth => 0)
-
-      if orgs.empty?
-        unless quiet?
-          line
-          line c("There are no organizations.", :warning)
-          line "You may want to create one with #{c("create-org", :good)}."
-        end
-      elsif orgs.size == 1 && !input.interactive?(:organization)
-        orgs.first
-      else
-        ask("Organization",
-            :choices => orgs.sort_by(&:name),
-            :display => proc(&:name))
-      end
-    }
-    input(:space, :alias => "-s",
-          :from_given => by_name("space"),
-          :desc => "Space") { |org|
-      spaces = org.spaces(:depth => 0)
-
-      if spaces.empty?
-        unless quiet?
-          line
-          line c("There are no spaces in #{b(org.name)}.", :warning)
-          line "You may want to create one with #{c("create-space", :good)}."
-        end
-      else
-        ask("Space", :choices => spaces, :display => proc(&:name))
-      end
-    }
+    input :url, :desc => "Target URL to switch to", :argument => :optional
+    input :organization, :desc => "Organization" , :aliases => %w{--org -o},
+          :from_given => by_name(:organization)
+    input :space, :desc => "Space", :alias => "-s",
+          :from_given => by_name(:space)
+    interactions TargetInteractions
     def target
       if !input.given?(:url) && !input.given?(:organization) && !input.given?(:space)
         display_target

data/lib/vmc/cli/start/target_interactions.rb

@@ -27,9 +27,11 @@ module VMC::Start
           line c("There are no spaces in #{b(org.name)}.", :warning)
           line "You may want to create one with #{c("create-space", :good)}."
         end
+      elsif spaces.size == 1 && !input.interactive?(:spaces)
+        spaces.first
       else
         ask("Space", :choices => spaces, :display => proc(&:name))
       end
     end
   end
-end
+end

data/lib/vmc/cli/start/targets.rb

@@ -1,4 +1,3 @@
-require "vmc/detect"
 require "vmc/cli/start/base"
 
 module VMC::Start

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

@@ -4,7 +4,7 @@ module VMC::User
   class Create < Base
     desc "Create a user"
     group :admin, :user, :hidden => true
-    input :email, :desc => "User email", :argument => true
+    input :email, :desc => "User email", :argument => :optional
     input :password, :desc => "User password"
     input :verify, :desc => "Repeat password"
     def create_user
@@ -20,7 +20,9 @@ module VMC::User
       end
     end
 
-    alias_command :create_user, :add_user
+    alias_command :add_user, :create_user
+
+    private
 
     def ask_email
       ask("Email")

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.7".freeze
+  VERSION = "0.5.0.beta.1".freeze
 end

data/spec/factories/organization_factory.rb

@@ -5,6 +5,7 @@ FactoryGirl.define do
 
     ignore do
       spaces []
+      domains []
     end
 
     initialize_with do
@@ -12,7 +13,11 @@ FactoryGirl.define do
     end
 
     after_build do |org, evaluator|
+      evaluator.spaces.each { |s| s.organization = org }
+      evaluator.domains.each { |s| s.owning_organization = org }
+
       RR.stub(org).spaces { evaluator.spaces }
+      RR.stub(org).domains { evaluator.domains }
     end
   end
 end

data/spec/factories/space_factory.rb

@@ -3,8 +3,23 @@ FactoryGirl.define do
     guid { FactoryGirl.generate(:guid) }
     name { FactoryGirl.generate(:random_string) }
 
+    ignore do
+      apps []
+      service_instances []
+      domains []
+    end
+
     initialize_with do
       CFoundry::V2::Space.new(nil, nil)
     end
+
+    after_build do |org, evaluator|
+      evaluator.apps.each { |s| s.space = org }
+      evaluator.service_instances.each { |s| s.space = org }
+
+      RR.stub(org).apps { evaluator.apps }
+      RR.stub(org).service_instances { evaluator.service_instances }
+      RR.stub(org).domains { evaluator.domains }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -15,3 +15,19 @@ RSpec.configure do |c|
   c.mock_with :rr
 end
 
+
+def reassign_stdout_to(output)
+  old_out = $stdout
+  $stdout = output
+  yield $stdout
+ensure
+  $stdout = old_out
+end
+
+def name_list(xs)
+  if xs.empty?
+    "none"
+  else
+    xs.collect(&:name).join(", ")
+  end
+end

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

@@ -29,8 +29,9 @@ describe VMC::App::Create do
 
   let(:create) do
     create = VMC::App::Push.new
-    create.path = "somePath"
+    create.path = "some-path"
     create.input = Mothership::Inputs.new(Mothership.commands[:push], create, inputs, given, global)
+    create.extend VMC::App::PushInteractions
     create
   end
 

data/spec/vmc/cli/app/push_spec.rb

@@ -39,7 +39,7 @@ describe VMC::App::Push do
     describe 'arguments' do
       subject { command.arguments }
       it 'has the correct argument order' do
-        should eq([{ :type => :normal, :value => nil, :name => :name }])
+        should eq([{ :type => :optional, :value => nil, :name => :name }])
       end
     end
   end

data/spec/vmc/cli/organization/orgs_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+require 'stringio'
+
+describe VMC::Organization::Orgs do
+  let(:global) { { :color => false } }
+  let(:inputs) { {} }
+  let(:given) { {} }
+  let(:output) { StringIO.new }
+  let!(:org_1) { FactoryGirl.build(:organization, :name => "bb_second", :spaces => FactoryGirl.build_list(:space, 2), :domains => [FactoryGirl.build(:domain)]) }
+  let!(:org_2) { FactoryGirl.build(:organization, :name => "aa_first", :spaces => [FactoryGirl.build(:space)], :domains => FactoryGirl.build_list(:domain, 3)) }
+  let!(:org_3) { FactoryGirl.build(:organization, :name => "cc_last", :spaces => FactoryGirl.build_list(:space, 2), :domains => FactoryGirl.build_list(:domain, 2)) }
+  let(:organizations) { [org_1, org_2, org_3]}
+  let(:client) { FactoryGirl.build(:client, :organizations => organizations) }
+
+  before do
+    any_instance_of(VMC::CLI) do |cli|
+      stub(cli).client { client }
+      stub(cli).precondition { nil }
+    end
+  end
+
+  subject do
+    reassign_stdout_to output do
+      Mothership.new.invoke(:orgs, inputs, given, global)
+    end
+  end
+
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:orgs] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "List available organizations" }
+      it { expect(Mothership::Help.group(:organizations)).to include(subject) }
+    end
+
+    describe 'inputs' do
+      subject { command.inputs }
+
+      it "is not missing any descriptions" do
+        subject.each do |_, attrs|
+          expect(attrs[:description]).to be
+          expect(attrs[:description].strip).to_not be_empty
+        end
+      end
+    end
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has no arguments' do
+        should be_empty
+      end
+    end
+  end
+
+  it 'should have the correct first two lines' do
+    subject
+
+    output.rewind
+    expect(output.readline).to match /Getting organizations.*OK/
+    expect(output.readline).to eq "\n"
+  end
+
+  context 'when there are no orgnaizations' do
+    let(:organizations) { [] }
+
+    context 'and the full flag is given' do
+      let(:inputs) { {:full => true} }
+
+      it 'displays yaml-style output with all organization details' do
+        any_instance_of VMC::Organization::Orgs do |orgs|
+          dont_allow(orgs).invoke
+        end
+        subject
+      end
+    end
+
+    context 'and the full flag is not given (default is false)' do
+      it 'should show only the progress' do
+        subject
+
+        output.rewind
+        expect(output.readline).to match /Getting organizations.*OK/
+        expect(output).to be_eof
+      end
+    end
+  end
+
+  context 'when there are organizations' do
+    context 'and the full flag is given' do
+      let(:inputs) { {:full => true} }
+
+      it 'displays yaml-style output with all organization details' do
+        any_instance_of VMC::Organization::Orgs do |orgs|
+          mock(orgs).invoke(:org, :organization => org_2, :full => true).ordered
+          mock(orgs).invoke(:org, :organization => org_1, :full => true).ordered
+          mock(orgs).invoke(:org, :organization => org_3, :full => true).ordered
+        end
+        subject
+      end
+    end
+
+    context 'and the full flag is not given (default is false)' do
+      it 'displays tabular output with names, spaces and domains' do
+        subject
+
+        output.rewind
+        output.readline
+        output.readline
+
+        expect(output.readline).to match /name\s+spaces\s+domains/
+        organizations.sort_by(&:name).each do |org|
+          expect(output.readline).to match /#{org.name}\s+#{name_list(org.spaces)}\s+#{name_list(org.domains)}/
+        end
+        expect(output).to be_eof
+      end
+    end
+  end
+end

data/spec/vmc/cli/route/delete_route_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require "vmc/cli/route/delete_route"
+require "vmc/cli/route/delete"
 
-describe VMC::Route::DeleteRoute do
+describe VMC::Route::Delete do
   let(:global) { { :color => false, :quiet => true } }
   let(:inputs) { {} }
   let(:given) { {} }
@@ -45,7 +45,7 @@ describe VMC::Route::DeleteRoute do
   context 'when there are no routes' do
     context 'and a name is given' do
       let(:given) { { :route => "some-route" } }
-      it { expect { subject }.to raise_error(VMC::UserError, "No routes.") }
+      it { expect { subject }.to raise_error(VMC::UserError, "Unknown route 'some-route'.") }
     end
 
     context 'and a name is not given' do