cf 0.6.0.rc4 → 0.6.0.rc5

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

@@ -1,5 +1,3 @@
-require "cf/detect"
-
 module CF::App
   module Create
     attr_accessor :input
@@ -16,10 +14,7 @@ module CF::App
       inputs[:buildpack] = input[:buildpack]
       inputs[:command] = input[:command] if input.has?(:command) || !has_procfile?
 
-      detected = detector.detected
-      human_mb = human_mb((detected && detected.memory_suggestion) || 64)
-      inputs[:memory] = megabytes(input[:memory, human_mb])
-
+      inputs[:memory] = megabytes(input[:memory, human_mb(256)])
       inputs[:stack] = input[:stack]
 
       inputs
@@ -105,10 +100,6 @@ module CF::App
       @all_instances ||= client.service_instances
     end
 
-    def detector
-      @detector ||= CF::Detector.new(client, @path)
-    end
-
     def target_base
       client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
     end

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

@@ -1,5 +1,3 @@
-require "cf/detect"
-
 require "cf/cli/service/base"
 
 module CF::Service

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

@@ -1,5 +1,3 @@
-require "cf/detect"
-
 require "cf/cli/service/base"
 
 module CF::Service

data/lib/cf/version.rb

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

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

@@ -151,11 +151,6 @@ describe CF::App::Create do
         memory_choices = %w(64M 128M 256M 512M 1G)
         stub(create).memory_choices { memory_choices }
 
-        detector = mock
-        stub(create).detector { detector }
-
-        stub(detector).detected { Clouseau::Rails }
-
         mock_ask('Memory Limit', anything) do |_, options|
           expect(options[:choices]).to eq memory_choices
           expect(options[:default]).to eq "256M"

data/spec/features/account_lifecycle_spec.rb

@@ -31,7 +31,7 @@ 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" if TRAVIS_BUILD_ID
+      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|

data/spec/features/push_flow_spec.rb

@@ -22,7 +22,7 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
     end
 
     after do
-      cf %W(delete #{app} -f --no-script)
+      `#{cf_bin} delete #{app} -f --no-script`
       Interact::Progress::Dots.stop!
     end
 
@@ -100,13 +100,9 @@ if ENV['CF_V2_TEST_USER'] && ENV['CF_V2_TEST_PASSWORD'] && ENV['CF_V2_TEST_TARGE
           expect(runner).to say "Save configuration?> n", 10
           runner.send_keys ""
 
-          expect(runner).to say "Uploading #{app}... OK", 10
-          expect(runner).to say "Starting #{app}... OK", 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}..."
+          expect(runner).to say "Uploading #{app}... OK"
+          expect(runner).to say "Starting #{app}... OK"
+          expect(runner).to say "Checking #{app}...", 180
           expect(runner).to say "1/1 instances"
           expect(runner).to say "OK", 30
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cf
 version: !ruby/object:Gem::Version 
-  hash: -4129708240
+  hash: 505000847
   prerelease: 6
   segments: 
   - 0
   - 6
   - 0
   - rc
-  - 4
-  version: 0.6.0.rc4
+  - 5
+  version: 0.6.0.rc5
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-21 00:00:00 Z
+date: 2013-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -73,14 +73,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4129708240
+        hash: 505000847
         segments: 
         - 0
         - 6
         - 0
         - rc
-        - 4
-        version: 0.6.0.rc4
+        - 5
+        version: 0.6.0.rc5
     - - <
       - !ruby/object:Gem::Version 
         hash: 5
@@ -90,25 +90,10 @@ dependencies:
         version: "0.7"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: clouseau
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 0
-        version: "0.0"
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mothership
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,16 +112,16 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: manifests-cf-plugin
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4129708244
+        hash: 505000849
         segments: 
         - 0
         - 7
@@ -152,16 +137,16 @@ dependencies:
         - 8
         version: "0.8"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: tunnel-cf-plugin
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4129708180
+        hash: 505000913
         segments: 
         - 0
         - 3
@@ -177,11 +162,11 @@ dependencies:
         - 4
         version: "0.4"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -192,11 +177,11 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -207,11 +192,11 @@ dependencies:
         - 11
         version: "2.11"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -222,11 +207,11 @@ dependencies:
         - 9
         version: "1.9"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -237,7 +222,7 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 description: 
 email: 
 - vcap-dev@googlegroups.com
@@ -317,7 +302,6 @@ files:
 - lib/cf/cli/user/users.rb
 - lib/cf/cli.rb
 - lib/cf/constants.rb
-- lib/cf/detect.rb
 - lib/cf/errors.rb
 - lib/cf/plugin.rb
 - lib/cf/spacing.rb
@@ -364,7 +348,6 @@ files:
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
-- spec/cf/detect_spec.rb
 - spec/console_app_specker/console_app_specker_matchers_spec.rb
 - spec/console_app_specker/specker_runner_spec.rb
 - spec/features/account_lifecycle_spec.rb
@@ -457,7 +440,6 @@ test_files:
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
-- spec/cf/detect_spec.rb
 - spec/console_app_specker/console_app_specker_matchers_spec.rb
 - spec/console_app_specker/specker_runner_spec.rb
 - spec/features/account_lifecycle_spec.rb

data/lib/cf/detect.rb

@@ -1,129 +0,0 @@
-require "set"
-
-require "clouseau"
-
-module CF
-  class Detector
-    # "Basic" framework names for a detected language
-    PSEUDO_FRAMEWORKS = {
-      :node => "node",
-      :python => "wsgi",
-      :java => "java_web",
-      :php => "php",
-      :erlang => "otp_rebar",
-      :dotnet => "dotNet"
-    }
-
-    # Mismatched framework names
-    FRAMEWORK_NAMES = {
-      :rails => "rails3"
-    }
-
-    # Clouseau language symbol => matching runtime names
-    LANGUAGE_RUNTIMES = {
-      :ruby => /^ruby.*/,
-      :java => /^java.*/,
-      :node => /^node.*/,
-      :erlang => /^erlang.*/,
-      :dotnet => /^dotNet.*/,
-      :python => /^python.*/,
-      :php => /^php.*/
-    }
-
-    def initialize(client, path)
-      @client = client
-      @path = path
-    end
-
-    # detect the framework
-    def detect_framework
-      detected && frameworks[detected]
-    end
-
-    # detect the language and return the appropriate runtimes
-    def detect_runtimes
-      if detected && lang = detected.language_name
-        runtimes_for(lang)
-      else
-        []
-      end
-    end
-
-    # determine runtimes for a given framework based on the language its
-    # detector reports itself as
-    def runtimes(framework)
-      if detector = detectors[framework]
-        runtimes_for(detector.language_name)
-      else
-        []
-      end
-    end
-
-    # determine suitable memory allocation via the framework's detector
-    def suggested_memory(framework)
-      if detector = detectors[framework]
-        detector.memory_suggestion
-      end
-    end
-
-    # helper so that this is cached somewhere
-    def all_runtimes
-      @all_runtimes ||= @client.runtimes
-    end
-
-    # helper so that this is cached somewhere
-    def all_frameworks
-      @all_frameworks ||= @client.frameworks
-    end
-
-    def detected
-      @detected ||= Clouseau.detect(@path)
-    end
-
-    private
-
-    def map_detectors!
-      @framework_detectors = {}
-      @detector_frameworks = {}
-
-      Clouseau.detectors.each do |d|
-        name = d.framework_name
-        lang = d.language_name
-
-        framework = all_frameworks.find { |f|
-          f.name == name.to_s ||
-            f.name == FRAMEWORK_NAMES[name]
-        }
-
-        framework ||= all_frameworks.find { |f|
-          f.name == PSEUDO_FRAMEWORKS[lang]
-        }
-
-        next unless framework
-
-        @framework_detectors[framework] = d
-        @detector_frameworks[d] = framework
-      end
-
-      nil
-    end
-
-    # Framework -> Detector
-    def detectors
-      map_detectors! unless @framework_detectors
-      @framework_detectors
-    end
-
-    # Detector -> Framework
-    def frameworks
-      map_detectors! unless @detector_frameworks
-      @detector_frameworks
-    end
-
-    def runtimes_for(language)
-      all_runtimes.select do |r|
-        LANGUAGE_RUNTIMES[language] === r.name
-      end
-    end
-  end
-end

data/spec/cf/detect_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe CF::Detector do
-  let(:client) { fake_client :frameworks => [framework] }
-  let(:detector) { CF::Detector.new client, nil }
-
-  describe '#detect_framework' do
-    subject { detector.detect_framework }
-
-    { Clouseau::Django => "django",
-      Clouseau::DotNet => "dotNet",
-      Clouseau::Grails => "grails",
-      Clouseau::Java => "java_web",
-      Clouseau::Lift => "lift",
-      Clouseau::Node => "node",
-      Clouseau::PHP => "php",
-      Clouseau::Play => "play",
-      Clouseau::Python => "wsgi",
-      Clouseau::Rack => "rack",
-      Clouseau::Rails => "rails3",
-      Clouseau::Sinatra => "sinatra",
-      Clouseau::Spring => "spring"
-    }.each do |clouseau_detective, cf_name|
-      context "when we detected #{clouseau_detective}" do
-        let(:framework) { fake(:framework, :name => cf_name) }
-
-        it "maps to CF name #{cf_name}" do
-          stub(Clouseau).detect(anything) { clouseau_detective }
-          should eq framework
-        end
-      end
-    end
-  end
-end