vmc 0.5.0.beta.1 → 0.5.0.beta.2

data/lib/vmc/cli.rb

@@ -266,7 +266,7 @@ module VMC
 
     def ensure_config_dir
       config = File.expand_path(VMC::CONFIG_DIR)
-      Dir.mkdir(config) unless File.exist? config
+      FileUtils.mkdir_p(config) unless File.exist? config
     end
 
     def set_target(url)

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

@@ -14,7 +14,7 @@ module VMC::App
     input :path,      :desc => "Path containing the bits", :default => "."
     input :url,       :desc => "URL to bind to app"
     input :memory,    :desc => "Memory limit"
-    input :instances, :desc => "Number of instances to run"
+    input :instances, :desc => "Number of instances to run", :type => :integer
     input :framework, :desc => "Framework to use", :from_given => by_name(:framework)
     input :runtime,   :desc => "Runtime to use", :from_given => by_name(:runtime)
     input :command,   :desc => "Startup command for standalone app"

data/lib/vmc/cli/app/push/create.rb

@@ -70,11 +70,13 @@ module VMC::App
       url = input[:url, app.name]
 
       mapped_url = false
-      until !url || mapped_url
+      until url == "none" || !url || mapped_url
         begin
           invoke :map, :app => app, :url => url
           mapped_url = true
         rescue CFoundry::RouteHostTaken, CFoundry::UriAlreadyTaken => e
+          raise if force?
+
           line c(e.description, :bad)
           line
 

data/lib/vmc/cli/app/push/interactions.rb

@@ -14,11 +14,7 @@ module VMC::App
 
       options[:default] = choices.first if choices.size == 1
 
-      url = ask "URL", options
-
-      unless url == "none"
-        url
-      end
+      ask "URL", options
     end
 
     def ask_memory(default)

data/lib/vmc/constants.rb

@@ -1,12 +1,13 @@
 module VMC
-  OLD_TARGET_FILE = "~/.vmc_target"
-  OLD_TOKENS_FILE = "~/.vmc_token"
+  OLD_TARGET_FILE = "~/.vmc_target".freeze
+  OLD_TOKENS_FILE = "~/.vmc_token".freeze
 
-  CONFIG_DIR = "~/.vmc"
-  LOGS_DIR = "#{CONFIG_DIR}/logs"
-  PLUGINS_FILE = "#{CONFIG_DIR}/plugins.yml"
-  TARGET_FILE = "#{CONFIG_DIR}/target"
-  TOKENS_FILE = "#{CONFIG_DIR}/tokens.yml"
-  COLORS_FILE = "#{CONFIG_DIR}/colors.yml"
-  CRASH_FILE = "#{CONFIG_DIR}/crash"
+  CONFIG_DIR = (defined?(SPEC_ROOT) ? "#{SPEC_ROOT}/tmp/.vmc" : "~/.vmc").freeze
+
+  LOGS_DIR = "#{CONFIG_DIR}/logs".freeze
+  PLUGINS_FILE = "#{CONFIG_DIR}/plugins.yml".freeze
+  TARGET_FILE = "#{CONFIG_DIR}/target".freeze
+  TOKENS_FILE = "#{CONFIG_DIR}/tokens.yml".freeze
+  COLORS_FILE = "#{CONFIG_DIR}/colors.yml".freeze
+  CRASH_FILE = "#{CONFIG_DIR}/crash".freeze
 end

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.0.beta.1".freeze
+  VERSION = "0.5.0.beta.2".freeze
 end

data/spec/assets/hello-sinatra/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "sinatra"

data/spec/assets/hello-sinatra/main.rb

@@ -0,0 +1,6 @@
+require "rubygems"
+require "sinatra"
+
+get "/" do
+  "Hello, world!"
+end

data/spec/features/new_user_flow_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
+  describe 'A new user tries to use VMC against v1 production' do
+    let(:target) { ENV['VMC_TEST_TARGET'] }
+    let(:username) { ENV['VMC_TEST_USER'] }
+    let(:password) { ENV['VMC_TEST_PASSWORD'] }
+    let(:output) { StringIO.new }
+    let(:out) { output.string.gsub(/\.  \x08([\x08\. ]+)/, "... ") } # trim animated dots
+
+    let(:app) {
+      fuzz =
+        if defined? TRAVIS_BUILD_ID
+          TRAVIS_BUILD_ID
+        else
+          Time.new.to_f.to_s.gsub(".", "_")
+        end
+
+      "hello-sinatra-#{fuzz}"
+    }
+
+    before do
+      FileUtils.rm_rf VMC::CONFIG_DIR
+      stub(VMC::CLI).exit { |code| code }
+      WebMock.allow_net_connect!
+    end
+
+    after do
+      with_output_to { VMC::CLI.start %W(delete #{app} -f) }
+    end
+
+    it 'and pushes a simple sinatra app using defaults as much as possible' do
+      vmc_ok %W(target #{target}) do |out|
+        expect(out).to eq <<-OUT.strip_heredoc
+          Setting target to https://#{target}... OK
+        OUT
+      end
+
+      vmc_ok %W(login #{username} --password #{password}) do |out|
+        expect(out).to eq <<-OUT.strip_heredoc
+          target: https://#{target}
+
+          Authenticating... OK
+        OUT
+      end
+
+      vmc_fail %W(app #{app}) do |out|
+        expect(out).to eq <<-OUT.strip_heredoc
+          Unknown app '#{app}'.
+        OUT
+      end
+
+      Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+        vmc_ok %W(push #{app} --runtime ruby19 --url #{app}-vmc-test.cloudfoundry.com -f) do |out|
+          expect(out).to eq <<-OUT.strip_heredoc
+            Creating #{app}... OK
+
+            Updating #{app}... OK
+            Uploading #{app}... OK
+            Starting #{app}... OK
+            Checking #{app}... OK
+          OUT
+        end
+
+        vmc_ok %W(push #{app}) do |out|
+          expect(out).to eq <<-OUT.strip_heredoc
+            Uploading #{app}... OK
+            Stopping #{app}... OK
+
+            Starting #{app}... OK
+            Checking #{app}... OK
+          OUT
+        end
+      end
+
+      vmc_ok %W(delete #{app} -f) do |out|
+        expect(out).to eq <<-OUT.strip_heredoc
+          Deleting #{app}... OK
+        OUT
+      end
+    end
+  end
+else
+  $stderr.puts 'Skipping integration specs; please provide $VMC_TEST_TARGET, $VMC_TEST_USER, and $VMC_TEST_PASSWORD'
+end

data/spec/spec_helper.rb

@@ -1,27 +1,35 @@
-require "rspec"
+SPEC_ROOT = File.dirname(__FILE__).freeze
 
+require "rspec"
 require "cfoundry"
+require "cfoundry/spec_helper"
 require "vmc"
-require 'factory_girl'
-require 'webmock/rspec'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
   require file
 end
 
-FactoryGirl.find_definitions
-
 RSpec.configure do |c|
   c.mock_with :rr
 end
 
+class String
+  def strip_heredoc
+    min = scan(/^[ \t]*(?=\S)/).min
+    indent = min ? min.size : 0
+    gsub(/^[ \t]{#{indent}}/, '')
+  end
+end
 
-def reassign_stdout_to(output)
+def with_output_to(output = StringIO.new)
   old_out = $stdout
+  old_err = $stderr
   $stdout = output
-  yield $stdout
+  $stderr = output
+  yield output
 ensure
   $stdout = old_out
+  $stderr = old_err
 end
 
 def name_list(xs)
@@ -30,4 +38,4 @@ def name_list(xs)
   else
     xs.collect(&:name).join(", ")
   end
-end
+end

data/spec/support/feature_helpers.rb

@@ -0,0 +1,19 @@
+def vmc_ok(argv)
+  with_output_to do |out|
+    code = VMC::CLI.start(argv + ["--no-script"])
+    yield strip_progress_dots(out.string) if block_given?
+    expect(code).to eq 0
+  end
+end
+
+def vmc_fail(argv)
+  with_output_to do |out|
+    code = VMC::CLI.start(argv + ["--no-script"])
+    yield strip_progress_dots(out.string) if block_given?
+    expect(code).to eq 1
+  end
+end
+
+def strip_progress_dots(str)
+  str.gsub(/\.  \x08([\x08\. ]+)/, "... ")
+end

data/spec/vmc/cli/app/push/create_spec.rb

@@ -276,6 +276,16 @@ describe VMC::App::Create do
       subject
     end
 
+    context "when 'none' is given" do
+      it "does not perform any mapping" do
+        mock_ask('URL', anything) { "none" }
+
+        dont_allow(create).invoke(:map, anything)
+
+        subject
+      end
+    end
+
     context "when mapping fails" do
       before do
         mock_ask('URL', anything) { url_choices.first }

data/spec/vmc/cli/organization/orgs_spec.rb

@@ -20,7 +20,7 @@ describe VMC::Organization::Orgs do
   end
 
   subject do
-    reassign_stdout_to output do
+    with_output_to output do
       Mothership.new.invoke(:orgs, inputs, given, global)
     end
   end

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

@@ -21,7 +21,7 @@ describe VMC::Space::Spaces do
   end
 
   subject do
-    reassign_stdout_to output do
+    with_output_to output do
       Mothership.new.invoke(:spaces, inputs, given, global)
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 2835543005
+  hash: -2770117636
   prerelease: 6
   segments: 
   - 0
   - 5
   - 0
   - beta
-  - 1
-  version: 0.5.0.beta.1
+  - 2
+  version: 0.5.0.beta.2
 platform: ruby
 authors: 
 - Alex Suraci
@@ -17,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-12 00:00:00 Z
+date: 2012-12-14 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -27,18 +28,32 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 1
         - 6
-        - 5
-        version: 1.6.5
+        version: "1.6"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: interact
+  name: multi_json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: interact
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,27 +65,27 @@ dependencies:
         - 0
         version: 0.5.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cfoundry
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 4
-        - 10
-        version: 0.4.10
+        - 11
+        version: 0.4.11
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: clouseau
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,11 +97,11 @@ dependencies:
         - 2
         version: 0.0.2
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mothership
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,27 +113,27 @@ dependencies:
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: manifests-vmc-plugin
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 43
         segments: 
         - 0
         - 4
-        - 14
-        version: 0.4.14
+        - 18
+        version: 0.4.18
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: tunnel-dummy-vmc-plugin
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -130,22 +145,6 @@ dependencies:
         - 2
         version: 0.0.2
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: multi_json
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -155,13 +154,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 25
         segments: 
         - 0
         - 9
-        - 2
-        - 2
-        version: 0.9.2.2
+        version: "0.9"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -172,78 +169,58 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 21
         segments: 
         - 2
         - 11
-        - 0
-        version: 2.11.0
+        version: "2.11"
   type: :development
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: simplecov
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 6
-        - 4
-        version: 0.6.4
-  type: :development
-  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 29
         segments: 
         - 1
         - 9
-        - 0
-        version: 1.9.0
+        version: "1.9"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        version: "1.0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 15
         segments: 
         - 2
         - 6
-        - 4
-        version: 2.6.4
+        version: "2.6"
   type: :development
-  version_requirements: *id014
+  version_requirements: *id013
 description: 
 email: 
 - asuraci@vmware.com
@@ -256,117 +233,109 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
-- lib/vmc/cli/app/app.rb
-- lib/vmc/cli/app/apps.rb
-- lib/vmc/cli/app/base.rb
-- lib/vmc/cli/app/crashes.rb
-- lib/vmc/cli/app/delete.rb
-- lib/vmc/cli/app/deprecated.rb
-- lib/vmc/cli/app/env.rb
-- lib/vmc/cli/app/files.rb
+- lib/vmc/version.rb
+- lib/vmc/detect.rb
+- lib/vmc/errors.rb
+- lib/vmc/spacing.rb
+- lib/vmc/spec_helper.rb
+- lib/vmc/plugin.rb
+- lib/vmc/constants.rb
+- lib/vmc/cli.rb
+- lib/vmc/cli/organization/create.rb
+- lib/vmc/cli/organization/rename.rb
+- lib/vmc/cli/organization/orgs.rb
+- lib/vmc/cli/organization/base.rb
+- lib/vmc/cli/organization/delete.rb
+- lib/vmc/cli/organization/org.rb
+- lib/vmc/cli/start/target_interactions.rb
+- lib/vmc/cli/start/targets.rb
+- lib/vmc/cli/start/register.rb
+- lib/vmc/cli/start/colors.rb
+- lib/vmc/cli/start/target.rb
+- lib/vmc/cli/start/logout.rb
+- lib/vmc/cli/start/base.rb
+- lib/vmc/cli/start/info.rb
+- lib/vmc/cli/start/login.rb
+- lib/vmc/cli/route/create_route.rb
+- lib/vmc/cli/route/routes.rb
+- lib/vmc/cli/route/base.rb
+- lib/vmc/cli/route/delete.rb
+- lib/vmc/cli/app/scale.rb
 - lib/vmc/cli/app/health.rb
-- lib/vmc/cli/app/instances.rb
-- lib/vmc/cli/app/logs.rb
+- lib/vmc/cli/app/files.rb
 - lib/vmc/cli/app/push/create.rb
 - lib/vmc/cli/app/push/interactions.rb
 - lib/vmc/cli/app/push/sync.rb
-- 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/deprecated.rb
+- lib/vmc/cli/app/logs.rb
+- lib/vmc/cli/app/instances.rb
 - lib/vmc/cli/app/start.rb
-- lib/vmc/cli/app/stats.rb
+- lib/vmc/cli/app/app.rb
 - lib/vmc/cli/app/stop.rb
-- lib/vmc/cli/domain/add_domain.rb
-- lib/vmc/cli/domain/base.rb
+- lib/vmc/cli/app/env.rb
+- lib/vmc/cli/app/base.rb
+- lib/vmc/cli/app/stats.rb
+- lib/vmc/cli/app/apps.rb
+- lib/vmc/cli/app/restart.rb
+- lib/vmc/cli/app/delete.rb
+- lib/vmc/cli/app/push.rb
+- lib/vmc/cli/app/crashes.rb
+- lib/vmc/cli/interactive.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/delete_domain.rb
+- lib/vmc/cli/domain/base.rb
 - lib/vmc/cli/domain/remove_domain.rb
-- lib/vmc/cli/help.rb
-- lib/vmc/cli/interactive.rb
-- lib/vmc/cli/organization/base.rb
-- lib/vmc/cli/organization/create.rb
-- lib/vmc/cli/organization/delete.rb
-- lib/vmc/cli/organization/org.rb
-- 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/routes.rb
-- lib/vmc/cli/service/base.rb
+- lib/vmc/cli/domain/add_domain.rb
+- lib/vmc/cli/space/spaces.rb
+- lib/vmc/cli/space/create.rb
+- lib/vmc/cli/space/rename.rb
+- lib/vmc/cli/space/space.rb
+- lib/vmc/cli/space/take.rb
+- lib/vmc/cli/space/base.rb
+- lib/vmc/cli/space/delete.rb
+- lib/vmc/cli/service/service.rb
 - lib/vmc/cli/service/bind.rb
 - lib/vmc/cli/service/create.rb
-- lib/vmc/cli/service/delete.rb
 - lib/vmc/cli/service/rename.rb
-- lib/vmc/cli/service/service.rb
 - lib/vmc/cli/service/services.rb
 - lib/vmc/cli/service/unbind.rb
-- lib/vmc/cli/space/base.rb
-- lib/vmc/cli/space/create.rb
-- lib/vmc/cli/space/delete.rb
-- lib/vmc/cli/space/rename.rb
-- lib/vmc/cli/space/space.rb
-- lib/vmc/cli/space/spaces.rb
-- lib/vmc/cli/space/take.rb
-- lib/vmc/cli/start/base.rb
-- lib/vmc/cli/start/colors.rb
-- 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
-- lib/vmc/cli/user/base.rb
+- lib/vmc/cli/service/base.rb
+- lib/vmc/cli/service/delete.rb
+- lib/vmc/cli/user/passwd.rb
 - lib/vmc/cli/user/create.rb
+- lib/vmc/cli/user/base.rb
 - lib/vmc/cli/user/delete.rb
-- lib/vmc/cli/user/passwd.rb
 - lib/vmc/cli/user/users.rb
-- lib/vmc/cli.rb
-- lib/vmc/constants.rb
-- lib/vmc/detect.rb
-- lib/vmc/errors.rb
-- lib/vmc/plugin.rb
-- lib/vmc/spacing.rb
-- lib/vmc/spec_helper.rb
-- lib/vmc/version.rb
+- lib/vmc/cli/help.rb
 - lib/vmc.rb
-- spec/assets/hello-sinatra/Gemfile.lock
-- spec/factories/app_factory.rb
-- spec/factories/client_factory.rb
-- spec/factories/domain_factory.rb
-- spec/factories/factory.rb
-- spec/factories/framework_factory.rb
-- spec/factories/organization_factory.rb
-- spec/factories/route_factory.rb
-- spec/factories/runtime_factory.rb
-- spec/factories/service_binding_factory.rb
-- spec/factories/service_factory.rb
-- spec/factories/service_instance_factory.rb
-- spec/factories/service_plan_factory.rb
-- spec/factories/space_factory.rb
-- spec/spec_helper.rb
 - spec/support/interact_helpers.rb
-- spec/vmc/cli/app/push/create_spec.rb
-- spec/vmc/cli/app/push_spec.rb
-- spec/vmc/cli/app/rename_spec.rb
+- spec/support/feature_helpers.rb
+- spec/spec_helper.rb
+- spec/vmc/detect_spec.rb
 - spec/vmc/cli/organization/orgs_spec.rb
 - spec/vmc/cli/organization/rename_spec.rb
+- spec/vmc/cli/start/login_spec.rb
+- spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/route/delete_route_spec.rb
+- spec/vmc/cli/app/push_spec.rb
+- spec/vmc/cli/app/push/create_spec.rb
+- spec/vmc/cli/app/rename_spec.rb
+- spec/vmc/cli/space/spaces_spec.rb
+- spec/vmc/cli/space/rename_spec.rb
+- spec/vmc/cli/service/unbind_spec.rb
 - spec/vmc/cli/service/bind_spec.rb
 - spec/vmc/cli/service/delete_spec.rb
-- spec/vmc/cli/service/rename_spec.rb
 - spec/vmc/cli/service/service_spec.rb
-- spec/vmc/cli/service/unbind_spec.rb
-- spec/vmc/cli/space/rename_spec.rb
-- spec/vmc/cli/space/spaces_spec.rb
-- spec/vmc/cli/start/info_spec.rb
-- spec/vmc/cli/start/login_spec.rb
-- spec/vmc/detect_spec.rb
+- spec/vmc/cli/service/rename_spec.rb
+- spec/assets/hello-sinatra/Gemfile
+- spec/assets/hello-sinatra/main.rb
+- spec/assets/hello-sinatra/Gemfile.lock
+- spec/features/new_user_flow_spec.rb
 - bin/vmc
+has_rdoc: true
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -398,40 +367,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vmc
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files: 
-- spec/assets/hello-sinatra/Gemfile.lock
-- spec/factories/app_factory.rb
-- spec/factories/client_factory.rb
-- spec/factories/domain_factory.rb
-- spec/factories/factory.rb
-- spec/factories/framework_factory.rb
-- spec/factories/organization_factory.rb
-- spec/factories/route_factory.rb
-- spec/factories/runtime_factory.rb
-- spec/factories/service_binding_factory.rb
-- spec/factories/service_factory.rb
-- spec/factories/service_instance_factory.rb
-- spec/factories/service_plan_factory.rb
-- spec/factories/space_factory.rb
-- spec/spec_helper.rb
 - spec/support/interact_helpers.rb
-- spec/vmc/cli/app/push/create_spec.rb
-- spec/vmc/cli/app/push_spec.rb
-- spec/vmc/cli/app/rename_spec.rb
+- spec/support/feature_helpers.rb
+- spec/spec_helper.rb
+- spec/vmc/detect_spec.rb
 - spec/vmc/cli/organization/orgs_spec.rb
 - spec/vmc/cli/organization/rename_spec.rb
+- spec/vmc/cli/start/login_spec.rb
+- spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/route/delete_route_spec.rb
+- spec/vmc/cli/app/push_spec.rb
+- spec/vmc/cli/app/push/create_spec.rb
+- spec/vmc/cli/app/rename_spec.rb
+- spec/vmc/cli/space/spaces_spec.rb
+- spec/vmc/cli/space/rename_spec.rb
+- spec/vmc/cli/service/unbind_spec.rb
 - spec/vmc/cli/service/bind_spec.rb
 - spec/vmc/cli/service/delete_spec.rb
-- spec/vmc/cli/service/rename_spec.rb
 - spec/vmc/cli/service/service_spec.rb
-- spec/vmc/cli/service/unbind_spec.rb
-- spec/vmc/cli/space/rename_spec.rb
-- spec/vmc/cli/space/spaces_spec.rb
-- spec/vmc/cli/start/info_spec.rb
-- spec/vmc/cli/start/login_spec.rb
-- spec/vmc/detect_spec.rb
+- spec/vmc/cli/service/rename_spec.rb
+- spec/assets/hello-sinatra/Gemfile
+- spec/assets/hello-sinatra/main.rb
+- spec/assets/hello-sinatra/Gemfile.lock
+- spec/features/new_user_flow_spec.rb

data/spec/factories/app_factory.rb

@@ -1,14 +0,0 @@
-FactoryGirl.define do
-  factory :app, :class => CFoundry::V2::App do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-    memory 128
-    total_instances 0
-    production false
-    state "STOPPED"
-
-    initialize_with do
-      CFoundry::V2::App.new(nil, nil)
-    end
-  end
-end

data/spec/factories/client_factory.rb

@@ -1,25 +0,0 @@
-FactoryGirl.define do
-  factory :client, :class => CFoundry::V2::Client do
-    ignore do
-      routes []
-      apps []
-      frameworks []
-      runtimes []
-      service_instances []
-      spaces []
-      organizations []
-      logged_in true
-    end
-
-    after_build do |client, evaluator|
-      RR.stub(client).logged_in? { evaluator.logged_in }
-      RR.stub(client).routes { evaluator.routes }
-      RR.stub(client).apps { evaluator.apps }
-      RR.stub(client).frameworks { evaluator.frameworks }
-      RR.stub(client).runtimes { evaluator.runtimes }
-      RR.stub(client).service_instances { evaluator.service_instances }
-      RR.stub(client).spaces { evaluator.spaces }
-      RR.stub(client).organizations { evaluator.organizations }
-    end
-  end
-end

data/spec/factories/domain_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :domain, :class => CFoundry::V2::Domain do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    initialize_with do
-      CFoundry::V2::Domain.new(nil, nil)
-    end
-  end
-end

data/spec/factories/factory.rb

@@ -1,4 +0,0 @@
-FactoryGirl.define do
-  sequence(:random_string) {|n| "random_#{n}_string" }
-  sequence(:guid) {|n| "random_#{n}_guid" }
-end

data/spec/factories/framework_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :framework, :class => CFoundry::V2::Framework do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    initialize_with do
-      CFoundry::V2::Framework.new(nil, nil)
-    end
-  end
-end

data/spec/factories/organization_factory.rb

@@ -1,23 +0,0 @@
-FactoryGirl.define do
-  factory :organization, :class => CFoundry::V2::Organization do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    ignore do
-      spaces []
-      domains []
-    end
-
-    initialize_with do
-      CFoundry::V2::Organization.new(nil, nil)
-    end
-
-    after_build do |org, evaluator|
-      evaluator.spaces.each { |s| s.organization = org }
-      evaluator.domains.each { |s| s.owning_organization = org }
-
-      RR.stub(org).spaces { evaluator.spaces }
-      RR.stub(org).domains { evaluator.domains }
-    end
-  end
-end

data/spec/factories/route_factory.rb

@@ -1,11 +0,0 @@
-FactoryGirl.define do
-  factory :route, :class => CFoundry::V2::Route do
-    guid { FactoryGirl.generate(:guid) }
-    host { FactoryGirl.generate(:random_string) }
-    association :domain, :factory => :domain, :strategy => :build
-
-    initialize_with do
-      CFoundry::V2::Route.new(nil, nil)
-    end
-  end
-end

data/spec/factories/runtime_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :runtime, :class => CFoundry::V2::Runtime do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    initialize_with do
-      CFoundry::V2::Runtime.new(nil, nil)
-    end
-  end
-end

data/spec/factories/service_binding_factory.rb

@@ -1,9 +0,0 @@
-FactoryGirl.define do
-  factory :service_binding, :class => CFoundry::V2::ServiceBinding do
-    guid { FactoryGirl.generate(:guid) }
-
-    initialize_with do
-      CFoundry::V2::ServiceBinding.new(nil, nil)
-    end
-  end
-end

data/spec/factories/service_factory.rb

@@ -1,17 +0,0 @@
-FactoryGirl.define do
-  factory :service, :class => CFoundry::V2::Service do
-    guid { FactoryGirl.generate(:guid) }
-    label "redis"
-    provider "core"
-    url "http://example.com"
-    description "small key-value store"
-    version "2.8"
-    info_url "http://cloudfoundry.com/redis"
-    active true
-
-    initialize_with do
-      CFoundry::V2::Service.new(nil, nil)
-    end
-  end
-end
-

data/spec/factories/service_instance_factory.rb

@@ -1,10 +0,0 @@
-FactoryGirl.define do
-  factory :service_instance, :class => CFoundry::V2::ServiceInstance do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    initialize_with do
-      CFoundry::V2::ServiceInstance.new(nil, nil)
-    end
-  end
-end

data/spec/factories/service_plan_factory.rb

@@ -1,11 +0,0 @@
-FactoryGirl.define do
-  factory :service_plan, :class => CFoundry::V2::ServicePlan do
-    guid { FactoryGirl.generate(:guid) }
-    name "D100"
-    description "Filibuster plan"
-
-    initialize_with do
-      CFoundry::V2::ServicePlan.new(nil, nil)
-    end
-  end
-end

data/spec/factories/space_factory.rb

@@ -1,25 +0,0 @@
-FactoryGirl.define do
-  factory :space, :class => CFoundry::V2::Space do
-    guid { FactoryGirl.generate(:guid) }
-    name { FactoryGirl.generate(:random_string) }
-
-    ignore do
-      apps []
-      service_instances []
-      domains []
-    end
-
-    initialize_with do
-      CFoundry::V2::Space.new(nil, nil)
-    end
-
-    after_build do |org, evaluator|
-      evaluator.apps.each { |s| s.space = org }
-      evaluator.service_instances.each { |s| s.space = org }
-
-      RR.stub(org).apps { evaluator.apps }
-      RR.stub(org).service_instances { evaluator.service_instances }
-      RR.stub(org).domains { evaluator.domains }
-    end
-  end
-end