cf 0.6.0 → 0.6.1.rc1

data/lib/cf/cli/app/apps.rb

@@ -56,12 +56,11 @@ module CF::App
 
     def display_apps_table(apps)
       table(
-        ["name", "status", "usage", "plan", "url"],
+        ["name", "status", "usage", "url"],
         apps.collect { |a|
           [ c(a.name, :name),
             app_status(a),
             "#{a.total_instances} x #{human_mb(a.memory)}",
-            a.production ? "prod" : "dev",
             if a.urls.empty?
               d("none")
             elsif a.urls.size == 1

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

@@ -25,7 +25,7 @@ module CF::App
     input :memory,    :desc => "Memory limit"
     input :instances, :desc => "Number of instances to run", :type => :integer
     input :command,   :desc => "Startup command"
-    input :plan,      :desc => "Application plan", :default => "D100"
+    input :plan,      :desc => "Application plan"
     input :start,     :desc => "Start app after pushing?", :default => true
     input :restart,   :desc => "Restart app after updating?", :default => true
     input :buildpack, :desc => "Custom buildpack URL", :default => nil

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

@@ -9,8 +9,6 @@ module CF::App
       inputs[:total_instances] = input[:instances]
       inputs[:space] = client.current_space if client.current_space
 
-      inputs[:production] = !!(input[:plan] =~ /^p/i)
-
       inputs[:buildpack] = input[:buildpack]
       inputs[:command] = input[:command] if input.has?(:command) || !has_procfile?
 

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

@@ -4,7 +4,6 @@ module CF::App
       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
 
@@ -42,8 +41,6 @@ module CF::App
         human_mb(val)
       when :command, :buildpack
         "'#{val}'"
-      when :production
-        bool(val)
       else
         val
       end

data/lib/cf/cli/app/scale.rb

@@ -10,7 +10,7 @@ module CF::App
           :type => :numeric
     input :memory, :desc => "Memory limit"
     input :disk, :desc => "Disk quota"
-    input :plan, :desc => "Application plan", :default => "D100"
+    input :plan, :desc => "Application plan"
     input :restart, :desc => "Restart app after updating?", :default => true
     def scale
       app = input[:app]
@@ -29,7 +29,6 @@ module CF::App
 
       if input.has?(:plan)
         plan_name = input[:plan]
-        production = !!(plan_name =~ /^p/i)
       end
 
       unless instances || memory || disk || plan_name
@@ -40,7 +39,6 @@ module CF::App
       app.total_instances = instances if input.has?(:instances)
       app.memory = megabytes(memory) if input.has?(:memory)
       app.disk_quota = megabytes(disk) if input.has?(:disk)
-      app.production = production if input.has?(:plan)
 
       fail "No changes!" unless app.changed?
 

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

@@ -13,8 +13,7 @@ module CF::Service
     input :name, :desc => "Name for your service", :argument => :optional
     input :plan, :desc => "Service plan",
           :from_given => find_by_name_insensitive("plan"),
-          :default => proc { |plans|
-            plans.find { |p| p.name == "D100" } ||
+          :default => proc {
               interact
           }
     input :provider, :desc => "Service provider"

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1.rc1".freeze
 end

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

@@ -36,7 +36,7 @@ describe CF::App::Create do
     let(:given) do
       { :name => "some-name",
         :instances => "1",
-        :plan => "p100",
+        :plan => "100",
         :memory => "1G",
         :command => "ruby main.rb",
         :buildpack => "git://example.com",
@@ -48,7 +48,6 @@ describe CF::App::Create do
       its([:name]) { should eq "some-name" }
       its([:total_instances]) { should eq 1 }
       its([:space]) { should eq client.current_space }
-      its([:production]) { should eq true }
       its([:command]) { should eq "ruby main.rb" }
       its([:memory]) { should eq 1024 }
       its([:stack]) { should eq lucid64 }
@@ -171,7 +170,6 @@ describe CF::App::Create do
     let(:attributes) do
       { :name => "some-app",
         :total_instances => 2,
-        :production => false,
         :memory => 1024,
         :buildpack => "git://example.com"
       }

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

@@ -153,54 +153,6 @@ describe CF::App::Push do
       include_examples 'common tests for inputs', :command
     end
 
-    context 'when plan is given' do
-      let(:old) { "d100" }
-      let(:new) { "p100" }
-      let(:inputs) { { :plan => new } }
-
-      include_examples 'common tests for inputs', :production, :plan
-
-      %w{p100 P100 P200}.each do |plan|
-        context "when the given plan is #{plan}" do
-          let(:inputs) { { :plan => plan } }
-
-          it 'sets production to true' do
-            stub(push).line(anything)
-            mock(app).update!
-            expect { subject }.to change { app.production }.from(false).to(true)
-          end
-
-          it 'outputs the changed plan in single quotes' do
-            mock(push).line("Changes:")
-            mock(push).line("production: false -> true")
-            stub(app).update!
-            subject
-          end
-        end
-      end
-
-      %w{d100 D100 D200 fizzbuzz}.each do |plan|
-        context "when the given plan is #{plan}" do
-          let(:app) { fake(:app, :production => true) }
-
-          let(:inputs) { { :plan => plan } }
-
-          it 'sets production to false' do
-            stub(push).line(anything)
-            mock(app).update!
-            expect { subject }.to change { app.production }.from(true).to(false)
-          end
-
-          it 'outputs the changed plan in single quotes' do
-            mock(push).line("Changes:")
-            mock(push).line("production: true -> false")
-            stub(app).update!
-            subject
-          end
-        end
-      end
-    end
-
     context 'when restart is given' do
       let(:inputs) { { :restart => true, :memory => 4096 } }
 

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

@@ -48,28 +48,4 @@ command CF::App::Scale do
       expect { subject }.to change(app, :total_instances).from(before_value).to(5)
     end
   end
-
-  context "when the --plan flag is given" do
-    context "when the plan name begins with a 'p'" do
-      let(:app) { fake :app, :production => false }
-
-      subject { cf %W[scale #{app.name} --plan P100] }
-
-      it "changes the application's 'production' flag to true" do
-        mock(app).update!
-        expect { subject }.to change(app, :production).from(false).to(true)
-      end
-    end
-
-    context "when the plan name does not begin with a 'p'" do
-      let(:app) { fake :app, :production => true }
-
-      subject { cf %W[scale #{app.name} --plan D100] }
-
-      it "changes the application's 'production' flag to false" do
-        mock(app).update!
-        expect { subject }.to change(app, :production).from(true).to(false)
-      end
-    end
-  end
 end

data/spec/features/account_lifecycle_spec.rb

@@ -31,8 +31,6 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     end
 
     it "registers a new account and deletes it" do
-      pending "until we get some v2 admin credentials somewhere to actually run this with"
-
       email = Faker::Internet.email
       run("#{cf_bin} target #{target}") do |runner|
         runner.wait_for_exit
@@ -75,18 +73,24 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
         runner.send_keys "1"
       end
 
-      # run("#{cf_bin} delete-user #{email}") do |runner|
-        # expect(runner).to say "Really delete user #{email}?>"
-        # runner.send_keys "y"
-        # expect(runner).to say "Deleting #{email}... OK"
-      # end
+      # TODO: do this when cf delete-user is implemented
+      #run("#{cf_bin} delete-user #{email}") do |runner|
+      #  expect(runner).to say "Really delete user #{email}?>"
+      #  runner.send_keys "y"
+      #  expect(runner).to say "Deleting #{email}... OK"
+      #end
 
+      # TODO: not this.
       client.login(email, "p")
       user = client.current_user
       guid = user.guid
       client.login(username, password)
       user.delete!
       client.base.uaa.delete_user(guid)
+
+      run("#{cf_bin} login #{email} --password p") do |runner|
+        expect(runner).to say "Authenticating... FAILED"
+      end
     end
   end
 else

data/spec/features/push_flow_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "webmock/rspec"
 
-if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGET']
+if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGET'] && ENV['CF_V2_OTHER_TEST_ORGANIZATION']
   describe 'A new user tries to use CF against v2', :ruby19 => true do
     include ConsoleAppSpeckerMatchers
     include CF::Interactive
@@ -9,6 +9,7 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:username) { ENV['CF_V2_TEST_USER'] }
     let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
+    let(:organization) { ENV['CF_V2_OTHER_TEST_ORGANIZATION'] }
 
     let(:app) do
       fuzz = TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_")
@@ -44,7 +45,7 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
 
         expect(runner).to say(
           "Organization>" => proc {
-            runner.send_keys "1"
+            runner.send_keys organization
             expect(runner).to say /Switching to organization .*\.\.\. OK/
           },
           "Switching to organization" => proc {}
@@ -90,6 +91,22 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
           expect(runner).to say(/Binding #{app}\..* to #{app}\.\.\. OK/)
 
           expect(runner).to say "Create services for application?> n"
+          runner.send_keys "y"
+
+          # create a service here
+          expect(runner).to say "What kind?>"
+          runner.send_keys "redis"
+
+          expect(runner).to say "Name?>"
+          runner.send_keys ""
+
+          expect(runner).to say "Which plan?>"
+          runner.send_keys "1"
+
+          expect(runner).to say /Creating service redis-.* OK/
+          expect(runner).to say /Binding redis-.* to .+ OK/
+
+          expect(runner).to say "Create another service?> n"
           runner.send_keys ""
 
           # skip this
@@ -111,11 +128,14 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
       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"
+
+        expect(runner).to say "Delete orphaned service"
+        runner.send_keys "y"
+        expect(runner).to say /Deleting redis.* OK/
       end
     end
   end
 else
-  $stderr.puts 'Skipping v2 integration specs; please provide $CF_V2_TEST_TARGET, $CF_V2_TEST_USER, and $CF_V2_TEST_PASSWORD'
+  $stderr.puts 'Skipping v2 integration specs; please provide $CF_V2_TEST_TARGET, $CF_V2_TEST_USER, $CF_V2_TEST_PASSWORD, and $CF_V2_OTHER_TEST_ORGANIZATION'
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.6.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -348,13 +348,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4009648261134416659
+      hash: 4118664530804261355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: cf
 rubygems_version: 1.8.25