vmc 0.5.1.rc6 → 0.5.1

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

@@ -1,8 +1,8 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module App
-    class Base < CLI
+    class Base < V2CheckCLI
       # choose the right color for app/instance state
       def state_color(s)
         case s

data/lib/vmc/cli/domain/base.rb

@@ -1,8 +1,8 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module Domain
-    class Base < CLI
+    class Base < V2CheckCLI
       def precondition
         super
         fail "This command is v2-only." unless v2?

data/lib/vmc/cli/organization/base.rb

@@ -1,9 +1,10 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module Organization
-    class Base < CLI
+    class Base < V2CheckCLI
       def precondition
+        super
         check_target
         check_logged_in
 

data/lib/vmc/cli/route/base.rb

@@ -1,8 +1,8 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module Route
-    class Base < CLI
+    class Base < V2CheckCLI
       def precondition
         super
         fail "This command is v2-only." unless v2?

data/lib/vmc/cli/route/map.rb

@@ -2,7 +2,9 @@ require "vmc/cli/route/base"
 
 module VMC::Route
   class Map < Base
-    def precondition; end
+    def precondition
+      fail_on_v2
+    end
 
     desc "Add a URL mapping"
     group :apps, :info, :hidden => true

data/lib/vmc/cli/service/base.rb

@@ -1,8 +1,8 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module Service
-    class Base < CLI
+    class Base < V2CheckCLI
     end
   end
 end

data/lib/vmc/cli/space/base.rb

@@ -1,8 +1,8 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module Space
-    class Base < CLI
+    class Base < V2CheckCLI
       def precondition
         check_target
         check_logged_in

data/lib/vmc/cli/start/base.rb

@@ -1,8 +1,8 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module Start
-    class Base < CLI
+    class Base < V2CheckCLI
       # Make sure we only show the target once
       @@displayed_target = false
 
@@ -10,9 +10,10 @@ module VMC
         @@displayed_target
       end
 
-
       # These commands don't require authentication.
-      def precondition; end
+      def precondition
+        fail_on_v2
+      end
 
       private
 

data/lib/vmc/cli/start/login.rb

@@ -5,6 +5,7 @@ module VMC::Start
   class Login < Base
     def precondition
       check_target
+      super
     end
 
     desc "Authenticate with the target"

data/lib/vmc/cli/start/target.rb

@@ -3,6 +3,8 @@ require "vmc/cli/start/target_interactions"
 
 module VMC::Start
   class Target < Base
+    def precondition; end
+
     desc "Set or display the target cloud, organization, and space"
     group :start
     input :url, :desc => "Target URL to switch to", :argument => :optional
@@ -34,23 +36,10 @@ module VMC::Start
         end
       end
 
-      return unless v2? && client.logged_in?
-
-      if input.has?(:organization) || input.has?(:space)
-        info = target_info
-
-        select_org_and_space(input, info)
-
-        save_target_info(info)
+      if v2?
+        puts "Warning: Targeting a v2 instance. Further commands will fail until a v1 instance is targeted. Please use the 'cf' command to target v2 instances."
       end
 
-      return if quiet?
-
-      invalidate_client
-
-      line
-      display_target
-      display_org_and_space
     end
 
     private

data/lib/vmc/cli/user/base.rb

@@ -1,8 +1,8 @@
-require "vmc/cli"
+require "vmc/cli/v2_check_cli"
 
 module VMC
   module User
-    class Base < CLI
+    class Base < V2CheckCLI
       def precondition
         check_logged_in
       end

data/lib/vmc/cli/v2_check_cli.rb

@@ -0,0 +1,16 @@
+require "vmc/cli/v2_check_cli"
+
+module VMC
+  class V2CheckCLI < CLI
+    def precondition
+      fail_on_v2
+    end
+
+    def fail_on_v2
+      if v2?
+        fail "You are targeting a version 2 instance of Cloud Foundry: you must use the 'cf' command line client (which you can get with 'gem install cf')."
+      end
+    end
+  end
+end
+

data/lib/vmc/version.rb

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

data/spec/features/v2/v2_deprecation_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+
+if ENV['VMC_V2_TEST_TARGET']
+  describe 'v2 deprecation', :ruby19 => true do
+    include ConsoleAppSpeckerMatchers
+
+    let(:target) { ENV['VMC_V2_TEST_TARGET'] }
+
+    before do
+      Interact::Progress::Dots.start!
+    end
+
+    after do
+      Interact::Progress::Dots.stop!
+    end
+
+    it "targeting a v2 instance informs the user to use CF to target v2 instances" do
+      run("#{vmc_bin} target #{target}") do |runner|
+        expect(runner).to say "Setting target"
+        expect(runner).to say target
+        expect(runner).to say "Warning: Targeting a v2 instance. Further commands will fail until a v1 instance is targeted. Please use the 'cf' command to target v2 instances."
+        runner.wait_for_exit
+      end
+    end
+
+    it "running any command against a targeted v2 instance produces an error" do
+      run("#{vmc_bin} target #{target}") { |runner| runner.wait_for_exit }
+
+      error_message = "You are targeting a version 2 instance of Cloud Foundry: you must use the 'cf' command line client (which you can get with 'gem install cf')."
+
+      run("#{vmc_bin} push") do |runner|
+        expect(runner).to say error_message
+        runner.wait_for_exit
+      end
+
+      run("#{vmc_bin} create-service") do |runner|
+        expect(runner).to say error_message
+        runner.wait_for_exit
+      end
+
+      run("#{vmc_bin} start") do |runner|
+        expect(runner).to say error_message
+        runner.wait_for_exit
+      end
+
+      run("#{vmc_bin} login") do |runner|
+        expect(runner).to say error_message
+        runner.wait_for_exit
+      end
+    end
+
+  end
+
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide $VMC_V2_TEST_TARGET'
+end

data/spec/vmc/cli/start/target_spec.rb

@@ -98,26 +98,6 @@ command VMC::Start::Target do
           end
         end
       end
-
-      describe "switching the space" do
-        let(:space) { spaces.last }
-        let(:tokens_yaml) { YAML.load_file(File.expand_path(tokens_file_path)) }
-        let(:tokens_file_path) { '~/.vmc/tokens.yml' }
-
-        def run_command
-          vmc %W[target -s #{space.name}]
-        end
-
-        it "should not reprompt for organization" do
-          dont_allow_ask("Organization", anything)
-          run_command
-        end
-
-        it "sets the space param in the token file" do
-          run_command
-          expect(tokens_yaml["https://api.some-domain.com"][:space]).to be == 'space-id-2'
-        end
-      end
     end
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 2937694537
-  prerelease: 6
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 5
   - 1
-  - rc
-  - 6
-  version: 0.5.1.rc6
+  version: 0.5.1
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-09 00:00:00 Z
+date: 2013-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -73,7 +71,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2937694555
+        hash: 4187602971
         segments: 
         - 0
         - 5
@@ -136,7 +134,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2937694561
+        hash: 4187602977
         segments: 
         - 0
         - 6
@@ -307,6 +305,7 @@ files:
 - lib/vmc/cli/user/passwd.rb
 - lib/vmc/cli/user/register.rb
 - lib/vmc/cli/user/users.rb
+- lib/vmc/cli/v2_check_cli.rb
 - lib/vmc/cli.rb
 - lib/vmc/constants.rb
 - lib/vmc/detect.rb
@@ -327,9 +326,7 @@ files:
 - 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/switching_targets_spec.rb
+- spec/features/v2/v2_deprecation_spec.rb
 - spec/spec_helper.rb
 - spec/support/command_helper.rb
 - spec/support/config_helper.rb
@@ -395,14 +392,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: vmc
@@ -421,9 +416,7 @@ test_files:
 - 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/switching_targets_spec.rb
+- spec/features/v2/v2_deprecation_spec.rb
 - spec/spec_helper.rb
 - spec/support/command_helper.rb
 - spec/support/config_helper.rb

data/spec/features/v2/account_lifecycle_spec.rb

@@ -1,96 +0,0 @@
-require "spec_helper"
-require "webmock/rspec"
-require "ffaker"
-
-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 production', :ruby19 => true do
-    before(:all) do
-      WebMock.allow_net_connect!
-    end
-
-    after(:all) do
-      WebMock.disable_net_connect!
-    end
-
-    let(:target) { ENV['VMC_V2_TEST_TARGET'] }
-    let(:username) { ENV['VMC_V2_TEST_USER'] }
-    let(:password) { ENV['VMC_V2_TEST_PASSWORD'] }
-
-    let(:client) do
-      client = CFoundry::V2::Client.new("https://#{target}")
-      client.login(username, password)
-      client
-    end
-
-    before do
-      Interact::Progress::Dots.start!
-    end
-
-    after do
-      Interact::Progress::Dots.stop!
-    end
-
-    it "registers a new account and deletes it" do
-      pending "until we get some v2 admin credentials somewhere to actually run this with" if TRAVIS_BUILD_ID
-
-      email = Faker::Internet.email
-      run("#{vmc_bin} target #{target}") do |runner|
-        runner.wait_for_exit
-      end
-
-      run("#{vmc_bin} login #{username} --password #{password}") do |runner|
-        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
-
-      puts "registering #{email}"
-      run("#{vmc_bin} register #{email} --password p") do |runner|
-        expect(runner).to say "Confirm Password>"
-        runner.send_keys 'p'
-        expect(runner).to say "Your password strength is: good"
-        expect(runner).to say "Creating user... OK"
-        expect(runner).to say "Authenticating... OK"
-      end
-
-      run("#{vmc_bin} logout") do |runner|
-        runner.wait_for_exit
-      end
-
-      run("#{vmc_bin} login #{username} --password #{password}") do |runner|
-        expect(runner).to say "Organization>"
-        runner.send_keys "1"
-        expect(runner).to say "Space>"
-        runner.send_keys "1"
-      end
-
-      # run("#{vmc_bin} delete-user #{email}") do |runner|
-        # expect(runner).to say "Really delete user #{email}?>"
-        # runner.send_keys "y"
-        # expect(runner).to say "Deleting #{email}... OK"
-      # end
-
-      puts "deleting #{email}"
-      client.login(email, "p")
-      user = client.current_user
-      guid = user.guid
-      client.login(username, password)
-      user.delete!
-      client.base.uaa.delete_user(guid)
-    end
-  end
-else
-  $stderr.puts 'Skipping v2 integration specs; please provide $VMC_V2_TEST_TARGET, $VMC_V2_TEST_USER, and $VMC_V2_TEST_PASSWORD'
-end

data/spec/features/v2/login_spec.rb

@@ -1,66 +0,0 @@
-require "spec_helper"
-
-if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TARGET'] && ENV['VMC_V2_OTHER_TEST_USER']
-  describe 'A user logs in and switches spaces, after a different user has logged in', :ruby19 => true do
-    include ConsoleAppSpeckerMatchers
-
-    let(:target) { ENV['VMC_V2_TEST_TARGET'] }
-    let(:username) { ENV['VMC_V2_TEST_USER'] }
-    let(:password) { ENV['VMC_V2_TEST_PASSWORD'] }
-
-    let(:second_username) { ENV['VMC_V2_OTHER_TEST_USER'] }
-    let(:second_organization) { ENV['VMC_V2_OTHER_TEST_ORGANIZATION'] }
-    let(:second_space) { ENV['VMC_V2_OTHER_TEST_SPACE'] }
-    let(:second_password) { ENV['VMC_V2_OTHER_TEST_PASSWORD'] || ENV['VMC_V2_TEST_PASSWORD'] }
-
-    before do
-      Interact::Progress::Dots.start!
-
-      run("#{vmc_bin} target #{target}") do |runner|
-        expect(runner).to say "Setting target"
-        expect(runner).to say target
-        runner.wait_for_exit
-      end
-
-      run("#{vmc_bin} logout") do |runner|
-        runner.wait_for_exit
-      end
-    end
-
-    after do
-      Interact::Progress::Dots.stop!
-    end
-
-    context "when a different user is already logged in" do
-      before do
-        run("#{vmc_bin} login #{username} --password #{password}") do |runner|
-          expect(runner).to say "Authenticating... OK"
-          expect(runner).to say "Organization>"
-          runner.send_keys("pivotal")
-
-          expect(runner).to say "Switching to organization"
-          expect(runner).to say "OK"
-
-          expect(runner).to say "Space"
-          runner.send_keys("1")
-
-          expect(runner).to say "Switching to space"
-          expect(runner).to say "OK"
-
-          runner.wait_for_exit
-        end
-      end
-
-      it "can switch spaces on login" do
-        run("#{vmc_bin} login #{second_username} --password #{second_password} --organization #{second_organization} --space #{second_space}") do |runner|
-          expect(runner).to say "Authenticating... OK"
-          expect(runner).to say "Switching to organization #{second_organization}... OK"
-          expect(runner).to say "Switching to space #{second_space}... OK"
-          runner.wait_for_exit
-        end
-      end
-    end
-  end
-else
-  $stderr.puts 'Skipping v2 integration specs; please provide $VMC_V2_TEST_TARGET, $VMC_V2_TEST_USER, $VMC_V2_TEST_PASSWORD, and $VMC_V2_OTHER_TEST_USER'
-end

data/spec/features/v2/switching_targets_spec.rb

@@ -1,32 +0,0 @@
-require "spec_helper"
-
-if ENV['VMC_V2_TEST_TARGET']
-  describe 'A new user tries to use VMC against v2 production', :ruby19 => true do
-    include ConsoleAppSpeckerMatchers
-
-    let(:target) { ENV['VMC_V2_TEST_TARGET'] }
-
-    before do
-      Interact::Progress::Dots.start!
-    end
-
-    after do
-      Interact::Progress::Dots.stop!
-    end
-
-    it "can switch targets, even if a target is invalid" do
-      run("#{vmc_bin} target invalid-target") do |runner|
-        expect(runner).to say "Target refused"
-        runner.wait_for_exit
-      end
-
-      run("#{vmc_bin} target #{target}") do |runner|
-        expect(runner).to say "Setting target"
-        expect(runner).to say target
-        runner.wait_for_exit
-      end
-    end
-  end
-else
-  $stderr.puts 'Skipping v2 integration specs; please provide $VMC_V2_TEST_TARGET'
-end