cf 1.1.2.rc1 → 1.1.2.rc2

data/lib/cf/version.rb

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

data/lib/tunnel/tunnel.rb

@@ -120,31 +120,21 @@ class CFTunnel
   end
 
   def push_helper(token)
-    target_base = @client.target.sub(/^[^\.]+\./, "")
-
-    url = "#{random_helper_url}.#{target_base}"
-    is_v2 = @client.is_a?(CFoundry::V2::Client)
-
     app = @client.app
     app.name = HELPER_NAME
     app.command = "bundle exec ruby server.rb"
     app.total_instances = 1
     app.memory = 128
-    app.env = { "CALDECOTT_AUTH" => token }
-
-    if is_v2
-      app.space = @client.current_space
-    else
-      app.services = [@service] if @service
-      app.url = url
-    end
+    app.env = {"CALDECOTT_AUTH" => token}
 
+    space = app.space = @client.current_space
     app.create!
 
-    if is_v2
-      app.bind(@service) if @service
-      app.create_route(url)
-    end
+    app.bind(@service) if @service
+
+    domain = @client.domains.find { |d| d.owning_organization == nil }
+
+    app.create_route(:domain => domain, :space => space, :host => random_helper_url)
 
     begin
       app.upload(HELPER_APP)

data/spec/features/login_spec.rb

@@ -15,13 +15,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     before do
       Interact::Progress::Dots.start!
-
-      BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
-        expect(runner).to say "Setting target"
-        expect(runner).to say target
-        runner.wait_for_exit
-      end
-
+      set_target
       logout
     end
 

data/spec/features/org_spec.rb

@@ -14,24 +14,21 @@ if ENV['CF_V2_RUN_INTEGRATION']
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:organization) { ENV['CF_V2_TEST_ORGANIZATION'] }
     let(:space) { ENV['CF_V2_TEST_SPACE'] }
-    let(:admin_username) { ENV['CF_V2_ADMIN_USERNAME'] }
-    let(:admin_password) { ENV['CF_V2_ADMIN_PW'] }
+    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(admin_username, admin_password)
+      client.login(username, password)
       client
     end
 
     before do
       Interact::Progress::Dots.start!
-      "cf login #{admin_username} --password #{admin_password} -o #{organization} -s #{space}"
-      BlueShell::Runner.run("cf login #{admin_username} --password #{admin_password} -o #{organization} -s #{space}") do |runner|
-        runner.wait_for_exit(60)
-      end
+      login
     end
 
     after do

data/spec/features/push_flow_spec.rb

@@ -12,7 +12,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
     let(:app) { "hello-sinatra-#{run_id}" }
-    let(:service_name) { "rds_mysql-#{run_id}" }
+    let(:service_name) { "rds-mysql-#{run_id}" }
 
     before do
       FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
@@ -65,7 +65,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
           # create a service here
           expect(runner).to say "What kind?>"
-          runner.send_keys "rds_mysql"
+          runner.send_keys "rds-mysql"
 
           expect(runner).to say "Name?>"
           runner.send_keys service_name
@@ -97,8 +97,8 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
       BlueShell::Runner.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 /rds_mysql-.+?\s+ # name
-            rds_mysql\s+                        # service
+        expect(runner).to say /rds-mysql-.+?\s+ # name
+            rds-mysql\s+                        # service
             aws\s+                              # provider
             n\/a\s+                             # version
             10mb\s+                             # plan

data/spec/support/features_helper.rb

@@ -13,7 +13,9 @@ module FeaturesHelper
   end
 
   def logout
-    BlueShell::Runner.run("#{cf_bin} logout")
+    BlueShell::Runner.run("#{cf_bin} logout") do |runner|
+      runner.wait_for_exit 60
+    end
   end
 
   def set_target

data/spec/tunnel/tunnel_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+describe CFTunnel do
+  # temporary solution until we get rspec-mocks! ;)
+  class NullObject
+    def initialize(id = "")
+      @id = id
+    end
+
+    def ==(other)
+      @id == other.id
+    end
+
+    def <=>(other)
+      @id <=> other.id
+    end
+
+    def nil?
+      true
+    end
+
+    def method_missing(*args)
+      return self
+    end
+  end
+
+  let(:client) { fake_client }
+  let(:service) { NullObject.new }
+
+  subject { CFTunnel.new(client, service) }
+
+  describe "#open!" do
+    describe "creating a route for caldecott" do
+      let!(:app) { NullObject.new("app") }
+      let!(:domain) { fake(:domain, :owning_organization => nil) }
+      let!(:route) { fake(:route) }
+      let!(:space) { fake(:space) }
+      let(:host) { "caldecott" }
+
+      before do
+        stub(subject).random_helper_url { "caldecott" }
+        stub(client).app { app }
+        stub(client).current_space { space }
+        stub(client).domains { [fake(:domain, :owning_organization => fake(:organization)), domain] }
+      end
+
+      it "adds a new route to caldecott app" do
+        mock(app).create_route(:domain => domain, :host => host, :space => space)
+
+        subject.send("push_helper", "this is a token")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 1.1.2.rc1
+  version: 1.1.2.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,10 +51,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
     - - <
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,10 +62,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
     - - <
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -520,6 +520,7 @@ files:
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb
 - spec/tunnel/plugin_spec.rb
+- spec/tunnel/tunnel_spec.rb
 - bin/cf
 homepage: http://github.com/cloudfoundry/cf
 licenses: []
@@ -535,7 +536,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3839279030645441050
+      hash: -4028856741876005173
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -666,3 +667,4 @@ test_files:
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb
 - spec/tunnel/plugin_spec.rb
+- spec/tunnel/tunnel_spec.rb