cf 2.0.0 → 2.0.1

data/lib/cf/cli/service/create.rb

@@ -94,12 +94,11 @@ module CF::Service
       ask "Name?", :default => "#{offering.label}-#{random}"
     end
 
-    def ask_plan(plans, default_plan = nil)
+    def ask_plan(plans)
       ask "Which plan?",
         :choices => plans.sort_by(&:name),
         :indexed => true,
         :display => proc { |p| "#{p.name}: #{p.description || 'No description'}" },
-        :default => default_plan,
         :complete => proc(&:name)
     end
   end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.1".freeze
 end

data/spec/features/account_lifecycle_spec.rb

@@ -15,15 +15,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
     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(:space) { ENV['CF_V2_TEST_SPACE'] }
-
-
-    let(:client) do
-      client = CFoundry::V2::Client.new("https://#{target}")
-      client.login(username, password)
-      client
-    end
 
     before do
       Interact::Progress::Dots.start!
@@ -46,8 +37,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
         expect(runner).to say "Authenticating... OK"
       end
 
-      login
-
       # TODO: do this when cf delete-user is implemented
       #BlueShell::Runner.run("#{cf_bin} delete-user #{email}") do |runner|
       #  expect(runner).to say "Really delete user #{email}?>"
@@ -56,6 +45,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
       #end
 
       # TODO: not this.
+      client = CFoundry::V2::Client.new("https://#{target}")
       client.login(email, password)
       user = client.current_user
       guid = user.guid

data/spec/features/org_spec.rb

@@ -10,21 +10,9 @@ if ENV["CF_V2_RUN_INTEGRATION"]
       WebMock.disable_net_connect!
     end
 
-    let(:target) { ENV["CF_V2_TEST_TARGET"] }
-    let(:organization) { ENV["CF_V2_TEST_ORGANIZATION"] }
-    let(:space) { ENV["CF_V2_TEST_SPACE"] }
-    let(:username) { ENV["CF_V2_ADMIN_USERNAME"] }
-    let(:password) { ENV["CF_V2_ADMIN_PW"] }
-
     let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
     let(:new_org_name) { "new-org-#{run_id}" }
 
-    let(:client) do
-      client = CFoundry::V2::Client.new("https://#{target}")
-      client.login(username, password)
-      client
-    end
-
     before do
       Interact::Progress::Dots.start!
       login

data/spec/features/push_flow_spec.rb

@@ -5,11 +5,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A new user tries to use CF against v2', :ruby19 => true do
     include CF::Interactive
 
-    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_TWO'] }
-
     let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
     let(:app) { "hello-sinatra-#{run_id}" }
     let(:service_name) { "dummy-service-#{run_id}" }

data/spec/features/services_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+if ENV['CF_V2_RUN_INTEGRATION']
+  describe "Services" do
+    before do
+      login
+    end
+
+    describe "creating a service" do
+      describe "when the user leaves the line blank for a plan" do
+        let(:services) { [selected_service] }
+
+        it "re-prompts for the plan" do
+          BlueShell::Runner.run("#{cf_bin} create-service") do |runner|
+            expect(runner).to say "What kind?"
+            runner.send_keys "1"
+            expect(runner).to say "Name?"
+            runner.send_return
+            expect(runner).to say "Which plan?"
+            runner.send_return
+            expect(runner).to say "Which plan?"
+          end
+        end
+      end
+    end
+  end
+end

data/spec/features/space_spec.rb

@@ -12,18 +12,9 @@ if ENV['CF_V2_RUN_INTEGRATION']
       WebMock.disable_net_connect!
     end
 
-    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(:space) { ENV['CF_V2_TEST_SPACE'] }
 
-    let(:client) do
-      client = CFoundry::V2::Client.new("https://#{target}")
-      client.login(username, password)
-      client
-    end
-
     before do
       Interact::Progress::Dots.start!
       login

data/spec/features/switching_targets_spec.rb

@@ -4,12 +4,9 @@ if ENV['CF_V2_RUN_INTEGRATION']
   describe 'A new user tries to use CF against v2 production', :ruby19 => true do
 
     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'] }
-    let(:organization_two) { ENV['CF_V2_TEST_ORGANIZATION_TWO'] }
+    let(:space_2) { "#{ENV['CF_V2_TEST_SPACE']}-2"}
+    let(:organization_2) { ENV['CF_V2_TEST_ORGANIZATION_TWO'] }
 
     let(:created_space_1) { "space-#{rand(10000)}"}
     let(:created_space_2) { "space-#{rand(10000)}"}
@@ -17,7 +14,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
     before do
       Interact::Progress::Dots.start!
     end
-
     after do
       logout
       Interact::Progress::Dots.stop!
@@ -40,12 +36,12 @@ if ENV['CF_V2_RUN_INTEGRATION']
       it "can switch organizations and spaces" do
         login
 
-        BlueShell::Runner.run("#{cf_bin} target -o #{organization_two}") do |runner|
-          expect(runner).to say("Switching to organization #{organization_two}")
+        BlueShell::Runner.run("#{cf_bin} target -o #{organization_2}") do |runner|
+          expect(runner).to say("Switching to organization #{organization_2}")
           expect(runner).to say("Space>")
-          runner.send_keys space2
+          runner.send_keys space_2
 
-          expect(runner).to say(/Switching to space #{space2}/)
+          expect(runner).to say(/Switching to space #{space_2}/)
 
           runner.wait_for_exit
         end
@@ -55,8 +51,8 @@ if ENV['CF_V2_RUN_INTEGRATION']
           runner.wait_for_exit(15)
         end
 
-        BlueShell::Runner.run("#{cf_bin} target -s #{space2}") do |runner|
-          expect(runner).to say("Switching to space #{space2}")
+        BlueShell::Runner.run("#{cf_bin} target -s #{space_2}") do |runner|
+          expect(runner).to say("Switching to space #{space_2}")
           runner.wait_for_exit(15)
         end
       end

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ require "ostruct"
 require "fakefs/safe"
 require "blue-shell"
 
-INTEGRATE_WITH = ENV["INTEGRATE_WITH"] || "default"
 TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"]
 
 OriginalFile = File
@@ -23,12 +22,7 @@ class FakeFS::File
 end
 
 def cf_bin
-  cf = File.expand_path("#{SPEC_ROOT}/../bin/cf.dev")
-  if INTEGRATE_WITH != 'default'
-    "rvm #{INTEGRATE_WITH}@cf do #{cf}"
-  else
-    cf
-  end
+  File.expand_path("#{SPEC_ROOT}/../bin/cf.dev")
 end
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|

data/spec/support/features_helper.rb

@@ -3,10 +3,13 @@ module FeaturesHelper
     set_target
     logout
 
-    to_space = respond_to?(:space) ? space : ENV['CF_V2_TEST_SPACE']
+    space = ENV['CF_V2_TEST_SPACE']
+    organization = ENV['CF_V2_TEST_ORGANIZATION']
+    username = ENV['CF_V2_TEST_USER']
+    password = ENV['CF_V2_TEST_PASSWORD']
 
     cmd = "#{cf_bin} login #{username} --password #{password} -o #{organization}"
-    cmd += " -s #{to_space}"
+    cmd += " -s #{space}"
     BlueShell::Runner.run(cmd) do |runner|
       runner.wait_for_exit 60
     end
@@ -19,6 +22,7 @@ module FeaturesHelper
   end
 
   def set_target
+    target = ENV['CF_V2_TEST_TARGET']
     BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
       runner.wait_for_exit(20)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -51,10 +51,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1.rc1
+        version: 2.0.2
     - - <
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,10 +62,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1.rc1
+        version: 2.0.2
     - - <
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: anchorman
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
@@ -516,6 +532,7 @@ files:
 - spec/features/login_spec.rb
 - spec/features/org_spec.rb
 - spec/features/push_flow_spec.rb
+- spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
 - spec/manifests/errors_spec.rb
@@ -549,7 +566,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3456553480456892639
+      hash: 142598794769615443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -558,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cf
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
@@ -676,6 +693,7 @@ test_files:
 - spec/features/login_spec.rb
 - spec/features/org_spec.rb
 - spec/features/push_flow_spec.rb
+- spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
 - spec/manifests/errors_spec.rb