cf 0.6.1.rc3 → 0.6.1.rc4

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

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-command CF::User::Register do
+describe CF::User::Register do
+  before do
+    stub_client_and_precondition
+  end
+
   describe 'metadata' do
     let(:command) { Mothership.commands[:register] }
 

data/spec/cf/cli_spec.rb

@@ -66,7 +66,7 @@ describe CF::CLI do
       end
     end
 
-    context "with a CFoundry authentication error" do
+    context "when CC can't decode the auth token" do
       let(:action) { proc { raise CFoundry::InvalidAuthToken.new("foo bar") } }
       let(:asked) { false }
 
@@ -74,10 +74,30 @@ describe CF::CLI do
         $cf_asked_auth = asked
       end
 
+      it "tells the user they are not authenticated" do
+        subject
+        expect(stdout.string).to include "Invalid authentication token. Try logging in again with 'cf login'"
+      end
+
+      it "exits without attempting to login again" do
+        dont_allow(context).invoke(:login)
+        subject
+      end
+    end
+
+    context "with a CFoundry authentication error" do
+      let(:action) { proc { raise CFoundry::Forbidden.new("foo bar") } }
+      let(:asked) { false }
+
+      before do
+        $cf_asked_auth = asked
+      end
+
       it "tells the user they are not authenticated" do
         stub(context).invoke(:login)
         subject
         expect(stdout.string).to include "Not authenticated! Try logging in:"
+        expect($cf_asked_auth).to be_true
       end
 
       it "asks the user to log in" do

data/spec/features/account_lifecycle_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "webmock/rspec"
 require "ffaker"
 
-if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGET']
+if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A new user tries to use CF against v2 production', :ruby19 => true do
     before(:all) do
       WebMock.allow_net_connect!
@@ -15,6 +15,7 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:username) { ENV['CF_V2_TEST_USER'] }
     let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
+    let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
 
     let(:client) do
       client = CFoundry::V2::Client.new("https://#{target}")
@@ -32,6 +33,10 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
 
     it "registers a new account and deletes it" do
       email = Faker::Internet.email
+      run("#{cf_bin} logout") do |runner|
+        runner.wait_for_exit
+      end
+
       run("#{cf_bin} target #{target}") do |runner|
         runner.wait_for_exit
       end
@@ -39,7 +44,7 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
       run("#{cf_bin} login #{username} --password #{password}") do |runner|
         expect(runner).to say(
           "Organization>" => proc {
-            runner.send_keys "pivotal-integration"
+            runner.send_keys organization
             expect(runner).to say /Switching to organization .*\.\.\. OK/
           },
           "Switching to organization" => proc {}
@@ -102,5 +107,5 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     end
   end
 else
-  $stderr.puts 'Skipping v2 integration specs; please provide $CF_V2_TEST_TARGET, $CF_V2_TEST_USER, and $CF_V2_TEST_PASSWORD'
+  $stderr.puts 'Skipping v2 integration specs; please provide environment variables'
 end

data/spec/features/login_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGET'] && ENV['CF_V2_OTHER_TEST_USER']
+if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A user logs in and switches spaces, after a different user has logged in', :ruby19 => true do
     include ConsoleAppSpeckerMatchers
 
@@ -35,17 +35,22 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
       before do
         run("#{cf_bin} login #{username} --password #{password}") do |runner|
           expect(runner).to say "Authenticating... OK"
-          expect(runner).to say "Organization>"
-          runner.send_keys("1")
 
-          expect(runner).to say "Switching to organization"
-          expect(runner).to say "OK"
+          expect(runner).to say(
+            "Organization>" => proc {
+              runner.send_keys "1"
+              expect(runner).to say /Switching to organization .*\.\.\. OK/
+            },
+            "Switching to organization" => proc {}
+          )
 
-          expect(runner).to say "Space"
-          runner.send_keys("1")
-
-          expect(runner).to say "Switching to space"
-          expect(runner).to say "OK"
+          expect(runner).to say(
+            "Space>" => proc {
+              runner.send_keys "1"
+              expect(runner).to say /Switching to space .*\.\.\. OK/
+            },
+            "Switching to space" => proc {}
+          )
 
           runner.wait_for_exit
         end
@@ -62,5 +67,5 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     end
   end
 else
-  $stderr.puts 'Skipping v2 integration specs; please provide $CF_V2_TEST_TARGET, $CF_V2_TEST_USER, $CF_V2_TEST_PASSWORD, and $CF_V2_OTHER_TEST_USER'
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
 end

data/spec/features/push_flow_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "webmock/rspec"
 
-if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGET'] && ENV['CF_V2_OTHER_TEST_ORGANIZATION']
+if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A new user tries to use CF against v2', :ruby19 => true do
     include ConsoleAppSpeckerMatchers
     include CF::Interactive
@@ -9,7 +9,7 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:username) { ENV['CF_V2_TEST_USER'] }
     let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
-    let(:organization) { ENV['CF_V2_OTHER_TEST_ORGANIZATION'] }
+    let(:organization) { ENV['CF_V2_TEST_ORGANIZATION_TWO'] }
 
     let(:app) do
       fuzz = TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_")
@@ -23,11 +23,15 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     end
 
     after do
-      `#{cf_bin} delete #{app} -f --no-script`
+      `#{cf_bin} delete #{app} -f -o --no-script`
       Interact::Progress::Dots.stop!
     end
 
     it 'pushes a simple sinatra app using defaults as much as possible' do
+      run("#{cf_bin} logout") do |runner|
+        runner.wait_for_exit
+      end
+
       run("#{cf_bin} target http://#{target}") do |runner|
         expect(runner).to say %r{Setting target to http://#{target}... OK}
       end
@@ -73,10 +77,10 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
           runner.send_keys ""
 
           expect(runner).to say "Custom startup command> "
-          runner.send_keys "bundle exec ruby main.rb -p $PORT"
+          runner.send_keys ""
 
           expect(runner).to say "Memory Limit>"
-          runner.send_keys "64M"
+          runner.send_keys "128M"
 
           expect(runner).to say "Creating #{app}... OK"
 
@@ -95,16 +99,16 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
 
           # create a service here
           expect(runner).to say "What kind?>"
-          runner.send_keys "redis"
+          runner.send_keys "mysql"
 
           expect(runner).to say "Name?>"
           runner.send_keys ""
 
           expect(runner).to say "Which plan?>"
-          runner.send_keys "1"
+          runner.send_keys "200"
 
-          expect(runner).to say /Creating service redis-.* OK/
-          expect(runner).to say /Binding redis-.* to .+ OK/
+          expect(runner).to say /Creating service .+ OK/
+          expect(runner).to say /Binding .+ to .+ OK/
 
           expect(runner).to say "Create another service?> n"
           runner.send_keys ""
@@ -125,6 +129,17 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
         end
       end
 
+      run("#{cf_bin} services") do |runner|
+        expect(runner).to say /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+        expect(runner).to say /mysql-.+?\s+   # name
+            mysql\s+                          # service
+            core\s+                           # provider
+            [\d.]+\s+                         # version
+            200\s+                            # plan
+            #{app}                            # bound apps
+          /x
+      end
+
       run("#{cf_bin} delete #{app}") do |runner|
         expect(runner).to say "Really delete #{app}?>"
         runner.send_keys "y"
@@ -132,10 +147,10 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
 
         expect(runner).to say "Delete orphaned service"
         runner.send_keys "y"
-        expect(runner).to say /Deleting redis.* OK/
+        expect(runner).to say /Deleting .* OK/
       end
     end
   end
 else
-  $stderr.puts 'Skipping v2 integration specs; please provide $CF_V2_TEST_TARGET, $CF_V2_TEST_USER, $CF_V2_TEST_PASSWORD, and $CF_V2_OTHER_TEST_ORGANIZATION'
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
 end

data/spec/features/switching_targets_spec.rb

@@ -1,10 +1,15 @@
 require "spec_helper"
 
-if ENV['CF_V2_TEST_TARGET']
+if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A new user tries to use CF against v2 production', :ruby19 => true do
     include ConsoleAppSpeckerMatchers
 
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
+    let(:username) { ENV['CF_V2_TEST_USER'] }
+    let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
+    let(:space) { ENV['CF_V2_TEST_SPACE'] }
+    let(:space2) { "#{ENV['CF_V2_TEST_SPACE']}-2"}
+    let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
 
     before do
       Interact::Progress::Dots.start!
@@ -26,7 +31,42 @@ if ENV['CF_V2_TEST_TARGET']
         runner.wait_for_exit
       end
     end
+
+    it "can switch organizations and spaces" do
+      run("#{cf_bin} logout") do |runner|
+        runner.wait_for_exit
+      end
+
+      run("#{cf_bin} login") do |runner|
+        expect(runner).to say "Email>"
+        runner.send_keys username
+
+        expect(runner).to say "Password>"
+        runner.send_keys password
+
+        expect(runner).to say "Authenticating... OK"
+      end
+
+      run("#{cf_bin} target -o #{organization}") do |runner|
+        expect(runner).to say("Switching to organization #{organization}")
+
+        expect(runner).to say("Space>")
+        runner.send_keys space2
+
+        runner.wait_for_exit
+      end
+
+      run("#{cf_bin} target -s #{space}") do |runner|
+        expect(runner).to say("Switching to space #{space}")
+        runner.wait_for_exit
+      end
+
+      run("#{cf_bin} target -s #{space2}") do |runner|
+        expect(runner).to say("Switching to space #{space2}")
+        runner.wait_for_exit
+      end
+    end
   end
 else
-  $stderr.puts 'Skipping v2 integration specs; please provide $CF_V2_TEST_TARGET'
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
 end

data/spec/spec_helper.rb

@@ -44,7 +44,7 @@ RSpec.configure do |c|
   end
 
   c.include FakeHomeDir
-  c.include CommandHelper
+  c.include CliHelper
   c.include InteractHelper
   c.include ConfigHelper
 

data/spec/support/{command_helper.rb → cli_helper.rb}

@@ -1,35 +1,27 @@
-def command(klass, &specs)
-  describe klass do
-    let(:stub_precondition?) { true }
-
-    before do
-      any_instance_of klass do |cli|
-        stub(cli).precondition if stub_precondition?
-        stub(cli).client { client }
-      end
-    end
+module CliHelper
+  def stub_client_and_precondition
+    stub_client
+    stub_precondition
+  end
 
-    before(:all) do
-      klass.class_eval do
-        def wrap_errors
-          yield
-        rescue CF::UserError => e
-          err e.message
-        end
-      end
+  def stub_client
+    any_instance_of described_class do |cli|
+      stub(cli).client { client }
     end
+  end
 
-    after(:all) do
-      klass.class_eval do
-        remove_method :wrap_errors
-      end
+  def stub_precondition
+    any_instance_of described_class do |cli|
+      stub(cli).precondition
     end
+  end
 
-    class_eval(&specs)
+  def wrap_errors
+    yield
+  rescue CF::UserError => e
+    err e.message
   end
-end
 
-module CommandHelper
   def cf(argv)
     Mothership.new.exit_status 0
     stub(CF::CLI).exit { |code| code }
@@ -78,4 +70,5 @@ module CommandHelper
       dont_allow(cli).invoke *args
     end
   end
+
 end

data/spec/support/shared_examples/populate_organization.rb

@@ -0,0 +1,6 @@
+shared_examples_for "a_command_that_populates_organization" do
+  it "calls the organization populator" do
+    mock(CF::Populators::Organization).new(instance_of(Mothership::Inputs)) { mock!.populate_and_save! }
+    subject
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc3
+  version: 0.6.1.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -243,6 +243,11 @@ files:
 - lib/cf/cli/organization/org.rb
 - lib/cf/cli/organization/orgs.rb
 - lib/cf/cli/organization/rename.rb
+- lib/cf/cli/populators/base.rb
+- lib/cf/cli/populators/organization.rb
+- lib/cf/cli/populators/populator_methods.rb
+- lib/cf/cli/populators/space.rb
+- lib/cf/cli/populators/target.rb
 - lib/cf/cli/route/base.rb
 - lib/cf/cli/route/map.rb
 - lib/cf/cli/route/routes.rb
@@ -268,7 +273,6 @@ files:
 - lib/cf/cli/start/login.rb
 - lib/cf/cli/start/logout.rb
 - lib/cf/cli/start/target.rb
-- lib/cf/cli/start/target_interactions.rb
 - lib/cf/cli/start/targets.rb
 - lib/cf/cli/user/base.rb
 - lib/cf/cli/user/create.rb
@@ -304,12 +308,16 @@ files:
 - spec/cf/cli/domain/unmap_spec.rb
 - spec/cf/cli/organization/orgs_spec.rb
 - spec/cf/cli/organization/rename_spec.rb
+- spec/cf/cli/populators/organization_spec.rb
+- spec/cf/cli/populators/space_spec.rb
+- spec/cf/cli/populators/target_spec.rb
 - spec/cf/cli/route/map_spec.rb
 - spec/cf/cli/route/unmap_spec.rb
 - spec/cf/cli/service/bind_spec.rb
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/rename_spec.rb
 - spec/cf/cli/service/service_spec.rb
+- spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
 - spec/cf/cli/space/create_spec.rb
 - spec/cf/cli/space/rename_spec.rb
@@ -330,13 +338,14 @@ files:
 - spec/features/push_flow_spec.rb
 - spec/features/switching_targets_spec.rb
 - spec/spec_helper.rb
-- spec/support/command_helper.rb
+- spec/support/cli_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/shared_examples/populate_organization.rb
 - spec/support/specker_runner.rb
 - spec/support/tracking_expector.rb
 - bin/cf
@@ -354,7 +363,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1521493965711051536
+      hash: -2266107112903724844
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -388,12 +397,16 @@ test_files:
 - spec/cf/cli/domain/unmap_spec.rb
 - spec/cf/cli/organization/orgs_spec.rb
 - spec/cf/cli/organization/rename_spec.rb
+- spec/cf/cli/populators/organization_spec.rb
+- spec/cf/cli/populators/space_spec.rb
+- spec/cf/cli/populators/target_spec.rb
 - spec/cf/cli/route/map_spec.rb
 - spec/cf/cli/route/unmap_spec.rb
 - spec/cf/cli/service/bind_spec.rb
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/rename_spec.rb
 - spec/cf/cli/service/service_spec.rb
+- spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
 - spec/cf/cli/space/create_spec.rb
 - spec/cf/cli/space/rename_spec.rb
@@ -414,12 +427,13 @@ test_files:
 - spec/features/push_flow_spec.rb
 - spec/features/switching_targets_spec.rb
 - spec/spec_helper.rb
-- spec/support/command_helper.rb
+- spec/support/cli_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/shared_examples/populate_organization.rb
 - spec/support/specker_runner.rb
 - spec/support/tracking_expector.rb