engineyard-visualvm 0.5.1 → 0.5.2

data/ChangeLog

@@ -1,3 +1,13 @@
+2011-12-13  Nick Sieger  <nick@nicksieger.com>
+
+	*  (Changes): Release 0.5.2
+
+	* lib/engineyard-visualvm/cli.rb (EngineYard::VisualVM::Helpers#fetch_public_ip):
+	Use public hostname from environment's single instance
+
+	* lib/engineyard-visualvm/cli.rb (EngineYard::VisualVM::CLI#start):
+	Ensure host is in known_hosts file before launching visual vm
+
 2011-12-08  Nick Sieger  <nick@nicksieger.com>
 
 	*  (Changes): Release 0.5.1

data/README.md

@@ -97,6 +97,8 @@ To try it yourself, do the following:
 
 - Prompt for a JVM to connect to if more than one JVM process is
   running on the server
+- Prompt for an instance to connect to if the environment has multiple
+  instances
 - Data collected by `jstatd` is not yet supported, so things like the
   Visual GC tab are not supported yet.
 - Additional utilities to make use of the JMX connection remotely

data/Rakefile

@@ -45,6 +45,18 @@ RSpec::Core::RakeTask.new
 
 task :spec => :jar
 
+# Override push to use engineyard key
+class Bundler::GemHelper
+  def rubygem_push(path)
+    if Gem.configuration.api_keys.key? :engineyard
+      sh("gem push -k engineyard '#{path}'")
+      Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org"
+    else
+      raise ":engineyard key not set in ~/.gem/credentials"
+    end
+  end
+end
+
 begin
   require 'childprocess'
   require 'jmx'

data/lib/engineyard-visualvm/cli.rb

@@ -122,15 +122,21 @@ module EngineYard
         end
       end
 
-      # Return the public IP assigned to an environment (which may or
-      # may not be a booted cluster of instances) Displays error and
-      # exits if no public IP assigned to the environment
+      # Return the public IP or instance hostname assigned to an
+      # environment (which may or may not be a booted cluster of
+      # instances) Displays error and exits if no public IP assigned
+      # to the environment
       def fetch_public_ip(environment)
-        unless environment.load_balancer_ip_address
-          warn "#{environment.account.name}/#{environment.name} has no assigned public IP address."
+        if environment.load_balancer_ip_address
+          return environment.load_balancer_ip_address
         end
 
-        environment.load_balancer_ip_address
+        if environment.instances.length == 1 && environment.instances.first.public_hostname
+          return environment.instances.first.public_hostname
+        end
+
+        warn "#{environment.account.name}/#{environment.name} has no assigned public IP address or hostname."
+        nil
       end
     end
 
@@ -173,6 +179,10 @@ module EngineYard
 
         if ssh?
           ssh_dest = ssh_host
+          unless system "ssh #{ssh_dest} true"
+            warn "Error establishing ssh connection; make sure you can `ssh #{ssh_dest}'."
+            exit 3
+          end
 
           if socks_proxy?
             proxy_port = next_free_port
@@ -181,7 +191,7 @@ module EngineYard
           else
             server_host, server_port = host, port
             @host, @port = "localhost", next_free_port
-            @ssh_process = ChildProcess.build("ssh", "-NL", "#{@port}:#{@host}:#{server_port}", "#{ssh_dest}")
+            @ssh_process = ChildProcess.build("ssh", "-NL", "#{@port}:#{@host}:#{server_port}", ssh_dest)
           end
 
           @ssh_process.start

data/lib/engineyard-visualvm/version.rb

@@ -6,6 +6,6 @@
 
 module EngineYard
   module VisualVM
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/spec/engineyard-visualvm_spec.rb

@@ -23,7 +23,7 @@ describe EngineYard::VisualVM::Helpers do
 end
 
 describe EngineYard::VisualVM::CLI do
-  let(:script) { Class.new(EngineYard::VisualVM::CLI) }
+  let(:script) { Class.new(EngineYard::VisualVM::CLI) { include SystemDouble } }
 
   context "#help" do
     it "prints the default port" do
@@ -42,6 +42,7 @@ describe EngineYard::VisualVM::CLI do
   end
 
   context "#start" do
+    let(:system_double) { double("system").tap {|d| script.system_double = d } }
     let(:ssh_process) { double("ssh process double").tap {|d| d.should_receive(:start) } }
     let(:visualvm_process) do
       double("visualvm process double").tap {|d|
@@ -83,6 +84,7 @@ describe EngineYard::VisualVM::CLI do
     end
 
     it "sets up an ssh tunnel if the user@host format is used" do
+      system_double.should_receive(:system).with("ssh user@example.com true").ordered.and_return true
       ChildProcess.should_receive(:build).ordered.and_return do |*args|
         args.join(' ').should =~ /ssh -NL.*user@example.com/
         ssh_process
@@ -97,6 +99,7 @@ describe EngineYard::VisualVM::CLI do
     end
 
     it "allows an ssh tunnel to be forced" do
+      system_double.should_receive(:system).ordered.and_return true
       ChildProcess.should_receive(:build).ordered.and_return do |*args|
         args.join(' ').should =~ /ssh -NL/
         ssh_process
@@ -122,6 +125,7 @@ describe EngineYard::VisualVM::CLI do
       end
 
       it "finds an open port for the local side of the ssh tunnel" do
+        system_double.should_receive(:system).ordered.and_return true
         ChildProcess.should_receive(:build).ordered.and_return do |*args|
           args.join(' ').should =~ /ssh -NL #{@next_port}:localhost:#{@port}/
           ssh_process
@@ -139,7 +143,6 @@ describe EngineYard::VisualVM::CLI do
     context "with --environment specified" do
       let(:environment) do
         double(:environment).tap {|e|
-          e.stub!(:load_balancer_ip_address).and_return "0.0.0.0"
           e.stub!(:username).and_return "deploy"
         }
       end
@@ -151,6 +154,7 @@ describe EngineYard::VisualVM::CLI do
       end
 
       it "sets the user to 'deploy' and the host to the load balancer IP address" do
+        environment.stub!(:load_balancer_ip_address).and_return "0.0.0.0"
         ChildProcess.should_receive(:build).ordered.and_return do |*args|
           args.join(' ').should =~ /ssh -NL.* deploy@0.0.0.0/
           ssh_process
@@ -163,6 +167,22 @@ describe EngineYard::VisualVM::CLI do
 
         script.start(["start", "--environment=jruby"])
       end
+
+      it "uses the public hostname of the first instance if no load balancer" do
+        environment.stub!(:load_balancer_ip_address).and_return nil
+        environment.stub!(:instances).and_return [double("instance").tap{|d| d.stub!(:public_hostname).and_return "example.com" }]
+        ChildProcess.should_receive(:build).ordered.and_return do |*args|
+          args.join(' ').should =~ /ssh -NL.* deploy@example.com/
+          ssh_process
+        end
+        ChildProcess.should_receive(:build).ordered.and_return do |*args|
+          args[2].should =~ /service:jmx:rmi.*localhost:/
+          visualvm_process
+        end
+        ssh_process.should_receive(:stop)
+
+        script.start(["start", "--environment=jruby"])
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -25,6 +25,25 @@ module EYVisualVMSpecHelpers
   alias capture silence
 end
 
+module SystemDouble
+  def self.included(base)
+    def base.system_double
+        @@double
+    end
+    def base.system_double=(d)
+      @@double = d
+    end
+  end
+
+  def system_double
+    @@double
+  end
+
+  def system(*args)
+    system_double.system(*args)
+  end
+end
+
 RSpec.configure do |config|
   config.include EYVisualVMSpecHelpers
 end

metadata

@@ -2,7 +2,7 @@
 name: engineyard-visualvm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
   - Nick Sieger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 Z
+date: 2011-12-13 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: childprocess