cf 4.2.8.rc2 → 4.2.8

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

@@ -1,16 +1,6 @@
 require "cf/cli/service/base"
 
 module CF::Service
-  USER_PROVIDED_OFFERING = "user-provided" # I'd rather move this to CFoundry
-
-  class UPDummy
-    def label
-      "user-provided"
-    end
-
-    attr_reader :version, :provider
-  end
-
   class Create < Base
     offerings_from_label = proc { |label, offerings|
       offerings.select { |s| s.label == label }
@@ -56,8 +46,6 @@ module CF::Service
       end
       finalize
 
-      offerings << UPDummy.new
-
       selected_offerings = offerings.any? ? Array(input[:offering, offerings.sort_by(&:label)]) : []
       finalize
 
@@ -67,80 +55,48 @@ module CF::Service
 
       offering = selected_offerings.first
 
-      if offering.label == CF::Service::USER_PROVIDED_OFFERING
-        service_instance = client.user_provided_service_instance
-        service_instance.name = input[:name, offering]
-        finalize
-
-        service_instance.credentials = ask_credentials # input[:credentials]
-      else
-        service_instance = client.service_instance
-        service_instance.name = input[:name, offering]
-        finalize
-
-        plan = input[:plan, offering.service_plans]
-        finalize
-        service_instance.service_plan = if plan.is_a?(String)
-                                          offering.service_plans.find { |p| p.name.casecmp(plan) == 0 }
-                                        else
-                                          plan
-                                        end
-      end
-
-      service_instance.space = client.current_space
-
-      with_progress("Creating service #{c(service_instance.name, :name)}") do
-        service_instance.create!
+      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
+                               plan
+                             end
+      service.space = client.current_space
+
+      with_progress("Creating service #{c(service.name, :name)}") do
+        service.create!
       end
 
       app = input[:app]
       finalize
 
       if app
-        invoke :bind_service, :service => service_instance, :app => app
+        invoke :bind_service, :service => service, :app => app
       end
-      service_instance
+      service
     end
 
     private
 
-    def ask_credentials
-      credentials = {}
-      line("What credentials parameters should applications use to connect to this service instance? (e.g. key: uri, value: mysql://username:password@hostname:port/name)")
-
-      while true
-        key = ask("Key")
-        finalize
-        value = ask("Value")
-        finalize
-        credentials[key] = value
-
-        break unless ask("Another credentials parameter?", :default => false)
-      end
-
-      credentials
-    end
-
     def ask_offering(offerings)
       [ask("What kind?", :choices => offerings.sort_by(&:label),
-        :display => proc do |s|
+        :display => proc { |s|
           str = "#{c(s.label, :name)} #{s.version}"
           if s.provider != "core"
             str << ", via #{s.provider}"
           end
           str
-        end,
+        },
         :complete => proc { |s| "#{s.label} #{s.version}" })]
     end
 
     def ask_name(offering)
-      default = nil
-      unless offering == CF::Service::USER_PROVIDED_OFFERING
-        random = sprintf("%x", rand(1000000))
-        default = "#{offering.label}-#{random}"
-      end
-
-      ask "Name?", :default => default
+      random = sprintf("%x", rand(1000000))
+      ask "Name?", :default => "#{offering.label}-#{random}"
     end
 
     def ask_plan(plans)

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

@@ -76,7 +76,7 @@ module CF::Service
           plan = i.service_plan
 
           unless plan
-            [ c(i.name, :name), "user-provided", "none", "none", "none", apps]
+            [ c(i.name, :name), "none", "none", "none", "none", apps]
           else
             service = plan.service
             label    = service.label

data/lib/cf/version.rb

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

data/spec/cf/cli/service/create_spec.rb

@@ -94,38 +94,6 @@ module CF
             capture_output { command }
           end
         end
-
-        describe "when selecting the user-provided service" do
-          let(:services) { [build(:service), build(:service)] }
-          let(:user_provided_service) { build(:service, label: "user-provided")}
-
-          before do
-            client.stub(:services).and_return(services)
-          end
-
-          it "asks for an instance name and credentials" do
-            should_ask("What kind?", hash_including(choices: include(has_label("user-provided")))) { user_provided_service }
-            should_ask("Name?", anything) { "user-provided-service-name-1" }
-
-            should_print("What credentials parameters should applications use to connect to this service instance? (e.g. key: uri, value: mysql://username:password@hostname:port/name)")
-            should_ask("Key") { "host" }
-            should_ask("Value") { "example.com" }
-            should_ask("Another credentials parameter?", anything) { true }
-            should_ask("Key") { "port" }
-            should_ask("Value") { 8080 }
-            should_ask("Another credentials parameter?", anything) { false }
-            mock_with_progress("Creating service user-provided-service-name-1")
-
-            instance = client.user_provided_service_instance
-            client.should_receive(:user_provided_service_instance).and_return(instance)
-            instance.should_receive(:create!)
-
-            capture_output { command }
-
-            instance.credentials['host'].should == 'example.com'
-            instance.credentials['port'].should == 8080
-          end
-        end
       end
     end
   end

data/spec/cf/cli/service/services_spec.rb

@@ -48,28 +48,23 @@ module CF
         let(:current_space) { build(:space, :name => "the space") }
 
         subject do
-          capture_output { CF::CLI.new.invoke(:services, inputs, given, global) }
+          capture_output { Mothership.new.invoke(:services, inputs, given, global) }
         end
 
         before do
-          stub_client
+          stub_client_and_precondition
           client.stub(:service_bindings).and_return([service_binding])
         end
 
-        context "when the user is targeted to a space" do
-          before do
-            stub_precondition
-          end
-
-          it "produces a table of services" do
-            subject
-            stdout.rewind
-            output = stdout.read
+        it "produces a table of services" do
+          subject
+          stdout.rewind
+          output = stdout.read
 
-            expect(output).to match /Getting services in the space.*OK/
+          expect(output).to match /Getting services in the space.*OK/
 
-            expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
-            expect(output).to match /service-instance-.+?\s+  # name
+          expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+          expect(output).to match /service-instance-.+?\s+  # name
         service-.*?\s+                                  # service
         provider.*?\s+                                  # provider
         service_version\s+                              # version
@@ -77,69 +72,45 @@ module CF
         app-name-\d+\s+                                         # bound apps
         /x
 
-          end
-
-          context "when one of the services does not have a service plan" do
-            let(:service_instances) { [service1, service2]}
-            let(:service2) { build(:service_instance, :service_plan => nil, :service_bindings => [service_binding]) }
+        end
 
-            it 'still produces a table of service' do
-              subject
-              stdout.rewind
-              output = stdout.read
+        context "when one of the services does not have a service plan" do
+          let(:service_instances) { [service1, service2]}
+          let(:service2) { build(:service_instance, :service_plan => nil, :service_bindings => [service_binding]) }
+          it 'still produces a table of service' do
+            subject
+            stdout.rewind
+            output = stdout.read
 
-              expect(output).to match /Getting services in the space.*OK/
+            expect(output).to match /Getting services in the space.*OK/
 
-              expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+            expect(output).to match /name\s+service\s+provider\s+version\s+plan\s+bound apps/
 
-              expect(output).to match /service-instance-.+?\s+  # name
+            expect(output).to match /service-instance-.+?\s+  # name
         service-.*?\s+                                  # service
         provider.*?\s+                                  # provider
         service_version\s+                              # version
         service-plan-.*?\s+                             # plan
-        app-name-\d+\s+                                 # bound apps
+        app-name-\d+\s+                                         # bound apps
         /x
 
-              expect(output).to match /service-instance-.+?\s+  # name
-        user-provided\s+                                # service
-        none\s+                                         # provider
-        none\s+                                         # version
-        none\s+                                         # plan
-        app-name-\d+\s+                                 # bound apps
+            expect(output).to match /service-instance-.+?\s+  # name
+        none\s+                                  # service
+        none\s+                                  # provider
+        none\s+                              # version
+        none\s+                             # plan
+        app-name-\d+\s+                                         # bound apps
         /x
-            end
-          end
-
-          context 'when given --marketplace argument' do
-            it 'lists services on the target' do
-              client.stub(:services => Array.new(3) { build(:service) })
-              cf %W[services --marketplace]
-              expect(output).to say("Getting services... OK")
-              expect(output).to say(/service\s+version\s+provider\s+plans\s+description/)
-            end
           end
         end
 
-        context "when the user is not targeted to a space" do
-          before do
-            service_command.stub(:check_logged_in).and_return(true)
-            client.stub(:current_organization).and_return(true)
-          end
-          let(:service_command) { CF::Service::Services.new(nil, {}) }
-          let(:current_space) { nil }
-
-          subject do
-            capture_output { service_command.execute(:services, inputs, global) }
-
-            #capture_output { CF::CLI.new.invoke(:services, inputs, given, global) }
-          end
-
-          it "returns an error" do
-            subject
-            stdout.rewind
-            output = stderr.read
 
-            expect(output.to_s).to match "Please select a space with 'cf target --space SPACE_NAME'"
+        context 'when given --marketplace argument' do
+          it 'lists services on the target' do
+            client.stub(:services => Array.new(3) { build(:service) })
+            cf %W[services --marketplace]
+            expect(output).to say("Getting services... OK")
+            expect(output).to say(/service\s+version\s+provider\s+plans\s+description/)
           end
         end
       end

data/spec/features/services_spec.rb

@@ -6,20 +6,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
       login
     end
 
-    describe "listing services" do
-      it "shows all service instances in the space" do
-        service1 = "some-provided-instance-#{Time.now.to_i}"
-        service2 = "cf-managed-instance-#{Time.now.to_i}"
-        create_service_instance("user-provided", service1, credentials: { hostname: "myservice.com"} )
-        create_service_instance("dummy-dev", service2, plan: "small")
-
-        BlueShell::Runner.run("#{cf_bin} services") do |runner|
-          expect(runner).to say /#{service1}\s+none\s+none\s+none\s+none\s+.*/
-        end
-
-      end
-    end
-
     describe "creating a service" do
       describe "when the user leaves the line blank for a plan" do
         it "re-prompts for the plan" do
@@ -34,76 +20,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
           end
         end
       end
-
-      describe "when the service is a user-provided instance" do
-        let(:service_name) { "my-private-db-#{Random.rand(1000) + 1000}"}
-
-        it "can create a service instance" do
-          BlueShell::Runner.run("#{cf_bin} create-service") do |runner|
-            expect(runner).to say "What kind?"
-            runner.send_keys "user-provided"
-
-            expect(runner).to say "Name?"
-            runner.send_keys service_name
-
-            expect(runner).to say "What credentials parameters should applications use to connect to this service instance? (e.g. key: uri, value: mysql://username:password@hostname:port/name)
-Key"
-            runner.send_keys "hostname"
-            expect(runner).to say "Value"
-            runner.send_keys "myserviceinstance.com"
-            expect(runner).to say "Another credentials parameter?"
-            runner.send_keys "n"
-
-            expect(runner).to say /Creating service #{service_name}.+ OK/
-          end
-        end
-      end
-    end
-
-    describe "binding to a service" do
-      let(:app_folder) { "env" }
-      let(:app_name) { "services_env_test_app-#{Time.now.to_i}" }
-
-      let(:service_name) { "some-provided-instance-#{Time.now.to_i}" }
-
-      it "can bind and unbind user-provided services to apps" do
-        push_app(app_folder, app_name, start_command: "'bundle exec ruby env_test.rb -p $PORT'", timeout: 90)
-        create_service_instance("user-provided", service_name, credentials: { hostname: "myservice.com"} )
-
-        BlueShell::Runner.run("#{cf_bin} bind-service") do |runner|
-          expect(runner).to say "Which application?>"
-          runner.send_keys app_name
-
-          expect(runner).to say "Which service?>"
-          runner.send_keys service_name
-
-          expect(runner).to say "Binding #{service_name} to #{app_name}... OK"
-        end
-
-        BlueShell::Runner.run("#{cf_bin} unbind-service") do |runner|
-          expect(runner).to say "Which application?"
-          runner.send_keys app_name
-
-          expect(runner).to say "Which service?>"
-          runner.send_keys service_name
-
-          expect(runner).to say "Unbinding #{service_name} from #{app_name}... OK"
-        end
-      end
-
-      after do
-        delete_app(app_name)
-      end
-
-      def delete_app(app_name, routes=true)
-        delete_cmd = "#{cf_bin} delete #{app_name}"
-        delete_cmd + " --routes" if routes
-        BlueShell::Runner.run(delete_cmd) do |runner|
-          expect(runner).to say "Really delete #{app_name}?"
-          runner.send_keys "y"
-          expect(runner).to say "Deleting #{app_name}... OK"
-        end
-      end
     end
   end
 end

data/spec/support/features_helper.rb

@@ -28,45 +28,9 @@ module FeaturesHelper
     end
   end
 
-  def create_service_instance(service_name, instance_name, opts = {})
-    plan_name = opts[:plan]
-    credentials = opts[:credentials]
-
-    BlueShell::Runner.run("#{cf_bin} create-service") do |runner|
-      expect(runner).to say "What kind?>"
-      runner.send_keys service_name
-
-      expect(runner).to say "Name?>"
-      runner.send_keys instance_name
-
-      if service_name == "user-provided"
-        credentials.keys.each_with_index do |k, i|
-          expect(runner).to say "Key"
-          runner.send_keys k
-          expect(runner).to say "Value"
-          runner.send_keys credentials[k]
-          expect(runner).to say "Another credentials parameter?"
-          if i < credentials.size - 1
-            runner.send_keys "y"
-          else
-            runner.send_keys "n"
-          end
-        end
-      else
-        expect(runner).to say "Which plan?"
-        runner.send_keys plan_name
-      end
-
-      expect(runner).to say "Creating service #{instance_name}... OK"
-    end
-  end
-
-  def push_app(app_folder, deployed_app_name, opts = {})
-    push_cmd = "#{cf_bin} push --no-manifest"
-    push_cmd += " --command #{opts[:start_command]}" if opts[:start_command]
-
+  def push_app(app_folder, deployed_app_name)
     Dir.chdir("#{SPEC_ROOT}/assets/#{app_folder}") do
-      BlueShell::Runner.run(push_cmd) do |runner|
+      BlueShell::Runner.run("#{cf_bin} push --no-manifest") do |runner|
         expect(runner).to say "Name>"
         runner.send_keys deployed_app_name
 
@@ -95,9 +59,7 @@ module FeaturesHelper
           runner.send_return
         end
 
-        expect(runner).to say "Push successful!"
-
-        runner.wait_for_exit opts[:timeout] || 30
+        runner.wait_for_exit
       end
     end
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.8.rc2
+  version: 4.2.8
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -14,6 +15,7 @@ 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,20 +47,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.2.rc5
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.2.rc5
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,6 +106,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +117,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +125,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +133,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +141,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +149,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +157,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +165,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: anchorman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +173,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +181,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +189,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +197,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +205,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +213,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -195,6 +221,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -202,6 +229,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -209,6 +237,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -216,6 +245,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -223,6 +253,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,6 +261,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -237,6 +269,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -244,6 +277,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -251,6 +285,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -258,6 +293,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -265,6 +301,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -272,6 +309,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -279,6 +317,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -411,9 +450,6 @@ files:
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
 - spec/admin/set_quota_spec.rb
-- spec/assets/env/env_test.rb
-- spec/assets/env/Gemfile
-- spec/assets/env/Gemfile.lock
 - spec/assets/hello-sinatra/config.ru
 - spec/assets/hello-sinatra/fat-cat-makes-app-larger.png
 - spec/assets/hello-sinatra/Gemfile
@@ -566,34 +602,38 @@ files:
 homepage: http://github.com/cloudfoundry/cf
 licenses:
 - Apache 2.0
-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'
+      segments:
+      - 0
+      hash: 1212679267713831030
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1212679267713831030
 requirements: []
 rubyforge_project: cf
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
 - spec/admin/set_quota_spec.rb
-- spec/assets/env/env_test.rb
-- spec/assets/env/Gemfile
-- spec/assets/env/Gemfile.lock
 - spec/assets/hello-sinatra/config.ru
 - spec/assets/hello-sinatra/fat-cat-makes-app-larger.png
 - spec/assets/hello-sinatra/Gemfile

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGFmMTYzNDMzMzMwYTdiODgyNDI3OGNmOThjZjliMmI1MjdiZGU2OQ==
-  data.tar.gz: !binary |-
-    NGU3YjQ1NTQxMDc3MzMzMzE3NzljODdiZTQ0MTgzZDg4NmM2YTE3Yw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZmFmNWIzZGU1MmRmNmNjZTFiODVmYjViNjg5YjVmM2EyNGQwNjc3MTFmNjg5
-    MTU0YjFiOTEzZTlkNDU1MmE3YTk4Njg5ZWNlYzU0YjNmZjM1MDAxY2U5YzYx
-    NzI4ZjQzNzYyNWRhYmJkYzJiYmMzYjU0NzdjODZkNGE2YmEyMGY=
-  data.tar.gz: !binary |-
-    OTQzYmExMGQ0MjY0Zjk3ZGY5ZmU2NmUyYzhhMzU2ZjAyNTQzMjE0NDlmMjFk
-    MjAyZTA0YjkzYTQ2YzEzMTMwZjg2MzcyOTY2NDkzZTlhNWFhZTc0MzM1YWJj
-    Mzc3YzdhOTU2MWQ1MzYwZDlmNWNlMmZiZWVjMWJiNjBiMjlmYTA=

data/spec/assets/env/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-gem 'bundler'
-gem 'sinatra'
-gem 'json'

data/spec/assets/env/Gemfile.lock

@@ -1,17 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    json (1.5.1)
-    rack (1.2.2)
-    sinatra (1.2.1)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    tilt (1.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  json
-  sinatra

data/spec/assets/env/env_test.rb

@@ -1,58 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'sinatra'
-require 'json'
-
-$stdout.sync = true
-
-def dump_env(fmt)
-  if fmt == 'html' || fmt == nil
-    res = ''
-    ENV.each do |k, v|
-      res << "#{k}: #{v}<br/>"
-    end
-    res
-  elsif fmt == 'json'
-    res = {}
-    ENV.each do |k, v|
-      res[k] = v
-    end
-    puts res
-    res.to_json
-  end
-end
-
-get '/' do
-  dump_env('html')
-end
-
-get '/healthcheck' do
-  "OK"
-end
-
-get '/env' do
-  dump_env('json')
-end
-
-
-get '/services' do
-  app_instance = JSON.parse(ENV['VCAP_APPLICATION'])
-  services = JSON.parse(ENV['VCAP_SERVICES'])
-
-  valid_services = false
-  service_list = []
-  services.each do |k, v|
-    v.each do |i|
-      s = {}
-      s['vendor'] = k.split('-')[0]
-      s['name'] = i['name']
-      service_list << s
-      valid_services = true
-    end
-  end
-  response = "{\"status\":\"ok\", \"services\": #{service_list.to_json}}" if valid_services
-  response = "{\"status\":\"fail\", \"services\": []}" if !valid_services
-
-  puts "my response: #{response}"
-  response
-end