vmc 0.5.1.rc1 → 0.5.1.rc2

data/Rakefile

@@ -8,44 +8,5 @@ CURRENT_VERSION = SPEC.version.to_s.freeze
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
-namespace :deploy do
-  def last_staging_sha
-    `git rev-parse latest-staging`.strip
-  end
-
-  def last_release_sha
-    `git rev-parse latest-release`.strip
-  end
-
-  def last_staging_ref_was_released?
-    last_staging_sha == last_release_sha
-  end
-
-  def next_minor
-    Gem::Version.new(CURRENT_VERSION + ".0").bump.to_s
-  end
-
-  def next_rc
-    unless CURRENT_VERSION =~ /rc/
-      "#{next_minor}.rc1"
-    end
-  end
-
-  task :staging, :version do |_, args|
-    version = args.version || next_rc
-    sh "gem bump --push #{"--version #{version}" if version}" if last_staging_ref_was_released?
-    sh "git tag -f latest-staging"
-    sh "git push origin :latest-staging"
-    sh "git push origin latest-staging"
-  end
-
-  task :candidate do
-    sh "git fetch"
-    sh "git checkout latest-staging"
-    sh "gem release"
-    sh "git tag -f v#{CURRENT_VERSION}"
-    sh "git tag -f latest-release"
-    sh "git push origin :latest-release"
-    sh "git push origin latest-release"
-  end
-end
+# looking for a way to push gems? check out the new frontend-release git repo!
+# git@github.com:pivotal-vmware/frontend-release.git

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

@@ -16,6 +16,7 @@ module VMC::Space
     input :auditor, :desc => "Add yourself as auditor", :default => false
 
     def create_space
+      # TODO: ask org instead
       return invoke :help,
         :command => "create-space" if input[:organization].nil?
 
@@ -48,6 +49,8 @@ module VMC::Space
       if input[:target]
         invoke :target, :organization => space.organization,
           :space => space
+      else
+        line c("Space created! Use #{b("switch-space #{space.name}")} to target it.", :good)
       end
     end
 

data/lib/vmc/version.rb

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

data/spec/features/v1/new_user_flow_spec.rb

@@ -11,7 +11,7 @@ if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
     let(:password) { ENV['VMC_TEST_PASSWORD'] }
 
     let(:app) do
-      fuzz = defined?(TRAVIS_BUILD_ID) ? TRAVIS_BUILD_ID : Time.new.to_f.to_s.gsub(".", "_")
+      fuzz = TRAVIS_BUILD_ID || Time.new.to_f.to_s.gsub(".", "_")
       "hello-sinatra-#{fuzz}"
     end
 

data/spec/features/v2/account_lifecycle_spec.rb

@@ -1,14 +1,27 @@
 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
-    include ConsoleAppSpeckerMatchers
+    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
@@ -18,7 +31,7 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
     end
 
     it "registers a new account and deletes it" do
-      pending "until we get some v2 admin credentials somewhere to actually run this with"
+      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|
@@ -52,13 +65,21 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
         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
+      # 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
+end

data/spec/features/v2/push_flow_spec.rb

@@ -11,7 +11,7 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
     let(:password) { ENV['VMC_V2_TEST_PASSWORD'] }
 
     let(:app) do
-      fuzz = defined?(TRAVIS_BUILD_ID) ? TRAVIS_BUILD_ID : Time.new.to_f.to_s.gsub(".", "_")
+      fuzz = TRAVIS_BUILD_ID || Time.new.to_f.to_s.gsub(".", "_")
       "hello-sinatra-#{fuzz}"
     end
 
@@ -103,7 +103,7 @@ if ENV['VMC_V2_TEST_USER'] && ENV['VMC_V2_TEST_PASSWORD'] && ENV['VMC_V2_TEST_TA
           expect(runner).to say "Uploading #{app}... OK"
           expect(runner).to say "Starting #{app}... OK"
 
-          expect(runner).to say "Using Ruby", 10
+          expect(runner).to say /(Using|Installing) Ruby/i, 10
           expect(runner).to say "Your bundle is complete!", 30
 
           expect(runner).to say "Checking #{app}..."

data/spec/features/v2/switching_targets_spec.rb

@@ -16,7 +16,7 @@ if ENV['VMC_V2_TEST_TARGET']
 
     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/i
+        expect(runner).to say "Target refused"
         runner.wait_for_exit
       end
 

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require "webmock"
 require "ostruct"
 
 INTEGRATE_WITH = ENV["INTEGRATE_WITH"] || "default"
+TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"]
 
 def vmc_bin
   vmc = File.expand_path("#{SPEC_ROOT}/../bin/vmc.dev")

data/spec/support/command_helper.rb

@@ -1,6 +1,7 @@
 def command(klass, &specs)
   describe klass do
     let(:stub_precondition?) { true }
+
     before do
       any_instance_of klass do |cli|
         stub(cli).precondition if stub_precondition?

data/spec/support/tracking_expector.rb

@@ -68,4 +68,4 @@ class TrackingExpector
   def output_ended?(timeout)
     (@out.is_a?(IO) && !IO.select([@out], nil, nil, timeout)) || @out.eof?
   end
-end
+end

data/spec/vmc/cli/space/create_spec.rb

@@ -1,25 +1,7 @@
 require 'spec_helper'
 require "vmc/cli/space/create"
 
-describe VMC::Space::Create do
-  let(:spaces) { fake_list(:space, 3) }
-  let(:organization) { fake(:organization, :spaces => spaces) }
-  let(:new_space) { stub! }
-  let(:client) { fake_client(:current_organization => organization, :spaces => spaces) }
-  let(:new_name) { "some-new-name" }
-
-  before do
-    %w{create! organization= name= name add_manager add_developer add_auditor organization}.each do |method|
-      new_space.__send__(method.to_sym)
-    end
-
-    stub(client).space { new_space }
-    any_instance_of described_class do |cli|
-      stub(cli).client { client }
-      stub(cli).precondition { nil }
-    end
-  end
-
+command VMC::Space::Create do
   describe 'metadata' do
     let(:command) { Mothership.commands[:create_space] }
 
@@ -42,31 +24,69 @@ describe VMC::Space::Create do
     end
   end
 
-  context "when we don't specify an organization" do
-    subject { vmc %W[--no-quiet create-space new-space-name] }
+  describe "running the command" do
+    let(:client) do
+      fake_client(:current_organization => organization)
+    end
 
-    context "when we have a default organization" do
-      it "uses that organization to create a space" do
-        subject
+    let(:organization) { fake(:organization) }
+
+    let(:new_space) { fake :space, :name => new_name }
+    let(:new_name) { "some-new-name" }
+
+    before do
+      stub(client).space { new_space }
+      stub(new_space).create!
+      stub(new_space).add_manager
+      stub(new_space).add_developer
+      stub(new_space).add_auditor
+    end
 
-        stdout.rewind
-        expect(stdout.readline).to include "Creating space"
+    context "when --target is given" do
+      subject { vmc %W[create-space #{new_space.name} --target] }
+
+      it "switches them to the new space" do
+        mock_invoke :target, :organization => organization,
+          :space => new_space
+        subject
       end
     end
 
-    context "when we don't have a default organization" do
-      let(:organization) { nil }
+    context "when --target is NOT given" do
+      subject { vmc %W[create-space #{new_space.name}] }
 
-      it "shows the help for the command" do
+      it "tells the user how they can switch to the new space" do
         subject
+        expect(output).to say("Space created! Use switch-space #{new_space.name} to target it.")
+      end
+    end
+
+    context "when we don't specify an organization" do
+      subject { vmc %W[create-space #{new_space.name}] }
 
-        stdout.rewind
-        expect(stdout.readline).to include "Create a space in an organization"
+      context "when we have a default organization" do
+        it "uses that organization to create a space" do
+          subject
+
+          stdout.rewind
+          expect(stdout.readline).to include "Creating space"
+        end
       end
 
-      it "does not try to create the space" do
-        new_space.create! { raise "should not call this method" } # rr not behaving
-        subject
+      context "when we don't have a default organization" do
+        let(:organization) { nil }
+
+        it "shows the help for the command" do
+          subject
+
+          stdout.rewind
+          expect(stdout.readline).to include "Create a space in an organization"
+        end
+
+        it "does not try to create the space" do
+          new_space.create! { raise "should not call this method" } # rr not behaving
+          subject
+        end
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 2761529585
+  hash: -656826288
   prerelease: 6
   segments: 
   - 0
   - 5
   - 1
   - rc
-  - 1
-  version: 0.5.1.rc1
+  - 2
+  version: 0.5.1.rc2
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,12 +18,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-06 00:00:00 Z
+date: 2013-03-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +31,12 @@ dependencies:
         - 1
         - 6
         version: "1.6"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: json_pure
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: multi_json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +46,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  name: multi_json
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: interact
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,24 +61,24 @@ dependencies:
         - 0
         - 5
         version: "0.5"
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  name: interact
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: cfoundry
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2761529569
+        hash: -656826304
         segments: 
         - 0
         - 5
         - 3
         - rc
-        - 1
-        version: 0.5.3.rc1
+        - 2
+        version: 0.5.3.rc2
     - - <
       - !ruby/object:Gem::Version 
         hash: 7
@@ -88,12 +86,12 @@ dependencies:
         - 0
         - 6
         version: "0.6"
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  name: cfoundry
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: clouseau
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -103,12 +101,12 @@ dependencies:
         - 0
         - 0
         version: "0.0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
+  name: clouseau
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: mothership
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,12 +124,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id006
+  name: mothership
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: manifests-vmc-plugin
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,12 +140,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
+  prerelease: false
   type: :runtime
-  version_requirements: *id007
+  name: manifests-vmc-plugin
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: tunnel-vmc-plugin
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,12 +156,12 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
+  prerelease: false
   type: :runtime
-  version_requirements: *id008
+  name: tunnel-vmc-plugin
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -173,12 +171,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  name: rake
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -188,12 +186,12 @@ dependencies:
         - 2
         - 11
         version: "2.11"
+  prerelease: false
   type: :development
-  version_requirements: *id010
+  name: rspec
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -203,12 +201,12 @@ dependencies:
         - 1
         - 9
         version: "1.9"
+  prerelease: false
   type: :development
-  version_requirements: *id011
+  name: webmock
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: rr
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -218,8 +216,10 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  prerelease: false
   type: :development
-  version_requirements: *id012
+  name: rr
+  requirement: *id012
 description: 
 email: 
 - vcap-dev@googlegroups.com