tunnel-vmc-plugin 0.1.6 → 0.1.7

data/lib/tunnel-vmc-plugin/plugin.rb

@@ -29,7 +29,8 @@ module VMCTunnel
       fail "No services available for tunneling." if instances.empty?
 
       instance = input[:instance, instances.sort_by(&:name)]
-      clients = tunnel_clients[instance.vendor] || {}
+      vendor = v2? ? instance.service_plan.service.label : instance.vendor
+      clients = tunnel_clients[vendor] || {}
       client_name = input[:client, clients]
 
       tunnel = CFTunnel.new(client, instance)

data/lib/tunnel-vmc-plugin/tunnel.rb

@@ -19,7 +19,7 @@ class CFTunnel
   end
 
   def open!
-    if helper.exists?
+    if helper
       auth = helper_auth
 
       unless helper_healthy?(auth)
@@ -79,7 +79,7 @@ class CFTunnel
   private
 
   def helper
-    @helper ||= @client.app(HELPER_NAME)
+    @helper ||= @client.app_by_name(HELPER_NAME)
   end
 
   def create_helper
@@ -122,15 +122,31 @@ class CFTunnel
   def push_helper(token)
     target_base = @client.target.sub(/^[^\.]+\./, "")
 
-    app = @client.app(HELPER_NAME)
-    app.framework = "sinatra"
-    app.url = "#{random_helper_url}.#{target_base}"
+    url = "#{random_helper_url}.#{target_base}"
+    is_v2 = @client.is_a?(CFoundry::V2::Client)
+
+    app = @client.app
+    app.name = HELPER_NAME
+    app.framework = @client.framework_by_name("sinatra")
+    app.runtime = @client.runtime_by_name("ruby19")
     app.total_instances = 1
     app.memory = 64
     app.env = { "CALDECOTT_AUTH" => token }
-    app.services = [@service] if @service
+
+    if is_v2
+      app.space = @client.current_space
+    else
+      app.services = [@service] if @service
+      app.url = url
+    end
+
     app.create!
 
+    if is_v2
+      app.bind(@service)
+      app.create_route(url)
+    end
+
     begin
       app.upload(HELPER_APP)
       invalidate_tunnel_app_info
@@ -217,8 +233,10 @@ class CFTunnel
       raise "Remote tunnel helper is unaware of #{@service.name}!"
     end
 
+    is_v2 = @client.is_a?(CFoundry::V2::Client)
+
     info = JSON.parse(response)
-    case @service.vendor
+    case (is_v2 ? @service.service_plan.service.label : @service.vendor)
     when "rabbitmq"
       uri = Addressable::URI.parse info["url"]
       info["hostname"] = uri.host
@@ -237,6 +255,9 @@ class CFTunnel
     # our "name" is irrelevant for redis
     when "redis"
       info.delete "name"
+
+    when "filesystem"
+      raise "Tunneling is not supported for this type of service"
     end
 
     ["hostname", "port", "password"].each do |k|

data/lib/tunnel-vmc-plugin/version.rb

@@ -1,3 +1,3 @@
 module VMCTunnel
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/Rakefile

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default, :development)
+
+require 'rake/dsl_definition'
+require 'rake'
+require 'rspec'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "*_spec.rb"
+  t.rspec_opts = ["--format", "documentation", "--colour"]
+end

data/spec/tunnel_spec.rb

@@ -0,0 +1,71 @@
+require "vmc/spec_helpers"
+require "tunnel-vmc-plugin/plugin"
+
+describe "VMCtunnel#tunnel" do
+  before(:all) do
+    instance_name = "postgres-#{random_str}"
+    client.service_instance_by_name(instance_name).should_not be
+    psql_service = client.services.find { |svc| svc.label == "postgresql" }
+
+    @instance = client.service_instance
+    @instance.name = instance_name
+
+    if client.is_a?(CFoundry::V2::Client)
+      @instance.service_plan = psql_service.service_plans.first
+      @instance.space = client.current_space
+    else
+      @instance.type = psql_service.type
+      @instance.vendor = psql_service.label
+      @instance.version = psql_service.version
+      @instance.tier = "free"
+    end
+
+    @instance.create!
+  end
+
+  after(:all) do
+    @instance.delete!
+  end
+
+  it "runs with no arguments" do
+    running(:tunnel) do
+      asks("Which service instance?")
+      given(@instance.name)
+      has_input(:instance, @instance)
+
+      asks("Which client would you like to start?")
+      given("none")
+      has_input(:client, "none")
+
+      does("Opening tunnel on port 10000")
+      kill
+    end
+  end
+
+  it "runs with args INSTANCE" do
+    running(:tunnel, :instance => @instance) do
+      asks("Which client would you like to start?")
+      given("none")
+      has_input(:client, "none")
+
+      does("Opening tunnel on port 10000")
+      kill
+    end
+  end
+
+  it "runs with args --port" do
+    port = "10024"
+    running(:tunnel, :port => port) do
+      asks("Which service instance?")
+      given(@instance.name)
+      has_input(:instance, @instance)
+
+      asks("Which client would you like to start?")
+      given("none")
+      has_input(:client, "none")
+
+      does("Opening tunnel on port #{port}")
+      kill
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tunnel-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-29 00:00:00 Z
+date: 2012-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry
@@ -57,7 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -818584907
+        hash: 1147517565
         segments: 
         - 1
         - 0
@@ -82,6 +82,53 @@ dependencies:
         version: 0.0.5
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: vmc
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2295035119
+        segments: 
+        - 0
+        - 4
+        - 0
+        - beta
+        - 42
+        version: 0.4.0.beta.42
+  type: :development
+  version_requirements: *id007
 description: 
 email: 
 - asuraci@vmware.com
@@ -100,6 +147,8 @@ files:
 - helper-app/Gemfile.lock
 - helper-app/server.rb
 - config/clients.yml
+- spec/Rakefile
+- spec/tunnel_spec.rb
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -133,5 +182,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: External access to your services on Cloud Foundry via a Caldecott HTTP tunnel.
-test_files: []
-
+test_files: 
+- spec/Rakefile
+- spec/tunnel_spec.rb