vmc 0.5.1.rc5 → 0.5.1.rc6

data/lib/vmc/cli.rb

@@ -29,6 +29,9 @@ module VMC
     option :proxy, :desc => "Run this command as another user (admin)", :alias => "-u",
       :value => :email
 
+    option :http_proxy, :desc => "Connect though an http proxy server", :alias => "--http-proxy",
+      :value => :http_proxy
+
     option :version, :desc => "Print version number", :alias => "-v",
       :default => false
 
@@ -409,6 +412,7 @@ module VMC
         end
 
       @@client.proxy = input[:proxy]
+      @@client.http_proxy = input[:http_proxy] || ENV['HTTP_PROXY'] || ENV['http_proxy'] || nil
       @@client.trace = input[:trace]
 
       uri = URI.parse(target)

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.1.rc5".freeze
+  VERSION = "0.5.1.rc6".freeze
 end

data/spec/features/{v2 → v1}/push_flow_spec.rb

@@ -1,14 +1,14 @@
 require "spec_helper"
 require "webmock/rspec"
 
-if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TARGET']
-  describe 'A new user tries to use VMC against v2', :ruby19 => true do
+if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
+  describe 'A new user tries to use VMC against v1', :ruby19 => true do
     include ConsoleAppSpeckerMatchers
     include VMC::Interactive
 
-    let(:target) { ENV['VMC_V2_TEST_TARGET'] }
-    let(:username) { ENV['VMC_V2_TEST_USER'] }
-    let(:password) { ENV['VMC_V2_TEST_PASSWORD'] }
+    let(:target) { ENV['VMC_TEST_TARGET'] }
+    let(:username) { ENV['VMC_TEST_USER'] }
+    let(:password) { ENV['VMC_TEST_PASSWORD'] }
 
     let(:app) do
       fuzz = TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_")
@@ -22,7 +22,7 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
     end
 
     after do
-      vmc %W(delete #{app} -f --no-script)
+      `#{vmc_bin} delete #{app} -f --no-script`
       Interact::Progress::Dots.stop!
     end
 
@@ -41,22 +41,6 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
         runner.send_keys password
 
         expect(runner).to say "Authenticating... OK"
-
-        expect(runner).to say(
-          "Organization>" => proc {
-            runner.send_keys "1"
-            expect(runner).to say /Switching to organization .*\.\.\. OK/
-          },
-          "Switching to organization" => proc {}
-        )
-
-        expect(runner).to say(
-          "Space>" => proc {
-            runner.send_keys "1"
-            expect(runner).to say /Switching to space .*\.\.\. OK/
-          },
-          "Switching to space" => proc {}
-        )
       end
 
       run("#{vmc_bin} app #{app}") do |runner|
@@ -71,42 +55,31 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
           expect(runner).to say "Instances> 1"
           runner.send_keys ""
 
-          expect(runner).to say "Custom startup command> "
-          runner.send_keys "bundle exec ruby main.rb -p $PORT"
+          expect(runner).to say "Framework> sinatra"
+          runner.send_keys ""
+
+          expect(runner).to say "Runtime>"
+          runner.send_keys "1"
 
           expect(runner).to say "Memory Limit>"
           runner.send_keys "64M"
 
           expect(runner).to say "Creating #{app}... OK"
 
-          expect(runner).to say "Subdomain> #{app}"
-          runner.send_keys ""
-
-          expect(runner).to say "1:"
-          expect(runner).to say "Domain>"
+          expect(runner).to say "Domain> #{app}"
           runner.send_keys "1"
 
-          expect(runner).to say(/Creating route #{app}\..*\.\.\. OK/)
-          expect(runner).to say(/Binding #{app}\..* to #{app}\.\.\. OK/)
+          expect(runner).to say "Updating #{app}... OK"
 
           expect(runner).to say "Create services for application?> n"
           runner.send_keys ""
 
-          # skip this
-          if runner.expect "Bind other services to application?> n", 1
-            runner.send_keys ""
-          end
-
           expect(runner).to say "Save configuration?> n"
           runner.send_keys ""
 
           expect(runner).to say "Uploading #{app}... OK"
           expect(runner).to say "Starting #{app}... OK"
-
-          expect(runner).to say /(Using|Installing) Ruby/i, 10
-          expect(runner).to say "Your bundle is complete!", 30
-
-          expect(runner).to say "Checking #{app}..."
+          expect(runner).to say "Checking #{app}...", 180
           expect(runner).to say "1/1 instances"
           expect(runner).to say "OK", 30
         end
@@ -121,5 +94,5 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
     end
   end
 else
-  $stderr.puts 'Skipping v2 integration specs; please provide $VMC_V2_TEST_TARGET, $VMC_V2_TEST_USER, and $VMC_V2_TEST_PASSWORD'
+  $stderr.puts 'Skipping v1 integration specs; please provide $VMC_TEST_TARGET, $VMC_TEST_USER, and $VMC_TEST_PASSWORD'
 end

data/spec/vmc/cli_spec.rb

@@ -431,6 +431,37 @@ describe VMC::CLI do
           expect(context.client.proxy).to eq('foo@example.com')
         end
       end
+
+      context "when ENV['http_proxy'] is set" do
+        before { ENV['http_proxy'] = "http://lower.example.com:80" }
+        after { ENV.delete('http_proxy') }
+
+        it "uses the http proxy URI on the enviroenment" do
+          expect(context.client.http_proxy).to eq('http://lower.example.com:80')
+        end
+      end
+
+      context "when ENV['HTTP_PROXY'] is set" do
+        before { ENV['HTTP_PROXY'] = "http://upper.example.com:80" }
+        after { ENV.delete('HTTP_PROXY') }
+
+        it "uses the http proxy URI on the environement" do
+          expect(context.client.http_proxy).to eq('http://upper.example.com:80')
+        end
+      end
+
+      context "with a http proxy URI" do
+        before do
+          ENV['HTTP_PROXY'] = "http://should.be.overwritten.example.com:80"
+          stub(context).input { {:http_proxy => 'http://arg.example.com:80'} }
+        end
+        after { ENV.delete('HTTP_PROXY') }
+
+        it "uses the provided http proxy URI" do
+          expect(context.client.http_proxy).to eq('http://arg.example.com:80')
+        end
+      end
+
     end
 
     context "with a v2 cloud controller" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -1558593090
+  hash: 2937694537
   prerelease: 6
   segments: 
   - 0
   - 5
   - 1
   - rc
-  - 5
-  version: 0.5.1.rc5
+  - 6
+  version: 0.5.1.rc6
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-21 00:00:00 Z
+date: 2013-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -73,14 +73,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1558593112
+        hash: 2937694555
         segments: 
         - 0
         - 5
         - 3
         - rc
-        - 6
-        version: 0.5.3.rc6
+        - 7
+        version: 0.5.3.rc7
     - - <
       - !ruby/object:Gem::Version 
         hash: 7
@@ -136,7 +136,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1558593136
+        hash: 2937694561
         segments: 
         - 0
         - 6
@@ -317,7 +317,6 @@ files:
 - lib/vmc/test_support.rb
 - lib/vmc/version.rb
 - lib/vmc.rb
-- spec/assets/hello-sinatra/config.ru
 - spec/assets/hello-sinatra/fat-cat-makes-app-larger.png
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
@@ -327,9 +326,9 @@ files:
 - spec/console_app_specker/console_app_specker_matchers_spec.rb
 - spec/console_app_specker/specker_runner_spec.rb
 - spec/features/v1/new_user_flow_spec.rb
+- spec/features/v1/push_flow_spec.rb
 - spec/features/v2/account_lifecycle_spec.rb
 - spec/features/v2/login_spec.rb
-- spec/features/v2/push_flow_spec.rb
 - spec/features/v2/switching_targets_spec.rb
 - spec/spec_helper.rb
 - spec/support/command_helper.rb
@@ -412,7 +411,6 @@ signing_key:
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files: 
-- spec/assets/hello-sinatra/config.ru
 - spec/assets/hello-sinatra/fat-cat-makes-app-larger.png
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
@@ -422,9 +420,9 @@ test_files:
 - spec/console_app_specker/console_app_specker_matchers_spec.rb
 - spec/console_app_specker/specker_runner_spec.rb
 - spec/features/v1/new_user_flow_spec.rb
+- spec/features/v1/push_flow_spec.rb
 - spec/features/v2/account_lifecycle_spec.rb
 - spec/features/v2/login_spec.rb
-- spec/features/v2/push_flow_spec.rb
 - spec/features/v2/switching_targets_spec.rb
 - spec/spec_helper.rb
 - spec/support/command_helper.rb

data/spec/assets/hello-sinatra/config.ru

@@ -1,3 +0,0 @@
-require './main'
-
-run Main.new