cf 0.6.1.rc16 → 0.6.1.rc17

data/lib/cf/cli/user/passwd.rb

@@ -2,27 +2,20 @@ require "cf/cli/user/base"
 
 module CF::User
   class Passwd < Base
-    desc "Update a user's password"
+    desc "Update the current user's password"
     group :admin, :user, :hidden => true
-    input :user, :desc => "User to update", :argument => :optional,
-          :default => proc { client.current_user },
-          :from_given => proc { |email|
-            if client.current_user.email != email
-              fail "You can only change your own password."
-            end
-          }
     input :password, :desc => "Current password"
     input :new_password, :desc => "New password"
     input :verify, :desc => "Repeat new password"
+
     def passwd
-      user = input[:user]
       password = input[:password]
       new_password = input[:new_password]
 
       validate_password! new_password
 
       with_progress("Changing password") do
-        user.change_password!(new_password, password)
+        client.current_user.change_password!(new_password, password)
       end
     end
 

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.1.rc16".freeze
+  VERSION = "0.6.1.rc17".freeze
 end

data/lib/manifests/plugin.rb

@@ -67,7 +67,6 @@ class ManifestsPlugin < CF::App::Base
     app.memory = megabytes(input[:memory]) if input.has?(:memory)
     app.total_instances = input[:instances] if input.has?(:instances)
     app.command = input[:command] if input.has?(:command)
-    app.production = input[:plan].upcase.start_with?("P") if input.has?(:plan)
     app.buildpack = input[:buildpack] if input.has?(:buildpack)
   end
 

data/spec/cf/cli/user/passwd_spec.rb

@@ -6,18 +6,11 @@ describe CF::User::Passwd do
 
     describe 'command' do
       subject { command }
-      its(:description) { should eq "Update a user's password" }
+      its(:description) { should eq "Update the current user's password" }
       it { expect(Mothership::Help.group(:admin, :user)).to include(subject) }
     end
 
     include_examples 'inputs must have descriptions'
-
-    describe 'arguments' do
-      subject { command.arguments }
-      it 'have the correct commands (with inconsistent user instead of email)' do
-        should eq [{:type => :optional, :value => nil, :name => :user}]
-      end
-    end
   end
 
   describe '#passwd' do

data/spec/features/push_flow_spec.rb

@@ -23,6 +23,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     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!

data/spec/features/space_spec.rb

@@ -41,63 +41,76 @@ if ENV['CF_V2_RUN_INTEGRATION']
       end
     end
 
-    it "can create, switch, rename, and delete spaces" do
-      new_space = "test-space-#{rand(10000)}"
-      new_space_two = "test-space-renamed-#{rand(10000)}"
-      BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") do |runner|
-        expect(runner).to say("Creating space #{new_space}... OK")
+    describe "needs cleanup after specs" do
+      let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+      let(:app) { "hello-sinatra-recursive-#{run_id}" }
+      let(:new_space) { "test-space-#{rand(10000)}" }
+      let(:new_space_two) { "test-space-renamed-#{rand(10000)}" }
+
+      after do
+        begin
+          BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} -r -f")
+        rescue
+        end
+        begin
+          BlueShell::Runner.run("#{cf_bin} delete-space #{new_space_two} -r -f")
+        rescue
+        end
       end
 
-      BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") do |runner|
-        expect(runner).to say("Switching to space #{new_space}... OK")
-      end
+      it "can create, switch, rename, and delete spaces" do
+        BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") do |runner|
+          expect(runner).to say("Creating space #{new_space}... OK")
+        end
 
-      BlueShell::Runner.run("#{cf_bin} rename-space #{new_space} #{new_space_two}") do |runner|
-        expect(runner).to say("Renaming to #{new_space_two}... OK")
-      end
+        BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") do |runner|
+          expect(runner).to say("Switching to space #{new_space}... OK")
+        end
 
-      BlueShell::Runner.run("#{cf_bin} delete-space #{new_space_two}") do |runner|
-        expect(runner).to say("Really delete")
-        runner.send_keys "y"
+        BlueShell::Runner.run("#{cf_bin} rename-space #{new_space} #{new_space_two}") do |runner|
+          expect(runner).to say("Renaming to #{new_space_two}... OK")
+        end
 
-        expect(runner).to say("Deleting space #{new_space_two}... OK")
-      end
-    end
+        BlueShell::Runner.run("#{cf_bin} delete-space #{new_space_two}") do |runner|
+          expect(runner).to say("Really delete")
+          runner.send_keys "y"
 
-    it "shows all the spaces in the org" do
-      BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
-        expect(runner).to say(space)
+          expect(runner).to say("Deleting space #{new_space_two}... OK")
+        end
       end
-    end
 
-    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
-    let(:app) { "hello-sinatra-recursive-#{run_id}" }
+      it "can create an app in a space, then delete it recursively" do
+        BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") { |runner| runner.wait_for_exit(30) }
+        BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") { |runner| runner.wait_for_exit(30) }
 
-    it "can create an app in a space, then delete it recursively" do
-      new_space = "test-space-#{rand(10000)}"
-      BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") { |runner| runner.wait_for_exit(30) }
-      BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") { |runner| runner.wait_for_exit(30) }
+        push_app("hello-sinatra", app)
 
-      push_app("hello-sinatra", app)
+        BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} --force") do |runner|
+          expect(runner).to say("If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag.")
+          runner.wait_for_exit(30)
+        end.should_not be_successful
 
-      BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} --force") do |runner|
-        expect(runner).to say("If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag.")
-        runner.wait_for_exit(30)
-      end.should_not be_successful
+        BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
+          expect(runner).to say(new_space)
+          expect(runner).to say(app)
+        end
 
-      BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
-        expect(runner).to say(new_space)
-        expect(runner).to say(app)
-      end
+        BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} --recursive --force") do |runner|
+          expect(runner).to say("Deleting space #{new_space}... OK")
+        end
 
-      BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} --recursive --force") do |runner|
-        expect(runner).to say("Deleting space #{new_space}... OK")
+        BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
+          expect(runner).to_not say(new_space)
+          expect(runner).to_not say(app)
+        end
       end
+    end
 
+    it "shows all the spaces in the org" do
       BlueShell::Runner.run("#{cf_bin} spaces") do |runner|
-        expect(runner).to_not say(new_space)
-        expect(runner).to_not say(app)
+        expect(runner).to say(space)
       end
     end
+
   end
 end

data/spec/features/switching_targets_spec.rb

@@ -52,12 +52,12 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
         BlueShell::Runner.run("#{cf_bin} target -s #{space}") do |runner|
           expect(runner).to say("Switching to space #{space}")
-          runner.wait_for_exit
+          runner.wait_for_exit(15)
         end
 
         BlueShell::Runner.run("#{cf_bin} target -s #{space2}") do |runner|
           expect(runner).to say("Switching to space #{space2}")
-          runner.wait_for_exit
+          runner.wait_for_exit(15)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc16
+  version: 0.6.1.rc17
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc8
+        version: 0.7.0.rc9
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0.rc8
+        version: 0.7.0.rc9
     - - <
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -531,7 +531,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3785386009027622899
+      hash: 1676711361169297204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: