jmx 0.7 → 0.8

data/.gitignore

@@ -0,0 +1,8 @@
+!.gitignore
+build
+dist
+*.orig
+*.rej
+*~
+nbproject/private
+pkg

data/History.txt

@@ -0,0 +1,24 @@
+== 0.1
+
+- Initial release
+
+== 0.2
+
+- Ruby-created mbeans can now specify r_attribute, rw_attribute, and w_attributes (by Jay McGaffigan)
+- More rdocs
+
+== 0.5
+
+- Use 'java_import' instead of 'import' to play nice with Rake
+- Use hash of hash in Thread.current so multiple beans don't add each others crud (by bpardee)
+
+== 0.6
+
+See https://github.com/enebo/jmxjr/issues for details
+- 2: MBean attributes shouldn't be tied to MBean instance variables. 
+- 3: MBeans created by another MBean don't have attributes/operations show up
+- 4: Extended MBeans don't have parents operations/attributes.
+
+== 0.7
+
+- 5: JMX::MBeanProxy#method_missing is broken (removed method_missing. dead)

data/Manifest.txt

@@ -12,4 +12,5 @@ lib/jmx/version.rb
 samples/memory.rb
 test/jmx_attribute_test.rb
 test/jmx_client_test.rb
+test/jmx_mangling_test.rb
 test/jmx_server_test.rb

data/Rakefile

@@ -1,27 +1,9 @@
-MANIFEST = FileList["Manifest.txt", "Rakefile", "README.md", "LICENSE.txt", "lib/**/*", "samples/*","test/**/*"]
+require 'rake/testtask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-file "Manifest.txt" => :manifest
-task :manifest do
-  File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
-end
-Rake::Task['manifest'].invoke # Always regen manifest, so Hoe has up-to-date list of files
-
-$LOAD_PATH << 'lib'
-require 'jmx/version'
-begin
-  require 'hoe'
-  Hoe.new("jmx", JMX::VERSION) do |p|
-    p.rubyforge_name = "jruby-extras"
-    p.url = "http://github.com/enebo/jmxjr"
-    p.author = "Thomas Enebo & Jay McGaffigan"
-    p.email = "tom.enebo@gmail.com"
-    p.summary = "Package for interacting/creating Java Management Extensions"
-    p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-    p.description = "Install this gem and require 'jmx' to load the library."
-  end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
-rescue LoadError
-  puts "You need Hoe installed to be able to package this gem"
-rescue => e
-  p e.backtrace
-  puts "ignoring error while loading hoe: #{e.to_s}"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
 end

data/jmx.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "jmx/version"
+
+Gem::Specification.new do |s|
+  s.name        = 'jmx'
+  s.version     = JMX::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = 'Thomas E. Enebo'
+  s.email       = 'tom.enebo@gmail.com'
+  s.homepage    = 'http://github.com/enebo/jmx'
+  s.summary     = %q{Access and create MBeans in a friendly Ruby syntax}
+  s.description = %q{Access and create MBeans in a friendly Ruby syntax}
+
+  s.rubyforge_project = "jmx"
+
+  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.has_rdoc      = true
+end

data/lib/jmx.rb

@@ -84,6 +84,8 @@ module JMX
     # name back to the caller.
     def self.parent_for(java_class_fqn)
       java_class_fqn.split(".").inject(MBeans) do |parent, segment|
+        # const_defined? will crash later if we don't remove $
+        segment.gsub!('$', 'Dollar') if segment =~ /\$/
         # Note: We are boned if java class name is lower cased
         return [parent, segment] if segment =~ /^[A-Z]/
 

data/lib/jmx/server.rb

@@ -92,7 +92,7 @@ module JMX
       return object_name if object_name.kind_of? ObjectName
 
       ObjectName.new object_name
-    rescue
+    rescue Exception
       raise ArgumentError.new("Invalid ObjectName #{$!.message}")
     end
   end

data/lib/jmx/version.rb

@@ -1,3 +1,3 @@
 module JMX
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

data/nbproject/project.properties

@@ -0,0 +1,6 @@
+javac.classpath=
+main.file=main.rb
+ruby.includejava=false
+source.encoding=UTF-8
+src.dir=lib
+test.src.dir=test

data/nbproject/project.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ruby.rubyproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
+            <name>jmxjr</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

data/samples/memory.rb

@@ -10,8 +10,7 @@ memory = client["java.lang:type=Memory"]
 
 Thread.new do
   puts "Enter 'gc' to garbage collect or anything else to quit"
-  while (command = gets.chomp)
-    break if command != "gc"
+  while gets.chomp == "gc"
     memory.gc
   end
 

data/test/jmx_client_test.rb

@@ -5,12 +5,12 @@ require 'rmi'
 require 'jmx'
 
 PORT = 9999
-$registry = RMIRegistry.new PORT
 
 class JMXConnectorClientTest < Test::Unit::TestCase
   URL = "service:jmx:rmi:///jndi/rmi://localhost:#{PORT}/jmxrmi"
   
   def setup
+    @registry = RMIRegistry.new PORT
     @connector = JMX::MBeanServerConnector.new(URL, JMX::MBeanServer.new)
     @connector.start
     @client = JMX::connect(:port => PORT)
@@ -18,6 +18,7 @@ class JMXConnectorClientTest < Test::Unit::TestCase
   
   def teardown
     @connector.stop
+    @registry.stop
   end
 
   def test_invalid_mbean_name

data/test/jmx_mangling_test.rb

@@ -0,0 +1,18 @@
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
+require 'test/unit'
+require 'jmx'
+
+class JMXConnectorClientTest < Test::Unit::TestCase
+  def test_that_mbeans_parent_for_handles_classes_with_dollar_sign
+    bean_module, class_name = JMX::MBeans.parent_for("evil.dollar.Pre$Middle$Post")
+    assert_equal(JMX::MBeans::Evil::Dollar, bean_module)
+    assert_equal("PreDollarMiddleDollarPost", class_name)
+  end
+
+  def test_mbeans_parent_for
+    bean_module, class_name = JMX::MBeans.parent_for("com.example.JavaClass")
+    assert_equal(JMX::MBeans::Com::Example, bean_module)
+    assert_equal("JavaClass", class_name)
+  end
+end

metadata

@@ -1,72 +1,83 @@
 --- !ruby/object:Gem::Specification 
 name: jmx
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: "0.7"
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  version: "0.8"
 platform: ruby
 authors: 
-  - Thomas Enebo & Jay McGaffigan
+- Thomas E. Enebo
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -05:00
+date: 2012-04-20 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Install this gem and require 'jmx' to load the library.
+description: Access and create MBeans in a friendly Ruby syntax
 email: tom.enebo@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-  - Manifest.txt
-  - LICENSE.txt
+extra_rdoc_files: []
+
 files: 
-  - Manifest.txt
-  - Rakefile
-  - README.md
-  - LICENSE.txt
-  - lib/jmx.rb
-  - lib/rmi.rb
-  - lib/jmx/dynamic_mbean.rb
-  - lib/jmx/notifier.rb
-  - lib/jmx/server.rb
-  - lib/jmx/version.rb
-  - samples/memory.rb
-  - test/jmx_attribute_test.rb
-  - test/jmx_client_test.rb
-  - test/jmx_server_test.rb
-  - .gemtest
+- .gitignore
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.md
+- Rakefile
+- jmx.gemspec
+- lib/jmx.rb
+- lib/jmx/dynamic_mbean.rb
+- lib/jmx/server.rb
+- lib/jmx/version.rb
+- lib/rmi.rb
+- nbproject/private/private.xml
+- nbproject/project.properties
+- nbproject/project.xml
+- samples/memory.rb
+- test/jmx_attribute_test.rb
+- test/jmx_client_test.rb
+- test/jmx_mangling_test.rb
+- test/jmx_server_test.rb
 has_rdoc: true
-homepage: http://github.com/enebo/jmxjr
+homepage: http://github.com/enebo/jmx
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-  - --main
-  - README.txt
+rdoc_options: []
+
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: jruby-extras
-rubygems_version: 1.5.1
+rubyforge_project: jmx
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Package for interacting/creating Java Management Extensions
-test_files: []
-
+summary: Access and create MBeans in a friendly Ruby syntax
+test_files: 
+- test/jmx_attribute_test.rb
+- test/jmx_client_test.rb
+- test/jmx_mangling_test.rb
+- test/jmx_server_test.rb

data/lib/jmx/notifier.rb

@@ -1,31 +0,0 @@
-module JMX
-  module RubyNotificationEmitter
-    java_import javax.management.MBeanNotificationInfo
-
-    include javax.management.NotificationEmitter
-
-    def listeners
-      @listener ||= {}
-    end
-
-    # NotificationListener listener, NotificationFilter filter, Object handback
-    def addNotificationListener(listener, filter, handback)
-      listeners[listener] = [filter, handback]
-    end
-
-    def getNotificationInfo
-      [].to_java MBeanNotificationInfo
-    end
-
-    # NotificationListener listener, NotificationFilter filter, Object handback
-    def removeNotificationListener(listener, filter=nil, handback=nil)
-      found = false
-      listeners.delete_if do |clistener, (cfilter, chandback)|
-        v = listener == clistener && filter == cfilter && handback == chandback
-        found = true if v
-        v
-      end
-      raise javax.management.ListenerNotFoundException.new unless found
-    end
-  end
-end