tunnel-vmc-plugin 0.1.11 → 0.2.0

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

@@ -64,6 +64,18 @@ module VMCTunnel
       end
     end
 
+    def tunnel_clients
+      return @tunnel_clients if @tunnel_clients
+      stock_config = YAML.load_file(STOCK_CLIENTS)
+      custom_config_file = File.expand_path(CLIENTS_FILE)
+      if File.exists?(custom_config_file)
+        custom_config = YAML.load_file(custom_config_file)
+        @tunnel_clients = deep_merge(stock_config, custom_config)
+      else
+        @tunnel_clients = stock_config
+      end
+    end
+
     private
 
     def display_tunnel_connection_info(info)
@@ -131,19 +143,6 @@ module VMCTunnel
       system(cmdline)
     end
 
-    def tunnel_clients
-      return @tunnel_clients if @tunnel_clients
-
-      stock = YAML.load_file(STOCK_CLIENTS)
-      clients = File.expand_path CLIENTS_FILE
-      if File.exists? clients
-        user = YAML.load_file(clients)
-        @tunnel_clients = deep_merge(stock, user)
-      else
-        @tunnel_clients = stock
-      end
-    end
-
     def resolve_symbols(str, info, local_port)
       str.gsub(/\$\{\s*([^\}]+)\s*\}/) do
         sym = $1
@@ -165,8 +164,8 @@ module VMCTunnel
     end
 
     def deep_merge(a, b)
-      merge = proc { |old, new|
-        if old === Hash && new === Hash
+      merge = proc { |_, old, new|
+        if old.is_a?(Hash) && new.is_a?(Hash)
           old.merge(new, &merge)
         else
           new

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

@@ -1,3 +1,3 @@
 module VMCTunnel
-  VERSION = "0.1.11".freeze
+  VERSION = "0.2.0".freeze
 end

data/spec/plugin_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe VMCTunnel::Tunnel do
+  describe "#tunnel_clients" do
+    context "when the user has a custom clients.yml in their vmc directory" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/with_custom_clients" }
+
+      it "overrides the default client config with the user's customizations" do
+        expect(subject.tunnel_clients["postgresql"]).to eq({
+          "psql" => {
+            "command"=>"-h ${host} -p ${port} -d ${name} -U ${user} -w",
+            "environment" => ["PGPASSWORD='dont_ask_password'"]
+          }
+        })
+      end
+    end
+
+    context "when the user does not have a custom clients.yml" do
+      it "returns the default client config" do
+        expect(subject.tunnel_clients["postgresql"]).to eq({
+          "psql" => {
+            "command"=>"-h ${host} -p ${port} -d ${name} -U ${user} -w",
+            "environment" => ["PGPASSWORD='${password}'"]
+          }
+        })
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+SPEC_ROOT = File.dirname(__FILE__).freeze
+
+require "rspec"
+require "cfoundry"
+require "cfoundry/test_support"
+require "vmc"
+require "vmc/test_support"
+
+require "#{SPEC_ROOT}/../lib/tunnel-vmc-plugin/plugin"
+
+RSpec.configure do |c|
+  c.include Fake::FakeMethods
+  c.mock_with :rr
+  c.include VMC::TestSupport::FakeHomeDir
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tunnel-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 11
-  version: 0.1.11
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-11 00:00:00 Z
+date: 2013-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -100,12 +100,13 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        version: "0"
+        - 9
+        version: "0.9"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -116,31 +117,43 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: vmc
+  name: webmock
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -2749972062
+        hash: 29
         segments: 
-        - 0
-        - 4
-        - 0
-        - beta
-        - 42
-        version: 0.4.0.beta.42
+        - 1
+        - 9
+        version: "1.9"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id009
 description: 
 email: 
 - asuraci@vmware.com
@@ -159,6 +172,8 @@ files:
 - helper-app/Gemfile.lock
 - helper-app/server.rb
 - config/clients.yml
+- spec/plugin_spec.rb
+- spec/spec_helper.rb
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -192,5 +207,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/plugin_spec.rb
+- spec/spec_helper.rb