cf 0.6.0.rc3 → 0.6.0.rc4

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

@@ -24,8 +24,6 @@ module CF::App
       line "#{c(a.name, :name)}: #{status}"
 
       indented do
-        line "platform: #{b(a.framework.name)} on #{b(a.runtime.name)}"
-
         start_line "usage: #{b(human_mb(a.memory))}"
         print " #{d(IS_UTF8 ? "\xc3\x97" : "x")} #{b(a.total_instances)}"
         print " instance#{a.total_instances == 1 ? "" : "s"}"

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

@@ -8,8 +8,6 @@ module CF::App
           :default => proc { client.current_space },
           :from_given => by_name(:space)
     input :name, :desc => "Filter by name regexp"
-    input :runtime, :desc => "Filter by runtime regexp"
-    input :framework, :desc => "Filter by framework regexp"
     input :url, :desc => "Filter by url regexp"
     input :full, :desc => "Verbose output format", :default => false
     def apps
@@ -58,13 +56,12 @@ module CF::App
 
     def display_apps_table(apps)
       table(
-        ["name", "status", "usage", "plan", "runtime", "url"],
+        ["name", "status", "usage", "plan", "url"],
         apps.collect { |a|
           [ c(a.name, :name),
             app_status(a),
             "#{a.total_instances} x #{human_mb(a.memory)}",
             a.production ? "prod" : "dev",
-            a.runtime.name,
             if a.urls.empty?
               d("none")
             elsif a.urls.size == 1
@@ -81,14 +78,6 @@ module CF::App
         return false if a.name !~ /#{name}/
       end
 
-      if runtime = options[:runtime]
-        return false if a.runtime.name !~ /#{runtime}/
-      end
-
-      if framework = options[:framework]
-        return false if a.framework.name !~ /#{framework}/
-      end
-
       if url = options[:url]
         return false if a.urls.none? { |u| u =~ /#{url}/ }
       end

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

@@ -24,10 +24,6 @@ module CF::App
                       }
     input :memory,    :desc => "Memory limit"
     input :instances, :desc => "Number of instances to run", :type => :integer
-    input :framework, :desc => "Framework to use",
-                      :from_given => by_name(:framework)
-    input :runtime,   :desc => "Runtime to use",
-                      :from_given => by_name(:runtime)
     input :command,   :desc => "Startup command"
     input :plan,      :desc => "Application plan", :default => "D100"
     input :start,     :desc => "Start app after pushing?", :default => true

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

@@ -25,35 +25,6 @@ module CF::App
       inputs
     end
 
-    def determine_framework
-      return input[:framework] if input.has?(:framework)
-
-      if (detected_framework = detector.detect_framework)
-        input[:framework, [detected_framework], detected_framework, :other]
-      else
-        input[:framework, detector.all_frameworks, nil, nil]
-      end
-    end
-
-    def determine_runtime(framework)
-      return input[:runtime] if input.has?(:runtime)
-
-      detected_runtimes =
-        if framework.name == "standalone"
-          detector.detect_runtimes
-        else
-          detector.runtimes(framework)
-        end
-
-      default_runtime = detected_runtimes.size == 1 ? detected_runtimes.first : nil
-
-      if detected_runtimes.empty?
-        input[:runtime, detector.all_runtimes, nil, nil]
-      else
-        input[:runtime, detected_runtimes, default_runtime, :other]
-      end
-    end
-
     def create_app(inputs)
       app = client.app
 
@@ -130,10 +101,6 @@ module CF::App
       File.exists?("#@path/Procfile")
     end
 
-    def can_have_custom_start_command?(framework)
-      framework.name == "standalone"
-    end
-
     def all_instances
       @all_instances ||= client.service_instances
     end

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

@@ -35,14 +35,6 @@ module CF::App
       ask("Instances", :default => 1)
     end
 
-    def ask_framework(choices, default, other)
-      ask_with_other("Framework", client.frameworks, choices, default, other)
-    end
-
-    def ask_runtime(choices, default, other)
-      ask_with_other("Runtime", client.runtimes, choices, default, other)
-    end
-
     def ask_command
       command = ask("Custom startup command", :default => "none")
 

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

@@ -5,8 +5,6 @@ module CF::App
       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.framework = input[:framework] if input.has?(:framework)
-      app.runtime = input[:runtime] if input.has?(:runtime)
       app.buildpack = input[:buildpack] if input.has?(:buildpack)
     end
 
@@ -42,8 +40,6 @@ module CF::App
       case attr
       when :memory
         human_mb(val)
-      when :framework, :runtime
-        val.name
       when :command, :buildpack
         "'#{val}'"
       when :production

data/lib/cf/cli/start/info.rb

@@ -8,10 +8,6 @@ module CF::Start
 
     desc "Display information on the current target, user, etc."
     group :start
-    input :runtimes, :desc => "List supported runtimes", :alias => "-r",
-          :default => false
-    input :frameworks, :desc => "List supported frameworks", :alias => "-f",
-          :default => false
     input :services, :desc => "List supported services", :alias => "-s",
           :default => false
     input :all, :desc => "Show all information", :alias => "-a",
@@ -19,33 +15,14 @@ module CF::Start
     def info
       all = input[:all]
 
-      if all || input[:runtimes]
-        runtimes =
-            with_progress("Getting runtimes") do
-              client.runtimes
-            end
-      end
-
-      if all || input[:frameworks]
-        frameworks =
-            with_progress("Getting frameworks") do
-              client.frameworks
-            end
-      end
-
       if all || input[:services]
-        services =
-            with_progress("Getting services") do
-              client.services
-            end
+        services = with_progress("Getting services") { client.services }
       end
 
-      showing_any = runtimes || services || frameworks
-
-      unless !all && showing_any
+      if all || !services
         info = client.info
 
-        line if showing_any
+        line if services
         line info[:description]
         line
         line "target: #{b(client.target)}"
@@ -55,48 +32,12 @@ module CF::Start
           line "support: #{info[:support]}"
         end
 
-        if user = client.current_user
+        if (user = client.current_user)
           line
           line "user: #{b(user.email || user.guid)}"
         end
       end
 
-      if runtimes
-        line unless quiet?
-
-        if runtimes.empty? && !quiet?
-          line "#{d("none")}"
-        elsif input[:quiet]
-          runtimes.each do |r|
-            line r.name
-          end
-        else
-          table(
-              %w{runtime description},
-              runtimes.sort_by(&:name).collect { |r|
-                [c(r.name, :name), r.description]
-              })
-        end
-      end
-
-      if frameworks
-        line unless quiet?
-
-        if frameworks.empty? && !quiet?
-          line "#{d("none")}"
-        elsif input[:quiet]
-          frameworks.each do |f|
-            line f.name
-          end
-        else
-          table(
-              %w{framework description},
-              frameworks.sort_by(&:name).collect { |f|
-                [c(f.name, :name), f.description]
-              })
-        end
-      end
-
       if services
         line unless quiet?
 

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "0.6.0.rc3".freeze
+  VERSION = "0.6.0.rc4".freeze
 end

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

@@ -6,24 +6,11 @@ describe CF::App::Create do
   let(:given) { {} }
   let(:global) { { :color => false, :quiet => true } }
 
-  let(:frameworks) { fake_list(:framework, 3) }
-  let(:framework) { buildpack }
-  let(:buildpack) { fake(:framework, :name => "buildpack") }
-  let(:standalone) { fake(:framework, :name => "standalone") }
-
-  let(:runtimes) { fake_list(:runtime, 3) }
-  let(:runtime) { runtimes.first }
-
   let(:service_instances) { fake_list(:service_instance, 5) }
-
   let(:lucid64) { fake :stack, :name => "lucid64" }
 
   let(:client) do
-    fake_client(
-      :frameworks => frameworks,
-      :runtimes => runtimes,
-      :service_instances => service_instances,
-      :stacks => [lucid64])
+    fake_client(:service_instances => service_instances, :stacks => [lucid64])
   end
 
   before do
@@ -62,11 +49,8 @@ describe CF::App::Create do
       its([:total_instances]) { should eq 1 }
       its([:space]) { should eq client.current_space }
       its([:production]) { should eq true }
-      its([:framework]) { should eq nil }
-      its([:runtime]) { should eq nil }
       its([:command]) { should eq "ruby main.rb" }
       its([:memory]) { should eq 1024 }
-      its([:buildpack]) { should eq "git://example.com" }
       its([:stack]) { should eq lucid64 }
     end
 
@@ -103,14 +87,6 @@ describe CF::App::Create do
         subject
       end
 
-      it 'does not ask for the framework' do
-        dont_allow_ask('Framework', anything) do |_, options|
-          expect(options[:choices]).to eq frameworks.sort_by(&:name)
-          framework
-        end
-        subject
-      end
-
       context 'when the command is not given' do
         before { given.delete(:command) }
 
@@ -134,17 +110,7 @@ describe CF::App::Create do
           end
         end
 
-        context 'when the framework is "buildpack"' do
-          let(:framework) { buildpack }
-
-          include_examples 'an app that can have a custom start command'
-        end
-
-        context 'when the framework is "standalone"' do
-          let(:framework) { standalone }
-
-          include_examples 'an app that can have a custom start command'
-        end
+        include_examples 'an app that can have a custom start command'
 
         describe "getting the start command" do
           before do
@@ -179,14 +145,6 @@ describe CF::App::Create do
         end
       end
 
-      it 'does not ask for the runtime' do
-        dont_allow_ask('Runtime', anything) do |_, options|
-          expect(options[:choices]).to eq runtimes.sort_by(&:name)
-          runtime
-        end
-        subject
-      end
-
       it 'asks for the memory' do
         given.delete(:memory)
 
@@ -209,116 +167,6 @@ describe CF::App::Create do
     end
   end
 
-  describe '#determine_framework' do
-    subject { create.determine_framework }
-
-    context 'when framework is given' do
-      let(:inputs) { { :framework => framework } }
-
-      it 'does not try to get the frameworks' do
-        any_instance_of(CF::Detector) do |detector|
-          dont_allow(detector).detect_framework
-          dont_allow(detector).all_frameworks
-        end
-
-        dont_allow_ask
-        dont_allow(client).frameworks
-
-        subject
-      end
-
-      it { should eq framework }
-    end
-
-    context 'when framework is not given' do
-      context 'and a framework is detected' do
-        it "lists the detected framework and an 'other' option" do
-          any_instance_of(CF::Detector) do |detector|
-            mock(detector).detect_framework { framework }
-          end
-
-          mock_ask('Framework', anything) do |_, options|
-            expect(options[:choices]).to eq [framework, :other] #frameworks.sort_by(&:name)
-            framework
-          end
-
-          subject
-        end
-      end
-
-      context 'and a framework is not detected' do
-        it "lists all available frameworks" do
-          any_instance_of(CF::Detector) do |detector|
-            stub(detector).detect_framework
-          end
-
-          mock_ask('Framework', anything) do |_, options|
-            expect(options[:choices]).to eq frameworks.sort_by(&:name)
-            framework
-          end
-
-          subject
-        end
-      end
-    end
-  end
-
-  describe '#detect_runtimes' do
-    subject { create.determine_runtime(framework) }
-
-    context 'when runtime is given' do
-      let(:inputs) { { :runtime => runtime } }
-
-      it 'does not try to get the runtime' do
-        any_instance_of(CF::Detector) do |detector|
-          dont_allow(detector).detect_runtime
-          dont_allow(detector).all_runtimes
-        end
-
-        dont_allow_ask
-        dont_allow(client).runtimes
-
-        subject
-      end
-
-      it { should eq runtime }
-    end
-
-    context 'when runtime is not given' do
-      context 'and the framework is standalone' do
-        let(:framework) { standalone }
-
-        it "detects the runtime" do
-          any_instance_of(CF::Detector) do |detector|
-            mock(detector).detect_runtimes { runtimes }
-          end
-
-          mock_ask('Runtime', anything) do |_, options|
-            expect(options[:choices]).to eq(runtimes.sort_by(&:name) + [:other])
-            runtime
-          end
-
-          subject
-        end
-      end
-
-      context 'and the framework is not standalone' do
-        it "gets the runtimes based on the framework" do
-          any_instance_of(CF::Detector) do |detector|
-            mock(detector).runtimes(framework) { runtimes }
-          end
-
-          mock_ask('Runtime', anything) do |_, options|
-            expect(options[:choices]).to eq(runtimes.sort_by(&:name) + [:other])
-            runtime
-          end
-
-          subject
-        end
-      end
-    end
-  end
-
   describe '#create_app' do
     before { dont_allow_ask }
 
@@ -328,8 +176,6 @@ describe CF::App::Create do
     let(:attributes) do
       { :name => "some-app",
         :total_instances => 2,
-        :framework => framework,
-        :runtime => runtime,
         :production => false,
         :memory => 1024,
         :buildpack => "git://example.com"

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

@@ -81,11 +81,9 @@ describe CF::App::Push do
         subject
       end
 
-      [:memory=, :framework=].each do |property|
-        it "should not set #{property} on the app" do
-          dont_allow(app).__send__(property)
-          subject
-        end
+      it "should not set memory on the app" do
+        dont_allow(app).__send__(:memory=)
+        subject
       end
     end
 
@@ -133,50 +131,6 @@ describe CF::App::Push do
       include_examples 'common tests for inputs', :total_instances, :instances
     end
 
-    context 'when framework is given' do
-      let(:old) { fake(:framework, :name => "Old Framework") }
-      let(:new) { fake(:framework, :name => "New Framework") }
-      let(:app) { fake(:app, :framework => old) }
-      let(:inputs) { { :framework => new } }
-
-      it 'updates the app framework' do
-        stub(push).line(anything)
-        mock(app).update!
-        expect { subject }.to change { app.framework }.from(old).to(new)
-      end
-
-      it 'outputs the changed framework using the name' do
-        mock(push).line("Changes:")
-        mock(push).line("framework: Old Framework -> New Framework")
-        stub(app).update!
-        subject
-      end
-
-      include_examples 'common tests for inputs', :framework
-    end
-
-    context 'when runtime is given' do
-      let(:old) { fake(:runtime, :name => "Old Runtime") }
-      let(:new) { fake(:runtime, :name => "New Runtime") }
-      let(:app) { fake(:app, :runtime => old) }
-      let(:inputs) { { :runtime => new } }
-
-      it 'updates the app runtime' do
-        stub(push).line(anything)
-        mock(app).update!
-        expect { subject }.to change { app.runtime }.from(old).to(new)
-      end
-
-      it 'outputs the changed runtime using the name' do
-        mock(push).line("Changes:")
-        mock(push).line("runtime: Old Runtime -> New Runtime")
-        stub(app).update!
-        subject
-      end
-
-      include_examples 'common tests for inputs', :runtime
-    end
-
     context 'when command is given' do
       let(:old) { "./start" }
       let(:new) { "./start foo " }
@@ -331,15 +285,11 @@ describe CF::App::Push do
 
   describe '#setup_new_app (integration spec!!)' do
     let(:app) { fake(:app, :guid => nil) }
-    let(:framework) { fake(:framework) }
-    let(:runtime) { fake(:runtime) }
     let(:host) { "" }
     let(:domain) { fake(:domain, :name => "example.com") }
     let(:inputs) do
       { :name => "some-app",
         :instances => 2,
-        :framework => framework,
-        :runtime => runtime,
         :memory => 1024,
         :host => host,
         :domain => domain

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

@@ -1,16 +1,11 @@
 require 'spec_helper'
 
 describe CF::Start::Info do
-  let(:frameworks) { false }
-  let(:runtimes) { false }
   let(:services) { false }
   let(:all) { false }
 
   let(:client) do
-    fake_client :frameworks => fake_list(:framework, 3),
-      :runtimes => fake_list(:runtime, 3),
-      :services => fake_list(:service, 3),
-      :token => CFoundry::AuthToken.new("bearer some-access-token")
+    fake_client :services => fake_list(:service, 3), :token => CFoundry::AuthToken.new("bearer some-access-token")
   end
 
   let(:target_info) do
@@ -40,8 +35,6 @@ describe CF::Start::Info do
     describe 'flags' do
       subject { command.flags }
 
-      its(["-f"]) { should eq :frameworks }
-      its(["-r"]) { should eq :runtimes }
       its(["-s"]) { should eq :services }
       its(["-a"]) { should eq :all }
     end
@@ -53,7 +46,7 @@ describe CF::Start::Info do
   end
 
 
-  subject { cf %W[info --#{bool_flag(:frameworks)} --#{bool_flag(:runtimes)} --#{bool_flag(:services)} --#{bool_flag(:all)} --no-force --no-quiet] }
+  subject { cf %W[info --#{bool_flag(:services)} --#{bool_flag(:all)} --no-force --no-quiet] }
 
   context 'when given no flags' do
     it "displays target information" do
@@ -70,50 +63,6 @@ describe CF::Start::Info do
     end
   end
 
-  context 'when given --frameworks' do
-    let(:frameworks) { true }
-
-    it 'does not grab /info' do
-      dont_allow(client).info
-      subject
-    end
-
-    it 'lists frameworks on the target' do
-      subject
-
-      stdout.rewind
-      expect(stdout.readline).to match /Getting frameworks.*OK/
-      expect(stdout.readline).to eq "\n"
-      expect(stdout.readline).to match /framework\s+description/
-
-      client.frameworks.sort_by(&:name).each do |f|
-        expect(stdout.readline).to match /#{f.name}\s+#{f.description}/
-      end
-    end
-  end
-
-  context 'when given --runtimes' do
-    let(:runtimes) { true }
-
-    it 'does not grab /info' do
-      dont_allow(client).info
-      subject
-    end
-
-    it 'lists runtimes on the target' do
-      subject
-
-      stdout.rewind
-      expect(stdout.readline).to match /Getting runtimes.*OK/
-      expect(stdout.readline).to eq "\n"
-      expect(stdout.readline).to match /runtime\s+description/
-
-      client.runtimes.sort_by(&:name).each do |r|
-        expect(stdout.readline).to match /#{r.name}\s+#{r.description}/
-      end
-    end
-  end
-
   context 'when given --services' do
     let(:services) { true }
 
@@ -139,14 +88,12 @@ describe CF::Start::Info do
   context 'when given --all' do
     let(:all) { true }
 
-    it 'combines --frameworks --runtimes and --services' do
+    it 'runs as --services' do
       mock(client).info { target_info }
 
       subject
 
       stdout.rewind
-      expect(stdout.readline).to match /Getting runtimes.*OK/
-      expect(stdout.readline).to match /Getting frameworks.*OK/
       expect(stdout.readline).to match /Getting services.*OK/
     end
   end

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

@@ -49,9 +49,7 @@ command CF::Start::Target do
       let(:user) { stub! }
       let(:organization) { organizations.first }
       let(:client) do
-        fake_client :frameworks => fake_list(:framework, 3),
-          :organizations => organizations,
-          :token => CFoundry::AuthToken.new("bearer some-access-token")
+        fake_client :organizations => organizations, :token => CFoundry::AuthToken.new("bearer some-access-token")
       end
 
       before do

data/spec/cf/detect_spec.rb

@@ -31,24 +31,4 @@ describe CF::Detector do
       end
     end
   end
-
-  describe '#detect_runtime' do
-
-  end
-
-  describe '#runtimes' do
-
-  end
-
-  describe '#suggested_memory' do
-
-  end
-
-  describe '#all_runtimes' do
-
-  end
-
-  describe '#all_frameworks' do
-
-  end
 end

data/spec/features/push_flow_spec.rb

@@ -97,13 +97,13 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
             runner.send_keys ""
           end
 
-          expect(runner).to say "Save configuration?> n"
+          expect(runner).to say "Save configuration?> n", 10
           runner.send_keys ""
 
-          expect(runner).to say "Uploading #{app}... OK"
-          expect(runner).to say "Starting #{app}... OK"
+          expect(runner).to say "Uploading #{app}... OK", 10
+          expect(runner).to say "Starting #{app}... OK", 10
 
-          expect(runner).to say /(Using|Installing) Ruby/i, 10
+          expect(runner).to say /(Using|Installing) Ruby/i, 60
           expect(runner).to say "Your bundle is complete!", 30
 
           expect(runner).to say "Checking #{app}..."

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cf
 version: !ruby/object:Gem::Version 
-  hash: -3819338190
+  hash: -4129708240
   prerelease: 6
   segments: 
   - 0
   - 6
   - 0
   - rc
-  - 3
-  version: 0.6.0.rc3
+  - 4
+  version: 0.6.0.rc4
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-19 00:00:00 Z
+date: 2013-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -73,14 +73,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3819338192
+        hash: -4129708240
         segments: 
         - 0
         - 6
         - 0
         - rc
-        - 2
-        version: 0.6.0.rc2
+        - 4
+        version: 0.6.0.rc4
     - - <
       - !ruby/object:Gem::Version 
         hash: 5
@@ -136,7 +136,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3819338208
+        hash: -4129708244
         segments: 
         - 0
         - 7
@@ -161,7 +161,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3819338144
+        hash: -4129708180
         segments: 
         - 0
         - 3