cf 3.0.0rc1 → 3.0.0rc2

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

@@ -22,6 +22,7 @@ module CF::App
       app = client.app
 
       inputs.each { |key, value| app.send(:"#{key}=", value) }
+      finalize
 
       app = filter(:create_app, app)
 
@@ -42,7 +43,9 @@ module CF::App
       line unless quiet?
 
       host = input[:host, app.name]
+      finalize
       domain = input[:domain, app]
+      finalize
 
       mapped_url = false
       until domain == "none" || !domain || mapped_url
@@ -67,7 +70,7 @@ module CF::App
 
     def create_services(app)
       return unless input[:create_services]
-
+      finalize
       while true
         invoke :create_service, { :app => app }, :plan => :interact
         break unless ask("Create another service?", :default => false)

data/lib/cf/cli/service/bind.rb

@@ -11,6 +11,7 @@ module CF::Service
     def bind_service
       app = input[:app]
       service = input[:service, app]
+      finalize
 
       with_progress(
           "Binding #{c(service.name, :name)} to #{c(app.name, :name)}") do |s|

data/lib/cf/cli/service/create.rb

@@ -44,8 +44,10 @@ module CF::Service
           end
         end
       end
+      finalize
 
       selected_offerings = offerings.any? ? Array(input[:offering, offerings.sort_by(&:label)]) : []
+      finalize
 
       if selected_offerings.empty?
         fail "Cannot find services matching the given criteria."
@@ -55,8 +57,9 @@ module CF::Service
 
       service = client.service_instance
       service.name = input[:name, offering]
-
+      finalize
       plan = input[:plan, offering.service_plans]
+      finalize
       service.service_plan = if plan.is_a?(String)
                                offering.service_plans.find { |p| p.name.casecmp(plan) == 0 }
                              else
@@ -68,10 +71,12 @@ module CF::Service
         service.create!
       end
 
-      if app = input[:app]
+      app = input[:app]
+      finalize
+
+      if app
         invoke :bind_service, :service => service, :app => app
       end
-
       service
     end
 

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "3.0.0rc1".freeze
+  VERSION = "3.0.0rc2".freeze
 end

data/spec/cf/cli/app/push_spec.rb

@@ -263,6 +263,7 @@ module CF
         it "creates the app" do
           app.should_receive(:create!)
           app.should_receive(:upload).with(path)
+
           push.should_receive(:filter).with(:create_app, app) { app }
           push.should_receive(:filter).with(:push_app, app) { app }
           push.should_receive(:invoke).with(:map, :app => app, :host => host, :domain => domain)

data/spec/integration/push_flow_spec.rb

@@ -0,0 +1,128 @@
+require "spec_helper"
+require "webmock/rspec"
+
+if ENV["CF_V2_RUN_INTEGRATION"]
+  describe "A user pushing a new sinatra app", :ruby19 => true do
+    include CF::Interactive
+
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:app) { "hello-sinatra-#{run_id}" }
+    let(:service_name) { "dummy-service-#{run_id}" }
+
+    before do
+      FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
+      WebMock.allow_net_connect!
+      Interact::Progress::Dots.start!
+      login
+    end
+
+    after do
+      `#{cf_bin} unbind-service -f --no-script #{service_name} #{app}`
+      `#{cf_bin} delete-service -f --no-script #{service_name}`
+      `#{cf_bin} delete #{app} -f --routes --no-script`
+      logout
+      Interact::Progress::Dots.stop!
+    end
+
+    it "attempts to change already processed choices" do
+      BlueShell::Runner.run("#{cf_bin} app #{app}") do |runner|
+        expect(runner).to say "Unknown app '#{app}'."
+      end
+
+      Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+        BlueShell::Runner.run("#{cf_bin} push") do |runner|
+          expect(runner).to say "Name>"
+          runner.send_keys app
+
+          expect(runner).to say "Instances> 1"
+          runner.send_return
+
+          expect(runner).to_not say "Custom startup command> "
+
+          runner.send_up_arrow
+          expect(runner).to say "Instances> 1"
+          runner.send_return
+
+          expect(runner).to say "Memory Limit>"
+          runner.send_keys "128M"
+
+          expect(runner).to say "Creating #{app}... OK"
+
+          expect(runner).to say "Subdomain> #{app}"
+
+          runner.send_up_arrow
+          expect(runner).not_to say "Memory Limit>"
+          runner.send_return
+
+          expect(runner).to say "1:"
+          expect(runner).to say "Domain>"
+          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 "Create services for application?> n"
+          runner.send_up_arrow
+          expect(runner).not_to say "Domain>"
+          runner.send_keys "y"
+
+          # create a service here
+          expect(runner).to say "What kind?>"
+          runner.send_keys "dummy n/a"
+
+          expect(runner).to say "Name?>"
+          runner.send_keys service_name
+
+          expect(runner).to say "Which plan?>"
+          runner.send_keys "small"
+
+          expect(runner).to say /Creating service #{service_name}.*OK/
+          expect(runner).to say /Binding .+ to .+ OK/
+
+          expect(runner).to say "Create another service?> n"
+          runner.send_up_arrow
+          expect(runner).not_to say "Which plan?>"
+          runner.send_up_arrow
+          expect(runner).not_to say "Which plan?>"
+          runner.send_return
+
+          if runner.expect "Bind other services to application?> n", 15
+            runner.send_return
+          end
+
+          expect(runner).to say "Save configuration?> n", 20
+          runner.send_return
+
+          expect(runner).to say "Uploading #{app}... OK", 180
+          expect(runner).to say "Starting #{app}... OK", 180
+          expect(runner).to say "Checking #{app}...", 180
+          expect(runner).to say "1/1 instances"
+          expect(runner).to say "OK", 30
+        end
+      end
+
+      BlueShell::Runner.run("#{cf_bin} services") do |runner|
+        expect(runner).to say /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+        expect(runner).to say /dummy-service-.+?\s+ # name
+            dummy\s+                        # service
+            dummy\s+                              # provider
+            n\/a\s+                             # version
+            small\s+                             # plan
+            #{app}                              # bound apps
+          /x
+      end
+
+      BlueShell::Runner.run("#{cf_bin} unbind-service #{service_name} #{app}") do |runner|
+        expect(runner).to say "OK", 20
+      end
+
+      BlueShell::Runner.run("#{cf_bin} delete #{app}") do |runner|
+        expect(runner).to say "Really delete #{app}?>"
+        runner.send_keys "y"
+        expect(runner).to say "Deleting #{app}... OK"
+      end
+    end
+  end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 3.0.0rc1
+  version: 3.0.0rc2
+  prerelease: 5
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: caldecott-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -52,6 +58,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +69,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +77,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +85,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +93,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +101,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -100,6 +112,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,6 +123,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -117,6 +131,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,6 +139,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,6 +147,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -138,6 +155,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -145,6 +163,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,6 +171,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: anchorman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -159,6 +179,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,20 +187,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -187,6 +211,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -194,6 +219,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -201,6 +227,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -208,6 +235,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -215,6 +243,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -222,6 +251,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -229,6 +259,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -236,6 +267,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -243,6 +275,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -250,6 +283,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -257,6 +291,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -264,6 +299,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -271,6 +307,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -498,6 +535,7 @@ files:
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
+- spec/integration/push_flow_spec.rb
 - spec/manifests/errors_spec.rb
 - spec/manifests/loader/builder_spec.rb
 - spec/manifests/loader/normalizer_spec.rb
@@ -517,26 +555,27 @@ files:
 - bin/cf
 homepage: http://github.com/cloudfoundry/cf
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/assets/hello-sinatra/config.ru
@@ -655,6 +694,7 @@ test_files:
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
+- spec/integration/push_flow_spec.rb
 - spec/manifests/errors_spec.rb
 - spec/manifests/loader/builder_spec.rb
 - spec/manifests/loader/normalizer_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4f67d8c3ab44498adea58fb50d2334f60e6af1a3
-  data.tar.gz: 0b1471beb2d384df8dc6a84d6f7958106c902b91
-SHA512:
-  metadata.gz: aaec1048764a06b5e7b277af33b00a5ec13a565a72e7cfa29aab5aede67e12a6b0853f8c91fee6934ea338ffb3acc9422d397f9e24f4ca9b376e5ce5750ab171
-  data.tar.gz: 4cb90ad017c6b9e89b5dce07935c44457d09aa1ef32a8e2f8730cc14c5fdfb54f80841b136b58ab4d4ba6d04b87e779709285d527437b51f93e6ebbdd77e3b56