vmc 0.5.0.beta.7 → 0.5.0.beta.10

data/spec/vmc/cli_spec.rb

@@ -2,19 +2,20 @@ require 'spec_helper'
 
 describe VMC::CLI do
   let(:cmd) { Class.new(VMC::CLI).new }
+  let(:cli) { VMC::CLI.new }
 
   describe '#execute' do
     let(:inputs) { {} }
 
     subject do
-      with_output_to do
+      capture_output do
         stub(cmd).input { inputs }
         cmd.execute(nil, [])
       end
     end
 
     it 'wraps Timeout::Error with a more friendly message' do
-      stub(cmd).precondition { raise CFoundry::Timeout.new(Net::HTTP::Get, "/foo") }
+      stub(cmd).precondition { raise CFoundry::Timeout.new("GET", "/foo") }
 
       mock(cmd).err 'GET /foo timed out'
       subject
@@ -42,7 +43,7 @@ describe VMC::CLI do
   describe '#log_error' do
     subject do
       cmd.log_error(exception)
-      File.read(VMC::CRASH_FILE)
+      File.read(File.expand_path(VMC::CRASH_FILE))
     end
 
     context 'when the exception is a normal error' do
@@ -60,10 +61,10 @@ describe VMC::CLI do
     end
 
     context 'when the exception is an APIError' do
-      let(:request) { Net::HTTP::Get.new("http://api.cloudfoundry.com/foo") }
-      let(:response) { Net::HTTPNotFound.new("foo", 404, "bar")}
+      let(:request) { { :method => "GET", :url => "http://api.cloudfoundry.com/foo", :headers => {}, :body => nil } }
+      let(:response) { { :status => 404, :body => "bar", :headers => {} } }
       let(:exception) do
-        error = CFoundry::APIError.new(request, response)
+        error = CFoundry::APIError.new(nil, nil, request, response)
         error.set_backtrace(["fo/gems/bar", "baz quick"])
         error
       end
@@ -76,5 +77,162 @@ describe VMC::CLI do
       it { should include "RESPONSE: " }
     end
   end
+
+  describe "#client_target" do
+    subject { cli.client_target }
+
+    context "when a ~/.vmc/target exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
+
+      it "returns the target in that file" do
+        expect(subject).to eq "https://api.some-domain.com"
+      end
+    end
+
+    context "when a ~/.vmc_target exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/old" }
+
+      it "returns the target in that file" do
+        expect(subject).to eq "https://api.some-domain.com"
+      end
+    end
+
+    context "when no target file exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/no_config" }
+
+      it "displays an error to the user" do
+        expect{ subject }.to raise_error(VMC::UserError, /Please select a target/)
+      end
+    end
+  end
+
+  describe "#targets_info" do
+    subject { cli.targets_info }
+
+    context "when a ~/.vmc/tokens.yml exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
+
+      it "returns the file's contents as a hash" do
+        expect(subject).to eq({
+          "https://api.some-domain.com" => {
+            :token => "bearer some-token",
+            :version => 2
+          }
+        })
+      end
+    end
+
+    context "when a ~/.vmc_token file exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/old" }
+
+      it "returns the target in that file" do
+        expect(subject).to eq({
+          "https://api.some-domain.com" => {
+            :token => "bearer some-token"
+          }
+        })
+      end
+    end
+
+    context "when no token file exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/no_config" }
+
+      it "returns an empty hash" do
+        expect(subject).to eq({})
+      end
+    end
+  end
+
+  describe "#target_info" do
+    subject { VMC::CLI.new.target_info("https://api.some-domain.com") }
+
+    context "when a ~/.vmc/tokens.yml exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
+
+      it "returns the info for the given url" do
+        expect(subject).to eq({
+          :token => "bearer some-token",
+          :version => 2
+        })
+      end
+    end
+
+    context "when a ~/.vmc_token file exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/old" }
+
+      it "returns the info for the given url" do
+        expect(subject).to eq({
+          :token => "bearer some-token"
+        })
+      end
+    end
+
+    context "when no token file exists" do
+      use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/no_config" }
+
+      it "returns an empty hash" do
+        expect(subject).to eq({})
+      end
+    end
+  end
+
+  describe "methods that update the token info" do
+    let!(:tmpdir) { Dir.mktmpdir }
+    use_fake_home_dir { tmpdir }
+
+    before do
+      stub(cli).targets_info do
+        {
+          "https://api.some-domain.com" => { :token => "bearer token1" },
+          "https://api.some-other-domain.com" => { :token => "bearer token2" }
+        }
+      end
+    end
+
+    after { FileUtils.rm_rf tmpdir }
+
+    describe "#save_target_info" do
+      it "adds the given target info, and writes the result to ~/.vmc/tokens.yml" do
+        cli.save_target_info({ :token => "bearer token3" }, "https://api.some-domain.com")
+        YAML.load_file(File.expand_path("~/.vmc/tokens.yml")).should == {
+          "https://api.some-domain.com" => { :token => "bearer token3" },
+          "https://api.some-other-domain.com" => { :token => "bearer token2" }
+        }
+      end
+    end
+
+    describe "#remove_target_info" do
+      it "removes the given target, and writes the result to ~/.vmc/tokens.yml" do
+        cli.remove_target_info("https://api.some-domain.com")
+        YAML.load_file(File.expand_path("~/.vmc/tokens.yml")).should == {
+          "https://api.some-other-domain.com" => { :token => "bearer token2" }
+        }
+      end
+    end
+  end
+
+  describe "#client" do
+    use_fake_home_dir { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
+    before { stub(cli).input { {} } }
+
+    describe "the client's token" do
+      it "constructs an AuthToken object with the data from the tokens.yml file" do
+        expect(cli.client.token).to be_a(CFoundry::AuthToken)
+        expect(cli.client.token.auth_header).to eq("bearer some-token")
+      end
+
+      it "does not assign an AuthToken on the client if there is no token stored" do
+        mock(cli).target_info("some-fake-target") { { :version => 2 } }
+        expect(cli.client("some-fake-target").token).to be_nil
+      end
+    end
+
+    describe "the client's version" do
+      it "uses the version stored in the yml file" do
+
+        expect(cli.client.version).to eq(2)
+      end
+    end
+  end
 end
 

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1416830649
+  hash: -3788488616
   prerelease: 6
   segments: 
   - 0
   - 5
   - 0
   - beta
-  - 7
-  version: 0.5.0.beta.7
+  - 10
+  version: 0.5.0.beta.10
 platform: ruby
 authors: 
+- Cloud Foundry Team
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-01-10 00:00:00 Z
+date: 2013-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -71,12 +72,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 39
         segments: 
         - 0
         - 4
-        - 19
-        version: 0.4.19
+        - 20
+        version: 0.4.20
   prerelease: false
   type: :runtime
   name: cfoundry
@@ -103,12 +104,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   prerelease: false
   type: :runtime
   name: mothership
@@ -119,12 +120,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 11
         segments: 
         - 0
-        - 4
-        - 19
-        version: 0.4.19
+        - 5
+        - 0
+        version: 0.5.0
   prerelease: false
   type: :runtime
   name: manifests-vmc-plugin
@@ -135,15 +136,15 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 13
         segments: 
         - 0
-        - 0
-        - 2
-        version: 0.0.2
+        - 1
+        - 11
+        version: 0.1.11
   prerelease: false
   type: :runtime
-  name: tunnel-dummy-vmc-plugin
+  name: tunnel-vmc-plugin
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
@@ -207,7 +208,7 @@ dependencies:
   requirement: *id012
 description: 
 email: 
-- asuraci@vmware.com
+- vcap-dev@googlegroups.com
 executables: 
 - vmc
 extensions: []
@@ -234,17 +235,14 @@ files:
 - lib/vmc/cli/app/push.rb
 - lib/vmc/cli/app/rename.rb
 - lib/vmc/cli/app/restart.rb
-- lib/vmc/cli/app/routes.rb
 - lib/vmc/cli/app/scale.rb
 - lib/vmc/cli/app/start.rb
 - lib/vmc/cli/app/stats.rb
 - lib/vmc/cli/app/stop.rb
-- lib/vmc/cli/domain/add_domain.rb
 - lib/vmc/cli/domain/base.rb
-- lib/vmc/cli/domain/create_domain.rb
-- lib/vmc/cli/domain/delete_domain.rb
 - lib/vmc/cli/domain/domains.rb
-- lib/vmc/cli/domain/remove_domain.rb
+- lib/vmc/cli/domain/map.rb
+- lib/vmc/cli/domain/unmap.rb
 - lib/vmc/cli/help.rb
 - lib/vmc/cli/interactive.rb
 - lib/vmc/cli/organization/base.rb
@@ -254,9 +252,9 @@ files:
 - lib/vmc/cli/organization/orgs.rb
 - lib/vmc/cli/organization/rename.rb
 - lib/vmc/cli/route/base.rb
-- lib/vmc/cli/route/create_route.rb
-- lib/vmc/cli/route/delete.rb
+- lib/vmc/cli/route/map.rb
 - lib/vmc/cli/route/routes.rb
+- lib/vmc/cli/route/unmap.rb
 - lib/vmc/cli/service/base.rb
 - lib/vmc/cli/service/bind.rb
 - lib/vmc/cli/service/create.rb
@@ -277,7 +275,6 @@ files:
 - lib/vmc/cli/start/info.rb
 - lib/vmc/cli/start/login.rb
 - lib/vmc/cli/start/logout.rb
-- lib/vmc/cli/start/register.rb
 - lib/vmc/cli/start/target.rb
 - lib/vmc/cli/start/target_interactions.rb
 - lib/vmc/cli/start/targets.rb
@@ -285,6 +282,7 @@ files:
 - lib/vmc/cli/user/create.rb
 - lib/vmc/cli/user/delete.rb
 - lib/vmc/cli/user/passwd.rb
+- lib/vmc/cli/user/register.rb
 - lib/vmc/cli/user/users.rb
 - lib/vmc/cli.rb
 - lib/vmc/constants.rb
@@ -293,25 +291,31 @@ files:
 - lib/vmc/plugin.rb
 - lib/vmc/spacing.rb
 - lib/vmc/spec_helper.rb
+- lib/vmc/test_support/command_helper.rb
+- lib/vmc/test_support/common_input_examples.rb
+- lib/vmc/test_support/fake_home_dir.rb
+- lib/vmc/test_support/interact_helper.rb
+- lib/vmc/test_support.rb
 - lib/vmc/version.rb
 - lib/vmc.rb
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/main.rb
 - spec/features/new_user_flow_spec.rb
 - spec/spec_helper.rb
-- spec/support/common_input_examples.rb
-- spec/support/feature_helpers.rb
-- spec/support/interact_helpers.rb
 - spec/vmc/cli/app/base_spec.rb
 - spec/vmc/cli/app/delete_spec.rb
 - spec/vmc/cli/app/instances_spec.rb
 - spec/vmc/cli/app/push/create_spec.rb
 - spec/vmc/cli/app/push_spec.rb
 - spec/vmc/cli/app/rename_spec.rb
+- spec/vmc/cli/app/scale_spec.rb
 - spec/vmc/cli/app/stats_spec.rb
+- spec/vmc/cli/domain/map_spec.rb
+- spec/vmc/cli/domain/unmap_spec.rb
 - spec/vmc/cli/organization/orgs_spec.rb
 - spec/vmc/cli/organization/rename_spec.rb
-- spec/vmc/cli/route/delete_route_spec.rb
+- spec/vmc/cli/route/map_spec.rb
+- spec/vmc/cli/route/unmap_spec.rb
 - spec/vmc/cli/service/bind_spec.rb
 - spec/vmc/cli/service/delete_spec.rb
 - spec/vmc/cli/service/rename_spec.rb
@@ -321,12 +325,13 @@ files:
 - spec/vmc/cli/space/spaces_spec.rb
 - spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/start/login_spec.rb
-- spec/vmc/cli/start/register_spec.rb
+- spec/vmc/cli/user/create_spec.rb
 - spec/vmc/cli/user/passwd_spec.rb
+- spec/vmc/cli/user/register_spec.rb
 - spec/vmc/cli_spec.rb
 - spec/vmc/detect_spec.rb
 - bin/vmc
-homepage: http://cloudfoundry.com/
+homepage: http://github.com/cloudfoundry/vmc
 licenses: []
 
 post_install_message: 
@@ -366,19 +371,20 @@ test_files:
 - spec/assets/hello-sinatra/main.rb
 - spec/features/new_user_flow_spec.rb
 - spec/spec_helper.rb
-- spec/support/common_input_examples.rb
-- spec/support/feature_helpers.rb
-- spec/support/interact_helpers.rb
 - spec/vmc/cli/app/base_spec.rb
 - spec/vmc/cli/app/delete_spec.rb
 - spec/vmc/cli/app/instances_spec.rb
 - spec/vmc/cli/app/push/create_spec.rb
 - spec/vmc/cli/app/push_spec.rb
 - spec/vmc/cli/app/rename_spec.rb
+- spec/vmc/cli/app/scale_spec.rb
 - spec/vmc/cli/app/stats_spec.rb
+- spec/vmc/cli/domain/map_spec.rb
+- spec/vmc/cli/domain/unmap_spec.rb
 - spec/vmc/cli/organization/orgs_spec.rb
 - spec/vmc/cli/organization/rename_spec.rb
-- spec/vmc/cli/route/delete_route_spec.rb
+- spec/vmc/cli/route/map_spec.rb
+- spec/vmc/cli/route/unmap_spec.rb
 - spec/vmc/cli/service/bind_spec.rb
 - spec/vmc/cli/service/delete_spec.rb
 - spec/vmc/cli/service/rename_spec.rb
@@ -388,7 +394,8 @@ test_files:
 - spec/vmc/cli/space/spaces_spec.rb
 - spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/start/login_spec.rb
-- spec/vmc/cli/start/register_spec.rb
+- spec/vmc/cli/user/create_spec.rb
 - spec/vmc/cli/user/passwd_spec.rb
+- spec/vmc/cli/user/register_spec.rb
 - spec/vmc/cli_spec.rb
 - spec/vmc/detect_spec.rb

data/lib/vmc/cli/app/routes.rb

@@ -1,100 +0,0 @@
-require "vmc/cli/app/base"
-
-# TODO: split up, as the URL interaction will differ (see other TODO)
-module VMC::App
-  class Routes < Base
-    desc "Add a URL mapping for an app"
-    group :apps, :info, :hidden => true
-    input :app, :desc => "Application to add the URL to", :argument => true,
-          :from_given => by_name(:app)
-    input :url, :desc => "URL to map to the application", :argument => true
-    # TODO: move push's URL interaction here, and have it just invoke
-    def map
-      app = input[:app]
-
-      simple = input[:url].sub(/^https?:\/\/(.*)\/?/i, '\1')
-
-      if v2?
-        host, domain_name = simple.split(".", 2)
-
-        domain =
-          client.current_space.domain_by_name(domain_name, :depth => 0)
-
-        fail "Invalid domain '#{domain_name}'" unless domain
-
-        route = client.routes_by_host(host, :depth => 0).find do |r|
-          r.domain == domain
-        end
-
-        unless route
-          route = client.route
-
-          with_progress("Creating route #{c(simple, :name)}") do
-            route.host = host
-            route.domain = domain
-            route.space = app.space
-            route.create!
-          end
-        end
-
-        with_progress("Binding #{c(simple, :name)} to #{c(app.name, :name)}") do
-          app.add_route(route)
-        end
-      else
-        with_progress("Updating #{c(app.name, :name)}") do
-          app.urls << simple
-          app.update!
-        end
-      end
-    end
-
-
-    desc "Remove a URL mapping from an app"
-    group :apps, :info, :hidden => true
-    input :app, :desc => "Application to remove the URL from",
-          :argument => true, :from_given => by_name(:app)
-    input :url, :desc => "URL to unmap", :argument => :optional
-    def unmap
-      app = input[:app]
-      url = input[:url, app.urls]
-
-      simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
-
-      if v2?
-        host, domain_name = simple.split(".", 2)
-
-        domain =
-          client.current_space.domain_by_name(domain_name, :depth => 0)
-
-        fail "Invalid domain '#{domain_name}'" unless domain
-
-        route = app.routes_by_host(host, :depth => 0).find do |r|
-          r.domain == domain
-        end
-
-        fail "Invalid route '#{simple}'" unless route
-
-        with_progress("Removing route #{c(simple, :name)}") do
-          app.remove_route(route)
-        end
-      else
-        with_progress("Updating #{c(app.name, :name)}") do |s|
-          unless app.urls.delete(simple)
-            s.fail do
-              err "URL #{url} is not mapped to this application."
-              return
-            end
-          end
-
-          app.update!
-        end
-      end
-    end
-
-    private
-
-    def ask_url(choices)
-      ask("Which URL?", :choices => choices)
-    end
-  end
-end