cf 5.2.1.rc7 → 5.2.1.rc8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YThiM2I0YjhiZjFkYWFmNmZhYWU2ZmU2MDUzODYyZGU0OThhNDhkMw==
+  data.tar.gz: !binary |-
+    MTdhZGNhNDA2YTBmMTBhMzBkNzBjZmJiY2IwYjVhMjI5NzJkOGZlYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZGY3N2JkY2U5YWVmMzc5NDRhZjY5YTQ4YWU2YTI5YWI5MjQ3YzM3Y2Q0ZTY0
+    MTQyM2VjNGExNzEzYjgzOGIxNDJkMjkxNWJmY2FkMTYyYjkzNDg2M2U0OWMw
+    MzVmZDc3YzNjNjAxNmU1ZGY0ZGIxMWQwZTNjMWFhYWZiNzAxODI=
+  data.tar.gz: !binary |-
+    ZmY2ZWFjYzA1YWQ1MDc3Y2Y4YjUyMjhkZGFmYzFmY2Y3YThlZTlhMGU3NTIy
+    MWRhZWVhN2U5MGQ5NjVlYjZhN2M4NTJhOGIwZmVhNTFkMzdmODFhZDU2ZGRi
+    MTk4YzQxN2RkZDE3YmUzY2YyODk5NGFiMGU3MmYxMmFjMzA0YzY=

data/lib/admin/service_broker/update.rb

@@ -10,7 +10,7 @@ module CFAdmin::ServiceBroker
     group :admin
     input :broker, :argument => :required,
       :desc => "Service broker to update",
-      :from_given => by_name(:service_broker)
+      :from_given => by_name(:service_broker, 'service broker')
     input :name, :argument => :optional,
       :desc => "New name"
     input :url,
@@ -19,34 +19,34 @@ module CFAdmin::ServiceBroker
       :desc => "New token"
 
     def update_service_broker
-      broker = input[:broker]
+      @broker = input[:broker]
 
-      old_name = broker.name
+      old_name = @broker.name
 
-      broker.name = input[:name]
+      @broker.name = input[:name]
       finalize
-      broker.broker_url = input[:url]
+      @broker.broker_url = input[:url]
       finalize
-      broker.token = input[:token]
+      @broker.token = input[:token]
       finalize
 
       with_progress("Updating service broker #{old_name}") do
-        broker.update!
+        @broker.update!
       end
     end
 
     private
 
     def ask_name
-      ask("Name")
+      ask("Name", :default => @broker.name)
     end
 
     def ask_url
-      ask("URL")
+      ask("URL", :default => @broker.broker_url)
     end
 
     def ask_token
-      ask("Token")
+      ask("Token", :default => @broker.token)
     end
   end
 end

data/lib/cf/cli.rb

@@ -27,10 +27,10 @@ module CF
     option :help, :desc => "Show command usage", :alias => "-h",
       :default => false
 
-    option :http_proxy, :desc => "Connect though an http proxy server", :alias => "--http-proxy",
+    option :http_proxy, :desc => "Connect with an http proxy server", :alias => "--http-proxy",
       :value => :http_proxy
 
-    option :https_proxy, :desc => "Connect though an https proxy server", :alias => "--https-proxy",
+    option :https_proxy, :desc => "Connect with an https proxy server", :alias => "--https-proxy",
       :value => :https_proxy
 
     option :version, :desc => "Print version number", :alias => "-v",
@@ -322,12 +322,8 @@ EOS
 
     def sane_target_url(url)
       unless url =~ /^https?:\/\//
-        begin
-          TCPSocket.new(url, Net::HTTP.https_default_port)
-          url = "https://#{url}"
-        rescue Errno::ECONNREFUSED, SocketError, Timeout::Error
-          url = "http://#{url}"
-        end
+        prefix = can_connect_on_https?(url) ? "https://" : "http://"
+        url = prefix + url
       end
 
       url.gsub(/\/$/, "")
@@ -344,7 +340,6 @@ EOS
 
     def client_target
       return File.read(target_file).chomp if File.exists?(target_file)
-      sane_target_url(CF::DEFAULT_API_URL)
     end
 
     def ensure_config_dir
@@ -356,7 +351,7 @@ EOS
       ensure_config_dir
 
       File.open(File.expand_path(CF::TARGET_FILE), "w") do |f|
-        f.write(sane_target_url(url))
+        f.write(url)
       end
 
       invalidate_client
@@ -492,6 +487,17 @@ EOS
 
     private
 
+    def can_connect_on_https?(unqualified_url)
+      begin
+        Timeout.timeout(1) do
+          TCPSocket.new(unqualified_url, Net::HTTP.https_default_port)
+        end
+        true
+      rescue Errno::ECONNREFUSED, SocketError, Timeout::Error, Errno::ETIMEDOUT
+        false
+      end
+    end
+
     def target_file
       File.expand_path(CF::TARGET_FILE)
     end

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

@@ -0,0 +1,25 @@
+class ServiceHelper
+  def initialize(service)
+    @service = service
+  end
+
+  def label
+    @service.label
+  end
+
+  def provider
+    @service.provider || 'n/a'
+  end
+
+  def version
+    @service.version || 'n/a'
+  end
+
+  def service_plans
+    @service.service_plans.map(&:name).join(', ')
+  end
+
+  def description
+    @service.description
+  end
+end

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

@@ -46,18 +46,19 @@ end
 class ManagedServiceInstanceHelper
   def initialize(service_instance)
     @instance = service_instance
+    @service_helper = ServiceHelper.new(service_instance.service_plan.service)
   end
 
   def service_label
-    @instance.service_plan.service.label
+    @service_helper.label
   end
 
   def service_provider
-    @instance.service_plan.service.provider
+    @service_helper.provider
   end
 
   def version
-    @instance.service_plan.service.version
+    @service_helper.version
   end
 
   def plan_name

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

@@ -53,11 +53,12 @@ module CF::Service
       table(
         ["service", "version", "provider", "plans", "description"],
         services.sort_by(&:label).collect { |s|
-          [c(s.label, :name),
-            s.version,
-            s.provider,
-            s.service_plans.collect(&:name).join(", "),
-            s.description
+          presenter = ServiceHelper.new(s)
+          [c(presenter.label, :name),
+             presenter.version,
+             presenter.provider,
+             presenter.service_plans,
+             presenter.description
           ]
         })
     end

data/lib/cf/constants.rb

@@ -7,5 +7,4 @@ module CF
   TOKENS_FILE     = "#{CONFIG_DIR}/tokens.yml".freeze
   COLORS_FILE     = "#{CONFIG_DIR}/colors.yml".freeze
   CRASH_FILE      = "#{CONFIG_DIR}/crash".freeze
-  DEFAULT_API_URL = "api.run.pivotal.io".freeze
 end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "5.2.1.rc7".freeze
+  VERSION = "5.2.1.rc8".freeze
 end

data/lib/tasks/gem_release.rake

@@ -1,3 +1,4 @@
+require 'active_support/time'
 require 'active_support/core_ext'
 
 namespace :gem do
@@ -7,22 +8,28 @@ namespace :gem do
     old_version = gem_version
 
     sh! "gem bump --version #{version} --no-commit"
+
+    print "About to bump version to #{gem_version}, continue? (Y): "
+    answer = STDIN.gets.strip
+    exit unless answer.length == 0 || answer.upcase.start_with?("Y")
+
     sh! "git add lib/cf/version.rb"
 
     print_with_purpose "Bumping to version #{gem_version}"
-    #generate_release_notes(old_version)
+    generate_release_notes(old_version)
     sh!("git commit -m 'Bumping to version #{gem_version}.'")
     sh!("git push")
     sh!("gem release --tag")
   end
 
   private
-  #def generate_release_notes(old_version)
-  #  print_with_purpose "Generating release notes..."
-  #  file_name = "release_#{gem_version}"
-  #  sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
-  #  sh!("git add release_notes")
-  #end
+
+  def generate_release_notes(old_version)
+    print_with_purpose "Generating release notes..."
+    file_name = "release_#{gem_version}"
+    sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
+    sh!("git add release_notes")
+  end
 
   def sh!(cmd)
     `#{cmd}`

data/spec/admin/service_broker/update_spec.rb

@@ -9,14 +9,18 @@ describe CFAdmin::ServiceBroker::Update do
   let(:service_broker) { CFoundry::V2::ServiceBroker.new(nil, client) }
 
   before do
+    service_broker.name = 'formername'
+    service_broker.broker_url = 'http://former.example.com'
+    service_broker.token = 'formertoken'
+
     CFAdmin::ServiceBroker::Update.client = client
-    client.stub(:service_broker_by_name).with('cf-mysql').and_return(service_broker)
+    client.stub(:service_broker_by_name).with('formername').and_return(service_broker)
   end
 
   it "updates a service broker when arguments are provided on the command line" do
     service_broker.stub(:update!)
 
-    cf %W[update-service-broker --broker cf-mysql --name cf-othersql --url http://other.cfapp.io --token secret2]
+    cf %W[update-service-broker --broker formername --name cf-othersql --url http://other.cfapp.io --token secret2]
 
     service_broker.name.should == 'cf-othersql'
     service_broker.broker_url.should == 'http://other.cfapp.io'
@@ -28,11 +32,11 @@ describe CFAdmin::ServiceBroker::Update do
   it "updates a service broker when no change arguments are provided" do
     service_broker.stub(:update!)
 
-    stub_ask("Name").and_return("cf-othersql")
-    stub_ask("URL").and_return("http://other.example.com")
-    stub_ask("Token").and_return("token2")
+    stub_ask("Name", :default => 'formername').and_return("cf-othersql")
+    stub_ask("URL", :default => 'http://former.example.com').and_return("http://other.example.com")
+    stub_ask("Token", :default => 'formertoken').and_return("token2")
 
-    cf %W[update-service-broker cf-mysql]
+    cf %W[update-service-broker formername]
 
     service_broker.name.should == 'cf-othersql'
     service_broker.broker_url.should == 'http://other.example.com'

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

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe ServiceHelper do
+  describe "#label" do
+    it "returns the label for the service" do
+      service = build(:service, label: 'mysql')
+      helper = ServiceHelper.new(service)
+
+      expect(helper.label).to eq('mysql')
+    end
+  end
+
+  describe "#provider" do
+    it "returns the provider for the service if it has one" do
+      service = build(:service, provider: 'aws')
+      helper = ServiceHelper.new(service)
+
+      expect(helper.provider).to eq('aws')
+    end
+
+    it "returns n/a if it does not have a provider" do
+      service = build(:service, provider: nil)
+      helper = ServiceHelper.new(service)
+
+      expect(helper.provider).to eq('n/a')
+    end
+  end
+
+  describe "#version" do
+    it "returns the version for the service if it has one" do
+      service = build(:service, version: '3.11')
+      helper = ServiceHelper.new(service)
+
+      expect(helper.version).to eq('3.11')
+    end
+
+    it "returns n/a if it does not have a version" do
+      service = build(:service, version: nil)
+      helper = ServiceHelper.new(service)
+
+      expect(helper.version).to eq('n/a')
+    end
+  end
+
+  describe "#service_plans" do
+    it "returns the plans for the service if it has one" do
+      plans = [
+        build(:service_plan, name: 'small'),
+        build(:service_plan, name: 'large')
+      ]
+      service = build(:service, :service_plans => plans)
+      helper = ServiceHelper.new(service)
+
+      expect(helper.service_plans).to eq('small, large')
+    end
+  end
+
+  describe "#description" do
+    it "returns the plans for the service if it has one" do
+      service = build(:service, :description => 'super awesome NoSQL NO DOWNTIME')
+      helper = ServiceHelper.new(service)
+
+      expect(helper.description).to eq('super awesome NoSQL NO DOWNTIME')
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ describe ServiceInstanceHelper do
     let(:provided_instance) { build(:user_provided_service_instance) }
     let(:managed_instance) { build(:managed_service_instance) }
 
-    it "returns a ManagedSerivceInstanceHelper when the argument is a ManagedServiceInstance" do
+    it "returns a ManagedServiceInstanceHelper when the argument is a ManagedServiceInstance" do
       expect(ServiceInstanceHelper.new(managed_instance)).to be_a ManagedServiceInstanceHelper
     end
 

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

@@ -117,6 +117,14 @@ module CF
               expect(output).to say("Getting services... OK")
               expect(output).to say(/service\s+version\s+provider\s+plans\s+description/)
             end
+
+            context "when one of the services does not have a version or provider" do
+              it 'replaces those fields with n/a' do
+                client.stub(:services => [build(:service, :version => nil, :provider => nil)])
+                cf %W[services --marketplace]
+                expect(output).to say(/n\/a\s+n\/a/)
+              end
+            end
           end
         end
 

data/spec/cf/cli/start/target_prettifier_spec.rb

@@ -37,6 +37,24 @@ Target Information (where will apps be pushed):
         end
       end
 
+      context "when there is no target" do
+        let(:target) { nil }
+        it "displays 'N/A' as the value of the target" do
+          desired_result = <<-STR
+Target Information (where will apps be pushed):
+  CF instance: N/A (API version: 2)
+  user: #{user.email}
+  target app space: #{space.name} (org: #{organization.name})
+          STR
+
+          desired_result.each_line do |line|
+            outputter.should_receive(:line).with(line.chomp)
+          end
+
+          TargetPrettifier.prettify(client, outputter)
+        end
+      end
+
       context "when nothing is specified" do
         let(:user) { nil }
         let(:space) { nil }

data/spec/cf/cli_spec.rb

@@ -316,8 +316,8 @@ module CF
       context "when no target file exists" do
         let(:fake_home_dir) { "#{SPEC_ROOT}/fixtures/fake_home_dirs/no_config" }
 
-        it "returns the default production API url" do
-          expect(subject).to eq "https://api.run.pivotal.io"
+        it "returns nil" do
+          expect(subject).to eq nil
         end
       end
     end
@@ -459,5 +459,76 @@ module CF
         end
       end
     end
+
+    describe "#sane_target_url" do
+      subject(:sane_target_url) { context.sane_target_url(input_url)}
+      context "when the given url has an http(s) scheme as a prefix" do
+        let(:input_url) { "http://example.com" }
+        it "removes any trailing slashes" do
+          expect(sane_target_url).to eq "http://example.com"
+        end
+      end
+
+      context "when the given url has no http(s) scheme" do
+        let(:input_url) { "example.com" }
+        context "when the url can be reached via https" do
+          before do
+            TCPSocket.stub(:new).with(input_url, Net::HTTP.https_default_port)
+          end
+
+          it "prepends 'https' to the url" do
+            expect(sane_target_url).to eq "https://example.com"
+          end
+        end
+
+        context "when the url cannot be reached via https" do
+          before do
+            TCPSocket.stub(:new).with(input_url, Net::HTTP.https_default_port).and_raise error
+          end
+
+          context "due to ECONNREFUSED" do
+            let(:error) { Errno::ECONNREFUSED }
+            it "prepends 'http' to the url" do
+              expect(sane_target_url).to eq "http://example.com"
+            end
+          end
+
+          context "due to a SocketError" do
+            let(:error) { SocketError }
+            it "prepends 'http' to the url" do
+              expect(sane_target_url).to eq "http://example.com"
+            end
+          end
+
+          context "due to ETIMEDOUT" do
+            let(:error) { Errno::ETIMEDOUT }
+            it "prepends 'http' to the url" do
+              expect(sane_target_url).to eq "http://example.com"
+            end
+          end
+        end
+
+        context "when the TCP connection times out" do
+          let(:current_time) { Time.now }
+
+          before do
+            TCPSocket.stub(:new).with(input_url, Net::HTTP.https_default_port) {
+              sleep 10
+            }
+          end
+
+          it "prepends 'http' to the url" do
+            expect(sane_target_url).to eq "http://example.com"
+          end
+
+          it "times out after one second" do
+            start_time = Time.now
+            sane_target_url
+            end_time = Time.now
+            expect(end_time).to be_within(0.5).of(start_time + 1)
+          end
+        end
+      end
+    end
   end
 end

data/spec/factories/cfoundry/v2/managed_service_instances_factory.rb

@@ -2,6 +2,7 @@ FactoryGirl.define do
   factory :managed_service_instance, :class => CFoundry::V2::ManagedServiceInstance do
     sequence(:guid) { |n| "service-instance-guid-#{n}" }
     sequence(:name) { |n| "service-instance-name-#{n}" }
+    service_plan { build(:service_plan) }
 
     ignore do
       client { FactoryGirl.build(:client) }

data/spec/factories/cfoundry/v2/service_plans_factory.rb

@@ -4,10 +4,14 @@ FactoryGirl.define do
     sequence(:name) { |n| "service-plan-name-#{n}" }
     extra { "{}" }
 
+    after(:build) do |service_plan|
+      service_plan.service ||= FactoryGirl.build(:service, service_plans: [service_plan])
+    end
+
     ignore do
       client { FactoryGirl.build(:client) }
     end
 
     initialize_with { new(guid, client) }
   end
-end
+end

data/spec/features/switching_targets_spec.rb

@@ -21,6 +21,10 @@ if ENV['CF_V2_RUN_INTEGRATION']
     end
 
     it "can switch targets, even if a target is invalid" do
+      BlueShell::Runner.run("#{cf_bin} target") do |runner|
+        expect(runner).to say "  CF instance: N/A"
+      end
+
       BlueShell::Runner.run("#{cf_bin} target invalid-target") do |runner|
         expect(runner).to say "Target refused"
         runner.wait_for_exit

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.2.1.rc7
-  prerelease: 6
+  version: 5.2.1.rc8
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,28 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: caldecott-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,61 +56,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,7 +105,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -133,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -141,7 +119,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -149,7 +126,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -157,7 +133,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -165,7 +140,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -173,7 +147,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,7 +154,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -189,7 +161,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -197,7 +168,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -205,7 +175,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -213,7 +182,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -221,7 +189,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -229,7 +196,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -237,7 +203,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -245,7 +210,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -253,7 +217,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -261,7 +224,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -269,7 +231,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -277,7 +238,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -285,7 +245,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -293,7 +252,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -301,7 +259,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -309,19 +266,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -392,6 +347,7 @@ files:
 - lib/cf/cli/service/delete.rb
 - lib/cf/cli/service/rename.rb
 - lib/cf/cli/service/service.rb
+- lib/cf/cli/service/service_helper.rb
 - lib/cf/cli/service/service_instance_helper.rb
 - lib/cf/cli/service/services.rb
 - lib/cf/cli/service/unbind.rb
@@ -549,6 +505,7 @@ files:
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/help_spec.rb
 - spec/cf/cli/service/rename_spec.rb
+- spec/cf/cli/service/service_helper_spec.rb
 - spec/cf/cli/service/service_instance_helper_spec.rb
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb
@@ -622,30 +579,26 @@ 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: -3330496737720499293
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/admin/curl_spec.rb
@@ -746,6 +699,7 @@ test_files:
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/help_spec.rb
 - spec/cf/cli/service/rename_spec.rb
+- spec/cf/cli/service/service_helper_spec.rb
 - spec/cf/cli/service/service_instance_helper_spec.rb
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb