cf 4.2.1.rc1 → 4.2.1.rc2

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.2.1.rc1".freeze
+  VERSION = "4.2.1.rc2".freeze
 end

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

@@ -59,7 +59,7 @@ module CF
             stub_ask("Password", anything) { "password1" }
             stub_ask("Verify Password", anything) { confirmation }
 
-            CF::Populators::Organization.stub(:new) { stub(:organization, :populate_and_save! => org) }
+            CF::Populators::Organization.stub(:new) { double(:organization, :populate_and_save! => org) }
             client.stub(:register).with("some-angry-dude@example.com", "password1") { user }
             user.stub(:update!)
           end

data/spec/micro/plugin_spec.rb

@@ -1,26 +1,26 @@
 require 'spec_helper'
 
 describe CFMicro::McfCommand do
-  describe 'micro_status' do
-    shared_examples 'micro common inputs' do
-      describe 'inputs' do
-        subject { command.inputs }
-        it { expect(subject[:vmx][:description]).to eq "Path to micro.vmx" }
-        it { expect(subject[:password][:description]).to eq "Cleartext password for guest VM vcap user" }
-      end
+  shared_examples 'micro common inputs' do
+    describe 'inputs' do
+      subject { command.inputs }
+      it { expect(subject[:vmx][:description]).to eq "Path to micro.vmx" }
+      it { expect(subject[:password][:description]).to eq "Cleartext password for guest VM vcap user" }
+    end
 
-      describe 'arguments' do
-        subject { command.arguments }
+    describe 'arguments' do
+      subject { command.arguments }
 
-        it 'has the correct argument order' do
-          should eq([
-            {:type => :required, :value => nil, :name => :vmx},
-            {:type => :optional, :value => nil, :name => :password}
-          ])
-        end
+      it 'has the correct argument order' do
+        should eq([
+                      {:type => :required, :value => nil, :name => :vmx},
+                      {:type => :optional, :value => nil, :name => :password}
+                  ])
       end
     end
+  end
 
+  describe 'micro_status' do
     describe '#metadata' do
       let(:command) { Mothership.commands[:micro_status] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.1.rc1
+  version: 4.2.1.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -405,7 +405,6 @@ files:
 - lib/cf/cli/space/switch.rb
 - lib/cf/cli/start/base.rb
 - lib/cf/cli/start/colors.rb
-- lib/cf/cli/start/info.rb
 - lib/cf/cli/start/login.rb
 - lib/cf/cli/start/logout.rb
 - lib/cf/cli/start/target.rb
@@ -556,7 +555,6 @@ files:
 - spec/cf/cli/space/spaces_spec.rb
 - spec/cf/cli/space/switch_space_spec.rb
 - spec/cf/cli/start/help_spec.rb
-- spec/cf/cli/start/info_spec.rb
 - spec/cf/cli/start/login_spec.rb
 - spec/cf/cli/start/logout_spec.rb
 - spec/cf/cli/start/target_prettifier_spec.rb
@@ -619,6 +617,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4538612442505593071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -733,7 +734,6 @@ test_files:
 - spec/cf/cli/space/spaces_spec.rb
 - spec/cf/cli/space/switch_space_spec.rb
 - spec/cf/cli/start/help_spec.rb
-- spec/cf/cli/start/info_spec.rb
 - spec/cf/cli/start/login_spec.rb
 - spec/cf/cli/start/logout_spec.rb
 - spec/cf/cli/start/target_prettifier_spec.rb

data/lib/cf/cli/start/info.rb

@@ -1,65 +0,0 @@
-require "cf/cli/start/base"
-
-module CF::Start
-  class Info < Base
-    def precondition
-      check_target
-    end
-
-    desc "Display information on the current target, user, etc."
-    group :start
-    input :services, :desc => "List supported services", :alias => "-s",
-          :default => false
-    input :all, :desc => "Show all information", :alias => "-a",
-          :default => false
-    def info
-      all = input[:all]
-
-      if all || input[:services]
-        services = with_progress("Getting services") { client.services }
-      end
-
-      if all || !services
-        info = client.info
-
-        line if services
-        line info[:description]
-        line
-        line "target: #{b(client.target)}"
-
-        indented do
-          line "version: #{info[:version]}"
-          line "support: #{info[:support]}"
-        end
-
-        if (user = client.current_user)
-          line
-          line "user: #{b(user.email || user.guid)}"
-        end
-      end
-
-      if services
-        line unless quiet?
-
-        if services.empty? && !quiet?
-          line "#{d("none")}"
-        elsif input[:quiet]
-          services.each do |s|
-            line s.label
-          end
-        else
-          table(
-              ["service", "version", "provider", "plans", "description"],
-              services.sort_by(&:label).collect { |s|
-                [c(s.label, :name),
-                 s.version,
-                 s.provider,
-                 s.service_plans.collect(&:name).join(", "),
-                 s.description
-                ]
-              })
-        end
-      end
-    end
-  end
-end

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

@@ -1,107 +0,0 @@
-require 'spec_helper'
-
-describe CF::Start::Info do
-  let(:services) { false }
-  let(:all) { false }
-
-  let(:client) do
-    build(:client).tap do |client|
-      client.stub(:services => Array.new(3) { build(:service) })
-    end
-  end
-
-  let(:target_info) do
-    { :description => "Some description",
-      :version => 2,
-      :support => "http://example.com"
-    }
-  end
-
-  before do
-    described_class.any_instance.stub(:client).and_return(client)
-  end
-
-  describe 'metadata' do
-    let(:command) { Mothership.commands[:info] }
-
-    describe 'command' do
-      subject { command }
-      its(:description) { should eq "Display information on the current target, user, etc." }
-      it { expect(Mothership::Help.group(:start)).to include(subject) }
-    end
-
-    include_examples 'inputs must have descriptions'
-
-    describe 'flags' do
-      subject { command.flags }
-
-      its(["-s"]) { should eq :services }
-      its(["-a"]) { should eq :all }
-    end
-
-    describe 'arguments' do
-      subject { command.arguments }
-      it { should be_empty }
-    end
-  end
-
-
-  subject { cf %W[info --#{bool_flag(:services)} --#{bool_flag(:all)} --no-force --no-quiet] }
-
-  context 'when given no flags' do
-    it "displays target information" do
-      client.should_receive(:info).and_return(target_info)
-
-      subject
-
-      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 --services' do
-    let(:services) { true }
-
-    it 'does not grab /info' do
-      client.should_not_receive(:info)
-      subject
-    end
-
-    it 'lists services on the target' do
-      subject
-
-      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(stdout.readline).to match /#{s.label}\s+#{s.version}\s+#{s.provider}.+#{s.description}/
-      end
-    end
-  end
-
-  context 'when given --all' do
-    let(:all) { true }
-
-    it 'runs as --services' do
-      client.should_receive(:info).and_return(target_info)
-
-      subject
-
-      stdout.rewind
-      expect(stdout.readline).to match /Getting services.*OK/
-    end
-  end
-
-  context 'when there is no target' do
-    let(:client) { nil }
-    it_behaves_like "an error that gets passed through",
-      :with_exception => CF::UserError,
-      :with_message => "Please select a target with 'cf target'."
-  end
-end