cf 0.6.1.rc3 → 0.6.1.rc4

data/lib/cf/version.rb

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

data/spec/assets/hello-sinatra/main.rb

@@ -1,6 +1,8 @@
 require "rubygems"
 require "sinatra"
 
-get "/" do
-  "Hello, world!"
-end
+class Main < Sinatra::Base
+	get "/" do
+	  "Hello, world!"
+	end
+end

data/spec/cf/cli/app/scale_spec.rb

@@ -1,7 +1,11 @@
 require "spec_helper"
 require "webmock/rspec"
 
-command CF::App::Scale do
+describe CF::App::Scale do
+  before do
+    stub_client_and_precondition
+  end
+
   let(:client) { fake_client :apps => [app] }
 
   context "when the --disk flag is given" do

data/spec/cf/cli/app/start_spec.rb

@@ -1,7 +1,11 @@
 require "spec_helper"
 require "webmock/rspec"
 
-command CF::App::Start do
+describe CF::App::Start do
+  before do
+    stub_client_and_precondition
+  end
+
   let(:client) { fake_client :apps => [app] }
   let(:app) { fake :app }
 

data/spec/cf/cli/domain/map_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-command CF::Domain::Map do
+describe CF::Domain::Map do
+  before do
+    stub_client_and_precondition
+  end
+
   let(:client) do
     fake_client(
       :current_organization => organization,

data/spec/cf/cli/domain/unmap_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-command CF::Domain::Unmap do
+describe CF::Domain::Unmap do
+  before do
+    stub_client_and_precondition
+  end
+
   let(:client) do
     fake_client(
       :current_organization => organization,

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

@@ -50,7 +50,7 @@ describe CF::Organization::Orgs do
     expect(stdout.readline).to eq "\n"
   end
 
-  context 'when there are no orgnaizations' do
+  context 'when there are no organizations' do
     let(:organizations) { [] }
 
     context 'and the full flag is given' do

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

@@ -0,0 +1,130 @@
+require "spec_helper"
+require "webmock/rspec"
+require "cf/cli/populators/organization"
+
+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(:user) { stub! }
+    let(:organizations) do
+      [
+        fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]),
+        fake(:organization, :guid => "organization-id-2")
+      ]
+    end
+    let(:organization) { organizations.first }
+    let(:client) { fake_client :organizations => organizations }
+
+    let(:input) { {:organization => organization} }
+    let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
+    let(:populator) { populator = CF::Populators::Organization.new(Mothership::Inputs.new(nil, nil, input)) }
+
+    before do
+      stub(client).current_user { user }
+      stub(client).organization { organization }
+      stub(client).current_organization { organization }
+      any_instance_of(described_class) do |instance|
+        stub(instance).client { client }
+      end
+
+      write_token_file({:organization => "organization-id-1"})
+    end
+
+    subject do
+      capture_output { populator.populate_and_save! }
+    end
+
+    it "updates the client with the new organization" do
+      write_token_file({:organization => "organization-id-2"})
+      any_instance_of(described_class) do |instance|
+        stub.proxy(instance).client
+      end
+      populator.client.current_organization.guid.should == "organization-id-2"
+
+      subject
+
+      populator.client.current_organization.guid.should == "organization-id-1"
+    end
+
+    it "returns the organization" do
+      subject.should == organization
+    end
+
+    context "with an organization in the input" do
+      let(:input) { {:organization => organization} }
+      before { write_token_file({:organization => "organization-id-2"}) }
+
+      it "uses that organization" do
+        subject.should == organization
+      end
+
+      it "should not reprompt for organization" do
+        dont_allow_ask("Organization", anything)
+        subject
+      end
+
+      it "sets the organization in the token file" do
+        subject
+        expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
+      end
+
+      it "prints out that it is switching to that organization" do
+        subject
+        expect(output).to say("Switching to organization #{organization.name}")
+      end
+    end
+
+    context "without an organization in the input" do
+      let(:input) { {} }
+
+      context "with an organization in the config file" do
+        it "should not reprompt for organization" do
+          dont_allow_ask("Organization", anything)
+          subject
+        end
+
+        it "sets the organization in the token file" do
+          subject
+          expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
+        end
+
+        context "but that organization doesn't exist anymore (not valid)" do
+          before { stub(organization).users { raise CFoundry::APIError } }
+
+          it "asks the user for an organization" do
+            mock_ask("Organization", anything) { organization }
+            subject
+          end
+        end
+      end
+
+      context "without an organization in the config file" do
+        before { write_token_file({}) }
+
+        it "prompts for the organization" do
+          mock_ask("Organization", anything) { organization }
+          subject
+
+          expect(output).to say("Switching to organization #{organization.name}")
+        end
+
+        it "sets the organization in the token file" do
+          mock_ask("Organization", anything) { organization }
+
+          subject
+          expect(tokens_yaml["https://api.some-domain.com"][:organization]).to be == "organization-id-1"
+        end
+
+        context "when the user has no organizations" do
+          let(:client) { fake_client :organizations => [] }
+
+          it "tells the user to create one by raising a UserFriendlyError" do
+            expect { subject }.to raise_error(CF::UserFriendlyError, /There are no organizations/)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,131 @@
+require "spec_helper"
+require "webmock/rspec"
+require "cf/cli/populators/space"
+
+describe CF::Populators::Space 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(:spaces) {
+      [fake(:space, :name => "Development", :guid => "space-id-1", :developers => [user]),
+        fake(:space, :name => "Staging", :guid => "space-id-2")]
+    }
+
+    let(:user) { stub! }
+    let(:organization) { fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => spaces) }
+    let(:space) { spaces.first }
+    let(:client) do
+      fake_client :organizations => [organization]
+    end
+
+    let(:input) { {:space => space} }
+    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) }
+
+    before do
+      stub(client).current_user { user }
+      stub(client).space { space }
+      any_instance_of(described_class) do |instance|
+        stub(instance).client { client }
+      end
+
+      write_token_file({:space => "space-id-1", :organization => "organization-id-1"})
+    end
+
+    subject do
+      capture_output { populator.populate_and_save! }
+    end
+
+    it "updates the client with the new space" do
+      write_token_file({:space => "space-id-2"})
+      any_instance_of(described_class) do |instance|
+        stub.proxy(instance).client
+      end
+      populator.client.current_space.guid.should == "space-id-2"
+
+      subject
+
+      populator.client.current_space.guid.should == "space-id-1"
+    end
+
+    it "returns the space" do
+      subject.should == space
+    end
+
+    context "with a space in the input" do
+      let(:input) { {:space => space} }
+      before { write_token_file({:space => "space-id-2"}) }
+
+      it "uses that space" do
+        subject.should == space
+      end
+
+      it "should not reprompt for space" do
+        dont_allow_ask("Space", anything)
+        subject
+      end
+
+      it "sets the space in the token file" do
+        subject
+        expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+      end
+
+      it "prints out that it is switching to that space" do
+        subject
+        expect(output).to say("Switching to space #{space.name}")
+      end
+    end
+
+    context "without a space in the input" do
+      let(:input) { {} }
+
+      context "with a space in the config file" do
+        it "should not reprompt for space" do
+          dont_allow_ask("Space", anything)
+          subject
+        end
+
+        it "sets the space in the token file" do
+          subject
+          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+        end
+
+        context "but that space doesn't exist anymore (not valid)" do
+          before { stub(space).developers { raise CFoundry::APIError } }
+
+          it "asks the user for an space" do
+            mock_ask("Space", anything) { space }
+            subject
+          end
+        end
+      end
+
+      context "without a space in the config file" do
+        before { write_token_file({}) }
+
+        it "prompts for the space" do
+          mock_ask("Space", anything) { space }
+          subject
+
+          expect(output).to say("Switching to space #{space.name}")
+        end
+
+        it "sets the space in the token file" do
+          mock_ask("Space", anything) { space }
+
+          subject
+          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == "space-id-1"
+        end
+
+        context "when the user has no spaces in that organization" do
+          let(:organization) { fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user]) }
+
+          it "tells the user to create one by raising a UserFriendlyError" do
+            expect { subject }.to raise_error(CF::UserFriendlyError, /There are no spaces/)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require "spec_helper"
+require "webmock/rspec"
+require "cf/cli/populators/target"
+
+describe CF::Populators::Target do
+  describe "#populate_and_save!" do
+    let(:input) { stub! }
+    let(:organization) { stub! }
+
+    subject { CF::Populators::Target.new(input).populate_and_save! }
+
+    it "uses a organization then a space populator" do
+      mock(CF::Populators::Organization).new(input) { mock!.populate_and_save! { organization } }
+      mock(CF::Populators::Space).new(input, organization) { mock!.populate_and_save! }
+      subject
+    end
+  end
+end

data/spec/cf/cli/route/map_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-command CF::Route::Map do
+describe CF::Route::Map do
+  before do
+    stub_client_and_precondition
+  end
+
   let(:client) { fake_client(:apps => apps, :routes => routes) }
 
   let(:app) { fake(:app, :space => space, :name => "app-name") }

data/spec/cf/cli/route/unmap_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-command CF::Route::Unmap do
+describe CF::Route::Unmap do
+  before do
+    stub_client_and_precondition
+  end
+
   let(:client) { fake_client :apps => [app] }
 
   let(:app){ fake(:app, :space => space, :name => "app-name") }

data/spec/cf/cli/service/services_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe CF::Service::Services do
+  let(:command) { Mothership.commands[:services] }
+
+  describe 'metadata' do
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "List your services" }
+      it { expect(Mothership::Help.group(:services)).to include(subject) }
+    end
+
+    include_examples 'inputs must have descriptions'
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'has no required arguments' do
+        should eq([])
+      end
+    end
+
+    describe 'inputs' do
+      subject { command.inputs }
+      it 'has the expected inputs' do
+        subject.keys.should =~ [:name, :service, :plan, :provider, :version, :app, :full, :space]
+      end
+    end
+  end
+
+  describe 'listing services' do
+    let(:global) { { :color => false } }
+    let(:inputs) { {} }
+    let(:given) { {} }
+    let(:client) { fake_client(:current_space => current_space, :service_instances => service_instances) }
+
+    let(:service_plan) { fake(:service_plan, :service => fake(:service, :version => 'service_version', :provider => 'provider') ) }
+    let(:service1) { fake(:service_instance, :service_plan => service_plan ) }
+
+    let(:service_instances) { [service1] }
+    let(:current_space) { fake(:space, :name => 'the space' ) }
+
+    subject do
+      capture_output { Mothership.new.invoke(:services, inputs, given, global) }
+    end
+
+    before do
+      any_instance_of(CF::CLI) do |cli|
+        stub(cli).client { client }
+        stub(cli).precondition { nil }
+      end
+    end
+
+    it 'produces a table of services' do
+      subject
+      stdout.rewind
+      output = stdout.read
+
+      expect(output).to match /Getting services in the space.*OK/
+
+      expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+      expect(output).to match /service_instance-.+?\s+  # name
+        service-.*?\s+                                  # service
+        provider.*?\s+                                  # provider
+        service_version\s+                              # version
+        service_plan-.*?\s+                             # plan
+        none\s+                                         # bound apps
+        /x
+
+    end
+  end
+end
+