blockenspiel 0.4.1 → 0.4.2

data/History.rdoc

@@ -1,3 +1,12 @@
+=== 0.4.2 / 2011-06-02
+
+* Fixed an unmixer compatibility issue with Rubinius > 1.2.x. (Thanks to @meh for the fix.)
+* Recent versions of Rubinius raised exceptions involving Fiber. Fixed.
+* Workaround for a JRuby NullPointerException (JRUBY-5842).
+* Integrated JRuby platform gem back into main gem.
+* A .gemspec file is now available for gem building and bundler git integration.
+* Some cleanup of the Rakefile and tests.
+
 === 0.4.1 / 2010-06-23
 
 * Support for rubinius 1.0.

data/Version

@@ -0,0 +1 @@
+0.4.2

data/ext/{blockenspiel → unmixer}/extconf.rb

@@ -34,5 +34,13 @@
 ;
 
 
-require 'mkmf'
-create_makefile 'blockenspiel/unmixer_mri'
+if ::RUBY_DESCRIPTION =~ /^jruby\s/
+  
+  ::File.open('Makefile', 'w'){ |f_| f_.write(".PHONY: install\ninstall:\n") }
+  
+else
+  
+  require 'mkmf'
+  create_makefile 'blockenspiel/unmixer_mri'
+  
+end

data/ext/{blockenspiel → unmixer}/unmixer_mri.c

@@ -47,7 +47,7 @@
 */
 
 
-#include "ruby.h"
+#include <ruby.h>
 
 
 #ifndef RCLASS_SUPER

data/lib/blockenspiel.rb

@@ -43,24 +43,19 @@ module Blockenspiel
 end
 
 
-includes_ = [
- 'errors',
- 'dsl_setup',
- 'builder',
- 'impl',
- 'version',
-]
-
-
-dir_ = ::File.expand_path('blockenspiel', ::File.dirname(__FILE__))
 case ::RUBY_DESCRIPTION
 when /^ruby\s/
-  includes_.unshift('unmixer_mri')
+  require 'blockenspiel/unmixer_mri'
 when /^jruby\s/
-  require "blockenspiel_unmixer_jruby"
+  require 'blockenspiel_unmixer_jruby'
 when /^rubinius\s/
-  includes_.unshift('unmixer_rubinius')
+  require 'blockenspiel/unmixer_rubinius'
 else
-  includes_.unshift('unmixer_unimplemented')
+  require 'blockenspiel/unmixer_unimplemented'
 end
-includes_.each{ |file_| require "#{dir_}/#{file_}" }
+
+require 'blockenspiel/errors'
+require 'blockenspiel/dsl_setup'
+require 'blockenspiel/builder'
+require 'blockenspiel/impl'
+require 'blockenspiel/version'

data/lib/blockenspiel/impl.rb

@@ -121,34 +121,34 @@ module Blockenspiel
   # Following are the options understood by Blockenspiel when providing
   # code using a block:
   # 
-  # <tt>:parameterless</tt>::
+  # [<tt>:parameterless</tt>]
   #   If set to false, disables parameterless blocks and always attempts to
   #   pass a parameter to the block. Otherwise, you may set it to one of
   #   three behaviors for parameterless blocks: <tt>:mixin</tt> (the
   #   default), <tt>:instance</tt>, and <tt>:proxy</tt>. See below for
   #   detailed descriptions of these behaviors. This option key is also
   #   available as <tt>:behavior</tt>.
-  # <tt>:parameter</tt>::
+  # [<tt>:parameter</tt>]
   #   If set to false, disables blocks with parameters, and always attempts
   #   to use parameterless blocks. Default is true, enabling parameter mode.
   # 
   # The following values control the precise behavior of parameterless
   # blocks. These are values for the <tt>:parameterless</tt> option.
   # 
-  # <tt>:mixin</tt>::
+  # [<tt>:mixin</tt>]
   #   This is the default behavior. DSL methods from the target are
   #   temporarily overlayed on the caller's +self+ object, but +self+ still
   #   points to the same object, so the helper methods and instance
   #   variables from the caller's closure remain available. The DSL methods
   #   are removed when the block completes.
-  # <tt>:instance</tt>::
+  # [<tt>:instance</tt>]
   #   This behavior actually changes +self+ to the target object using
   #   <tt>instance_eval</tt>. Thus, the caller loses access to its own
   #   helper methods and instance variables, and instead gains access to the
   #   target object's instance variables. The target object's methods are
   #   not modified: this behavior does not apply any DSL method changes
   #   specified using <tt>dsl_method</tt> directives.
-  # <tt>:proxy</tt>::
+  # [<tt>:proxy</tt>]
   #   This behavior changes +self+ to a proxy object created by applying the
   #   DSL methods to an empty object, whose <tt>method_missing</tt> points
   #   back at the block's context. This behavior is a compromise between
@@ -169,19 +169,19 @@ module Blockenspiel
   # <tt>:parameter</tt>, are meaningless and ignored. However, the
   # following new options are recognized:
   # 
-  # <tt>:file</tt>::
+  # [<tt>:file</tt>]
   #   The value of this option should be a string indicating the path to
   #   the file from which the user's DSL code is coming. It is passed
   #   as the "file" parameter to eval; that is, it is included in the stack
   #   trace should an exception be thrown out of the DSL. If no code string
   #   is provided directly, this option is required and must be set to the
   #   path of the file from which to load the code.
-  # <tt>:line</tt>::
+  # [<tt>:line</tt>]
   #   This option is passed as the "line" parameter to eval; that is, it
   #   indicates the starting line number for the code string, and is used
   #   to compute line numbers for the stack trace should an exception be
   #   thrown out of the DSL. This option is optional and defaults to 1.
-  # <tt>:behavior</tt>::
+  # [<tt>:behavior</tt>]
   #   Controls how the DSL is called. Recognized values are <tt>:proxy</tt>
   #   (the default) and <tt>:instance</tt>. See below for detailed
   #   descriptions of these behaviors. Note that <tt>:mixin</tt> is not
@@ -190,14 +190,14 @@ module Blockenspiel
   # 
   # The following values are recognized for the <tt>:behavior</tt> option:
   # 
-  # <tt>:proxy</tt>::
+  # [<tt>:proxy</tt>]
   #   This behavior changes +self+ to a proxy object created by applying the
   #   DSL methods to an empty object. Thus, the code in the DSL string does
   #   not have access to the target object's internal instance variables or
   #   private methods. Furthermore, the transformations specified by
   #   <tt>dsl_method</tt> directives are honored. This is the default
   #   behavior.
-  # <tt>:instance</tt>::
+  # [<tt>:instance</tt>]
   #   This behavior actually changes +self+ to the target object using
   #   <tt>instance_eval</tt>. Thus, the code in the DSL string gains access
   #   to the target object's instance variables and private methods. Also,
@@ -528,8 +528,14 @@ module Blockenspiel
   
   begin
     require 'fiber'
+    raise ::LoadError unless defined?(::Fiber)
     def self._current_context_id  # :nodoc:
-      ::Fiber.current.object_id
+      begin
+        ::Fiber.current.object_id
+      rescue ::Exception
+        # JRuby hack (see JRUBY-5842)
+        ::Thread.current.object_id
+      end
     end
   rescue ::LoadError
     def self._current_context_id  # :nodoc:

data/lib/blockenspiel/unmixer_rubinius.rb

@@ -41,6 +41,8 @@ module Blockenspiel
   
   module Unmixer
     
+    @old_metaclass = ''.respond_to?(:metaclass)
+    
     
     # Unmix a module from an object in Rubinius.
     # 
@@ -52,7 +54,7 @@ module Blockenspiel
     # Rubinius 1.0 release.
     
     def self.unmix(obj_, mod_)  # :nodoc:
-      last_super_ = obj_.metaclass
+      last_super_ = @old_metaclass ? obj_.metaclass : obj_.singleton_class
       this_super_ = last_super_.direct_superclass
       while this_super_
         if (this_super_ == mod_ || this_super_.respond_to?(:module) && this_super_.module == mod_)

data/lib/blockenspiel/version.rb

@@ -37,7 +37,7 @@
 module Blockenspiel
   
   # Current gem version, as a frozen string.
-  VERSION_STRING = '0.4.1'.freeze
+  VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../Version').strip.freeze
   
   autoload(:VERSION, ::File.dirname(__FILE__)+'/versionomy.rb')
   

data/{tests → test}/tc_basic.rb

@@ -37,7 +37,7 @@
 
 
 require 'test/unit'
-require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/blockenspiel.rb")
+require 'blockenspiel'
 
 
 module Blockenspiel

data/{tests → test}/tc_behaviors.rb

@@ -37,13 +37,13 @@
 
 
 require 'test/unit'
-require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/blockenspiel.rb")
+require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
     
-    class TextBehaviors < ::Test::Unit::TestCase  # :nodoc:
+    class TestBehaviors < ::Test::Unit::TestCase  # :nodoc:
       
       
       class Target1 < ::Blockenspiel::Base
@@ -96,7 +96,7 @@ module Blockenspiel
           context_self_.assert_raise(::NoMethodError){ set_value3_dslversion('d', 4) }
           context_self_.assert_raise(::NoMethodError){ helper_method() }
           context_self_.assert(!instance_variable_defined?(:@my_instance_variable_test))
-          context_self_.assert_instance_of(::Blockenspiel::Tests::TextBehaviors::Target1, self)
+          context_self_.assert_instance_of(::Blockenspiel::Tests::TestBehaviors::Target1, self)
         end
         ::Blockenspiel.invoke(block_, Target1.new(hash_), :parameterless => :instance)
         assert_equal(1, hash_['a1'])
@@ -123,7 +123,7 @@ module Blockenspiel
           context_self_.assert_raise(::NoMethodError){ set_value3('d', 4) }
           context_self_.assert(helper_method())
           context_self_.assert(!instance_variable_defined?(:@my_instance_variable_test))
-          context_self_.assert(!self.kind_of?(::Blockenspiel::Tests::TextBehaviors::Target1))
+          context_self_.assert(!self.kind_of?(::Blockenspiel::Tests::TestBehaviors::Target1))
           context_self_.assert_not_equal(context_self_, self)
         end
         ::Blockenspiel.invoke(block_, Target1.new(hash_), :parameterless => :proxy)

data/{tests → test}/tc_dsl_attrs.rb

@@ -37,7 +37,7 @@
 
 
 require 'test/unit'
-require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/blockenspiel.rb")
+require 'blockenspiel'
 
 
 module Blockenspiel

data/{tests → test}/tc_dsl_methods.rb

@@ -37,7 +37,7 @@
 
 
 require 'test/unit'
-require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/blockenspiel.rb")
+require 'blockenspiel'
 
 
 module Blockenspiel

data/{tests → test}/tc_dynamic.rb

@@ -37,7 +37,7 @@
 
 
 require 'test/unit'
-require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/blockenspiel.rb")
+require 'blockenspiel'
 
 
 module Blockenspiel

data/test/tc_embedded_block.rb

@@ -0,0 +1,93 @@
+# -----------------------------------------------------------------------------
+# 
+# Blockenspiel behavior tests
+# 
+# This file contains tests for behavior settings.
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2008-2009 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'blockenspiel'
+
+
+module Blockenspiel
+  module Tests  # :nodoc:
+    
+    class TestEmbeddedBlock < ::Test::Unit::TestCase  # :nodoc:
+      
+      
+      class Target1 < ::Blockenspiel::Base
+        
+        def initialize(value_)
+          @value = value_
+          @block = nil
+        end
+        
+        def set_block(&block_)
+          @block = block_
+        end
+        
+        def value
+          @value
+        end
+        
+        dsl_methods false
+        
+        def call_block
+          @block.call
+        end
+        
+      end
+      
+      
+      BLOCK = ::Proc.new do
+        set_block do
+          self.value
+        end
+      end
+      
+      
+      # Test an embedded block with a proxy.
+      
+      def test_proxy_embedded_block
+        return  # TEMP
+        target_ = Target1.new(23)
+        ::Blockenspiel.invoke(BLOCK, target_, :parameterless => :proxy)
+        assert_equal(23, target_.call_block)
+      end
+      
+      
+    end
+    
+  end
+end

data/{tests → test}/tc_mixins.rb

@@ -38,7 +38,7 @@
 
 
 require 'test/unit'
-require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/blockenspiel.rb")
+require 'blockenspiel'
 
 
 module Blockenspiel

data/{tests → test}/tc_modules.rb

@@ -37,7 +37,7 @@
 
 
 require 'test/unit'
-require ::File.expand_path("#{::File.dirname(__FILE__)}/../lib/blockenspiel.rb")
+require 'blockenspiel'
 
 
 module Blockenspiel

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: blockenspiel
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -07:00
-default_executable: 
+date: 2011-06-03 00:00:00 Z
 dependencies: []
 
 description: Blockenspiel is a helper library designed to make it easy to implement DSL blocks. It is designed to be comprehensive and robust, supporting most common usage patterns, and working correctly in the presence of nested blocks and multithreading.
@@ -24,16 +18,13 @@ email: dazuma@gmail.com
 executables: []
 
 extensions: 
-- ext/blockenspiel/extconf.rb
+- ext/unmixer/extconf.rb
 extra_rdoc_files: 
-- README.rdoc
 - Blockenspiel.rdoc
 - History.rdoc
 - ImplementingDSLblocks.rdoc
+- README.rdoc
 files: 
-- ext/blockenspiel/unmixer_mri.c
-- ext/blockenspiel/extconf.rb
-- ext/blockenspiel/BlockenspielUnmixerJrubyService.java
 - lib/blockenspiel/builder.rb
 - lib/blockenspiel/dsl_setup.rb
 - lib/blockenspiel/errors.rb
@@ -43,21 +34,22 @@ files:
 - lib/blockenspiel/version.rb
 - lib/blockenspiel/versionomy.rb
 - lib/blockenspiel.rb
-- lib/blockenspiel_unmixer_jruby.jar
-- tests/files/file1.rb
-- tests/tc_basic.rb
-- tests/tc_behaviors.rb
-- tests/tc_dsl_attrs.rb
-- tests/tc_dsl_methods.rb
-- tests/tc_dynamic.rb
-- tests/tc_mixins.rb
-- tests/tc_modules.rb
+- ext/unmixer/unmixer_mri.c
+- ext/unmixer/extconf.rb
+- test/files/file1.rb
+- test/tc_basic.rb
+- test/tc_behaviors.rb
+- test/tc_dsl_attrs.rb
+- test/tc_dsl_methods.rb
+- test/tc_dynamic.rb
+- test/tc_embedded_block.rb
+- test/tc_mixins.rb
+- test/tc_modules.rb
 - Blockenspiel.rdoc
 - History.rdoc
 - ImplementingDSLblocks.rdoc
 - README.rdoc
-- Rakefile
-has_rdoc: true
+- Version
 homepage: http://virtuoso.rubyforge.org/blockenspiel
 licenses: []
 
@@ -71,33 +63,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: virtuoso
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Blockenspiel is a helper library designed to make it easy to implement DSL blocks.
 test_files: 
-- tests/tc_basic.rb
-- tests/tc_behaviors.rb
-- tests/tc_dsl_attrs.rb
-- tests/tc_dsl_methods.rb
-- tests/tc_dynamic.rb
-- tests/tc_mixins.rb
-- tests/tc_modules.rb
+- test/tc_basic.rb
+- test/tc_behaviors.rb
+- test/tc_dsl_attrs.rb
+- test/tc_dsl_methods.rb
+- test/tc_dynamic.rb
+- test/tc_embedded_block.rb
+- test/tc_mixins.rb
+- test/tc_modules.rb

data/Rakefile

@@ -1,274 +0,0 @@
-# -----------------------------------------------------------------------------
-# 
-# Blockenspiel Rakefile
-# 
-# -----------------------------------------------------------------------------
-# Copyright 2008-2010 Daniel Azuma
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rdoc'
-require 'rdoc/rdoc'
-require 'rdoc/generator/darkfish'
-
-require ::File.expand_path("#{::File.dirname(__FILE__)}/lib/blockenspiel/version")
-
-
-# Configuration
-
-EXTRA_RDOC_FILES = ['README.rdoc', 'Blockenspiel.rdoc', 'History.rdoc', 'ImplementingDSLblocks.rdoc']
-
-
-# Environment configuration
-
-dlext_ = Config::CONFIG['DLEXT']
-platform_ =
-  case ::RUBY_DESCRIPTION
-  when /^jruby\s/ then :jruby
-  when /^ruby\s/ then :mri
-  when /^rubinius\s/ then :rubinius
-  else :unknown
-  end
-
-
-# Default task
-
-task :default => [:clean, :rdoc, :package, :test]
-
-
-# Clean task
-
-CLEAN.include(['ext/blockenspiel/Makefile*', "**/*.#{dlext_}", "**/*.rbc", 'ext/blockenspiel/*.o', '**/*.jar', 'ext/blockenspiel/*.class', 'idslb_markdown.txt', 'doc', 'pkg'])
-
-
-# Test task
-
-task :test => :build
-::Rake::TestTask.new('test') do |task_|
-  task_.pattern = 'tests/tc_*.rb'
-end
-
-
-# RDoc task
-
-::Rake::RDocTask.new do |task_|
-  task_.main = 'README.rdoc'
-  task_.rdoc_files.include(*EXTRA_RDOC_FILES)
-  task_.rdoc_files.include(['lib/blockenspiel.rb', 'lib/blockenspiel/*.rb'])
-  task_.rdoc_dir = 'doc'
-  task_.title = "Blockenspiel #{::Blockenspiel::VERSION_STRING} documentation"
-  task_.options << '--format=darkfish'
-end
-
-
-# Gem package task
-
-task :package => [:build_jruby] do
-  mkdir_p('pkg')
-  
-  # Common gemspec
-  def create_gemspec
-    ::Gem::Specification.new do |s_|
-      s_.name = 'blockenspiel'
-      s_.summary = 'Blockenspiel is a helper library designed to make it easy to implement DSL blocks.'
-      s_.version = ::Blockenspiel::VERSION_STRING.dup
-      s_.author = 'Daniel Azuma'
-      s_.email = 'dazuma@gmail.com'
-      s_.description = 'Blockenspiel is a helper library designed to make it easy to implement DSL blocks. It is designed to be comprehensive and robust, supporting most common usage patterns, and working correctly in the presence of nested blocks and multithreading.'
-      s_.homepage = 'http://virtuoso.rubyforge.org/blockenspiel'
-      s_.rubyforge_project = 'virtuoso'
-      s_.required_ruby_version = '>= 1.8.7'
-      s_.files = ::FileList['ext/**/*.{c,rb,java}', 'lib/**/*.{rb,jar}', 'tests/**/*.rb', '*.rdoc', 'Rakefile'].to_a
-      s_.extra_rdoc_files = EXTRA_RDOC_FILES.dup
-      s_.has_rdoc = true
-      s_.test_files = FileList['tests/tc_*.rb']
-      yield s_
-    end
-  end
-  
-  # Normal platform gemspec
-  gemspec_ = create_gemspec do |s_|
-    s_.platform = ::Gem::Platform::RUBY
-    s_.extensions = ['ext/blockenspiel/extconf.rb']
-  end
-  ::Gem::Builder.new(gemspec_).build
-  mv "blockenspiel-#{::Blockenspiel::VERSION_STRING}.gem", 'pkg'
-  
-  # JRuby gemspec
-  gemspec_ = create_gemspec do |s_|
-    s_.platform = 'java'
-    s_.files += ['lib/blockenspiel_unmixer_jruby.jar']
-  end
-  ::Gem::Builder.new(gemspec_).build
-  mv "blockenspiel-#{::Blockenspiel::VERSION_STRING}-java.gem", 'pkg'
-end
-
-
-# General build task
-
-case platform_
-when :jruby
-  task :build => [:build_jruby]
-when :mri
-  task :build => [:build_mri]
-else
-  task :build
-end
-
-
-# Build tasks for MRI.
-# These are available only if the current rake is running under MRI.
-# They build the C extension for the current MRI.
-
-if platform_ == :mri
-  
-  if ::RUBY_VERSION =~ /^1\.8\..*$/
-    mri_version_suffix_ = '18'
-  elsif ::RUBY_VERSION =~ /^1\.9\..*$/
-    mri_version_suffix_ = '19'
-  else
-    raise "Unknown version of Matz Ruby Interpreter (#{::RUBY_VERSION})"
-  end
-  
-  makefile_name_ = "Makefile#{mri_version_suffix_}"
-  unmixer_general_name_ = "unmixer_mri.#{dlext_}"
-  unmixer_name_ = "unmixer_mri#{mri_version_suffix_}.#{dlext_}"
-  
-  desc 'Ensures the MRI C extension appropriate to the current platform is present'
-  task :build_mri => ["ext/blockenspiel/#{unmixer_name_}"] do
-    cp "ext/blockenspiel/#{unmixer_name_}", "lib/blockenspiel/#{unmixer_general_name_}"
-  end
-  
-  file "ext/blockenspiel/#{unmixer_name_}" => ["ext/blockenspiel/#{makefile_name_}"] do
-    ::Dir.chdir('ext/blockenspiel') do
-      cp makefile_name_, 'Makefile'
-      sh 'make'
-      rm 'unmixer_mri.o'
-      mv unmixer_general_name_, unmixer_name_
-    end
-  end
-  
-  file "ext/blockenspiel/#{makefile_name_}" do
-    ::Dir.chdir('ext/blockenspiel') do
-      ruby 'extconf.rb'
-      mv 'Makefile', makefile_name_
-    end  
-  end
-  
-end
-
-
-# Build tasks for JRuby.
-# These are available under any ruby.
-# They assume that $JRUBY_HOME is set, and that the javac and jar
-# binaries are in the current path.
-
-desc 'Builds the JRuby extension'
-task :build_jruby => ['lib/blockenspiel_unmixer_jruby.jar']
-
-file 'lib/blockenspiel_unmixer_jruby.jar' do
-  ::Dir.chdir('ext/blockenspiel') do
-    sh 'javac -source 1.5 -target 1.5 -classpath $JRUBY_HOME/lib/jruby.jar BlockenspielUnmixerJrubyService.java'
-    sh 'jar cf blockenspiel_unmixer_jruby.jar BlockenspielUnmixerJrubyService.class'
-  end
-  mv 'ext/blockenspiel/blockenspiel_unmixer_jruby.jar', 'lib'
-end
-
-
-# Publish RDocs
-
-desc 'Publishes RDocs to RubyForge'
-task :publish_rdoc_to_rubyforge => [:rerdoc] do
-  config_ = ::YAML.load(::File.read(::File.expand_path("~/.rubyforge/user-config.yml")))
-  username_ = config_['username']
-  sh "rsync -av --delete doc/ #{username_}@rubyforge.org:/var/www/gforge-projects/virtuoso/blockenspiel"
-end
-
-
-# Publish gem
-
-task :release_gem => [:package] do |t_|
-  v_ = ::ENV["VERSION"]
-  abort "Must supply VERSION=x.y.z" unless v_
-  if v_ != ::Blockenspiel::VERSION_STRING
-    abort "Versions don't match: #{v_} vs #{::Blockenspiel::VERSION_STRING}"
-  end
-  puts "Releasing blockenspiel #{v_}"
-  ::Dir.chdir('pkg') do
-    sh "gem push blockenspiel-#{v_}.gem"
-    sh "gem push blockenspiel-#{v_}-java.gem"
-  end
-end
-
-
-# Publish everything
-
-task :release => [:release_gem, :publish_rdoc_to_rubyforge]
-
-
-# Custom task that takes the implementing dsl blocks paper
-# and converts it from RDoc format to Markdown
-
-task :idslb_markdown do
-  ::File.open('ImplementingDSLblocks.rdoc') do |read_|
-    ::File.open('idslb_markdown.txt', 'w') do |write_|
-      linenum_ = 0
-      read_.each do |line_|
-        linenum_ += 1
-        next if linenum_ < 4
-        line_.sub!(/^===\ /, '### ')
-        line_.sub!(/^\ \ /, '    ')
-        if line_[0..3] == '### '
-          line_.gsub!(/(\w)_(\w)/, '\1\_\2')
-        end
-        if line_[0..3] != '    '
-          line_.gsub!('"it_should_behave_like"', '"it\_should\_behave\_like"')
-          line_.gsub!('"time_zone"', '"time\_zone"')
-          line_.gsub!(/\+(\w+)\+/, '`\1`')
-          line_.gsub!(/\*(\w+)\*/, '**\1**')
-          line_.gsub!(/<\/?em>/, '*')
-          line_.gsub!(/<\/?tt>/, '`')
-          line_.gsub!(/<\/?b>/, '**')
-          line_.gsub!(/\{([^\}]+)\}\[([^\]]+)\]/) do |match_|
-            text_, url_ = $1, $2
-            "[#{text_.gsub('_', '\_')}](#{url_})"
-          end
-          line_.gsub!(/\ (http:\/\/[^\s]+)/, ' [\1](\1)')
-        end
-        write_.puts(line_)
-      end
-    end
-  end
-end

data/ext/blockenspiel/BlockenspielUnmixerJrubyService.java

@@ -1,140 +0,0 @@
-/*
-  -----------------------------------------------------------------------------
-  
-  Blockenspiel unmixer (JRuby implementation)
-  
-  -----------------------------------------------------------------------------
-  Copyright 2008-2009 Daniel Azuma
-  
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-  
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-  * Neither the name of the copyright holder, nor the names of any other
-    contributors to this software, may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-  -----------------------------------------------------------------------------
-*/
-
-
-/*
-  This implementation based on Mixology 0.1,
-  written by Patrick Farley, anonymous z, Dan Manges, and Clint Bishop.
-  http://rubyforge.org/projects/mixology
-  http://github.com/dan-manges/mixology
-  
-  It has been stripped down and modified for JRuby 1.2 compatibility.
-*/
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
- 
-import org.jruby.Ruby;
-import org.jruby.RubyArray;
-import org.jruby.RubyClass;
-import org.jruby.RubyModule;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.IncludedModuleWrapper;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.load.BasicLibraryService;
-
-
-public class BlockenspielUnmixerJrubyService implements BasicLibraryService
-{
-    
-    public boolean basicLoad(final Ruby runtime) throws IOException
-    {
-        RubyModule blockenspielModule = runtime.getOrCreateModule("Blockenspiel");
-        RubyModule unmixerModule = runtime.defineModuleUnder("Unmixer", blockenspielModule);
-        unmixerModule.getSingletonClass().defineAnnotatedMethods(BlockenspielUnmixerJrubyService.class);
-        return true;
-    }
-    
-    
-    @JRubyMethod(name = "unmix", required = 2)
-    public synchronized static IRubyObject unmix(IRubyObject self, IRubyObject receiver, IRubyObject module, Block block)
-        throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
-    {
-        RubyModule actualModule = (RubyModule)module;
-        RubyClass klass = receiver.getMetaClass();
-        while (klass != receiver.getMetaClass().getRealClass())
-        {
-            RubyClass superClass = klass.getSuperClass();
-            if (superClass != null && superClass.getNonIncludedClass() == actualModule)
-            {
-                if (actualModule.getSuperClass() != null &&
-                    actualModule.getSuperClass() instanceof IncludedModuleWrapper)
-                {
-                    removeNestedModule(superClass, actualModule);
-                }
-                setSuperClass(klass, superClass.getSuperClass());
-                invalidateCacheDescendants(klass);
-            }
-            klass = superClass;
-        }
-        return receiver;
-    }
-    
-    
-    protected synchronized static void removeNestedModule(RubyClass klass, RubyModule module) 
-        throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
-    {
-        if ((klass.getSuperClass() instanceof IncludedModuleWrapper) &&
-            ((IncludedModuleWrapper)klass.getSuperClass()).getNonIncludedClass() ==
-            ((IncludedModuleWrapper)module.getSuperClass()).getNonIncludedClass())
-        {
-            if (module.getSuperClass().getSuperClass() != null &&
-                module.getSuperClass() instanceof IncludedModuleWrapper)
-            {
-                removeNestedModule(klass.getSuperClass(), module.getSuperClass());
-            }
-            setSuperClass(klass, klass.getSuperClass().getSuperClass());
-        }
-    }
-    
-    
-    protected synchronized static void setSuperClass(RubyModule klass, RubyModule superClass)
-        throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
-    {
-        Method method = RubyModule.class.getDeclaredMethod("setSuperClass",
-                                                           new Class[] {RubyClass.class} );
-        method.setAccessible(true);
-        Object[] superClassArg = new Object[] { superClass };
-        method.invoke(klass, superClassArg);
-    }
-    
-    
-    protected synchronized static void invalidateCacheDescendants(RubyModule klass)
-        throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
-    {
-        Method method = RubyModule.class.getDeclaredMethod("invalidateCacheDescendants", new Class[0]);
-        method.setAccessible(true);
-        method.invoke(klass, new Object[0]);
-    }
-    
-}
-