remove clouseau (framework detection), update gem dependents

Author: Dennis Schmidt & Sheel Choksi

Gemfile

@@ -10,7 +10,6 @@ gem "rake"
 
 gem "interact", :git => "git://github.com/vito/interact.git"
 gem "cfoundry", :git => "git://github.com/cloudfoundry/cfoundry.git", :submodules => true
-gem "clouseau", :git => "git://github.com/vito/clouseau.git"
 gem "mothership", :git => "git://github.com/vito/mothership.git"
 
 gem "admin-cf-plugin", :git => "git://github.com/cloudfoundry/admin-cf-plugin.git"

Gemfile.lock

@@ -1,59 +1,52 @@
 GIT
   remote: git://github.com/cloudfoundry/admin-cf-plugin.git
-  revision: ca5a4ae481def9b550b89733cb23e441f4917ee4
+  revision: b911e17af3f77d20f1b267bf5b051c490e052f0a
   specs:
-    admin-cf-plugin (0.2.0.rc1)
-      cfoundry (>= 0.6.0.rc1, < 0.7)
+    admin-cf-plugin (0.2.0.rc2)
+      cfoundry (>= 0.5.3.rc6, < 0.6)
 
 GIT
   remote: git://github.com/cloudfoundry/cfoundry.git
-  revision: 049f9f70842ffee4c6d60c2d8d000f6dd7647e7e
+  revision: efcbc10041ee1e0bb0b4e41261e71f7a9fddd272
   submodules: true
   specs:
-    cfoundry (0.6.0.rc2)
+    cfoundry (0.6.0.rc5)
       cf-uaa-lib (~> 1.3.10)
       multi_json (~> 1.3)
       multipart-post (~> 1.1)
       rubyzip (~> 0.9)
 
 GIT
   remote: git://github.com/cloudfoundry/console-cf-plugin.git
-  revision: af02d02fb272d758037121be207ce71bb989fd44
+  revision: fcfd4eb362d5a041d5f101c24bfef84ec679fa22
   specs:
-    console-cf-plugin (0.2.0.rc1)
-      tunnel-cf-plugin (>= 0.3.0.rc1, < 0.4)
+    console-cf-plugin (0.2.0.rc3)
+      tunnel-cf-plugin (>= 0.3.0.rc2, < 0.4)
 
 GIT
   remote: git://github.com/cloudfoundry/manifests-cf-plugin.git
-  revision: a405fe289d71290dbd13d05093806af359f7d43c
+  revision: 05f2ef1db7f1a148c721e0717b2205644e17afad
   specs:
-    manifests-cf-plugin (0.7.0.rc1)
-      cfoundry (>= 0.6.0.rc1, < 0.7)
+    manifests-cf-plugin (0.7.0.rc2)
+      cfoundry (>= 0.5.3.rc6, < 0.6)
 
 GIT
   remote: git://github.com/cloudfoundry/micro-cf-plugin.git
-  revision: 758f9572a0a253457ae7e3c13ffa2282a4bf08bb
+  revision: 6e80930e9b8fe67d21245e2ba9d92cec1f6213bb
   specs:
-    micro-cf-plugin (0.1.0.rc1)
+    micro-cf-plugin (0.1.0.rc2)
 
 GIT
   remote: git://github.com/cloudfoundry/tunnel-cf-plugin.git
-  revision: f6d2690acef1ceb11949de30b4b9d9068e9569d6
+  revision: 8f548007cede3662a4921976dc51de4e421e3a80
   specs:
     tunnel-cf-plugin (0.3.0.rc2)
       addressable (~> 2.2)
       caldecott-client (~> 0.0.2)
-      cfoundry (>= 0.6.0.rc2, < 0.7)
+      cfoundry (>= 0.5.3.rc6, < 0.6)
       rest-client (~> 1.6)
       uuidtools (~> 2.1)
 
-GIT
-  remote: git://github.com/vito/clouseau.git
-  revision: af05617556504c436901d43edc76f6578f363b83
-  specs:
-    clouseau (0.0.1)
-      rubyzip (~> 0.9.9)
-
 GIT
   remote: git://github.com/vito/interact.git
   revision: 956058c9c1c03f9b606fb7f45e598edfdfa0a20e
@@ -81,7 +74,7 @@ GEM
     gem-release (0.4.1)
     json_pure (1.7.7)
     mime-types (1.21)
-    multi_json (1.7.1)
+    multi_json (1.7.2)
     multipart-post (1.2.0)
     parallel (0.6.2)
     parallel_tests (0.10.0)
@@ -110,7 +103,6 @@ PLATFORMS
 DEPENDENCIES
   admin-cf-plugin!
   cfoundry!
-  clouseau!
   console-cf-plugin!
   fakefs
   ffaker

cf.gemspec

@@ -28,8 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "multi_json", "~> 1.3"
 
   s.add_runtime_dependency "interact", "~> 0.5"
-  s.add_runtime_dependency "cfoundry", ">= 0.5.3.rc5", "< 0.6"
-  s.add_runtime_dependency "clouseau", "~> 0.0"
+  s.add_runtime_dependency "cfoundry", ">= 0.6.0.rc4", "< 0.7"
   s.add_runtime_dependency "mothership", ">= 0.5.1", "< 1.0"
   s.add_runtime_dependency "manifests-cf-plugin", ">= 0.7.0.rc2", "< 0.8"
   s.add_runtime_dependency "tunnel-cf-plugin", ">= 0.3.0.rc2", "< 0.4"

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 @@ def get_inputs
       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 @@ def all_instances
       @all_instances ||= client.service_instances
     end
 
-    def detector
-      @detector ||= CF::Detector.new(client, @path)
-    end
-
     def target_base
       client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
     end

lib/cf/cli/service/bind.rb

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

lib/cf/cli/service/unbind.rb

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

lib/cf/detect.rb

@@ -151,11 +151,6 @@
         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"

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

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