engineyard-visualvm 0.5.2 → 0.5.3

data/Gemfile

@@ -13,4 +13,14 @@ group :development do
   gem "jmx", :platform => :jruby
 end
 
-gemspec
+gemspec_in = Dir['*.gemspec.in'].first
+gemspec_ruby = gemspec_in.sub(/\.gemspec\.in/, '')
+gemspec_java = gemspec_ruby + '-java'
+
+platforms :jruby do
+  gemspec :name => gemspec_java
+end
+
+platforms :ruby do
+  gemspec :name => gemspec_ruby
+end

data/Rakefile

@@ -4,7 +4,6 @@
 # software license details.
 #++
 
-require "bundler/gem_tasks"
 require "rake/clean"
 
 desc "Compile and jar the agent extension class"
@@ -45,6 +44,42 @@ RSpec::Core::RakeTask.new
 
 task :spec => :jar
 
+## Bundler tasks
+gemspec_in = FileList['*.gemspec.in'].first
+gemspec = gemspec_in.sub(/\.in/, '')
+gemspec_java = gemspec.sub(/\.gemspec/, '-java.gemspec')
+write_gemspecs = lambda {
+  File.open(gemspec, 'w') {|f| f << eval(File.read(gemspec_in)).to_ruby }
+  File.open(gemspec_java, 'w') {|f| use_jruby = true; f << eval(File.read(gemspec_in)).to_ruby }
+}
+write_gemspecs.call unless File.exist?(gemspec) && File.exist?(gemspec_java)
+
+task :update_gemspecs do
+  write_gemspecs.call
+end
+task :build => :update_gemspecs
+task :install => :update_gemspecs
+task :release => :update_gemspecs
+
+require "bundler/gem_helper"
+
+Bundler::GemHelper.install_tasks(:name => gemspec.sub('.gemspec', ''))
+namespace :java do
+  gh = Bundler::GemHelper.new(Dir.pwd, gemspec_java.sub('.gemspec', ''))
+  # These are no-ops since we will have already tagged and pushed
+  def gh.guard_already_tagged; end
+  def gh.tag_version; yield if block_given?; end
+  def gh.git_push; end
+  gh.install
+end
+
+task :build do
+  Rake::Task["java:build"].invoke
+end
+task :release do
+  Rake::Task["java:release"].invoke
+end
+
 # Override push to use engineyard key
 class Bundler::GemHelper
   def rubygem_push(path)
@@ -57,6 +92,7 @@ class Bundler::GemHelper
   end
 end
 
+## Acceptance task
 begin
   require 'childprocess'
   require 'jmx'

data/engineyard-visualvm-java.gemspec

@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{engineyard-visualvm}
+  s.version = "0.5.3"
+  s.platform = %q{java}
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Nick Sieger}]
+  s.date = %q{2011-12-21}
+  s.description = %q{This provides a Java agent and command-line utility to enable
+    JMX in any Java process such that it can be accessed through a firewall,
+    and a VisualVM launcher aid to connect to that process through ssh.}
+  s.email = [%q{nick@nicksieger.com}]
+  s.executables = [%q{ey-visualvm}]
+  s.files = [%q{.gitignore}, %q{ChangeLog}, %q{Gemfile}, %q{LICENSE.txt}, %q{README.md}, %q{Rakefile}, %q{Vagrantfile}, %q{bin/ey-visualvm}, %q{cookbooks/apt/README.md}, %q{cookbooks/apt/files/default/apt-cacher}, %q{cookbooks/apt/files/default/apt-cacher.conf}, %q{cookbooks/apt/files/default/apt-proxy-v2.conf}, %q{cookbooks/apt/metadata.json}, %q{cookbooks/apt/metadata.rb}, %q{cookbooks/apt/providers/repository.rb}, %q{cookbooks/apt/recipes/cacher-client.rb}, %q{cookbooks/apt/recipes/cacher.rb}, %q{cookbooks/apt/recipes/default.rb}, %q{cookbooks/apt/resources/repository.rb}, %q{cookbooks/gems/recipes/default.rb}, %q{cookbooks/java/README.md}, %q{cookbooks/java/attributes/default.rb}, %q{cookbooks/java/files/default/java.seed}, %q{cookbooks/java/metadata.json}, %q{cookbooks/java/metadata.rb}, %q{cookbooks/java/recipes/default.rb}, %q{cookbooks/java/recipes/openjdk.rb}, %q{cookbooks/java/recipes/sun.rb}, %q{cookbooks/jruby/attributes/default.rb}, %q{cookbooks/jruby/recipes/default.rb}, %q{cookbooks/server/recipes/default.rb}, %q{cookbooks/server/templates/default/server.sh.erb}, %q{cookbooks/vagrant_main/recipes/default.rb}, %q{engineyard-visualvm-java.gemspec}, %q{engineyard-visualvm.gemspec}, %q{engineyard-visualvm.gemspec.in}, %q{ext/org/jruby/ext/jmx/Agent.java}, %q{ext/org/jruby/ext/jmx/JavaHome.java}, %q{ext/org/jruby/ext/jmx/RMIServerSocketFactoryImpl.java}, %q{lib/engineyard-visualvm.rb}, %q{lib/engineyard-visualvm/agent.jar}, %q{lib/engineyard-visualvm/cli.rb}, %q{lib/engineyard-visualvm/version.rb}, %q{spec/engineyard-visualvm_spec.rb}, %q{spec/spec_helper.rb}]
+  s.homepage = %q{https://github.com/engineyard/engineyard-visualvm}
+  s.require_paths = [%q{lib}]
+  s.rubyforge_project = %q{jruby-extras}
+  s.rubygems_version = %q{1.8.9}
+  s.summary = %q{Client and server helpers for using JMX and VisualVM with EY Cloud.}
+  s.test_files = [%q{spec/engineyard-visualvm_spec.rb}, %q{spec/spec_helper.rb}]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<childprocess>, [">= 0"])
+      s.add_runtime_dependency(%q<engineyard>, [">= 0"])
+      s.add_runtime_dependency(%q<jruby-openssl>, [">= 0"])
+      s.add_runtime_dependency(%q<ffi-ncurses>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<childprocess>, [">= 0"])
+      s.add_dependency(%q<engineyard>, [">= 0"])
+      s.add_dependency(%q<jruby-openssl>, [">= 0"])
+      s.add_dependency(%q<ffi-ncurses>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<childprocess>, [">= 0"])
+    s.add_dependency(%q<engineyard>, [">= 0"])
+    s.add_dependency(%q<jruby-openssl>, [">= 0"])
+    s.add_dependency(%q<ffi-ncurses>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end

data/engineyard-visualvm.gemspec

@@ -1,28 +1,43 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "engineyard-visualvm/version"
 
 Gem::Specification.new do |s|
-  s.name        = "engineyard-visualvm"
-  s.version     = EngineYard::VisualVM::VERSION
-  s.authors     = ["Nick Sieger"]
-  s.email       = ["nick@nicksieger.com"]
-  s.homepage    = "https://github.com/engineyard/engineyard-visualvm"
-  s.summary     = %q{Client and server helpers for using JMX and VisualVM with EY Cloud.}
+  s.name = %q{engineyard-visualvm}
+  s.version = "0.5.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Nick Sieger}]
+  s.date = %q{2011-12-21}
   s.description = %q{This provides a Java agent and command-line utility to enable
     JMX in any Java process such that it can be accessed through a firewall,
     and a VisualVM launcher aid to connect to that process through ssh.}
+  s.email = [%q{nick@nicksieger.com}]
+  s.executables = [%q{ey-visualvm}]
+  s.files = [%q{.gitignore}, %q{ChangeLog}, %q{Gemfile}, %q{LICENSE.txt}, %q{README.md}, %q{Rakefile}, %q{Vagrantfile}, %q{bin/ey-visualvm}, %q{cookbooks/apt/README.md}, %q{cookbooks/apt/files/default/apt-cacher}, %q{cookbooks/apt/files/default/apt-cacher.conf}, %q{cookbooks/apt/files/default/apt-proxy-v2.conf}, %q{cookbooks/apt/metadata.json}, %q{cookbooks/apt/metadata.rb}, %q{cookbooks/apt/providers/repository.rb}, %q{cookbooks/apt/recipes/cacher-client.rb}, %q{cookbooks/apt/recipes/cacher.rb}, %q{cookbooks/apt/recipes/default.rb}, %q{cookbooks/apt/resources/repository.rb}, %q{cookbooks/gems/recipes/default.rb}, %q{cookbooks/java/README.md}, %q{cookbooks/java/attributes/default.rb}, %q{cookbooks/java/files/default/java.seed}, %q{cookbooks/java/metadata.json}, %q{cookbooks/java/metadata.rb}, %q{cookbooks/java/recipes/default.rb}, %q{cookbooks/java/recipes/openjdk.rb}, %q{cookbooks/java/recipes/sun.rb}, %q{cookbooks/jruby/attributes/default.rb}, %q{cookbooks/jruby/recipes/default.rb}, %q{cookbooks/server/recipes/default.rb}, %q{cookbooks/server/templates/default/server.sh.erb}, %q{cookbooks/vagrant_main/recipes/default.rb}, %q{engineyard-visualvm-java.gemspec}, %q{engineyard-visualvm.gemspec}, %q{engineyard-visualvm.gemspec.in}, %q{ext/org/jruby/ext/jmx/Agent.java}, %q{ext/org/jruby/ext/jmx/JavaHome.java}, %q{ext/org/jruby/ext/jmx/RMIServerSocketFactoryImpl.java}, %q{lib/engineyard-visualvm.rb}, %q{lib/engineyard-visualvm/agent.jar}, %q{lib/engineyard-visualvm/cli.rb}, %q{lib/engineyard-visualvm/version.rb}, %q{spec/engineyard-visualvm_spec.rb}, %q{spec/spec_helper.rb}]
+  s.homepage = %q{https://github.com/engineyard/engineyard-visualvm}
+  s.require_paths = [%q{lib}]
+  s.rubyforge_project = %q{jruby-extras}
+  s.rubygems_version = %q{1.8.9}
+  s.summary = %q{Client and server helpers for using JMX and VisualVM with EY Cloud.}
+  s.test_files = [%q{spec/engineyard-visualvm_spec.rb}, %q{spec/spec_helper.rb}]
 
-  s.rubyforge_project = "jruby-extras"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
 
-  s.add_runtime_dependency "childprocess"
-  s.add_runtime_dependency "engineyard"
-  s.add_runtime_dependency "jruby-openssl" # engineyard gem uses ssl
-  s.add_runtime_dependency "ffi-ncurses" # for highline gem, dep of engineyard
-  s.add_development_dependency "rspec"
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<childprocess>, [">= 0"])
+      s.add_runtime_dependency(%q<engineyard>, [">= 0"])
+      s.add_runtime_dependency(%q<ffi-ncurses>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<childprocess>, [">= 0"])
+      s.add_dependency(%q<engineyard>, [">= 0"])
+      s.add_dependency(%q<ffi-ncurses>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<childprocess>, [">= 0"])
+    s.add_dependency(%q<engineyard>, [">= 0"])
+    s.add_dependency(%q<ffi-ncurses>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
 end

data/engineyard-visualvm.gemspec.in

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "engineyard-visualvm/version"
+
+Gem::Specification.new do |s|
+  s.name        = "engineyard-visualvm"
+  s.platform    = "java" if defined?(use_jruby)
+  s.version     = EngineYard::VisualVM::VERSION
+  s.authors     = ["Nick Sieger"]
+  s.email       = ["nick@nicksieger.com"]
+  s.homepage    = "https://github.com/engineyard/engineyard-visualvm"
+  s.summary     = %q{Client and server helpers for using JMX and VisualVM with EY Cloud.}
+  s.description = %q{This provides a Java agent and command-line utility to enable
+    JMX in any Java process such that it can be accessed through a firewall,
+    and a VisualVM launcher aid to connect to that process through ssh.}
+
+  s.rubyforge_project = "jruby-extras"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency "childprocess"
+  s.add_runtime_dependency "engineyard"
+  if defined?(use_jruby)
+    s.add_runtime_dependency "jruby-openssl" # engineyard gem uses ssl
+  end
+  s.add_runtime_dependency "ffi-ncurses" # for highline gem, dep of engineyard
+  s.add_development_dependency "rspec"
+end
+
+# Local Variables:
+# mode: ruby
+# End:

data/lib/engineyard-visualvm/version.rb

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

data/spec/engineyard-visualvm_spec.rb

@@ -53,7 +53,7 @@ describe EngineYard::VisualVM::CLI do
 
     before :each do
       script.class_eval do
-        no_tasks { define_method(:fetch_environment) { raise EY::Error, "error" } }
+        no_tasks { define_method(:fetch_environment) {|e,a| raise EY::Error, "error" } }
       end
     end
 
@@ -149,11 +149,12 @@ describe EngineYard::VisualVM::CLI do
       before :each do
         env = environment
         script.class_eval do
-          no_tasks { define_method(:fetch_environment) { env } }
+          no_tasks { define_method(:fetch_environment) {|e,a| env } }
         end
       end
 
       it "sets the user to 'deploy' and the host to the load balancer IP address" do
+        system_double.should_receive(:system).ordered.and_return true
         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/
@@ -169,6 +170,7 @@ describe EngineYard::VisualVM::CLI do
       end
 
       it "uses the public hostname of the first instance if no load balancer" do
+        system_double.should_receive(:system).ordered.and_return true
         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|

metadata

@@ -2,7 +2,7 @@
 name: engineyard-visualvm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
   - Nick Sieger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-13 00:00:00 Z
+date: 2011-12-21 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: childprocess
@@ -35,7 +35,7 @@ dependencies:
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
+    name: ffi-ncurses
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
@@ -45,28 +45,17 @@ dependencies:
             version: "0"
     type: :runtime
     version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: ffi-ncurses
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :runtime
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
     type: :development
-    version_requirements: *id005
+    version_requirements: *id004
 description: |-
   This provides a Java agent and command-line utility to enable
       JMX in any Java process such that it can be accessed through a firewall,
@@ -113,7 +102,9 @@ files:
   - cookbooks/server/recipes/default.rb
   - cookbooks/server/templates/default/server.sh.erb
   - cookbooks/vagrant_main/recipes/default.rb
+  - engineyard-visualvm-java.gemspec
   - engineyard-visualvm.gemspec
+  - engineyard-visualvm.gemspec.in
   - ext/org/jruby/ext/jmx/Agent.java
   - ext/org/jruby/ext/jmx/JavaHome.java
   - ext/org/jruby/ext/jmx/RMIServerSocketFactoryImpl.java