console-vmc-plugin 0.0.4 → 0.1.0

data/lib/console-vmc-plugin/console.rb

@@ -5,10 +5,11 @@ require "tunnel-vmc-plugin/tunnel"
 
 
 class CFConsole < CFTunnel
-  def initialize(client, app, port = 10000)
+  def initialize(client, app, port = 10000, v2 = false)
     @client = client
     @app = app
     @port = port
+    @v2 = v2
   end
 
   def get_connection_info(auth)
@@ -27,7 +28,11 @@ class CFConsole < CFTunnel
   end
 
   def get_credentials
-    YAML.load(@app.file("app", "cf-rails-console", ".consoleaccess"))
+    if @v2
+      YAML.load(@app.file("cf-rails-console", ".consoleaccess"))
+    else
+      YAML.load(@app.file("app", "cf-rails-console", ".consoleaccess"))
+    end
   end
 
   def start_console
@@ -157,8 +162,10 @@ class CFConsole < CFTunnel
   end
 
   def exit_console
+    @telnet.cmd("String" => "exit", "Timeout" => 1)
+  rescue TimeoutError
     # TimeoutError expected, as exit doesn't return anything
-    @telnet.cmd("String" => "exit", "Timeout" => 1) rescue TimeoutError
+  ensure
     close_console
   end
 

data/lib/console-vmc-plugin/plugin.rb

@@ -11,7 +11,7 @@ module VMCConsole
     def console
       app = input[:app]
 
-      console = CFConsole.new(client, app)
+      console = CFConsole.new(client, app, nil, v2?)
       port = console.pick_port!(input[:port])
 
       with_progress("Opening console on port #{c(port, :name)}") do
@@ -23,7 +23,8 @@ module VMCConsole
     end
 
     filter(:start, :start_app) do |app|
-      if app.framework.name == "rails3"
+      if app.framework.name == "rails3" || app.framework.name == "buildpack"
+        puts "Setting console to true"
         app.console = true
       end
 

data/lib/console-vmc-plugin/version.rb

@@ -1,3 +1,3 @@
 module VMCConsole
-  VERSION = "0.0.4"
+  VERSION = "0.1.0".freeze
 end

data/spec/console_spec.rb

@@ -1,214 +1,205 @@
-require "cfoundry"
-require "vmc"
+require "spec_helper"
 require "console-vmc-plugin/plugin"
 
 describe "CFConsole" do
-  before(:each) do
-    @app = mock("app")
-    @console = CFConsole.new(nil, @app)
-  end
-
-  it "should return connection info for apps that have a console ip and port" do
-    instance = mock("instance")
-    @app.should_receive(:instances).and_return([instance])
-    instance.should_receive(:console).
-        and_return({:ip => "192.168.1.1", :port => 3344})
-
-    @console.get_connection_info(nil).
-        should == {"hostname" => "192.168.1.1", "port" => 3344}
-  end
-
-  it "should raise error when no app instances found" do
-    @app.should_receive(:instances).and_return([])
-
-    expect { @console.get_connection_info(nil) }.
-        to raise_error("App has no running instances; try starting it.")
-  end
-
-  it "should raise error when app does not have console access" do
-    instance = mock("instance")
-    @app.should_receive(:instances).and_return([instance])
-    instance.should_receive(:console).and_return(nil)
-
-    expect { @console.get_connection_info(nil) }.
-        to raise_error("App does not have console access; try restarting it.")
-  end
-
-  describe "start_console" do
-    before(:each) do
-      @creds = {
-        :path => %w(app cf-rails-console .consoleaccess),
-        :yaml => "username: cfuser\npassword: testpw",
-        :telnet => {"Name" => "cfuser", "Password" => "testpw"}
-      }
-
-      unless example.metadata[:description_args].first ==
-          "should raise error if console credentials cannot be obtained"
-        @app.should_receive(:file).with(*@creds[:path]).
-            and_return(@creds[:yaml])
-        @telnet = mock("telnet")
-        @console.should_receive(:telnet_client).and_return(@telnet)
-      end
-    end
-
-    it "should raise error if console credentials cannot be obtained" do
-      @app.should_receive(:file).with(*@creds[:path]).
-          and_return("username: cfuser")
-
-      expect { @console.start_console }.
-          to raise_error("Unable to verify console credentials.")
-    end
-
-    it "should raise error if authentication fails" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("Login failed")
-      @telnet.should_receive(:close)
-
-      expect { @console.start_console }.to raise_error("Login failed")
-    end
-
-    it "should retry authentication on timeout" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_raise(TimeoutError)
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("Switch to inspect mode\nirb():001:0> ")
-      verify_console_exit("irb():001:0> ")
 
-      @console.start_console
+  context "V1" do
+    before do
+      @app = mock("app")
+      @console = CFConsole.new(nil, @app)
     end
 
-    it "should retry authentication on EOF" do
-      @console.should_receive(:telnet_client).and_return(@telnet)
-      @telnet.should_receive(:login).with(@creds[:telnet]).and_raise(EOFError)
-      @telnet.should_receive(:close)
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("irb():001:0> ")
-      verify_console_exit("irb():001:0> ")
+    it "should return connection info for apps that have a console ip and port" do
+      instance = mock("instance")
+      mock(@app).instances { [instance] }
+      mock(instance).console { {:ip => "192.168.1.1", :port => 3344} }
 
-      @console.start_console
-    end
-
-    it "should operate console interactively" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("irb():001:0> ")
-      Readline.should_receive(:readline).with("irb():001:0> ").
-          and_return("puts 'hi'")
-      Readline::HISTORY.should_receive(:push).with("puts 'hi'")
-      @telnet.should_receive(:cmd).with("puts 'hi'").
-          and_return("nil" + "\n" + "irb():002:0> ")
-      STDOUT.should_receive(:puts).with("nil")
-      verify_console_exit("irb():002:0> ")
-
-      @console.start_console
+      @console.get_connection_info(nil).should == {
+        "hostname" => "192.168.1.1",
+        "port" => 3344
+      }
     end
 
-    it "should not crash if command times out" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("irb():001:0> ")
-      Readline.should_receive(:readline).with("irb():001:0> ").
-          and_return("puts 'hi'")
-      Readline::HISTORY.should_receive(:push).with("puts 'hi'")
-      @telnet.should_receive(:cmd).with("puts 'hi'").and_raise(TimeoutError)
-      STDOUT.should_receive(:puts).with("Timed out sending command to server.")
-      verify_console_exit("irb():001:0> ")
-
-      @console.start_console
-    end
+    it "should raise error when no app instances found" do
+      mock(@app).instances { [] }
 
-    it "should raise error if an EOF is received" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("Switch to inspect mode\nirb():001:0> ")
-      Readline.should_receive(:readline).with("irb():001:0> ").
-          and_return("puts 'hi'")
-      Readline::HISTORY.should_receive(:push).with("puts 'hi'")
-      @telnet.should_receive(:cmd).with("puts 'hi'").and_raise(EOFError)
-
-      expect { @console.start_console }.
-          to raise_error("The console connection has been terminated. " +
-                         "Perhaps the app was stopped or deleted?")
+      expect {
+        @console.get_connection_info(nil)
+      }.to raise_error("App has no running instances; try starting it.")
     end
 
-    it "should not keep blank lines in history" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("irb():001:0> ")
-      Readline.should_receive(:readline).with("irb():001:0> ").and_return("")
-      Readline::HISTORY.should_not_receive(:push).with("")
-      @telnet.should_receive(:cmd).with("").and_return("irb():002:0*> ")
-      verify_console_exit("irb():002:0*> ")
+    it "should raise error when app does not have console access" do
+      instance = mock("instance")
+      mock(@app).instances { [instance] }
+      mock(instance).console { nil }
 
-      @console.start_console
+      expect {
+        @console.get_connection_info(nil)
+      }.to raise_error("App does not have console access; try restarting it.")
     end
 
-    it "should not keep identical commands in history" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("irb():001:0> ")
-      Readline.should_receive(:readline).with("irb():001:0> ").
-          and_return("puts 'hi'")
-      Readline::HISTORY.should_receive(:to_a).and_return(["puts 'hi'"])
-      Readline::HISTORY.should_not_receive(:push).with("puts 'hi'")
-      @telnet.should_receive(:cmd).with("puts 'hi'").
-          and_return("nil" + "\n" + "irb():002:0> ")
-      STDOUT.should_receive(:puts).with("nil")
-      verify_console_exit("irb():002:0> ")
-
-      @console.start_console
-    end
-
-    it "should return tab completion data" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("Switch to inspect mode\nirb():001:0> ")
-      @telnet.should_receive(:cmd).
-          with({"String" => "app.\t", "Match" => /\S*\n$/, "Timeout" => 10}).
-          and_return("to_s,nil?\n")
-      verify_console_exit("irb():001:0> ")
+    describe "start_console" do
+      before do
+        @creds = {
+          :path => %w(app cf-rails-console .consoleaccess),
+          :yaml => "username: cfuser\npassword: testpw",
+          :telnet => {"Name" => "cfuser", "Password" => "testpw"}
+        }
+      end
 
-      @console.start_console
-      Readline.completion_proc.yield("app.").should == ["to_s","nil?"]
-    end
+      context "when console credentials cannot be obtained" do
+        it "should raise error" do
+          mock(@app).file(*@creds[:path]) { "username: cfuser" }
 
-    it "should return tab completion data receiving empty completion string" do
-       @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("irb():001:0> ")
-      @telnet.should_receive(:cmd).
-          with({"String" => "app.\t", "Match" => /\S*\n$/, "Timeout" => 10}).
-          and_return("\n")
-      verify_console_exit("irb():001:0> ")
+          expect {
+            @console.start_console
+          }.to raise_error("Unable to verify console credentials.")
+        end
+      end
 
-      @console.start_console
-      Readline.completion_proc.yield("app.").should == []
+      context "when console credentials can be obtained" do
+        before do
+          mock(@app).file(*@creds[:path]) { @creds[:yaml] }
+          @telnet = Object.new
+          mock(@console).telnet_client { @telnet }
+        end
+
+        it "should raise error if authentication fails" do
+          mock(@telnet).login(@creds[:telnet]) { "Login failed" }
+          mock(@telnet).close
+
+          expect { @console.start_console }.to raise_error("Login failed")
+        end
+
+        it "should retry authentication on timeout" do
+          mock(@telnet).login(@creds[:telnet]) { raise TimeoutError }
+          mock(@telnet).login(@creds[:telnet]) { "Switch to inspect mode\nirb():001:0> " }
+          verify_console_exit("irb():001:0> ")
+
+          @console.start_console
+        end
+
+        it "should retry authentication on EOF" do
+          mock(@console).telnet_client { @telnet }
+          mock(@telnet).login(@creds[:telnet]) { raise EOFError }
+          mock(@telnet).close
+          mock(@telnet).login(@creds[:telnet]) { "irb():001:0> " }
+          verify_console_exit("irb():001:0> ")
+
+          @console.start_console
+        end
+
+        it "should operate console interactively" do
+          mock(@telnet).login(@creds[:telnet]) { "irb():001:0> " }
+          mock(Readline).readline("irb():001:0> ") { "puts 'hi'" }
+          mock(Readline::HISTORY).push("puts 'hi'")
+          mock(@telnet).cmd("puts 'hi'") { "nil" + "\n" + "irb():002:0> " }
+          mock(@console).puts("nil")
+          verify_console_exit("irb():002:0> ")
+
+          @console.start_console
+        end
+
+        it "should not crash if command times out" do
+          mock(@telnet).login(@creds[:telnet]) { "irb():001:0> " }
+          mock(Readline).readline("irb():001:0> ") { "puts 'hi'" }
+          mock(Readline::HISTORY).push("puts 'hi'")
+          mock(@telnet).cmd("puts 'hi'") { raise TimeoutError }
+          mock(@console).puts("Timed out sending command to server.")
+          verify_console_exit("irb():001:0> ")
+
+          @console.start_console
+        end
+
+        it "should raise error if an EOF is received" do
+          mock(@telnet).login(@creds[:telnet]) { "Switch to inspect mode\nirb():001:0> " }
+          mock(Readline).readline("irb():001:0> ") { "puts 'hi'" }
+          mock(Readline::HISTORY).push("puts 'hi'")
+          mock(@telnet).cmd("puts 'hi'") { raise EOFError }
+
+          expect {
+            @console.start_console
+          }.to raise_error("The console connection has been terminated. Perhaps the app was stopped or deleted?")
+        end
+
+        it "should not keep blank lines in history" do
+          mock(@telnet).login(@creds[:telnet]) { "irb():001:0> " }
+          mock(Readline).readline("irb():001:0> ") { "" }
+          dont_allow(Readline::HISTORY).push("")
+          mock(@telnet).cmd("") { "irb():002:0*> " }
+          verify_console_exit("irb():002:0*> ")
+
+          @console.start_console
+        end
+
+        it "should not keep identical commands in history" do
+          mock(@telnet).login(@creds[:telnet]) { "irb():001:0> " }
+          mock(Readline).readline("irb():001:0> ") { "puts 'hi'" }
+          mock(Readline::HISTORY).to_a { ["puts 'hi'"] }
+          dont_allow(Readline::HISTORY).push("puts 'hi'")
+          mock(@telnet).cmd("puts 'hi'") { "nil" + "\n" + "irb():002:0> " }
+          mock(@console).puts("nil")
+          verify_console_exit("irb():002:0> ")
+
+          @console.start_console
+        end
+
+        it "should return tab completion data" do
+          mock(@telnet).login(@creds[:telnet]) { "Switch to inspect mode\nirb():001:0> " }
+          mock(@telnet).cmd("String" => "app.\t", "Match" => /\S*\n$/, "Timeout" => 10) { "to_s,nil?\n" }
+          verify_console_exit("irb():001:0> ")
+
+          @console.start_console
+          Readline.completion_proc.call("app.").should == ["to_s", "nil?"]
+        end
+
+        it "should return tab completion data receiving empty completion string" do
+          mock(@telnet).login(@creds[:telnet]) { "irb():001:0> " }
+          mock(@telnet).cmd("String" => "app.\t", "Match" => /\S*\n$/, "Timeout" => 10) { "\n" }
+          verify_console_exit("irb():001:0> ")
+
+          @console.start_console
+          Readline.completion_proc.call("app.").should == []
+        end
+
+        it "should not crash on timeout of remote tab completion data" do
+          mock(@telnet).login(@creds[:telnet]) { "Switch to inspect mode\nirb():001:0> " }
+          mock(@telnet).cmd("String" => "app.\t", "Match" => /\S*\n$/, "Timeout" => 10) { raise TimeoutError }
+          verify_console_exit("irb():001:0> ")
+
+          @console.start_console
+          Readline.completion_proc.call("app.").should == []
+        end
+
+        it "should properly initialize Readline for tab completion" do
+          mock(@telnet).login(@creds[:telnet]) { "irb():001:0> " }
+          mock(Readline).respond_to?("basic_word_break_characters=") { true }
+          mock(Readline).basic_word_break_characters=(" \t\n`><=;|&{(")
+          mock(Readline).completion_append_character=(nil)
+          mock(Readline).completion_proc=(anything)
+          verify_console_exit("irb():001:0> ")
+
+          @console.start_console
+        end
+      end
     end
+  end
 
-    it "should not crash on timeout of remote tab completion data" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("Switch to inspect mode\nirb():001:0> ")
-      @telnet.should_receive(:cmd).
-          with({"String" => "app.\t", "Match" => /\S*\n$/, "Timeout" => 10}).
-          and_raise(TimeoutError)
-      verify_console_exit("irb():001:0> ")
-
-      @console.start_console
-      Readline.completion_proc.yield("app.").should == []
+  context "V2" do
+    before do
+      @app = mock("app")
+      @console = CFConsole.new(nil, @app, nil, true)
     end
 
-    it "should properly initialize Readline for tab completion" do
-      @telnet.should_receive(:login).with(@creds[:telnet]).
-          and_return("irb():001:0> ")
-      Readline.should_receive(:respond_to?).
-          with("basic_word_break_characters=").and_return(true)
-      Readline.should_receive(:basic_word_break_characters=).
-          with(" \t\n`><=;|&{(")
-      Readline.should_receive(:completion_append_character=).with(nil)
-      Readline.should_receive(:completion_proc=)
-      verify_console_exit("irb():001:0> ")
-
-      @console.start_console
+    it "reads console credentials from correct file" do
+      mock(@app).file(*%w(cf-rails-console .consoleaccess)) { "username: cfuser\npassword: testpw" }
+      @console.get_credentials
     end
   end
 
   def verify_console_exit(prompt)
-    Readline.should_receive(:readline).with(prompt).and_return("exit")
-    @telnet.should_receive(:cmd).with(({"String" => "exit", "Timeout" => 1})).
-        and_raise(TimeoutError)
-    @telnet.should_receive(:close)
+    mock(Readline).readline(prompt) { "exit" }
+    mock(@telnet).cmd("String" => "exit", "Timeout" => 1) { raise TimeoutError }
+    mock(@telnet).close
   end
-end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+SPEC_ROOT = File.dirname(__FILE__).freeze
+
+require "rspec"
+require "vmc"
+require "cfoundry"
+require "cfoundry/test_support"
+
+RSpec.configure do |c|
+  c.include Fake::FakeMethods
+  c.mock_with :rr
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: console-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-20 00:00:00 -08:00
-default_executable: 
+date: 2013-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tunnel-vmc-plugin
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 8
-        version: 0.1.8
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,12 +39,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        version: "0"
+        - 9
+        version: "0.9"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,43 +56,41 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 11
+        version: "2.11"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: vmc
+  name: webmock
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: -305487662
+        hash: 29
         segments: 
-        - 0
-        - 4
-        - 0
-        - beta
-        - 42
-        version: 0.4.0.beta.42
+        - 1
+        - 9
+        version: "1.9"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: rr
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :development
   version_requirements: *id005
 description: 
@@ -106,61 +104,59 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
-- lib/console-vmc-plugin/version.rb
-- lib/console-vmc-plugin/plugin.rb
 - lib/console-vmc-plugin/console.rb
-- spec/console_spec.rb
-- spec/assets/rails328_ruby187_app/doc/README_FOR_APP
-- spec/assets/rails328_ruby187_app/app/controllers/application_controller.rb
-- spec/assets/rails328_ruby187_app/app/helpers/application_helper.rb
+- lib/console-vmc-plugin/plugin.rb
+- lib/console-vmc-plugin/version.rb
+- spec/assets/rails328_ruby187_app/app/assets/images/rails.png
 - spec/assets/rails328_ruby187_app/app/assets/javascripts/application.js
 - spec/assets/rails328_ruby187_app/app/assets/stylesheets/application.css
-- spec/assets/rails328_ruby187_app/app/assets/images/rails.png
+- spec/assets/rails328_ruby187_app/app/controllers/application_controller.rb
+- spec/assets/rails328_ruby187_app/app/helpers/application_helper.rb
 - spec/assets/rails328_ruby187_app/app/views/layouts/application.html.erb
-- spec/assets/rails328_ruby187_app/manifest.yml
-- spec/assets/rails328_ruby187_app/script/rails
-- spec/assets/rails328_ruby187_app/db/seeds.rb
-- spec/assets/rails328_ruby187_app/Gemfile
-- spec/assets/rails328_ruby187_app/config/routes.rb
-- spec/assets/rails328_ruby187_app/config/environments/production.rb
+- spec/assets/rails328_ruby187_app/config/application.rb
+- spec/assets/rails328_ruby187_app/config/boot.rb
+- spec/assets/rails328_ruby187_app/config/database.yml
+- spec/assets/rails328_ruby187_app/config/environment.rb
 - spec/assets/rails328_ruby187_app/config/environments/development.rb
+- spec/assets/rails328_ruby187_app/config/environments/production.rb
 - spec/assets/rails328_ruby187_app/config/environments/test.rb
+- spec/assets/rails328_ruby187_app/config/initializers/backtrace_silencers.rb
 - spec/assets/rails328_ruby187_app/config/initializers/inflections.rb
-- spec/assets/rails328_ruby187_app/config/initializers/wrap_parameters.rb
 - spec/assets/rails328_ruby187_app/config/initializers/mime_types.rb
-- spec/assets/rails328_ruby187_app/config/initializers/session_store.rb
-- spec/assets/rails328_ruby187_app/config/initializers/backtrace_silencers.rb
 - spec/assets/rails328_ruby187_app/config/initializers/secret_token.rb
-- spec/assets/rails328_ruby187_app/config/application.rb
-- spec/assets/rails328_ruby187_app/config/environment.rb
-- spec/assets/rails328_ruby187_app/config/database.yml
-- spec/assets/rails328_ruby187_app/config/boot.rb
+- spec/assets/rails328_ruby187_app/config/initializers/session_store.rb
+- spec/assets/rails328_ruby187_app/config/initializers/wrap_parameters.rb
 - spec/assets/rails328_ruby187_app/config/locales/en.yml
-- spec/assets/rails328_ruby187_app/test/test_helper.rb
-- spec/assets/rails328_ruby187_app/test/performance/browsing_test.rb
+- spec/assets/rails328_ruby187_app/config/routes.rb
 - spec/assets/rails328_ruby187_app/config.ru
-- spec/assets/rails328_ruby187_app/public/favicon.ico
-- spec/assets/rails328_ruby187_app/public/robots.txt
+- spec/assets/rails328_ruby187_app/db/seeds.rb
+- spec/assets/rails328_ruby187_app/doc/README_FOR_APP
+- spec/assets/rails328_ruby187_app/Gemfile
+- spec/assets/rails328_ruby187_app/manifest.yml
+- spec/assets/rails328_ruby187_app/public/404.html
 - spec/assets/rails328_ruby187_app/public/422.html
-- spec/assets/rails328_ruby187_app/public/assets/rails-be8732dac73d845ac5b142c8fb5f9fb0.png
-- spec/assets/rails328_ruby187_app/public/assets/application.js
-- spec/assets/rails328_ruby187_app/public/assets/application-7270767b2a9e9fff880aa5de378ca791.css.gz
-- spec/assets/rails328_ruby187_app/public/assets/manifest.yml
-- spec/assets/rails328_ruby187_app/public/assets/application.js.gz
+- spec/assets/rails328_ruby187_app/public/500.html
 - spec/assets/rails328_ruby187_app/public/assets/application-7270767b2a9e9fff880aa5de378ca791.css
+- spec/assets/rails328_ruby187_app/public/assets/application-7270767b2a9e9fff880aa5de378ca791.css.gz
+- spec/assets/rails328_ruby187_app/public/assets/application-ccab98dc1abdf097c0af693e20aed861.js
 - spec/assets/rails328_ruby187_app/public/assets/application-ccab98dc1abdf097c0af693e20aed861.js.gz
+- spec/assets/rails328_ruby187_app/public/assets/application.css
 - spec/assets/rails328_ruby187_app/public/assets/application.css.gz
-- spec/assets/rails328_ruby187_app/public/assets/application-ccab98dc1abdf097c0af693e20aed861.js
+- spec/assets/rails328_ruby187_app/public/assets/application.js
+- spec/assets/rails328_ruby187_app/public/assets/application.js.gz
+- spec/assets/rails328_ruby187_app/public/assets/manifest.yml
+- spec/assets/rails328_ruby187_app/public/assets/rails-be8732dac73d845ac5b142c8fb5f9fb0.png
 - spec/assets/rails328_ruby187_app/public/assets/rails.png
-- spec/assets/rails328_ruby187_app/public/assets/application.css
-- spec/assets/rails328_ruby187_app/public/404.html
+- spec/assets/rails328_ruby187_app/public/favicon.ico
 - spec/assets/rails328_ruby187_app/public/index.html
-- spec/assets/rails328_ruby187_app/public/500.html
-- spec/assets/rails328_ruby187_app/README.rdoc
+- spec/assets/rails328_ruby187_app/public/robots.txt
 - spec/assets/rails328_ruby187_app/Rakefile
-- spec/console_functional_spec.rb
-- spec/Rakefile
-has_rdoc: true
+- spec/assets/rails328_ruby187_app/README.rdoc
+- spec/assets/rails328_ruby187_app/script/rails
+- spec/assets/rails328_ruby187_app/test/performance/browsing_test.rb
+- spec/assets/rails328_ruby187_app/test/test_helper.rb
+- spec/console_spec.rb
+- spec/spec_helper.rb
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -190,59 +186,58 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: console-vmc-plugin
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Port of rails-console to vmc-ng.
 test_files: 
-- spec/console_spec.rb
-- spec/assets/rails328_ruby187_app/doc/README_FOR_APP
-- spec/assets/rails328_ruby187_app/app/controllers/application_controller.rb
-- spec/assets/rails328_ruby187_app/app/helpers/application_helper.rb
+- spec/assets/rails328_ruby187_app/app/assets/images/rails.png
 - spec/assets/rails328_ruby187_app/app/assets/javascripts/application.js
 - spec/assets/rails328_ruby187_app/app/assets/stylesheets/application.css
-- spec/assets/rails328_ruby187_app/app/assets/images/rails.png
+- spec/assets/rails328_ruby187_app/app/controllers/application_controller.rb
+- spec/assets/rails328_ruby187_app/app/helpers/application_helper.rb
 - spec/assets/rails328_ruby187_app/app/views/layouts/application.html.erb
-- spec/assets/rails328_ruby187_app/manifest.yml
-- spec/assets/rails328_ruby187_app/script/rails
-- spec/assets/rails328_ruby187_app/db/seeds.rb
-- spec/assets/rails328_ruby187_app/Gemfile
-- spec/assets/rails328_ruby187_app/config/routes.rb
-- spec/assets/rails328_ruby187_app/config/environments/production.rb
+- spec/assets/rails328_ruby187_app/config/application.rb
+- spec/assets/rails328_ruby187_app/config/boot.rb
+- spec/assets/rails328_ruby187_app/config/database.yml
+- spec/assets/rails328_ruby187_app/config/environment.rb
 - spec/assets/rails328_ruby187_app/config/environments/development.rb
+- spec/assets/rails328_ruby187_app/config/environments/production.rb
 - spec/assets/rails328_ruby187_app/config/environments/test.rb
+- spec/assets/rails328_ruby187_app/config/initializers/backtrace_silencers.rb
 - spec/assets/rails328_ruby187_app/config/initializers/inflections.rb
-- spec/assets/rails328_ruby187_app/config/initializers/wrap_parameters.rb
 - spec/assets/rails328_ruby187_app/config/initializers/mime_types.rb
-- spec/assets/rails328_ruby187_app/config/initializers/session_store.rb
-- spec/assets/rails328_ruby187_app/config/initializers/backtrace_silencers.rb
 - spec/assets/rails328_ruby187_app/config/initializers/secret_token.rb
-- spec/assets/rails328_ruby187_app/config/application.rb
-- spec/assets/rails328_ruby187_app/config/environment.rb
-- spec/assets/rails328_ruby187_app/config/database.yml
-- spec/assets/rails328_ruby187_app/config/boot.rb
+- spec/assets/rails328_ruby187_app/config/initializers/session_store.rb
+- spec/assets/rails328_ruby187_app/config/initializers/wrap_parameters.rb
 - spec/assets/rails328_ruby187_app/config/locales/en.yml
-- spec/assets/rails328_ruby187_app/test/test_helper.rb
-- spec/assets/rails328_ruby187_app/test/performance/browsing_test.rb
+- spec/assets/rails328_ruby187_app/config/routes.rb
 - spec/assets/rails328_ruby187_app/config.ru
-- spec/assets/rails328_ruby187_app/public/favicon.ico
-- spec/assets/rails328_ruby187_app/public/robots.txt
+- spec/assets/rails328_ruby187_app/db/seeds.rb
+- spec/assets/rails328_ruby187_app/doc/README_FOR_APP
+- spec/assets/rails328_ruby187_app/Gemfile
+- spec/assets/rails328_ruby187_app/manifest.yml
+- spec/assets/rails328_ruby187_app/public/404.html
 - spec/assets/rails328_ruby187_app/public/422.html
-- spec/assets/rails328_ruby187_app/public/assets/rails-be8732dac73d845ac5b142c8fb5f9fb0.png
-- spec/assets/rails328_ruby187_app/public/assets/application.js
-- spec/assets/rails328_ruby187_app/public/assets/application-7270767b2a9e9fff880aa5de378ca791.css.gz
-- spec/assets/rails328_ruby187_app/public/assets/manifest.yml
-- spec/assets/rails328_ruby187_app/public/assets/application.js.gz
+- spec/assets/rails328_ruby187_app/public/500.html
 - spec/assets/rails328_ruby187_app/public/assets/application-7270767b2a9e9fff880aa5de378ca791.css
+- spec/assets/rails328_ruby187_app/public/assets/application-7270767b2a9e9fff880aa5de378ca791.css.gz
+- spec/assets/rails328_ruby187_app/public/assets/application-ccab98dc1abdf097c0af693e20aed861.js
 - spec/assets/rails328_ruby187_app/public/assets/application-ccab98dc1abdf097c0af693e20aed861.js.gz
+- spec/assets/rails328_ruby187_app/public/assets/application.css
 - spec/assets/rails328_ruby187_app/public/assets/application.css.gz
-- spec/assets/rails328_ruby187_app/public/assets/application-ccab98dc1abdf097c0af693e20aed861.js
+- spec/assets/rails328_ruby187_app/public/assets/application.js
+- spec/assets/rails328_ruby187_app/public/assets/application.js.gz
+- spec/assets/rails328_ruby187_app/public/assets/manifest.yml
+- spec/assets/rails328_ruby187_app/public/assets/rails-be8732dac73d845ac5b142c8fb5f9fb0.png
 - spec/assets/rails328_ruby187_app/public/assets/rails.png
-- spec/assets/rails328_ruby187_app/public/assets/application.css
-- spec/assets/rails328_ruby187_app/public/404.html
+- spec/assets/rails328_ruby187_app/public/favicon.ico
 - spec/assets/rails328_ruby187_app/public/index.html
-- spec/assets/rails328_ruby187_app/public/500.html
-- spec/assets/rails328_ruby187_app/README.rdoc
+- spec/assets/rails328_ruby187_app/public/robots.txt
 - spec/assets/rails328_ruby187_app/Rakefile
-- spec/console_functional_spec.rb
-- spec/Rakefile
+- spec/assets/rails328_ruby187_app/README.rdoc
+- spec/assets/rails328_ruby187_app/script/rails
+- spec/assets/rails328_ruby187_app/test/performance/browsing_test.rb
+- spec/assets/rails328_ruby187_app/test/test_helper.rb
+- spec/console_spec.rb
+- spec/spec_helper.rb

data/spec/Rakefile

@@ -1,13 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-Bundler.require(:default, :development)
-
-require 'rake/dsl_definition'
-require 'rake'
-require 'rspec'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = "*_spec.rb"
-  t.rspec_opts = ["--format", "documentation", "--colour"]
-end

data/spec/console_functional_spec.rb

@@ -1,53 +0,0 @@
-require "vmc/spec_helpers"
-require "console-vmc-plugin/plugin"
-
-describe "VMCConsole#console" do
-  before(:all) do
-    rails_app = File.expand_path("../assets/rails328_ruby187_app", __FILE__)
-    @name = "app-#{random_str}"
-    client.app_by_name(@name).should_not be
-
-    @app = client.app
-    @app.name = @name
-    @app.space = client.current_space if client.current_space
-    @app.framework = client.framework_by_name("rails3")
-    @app.runtime = client.runtime_by_name("ruby18")
-    @app.memory = client.is_a?(CFoundry::V2::Client) ? 128 : "128M"
-    @app.total_instances = 1
-    @app.console = true
-    @app.create!
-
-    @app.upload(rails_app)
-    @app.start!
-
-    @caldecott = client.app_by_name("caldecott")
-    @caldecott_running = @caldecott.running? if @caldecott
-  end
-
-  after(:all) do
-    if created = client.app_by_name(@name)
-      created.delete!
-    end
-
-    if @caldecott
-      client.app_by_name("caldecott").stop! unless @caldecott_running
-    else
-      client.app_by_name("caldecott").delete!
-    end
-  end
-
-  it "runs with args APP" do
-    running(:console, :app => @app) do
-      does("Opening console on port 10000")
-      kill
-    end
-  end
-
-  it "runs with args APP and PORT" do
-    port = "10024"
-    running(:console, :app => @app, :port => port) do
-      does("Opening console on port #{port}")
-      kill
-    end
-  end
-end