Modified version of Sergio's fixes for JVMSCRIPT-3 plus some tests fo…

…r package logic.

lib/bitescript/builder.rb

@@ -93,7 +93,8 @@ def self.build(filename, &block)
     end
 
     def define_class(class_name, opts, &block)
-      pkg = opts[:package] || @package || []
+      pkg = opts[:package] || @package.dup || []
+
       class_name = pkg.empty? ? class_name : "#{pkg.join('/')}/#{class_name}"
       class_builder = ClassBuilder.new(self, class_name, @file_name, opts)
       @class_builders[class_name] ||= class_builder # TODO Is this really what we want?
@@ -138,15 +139,26 @@ def line(line)
     end
 
     def package(*names)
-      elements = 0
+      return @package unless names.size > 0
+
+      packages = unpack_packages(*names)
+      @package.concat(packages)
+      yield
+      @package = @package[0..(packages.size - 1)]
+    end
+
+    def package=(name)
+      @package = unpack_packages(name)
+    end
+
+    def unpack_packages(*names)
+      package = []
       names.each do |name_maybe_dotted|
         name_maybe_dotted.split(/\./).each do |name|
-          elements += 1
-          @package.push name
+          package.push name
         end
       end
-      yield
-      elements.times {@package.pop}
+      package
     end
 
     def method?

test/test_builder.rb

@@ -29,7 +29,6 @@ def dummy_constructor(class_builder)
 
   def load_and_construct(name, class_builder)
     class_bytes = class_builder.generate
-    File.open(name + ".class", 'w') {|f| f.write(class_bytes)}
     cls = JRuby.runtime.jruby_class_loader.define_class(name, class_bytes.to_java_bytes)
 
     cls.new_instance
@@ -426,4 +425,35 @@ def test_annotation
     anno = method.annotation(JRubyMethod.java_class)
     assert anno
   end
+
+  def test_package_equals
+    @builder.package = "org.jruby"
+    cb = @builder.public_class(@class_name, @builder.object);
+    dummy_constructor(cb)
+    obj = load_and_construct("org.jruby.#{@class_name}", cb);
+
+    assert_equal "org.jruby.#{@class_name}", obj.class.java_class.to_s
+  end
+
+  def test_package_builder_list
+    obj = nil
+    @builder.package "org", "jruby" do
+      cb = @builder.public_class(@class_name, @builder.object);
+      dummy_constructor(cb)
+      obj = load_and_construct("org.jruby.#{@class_name}", cb);
+    end
+
+    assert_equal "org.jruby.#{@class_name}", obj.class.java_class.to_s
+  end
+
+  def test_package_builder_string
+    obj = nil
+    @builder.package "org.jruby" do
+      cb = @builder.public_class(@class_name, @builder.object);
+      dummy_constructor(cb)
+      obj = load_and_construct("org.jruby.#{@class_name}", cb);
+    end
+
+    assert_equal "org.jruby.#{@class_name}", obj.class.java_class.to_s
+  end
 end