duby 0.0.2-java → 0.0.3-java

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.0.3 / 2010-06-09
+
+* Even more language features!
+* invokedynamic support (sort of)
+* Using mirror types to avoid class initialization
+* Other stuff
+
 === 0.0.2 / 2010-02-15
 
 * More language features added

data/README.txt

@@ -20,20 +20,31 @@ output either JVM bytecode or Java source files.
 duby <script.duby>
 duby -e "inline script"
 dubyc <script.duby>
-dubyc -e "inline script" # produces dash_e.class
+dubyc -e "inline script" # produces DashE.class
 dubyc -java <script.duby>
-dubyc -java -e "inline script" # produces dash_e.java
+dubyc -java -e "inline script" # produces DashE.java
 
 == REQUIREMENTS:
 
-* JRuby 1.4RC2 or higher.
+* JRuby 1.5.0 or higher.
 * BiteScript 0.0.5 or higher
 
 == INSTALL:
 
+If your "gem" command is the one from JRuby:
+
 * gem install duby
 
-To build from source you should have a checkout of both jruby and
-bitescript in Duby's parent directory. Run "ant jar-complete" in
-jruby, then in the duby directory "ant bootstrap" followed by "ant"
-should build it.
+Otherwise:
+
+* jruby -S gem install duby
+
+Only JRuby is supported at this time.
+
+== For Java tools:
+
+To build the Duby jars from source you should have a checkout of both jruby and
+bitescript in Duby's parent directory. Run "ant jar-complete" in jruby, then in
+the duby directory "../jruby/bin/jruby -S rake jar" to build the Duby jar. Use
+"jar:complete" instead to produce a free-standing jar file with JRuby and the
+JRubyParser libraries included.

data/Rakefile

@@ -1,6 +1,10 @@
 require 'rake'
 require 'rake/testtask'
 require 'java'
+$: << './lib'
+require 'duby'
+require 'jruby/compiler'
+require 'ant'
 
 task :default => :test
 
@@ -11,3 +15,71 @@ Rake::TestTask.new :test do |t|
   t.test_files = FileList["test/**/*.rb"]
   java.lang.System.set_property("jruby.duby.enabled", "true")
 end
+
+task :init do
+  mkdir_p 'dist'
+  mkdir_p 'build'
+end
+
+task :clean do
+  ant.delete :quiet => true, :dir => 'build'
+  ant.delete :quiet => true, :dir => 'dist'
+end
+
+task :compile => :init do
+  # build the Ruby sources
+  puts "Compiling Ruby sources"
+  JRuby::Compiler.compile_argv([
+    '-t', 'build',
+    '--javac',
+    'src/org/jruby/duby/duby_command.rb'
+  ])
+  
+  # build the Duby sources
+  puts "Compiling Duby sources"
+  Dir.chdir 'src' do
+    classpath = Duby::Env.encode_paths([
+        'javalib/jruby-complete.jar',
+        'javalib/JRubyParser.jar',
+        'dist/duby.jar',
+        'build',
+        '/usr/share/ant/lib/ant.jar'
+      ])
+    Duby.compile(
+      '-c', classpath,
+      '-d', '../build',
+      'org/jruby/duby',
+      'duby/lang')
+  end
+end
+
+task :jar => :compile do
+  ant.jar :jarfile => 'dist/duby.jar' do
+    fileset :dir => 'lib'
+    fileset :dir => 'build'
+    fileset :dir => '.', :includes => 'bin/*'
+    fileset :dir => '../bitescript/lib'
+    manifest do
+      attribute :name => 'Main-Class', :value => 'org.jruby.duby.DubyCommand'
+    end
+  end
+end
+
+namespace :jar do
+  task :complete => :jar do
+    ant.jar :jarfile => 'dist/duby-complete.jar' do
+      zipfileset :src => 'dist/duby.jar'
+      zipfileset :src => 'javalib/jruby-complete.jar'
+      zipfileset :src => 'javalib/JRubyParser.jar'
+      manifest do
+        attribute :name => 'Main-Class', :value => 'org.jruby.duby.DubyCommand'
+      end
+    end
+  end
+
+  task :bootstrap => :compile do
+    ant.jar :jarfile => 'javalib/duby-bootstrap.jar' do
+      fileset :dir => 'build'
+    end
+  end
+end

data/examples/ant/example-build.xml

@@ -0,0 +1,7 @@
+<project name="test">
+  <taskdef name="dubyc" classname="org.jruby.duby.ant.Compile"/>
+
+  <target name="blah">
+    <dubyc src="examples/fib.duby" target="build"/>
+  </target>
+</project>

data/examples/appengine/Rakefile

@@ -1,72 +1,13 @@
-require 'appengine-sdk'
-require 'appengine-tools/web-xml'
-require 'appengine-tools/xml-formatter'
+$: << File.expand_path(File.dirname(__FILE__) + '/lib')
+require 'duby/appengine_tasks'
 
-SRC = File.expand_path(File.dirname(__FILE__) + '/src')
-LIB = File.expand_path(File.dirname(__FILE__) + '/lib')
-WAR = File.expand_path(File.dirname(__FILE__) + '/war')
-CONFIG_RU = File.expand_path(File.dirname(__FILE__) + '/config.ru')
-SERVLET = AppEngine::SDK::SDK_ROOT +
-          '/lib/shared/geronimo-servlet_2.5_spec-1.2.jar'
-APIS = AppEngine::SDK::API_JAR
+appengine_app :app
 
-WEB_INF_CLASSES = WAR + '/WEB-INF/classes'
-WEB_XML = WAR + '/WEB-INF/web.xml'
-AEWEB_XML = WAR + '/WEB-INF/appengine-web.xml'
+DUBY_APP = "#{Duby.dest_path}/com/ribrdb/DubyApp.class"
+MODEL = "#{Duby.dest_path}/com/google/appengine/ext/duby/db/Model.class"
+LIST = "#{Duby.source_path}/com/ribrdb/list.dhtml"
 
-MODEL = 'com/google/appengine/ext/duby/db/Model'
-DUBY_APP = 'com/ribrdb/DubyApp'
-
-MODEL_DUBY = "#{SRC}/#{MODEL}.duby"
-MODEL_CLASS = "#{WEB_INF_CLASSES}/#{MODEL}.class"
-DUBY_APP_DUBY = "#{SRC}/#{DUBY_APP}.duby"
-DUBY_APP_CLASS = "#{WEB_INF_CLASSES}/#{DUBY_APP}.class"
-LIST = "#{SRC}/com/ribrdb/list.dhtml"
-
-def dubyc(*files)
-  chdir(File.dirname(__FILE__) + '/src') do
-    files = files.join ' '
-    dest = '-d ../war/WEB-INF/classes'
-    dubyc = '../../../bin/dubyc'
-    options = "-I #{LIB} -p datastore"
-    orig_classpath = ENV['CLASSPATH']
-    ENV['CLASSPATH'] ||= ''
-    ENV['CLASSPATH'] += ":#{SERVLET}:#{APIS}:#{WEB_INF_CLASSES}"
-    sh %{#{dubyc} #{dest} #{options} #{files}}
-    ENV['CLASSPATH'] = orig_classpath
-  end
-end
-
-directory WEB_INF_CLASSES
-
-file MODEL_CLASS => MODEL_DUBY do
-  dubyc("#{MODEL}.duby")
-end
-
-file DUBY_APP_CLASS => [DUBY_APP_DUBY, LIST, MODEL_CLASS] do
-  dubyc("#{DUBY_APP}.duby")
-end
-
-file WEB_XML => [WEB_INF_CLASSES, CONFIG_RU] do
-  builder = WebXmlBuilder.new do
-    eval IO.read(CONFIG_RU), nil, 'config.ru', 1
-  end
-  open(WEB_XML, 'w') do |webxml|
-    xml = AppEngine::Rack::XmlFormatter.format(builder.to_xml)
-    webxml.write(xml)
-  end
-  open(AEWEB_XML, 'w') do |aeweb|
-    xml = AppEngine::Rack::XmlFormatter.format(AppEngine::Rack.app.to_xml)
-    aeweb.write(xml)
-  end
-end
-
-task :server => [WEB_XML, DUBY_APP_CLASS] do
-  sh "dev_appserver.rb #{WAR}"
-end
-
-task :upload => [WEB_XML, DUBY_APP_CLASS] do
-  sh "appcfg.rb update #{WAR}"
-end
+Rake::Task[DUBY_APP].enhance([LIST, MODEL])
 
+task :app => DUBY_APP
 task :default => :server

data/examples/appengine/Readme

@@ -1,8 +1,9 @@
-Run rake to compile the application and start the development server.
+Run rake to compile the application and start the development server:
+
+$ jruby -I `pwd`/../../lib -S rake
 
 Requirements:
- - Install the google-appengine gem (under MRI, not JRUBY)
- - Have jruby on your path so dubyc can run.
+ - jruby -S gem install google-appengine bitescript
 
 Datastore API:
   Model.get(key)

data/examples/appengine/lib/duby/appengine_tasks.rb

@@ -0,0 +1,173 @@
+require 'appengine-sdk'
+require 'appengine-tools/appcfg'
+require 'appengine-tools/dev_appserver'
+require 'appengine-tools/web-xml'
+require 'appengine-tools/xml-formatter'
+require 'duby_task'
+require 'java'
+require 'open-uri'
+require 'rake'
+require 'yaml'
+
+Duby.compiler_options.concat %w"-p datastore"
+AppEngine::Development::JRubyDevAppserver::ARGV = []
+module AppEngine::Rake
+  SERVLET = AppEngine::SDK::SDK_ROOT +
+            '/lib/shared/geronimo-servlet_2.5_spec-1.2.jar'
+  APIS = AppEngine::SDK::API_JAR
+
+  $CLASSPATH << SERVLET
+  $CLASSPATH << APIS
+
+  class AppEngineTask < Rake::Task
+    def initialize(*args, &block)
+      super
+      AppEngineTask.tasks << self
+    end
+
+    def init(src, war)
+      @src = src
+      @war = war
+      unless $CLASSPATH.include?(webinf_classes)
+        $CLASSPATH << webinf_classes
+      end
+      Duby.source_path = src
+      Duby.dest_path = webinf_classes
+      directory(webinf_classes)
+      directory(generated)
+      file_create dummy_config_ru do |t|
+        touch t.name
+      end
+      file_create gemfile do |t|
+        open(t.name, 'w') do |gems|
+          gems.puts('bundle_path ".gems/bundler_gems"')
+        end
+      end
+      file web_xml => [webinf_classes, real_config_ru] do
+        config_ru = IO.read(real_config_ru)
+        builder = WebXmlBuilder.new do
+          eval config_ru, nil, 'config.ru', 1
+        end
+        open(web_xml, 'w') do |webxml|
+          xml = AppEngine::Rack::XmlFormatter.format(builder.to_xml)
+          webxml.write(xml)
+        end
+        open(aeweb_xml, 'w') do |aeweb|
+          xml = AppEngine::Rack::XmlFormatter.format(AppEngine::Rack.app.to_xml)
+          aeweb.write(xml)
+        end
+      end
+      file build_status => [web_xml, dummy_config_ru, aeweb_xml, generated] do
+        open(build_status, 'w') do |status_file|
+          status = {
+            :config_ru => File.stat(dummy_config_ru).mtime,
+            :web_xml => File.stat(web_xml).mtime,
+            :aeweb_xml => File.stat(aeweb_xml).mtime,
+          }
+          status_file.write(status.to_yaml)
+        end
+      end
+
+      task :server => [name, build_status] do
+        # Begin horrible hacks
+        if AppEngine::Development::JRubyDevAppserver::ARGV.empty?
+          AppEngine::Development::JRubyDevAppserver::ARGV << @war
+        end
+        class << AppEngine::Development::JRubyDevAppserver
+          def exec(*args)
+            sh *args
+          end
+        end
+        # End horrible hacks
+        check_for_updates
+        AppEngine::Development::JRubyDevAppserver.run([@war])
+        @done = true
+        @update_thread.join
+      end
+      task :upload => [name, build_status] do
+        AppEngine::Admin::JRubyAppCfg.main(['update', @war])
+      end
+
+      enhance([web_xml])
+    end
+
+    def real_prerequisites
+      prerequisites.map {|n| application[n, scope]}
+    end
+
+    def check_for_updates
+      @update_thread = Thread.new do
+        # Give the server time to start
+        next_time = Time.now + 5
+        until @done
+          sleep_time = next_time - Time.now
+          sleep(sleep_time) if sleep_time > 0
+          next_time = Time.now + 1
+          update
+        end
+      end
+    end
+
+    def update
+      updated = false
+      real_prerequisites.each do |dep|
+        if dep.needed?
+          dep.execute
+          updated = true
+        end
+      end
+      if updated
+        #touch aeweb_xml
+        open('http://localhost:8080/_ah/reloadwebapp')
+      end
+    end
+
+    def webinf_classes
+      @war + '/WEB-INF/classes'
+    end
+
+    def aeweb_xml
+      @war + '/WEB-INF/appengine-web.xml'
+    end
+
+    def web_xml
+      @war + '/WEB-INF/web.xml'
+    end
+
+    def real_config_ru
+      @src + '/config.ru'
+    end
+
+    def dummy_config_ru
+      @war + '/config.ru'
+    end
+
+    def generated
+      @war + '/WEB-INF/appengine-generated'
+    end
+
+    def build_status
+      generated + '/build_status.yaml'
+    end
+
+    def gemfile
+      @war + '/Gemfile'
+    end
+  end
+end
+
+def appengine_app(*args, &block)
+  deps = []
+  if args[-1].kind_of?(Hash)
+    hash = args.pop
+    arg = hash.keys[0]
+    deps = hash[arg]
+    args << arg
+  end
+  name, src, war = args
+  task = AppEngine::Rake::AppEngineTask.define_task(name => deps, &block)
+  src = File.expand_path(src || 'src')
+  war = File.expand_path(war || 'war')
+  task.init(src, war)
+  task
+end

data/examples/appengine/lib/duby/plugin/datastore.rb

@@ -1,10 +1,42 @@
 class DatastorePlugin
   @models = {}
-  
+
+  TypeMap = {
+    'Category' => 'String',
+    'Email' => 'String',
+    'Link' => 'String',
+    'PhoneNumber' => 'String',
+    'PostalAddress' => 'String',
+    'Text' => 'String',
+    'Blob' => 'byte[]',
+    'ShortBlob' => 'byte[]',
+    'Rating' => 'int',
+    'Integer' => 'int',
+    'Double' => 'double',
+  }
+
+  Defaults = {
+    'Rating' => '0',
+    'int' => '0',
+    'double' => '0.0',
+  }
+
+  Conversions = {
+    'Category' => 'getCategory',
+    'Email' => 'getEmail',
+    'Link' => 'getValue',
+    'PhoneNumber' => 'getNumber',
+    'PostalAddress' => 'getAddress',
+    'Text' => 'getValue',
+    'Blob' => 'getBytes',
+    'Integer' => 'intValue',
+    'Double' => 'doubleValue',
+  }
+
   class ModelState
     include Duby::AST
     attr_reader :kind, :query, :read, :save, :transformer
-    
+
     def initialize(transformer, klass, parent, position, ast)
       @transformer = transformer
       @kind = klass.name.split('.')[-1]
@@ -13,13 +45,13 @@ class DatastorePlugin
       init_read(parent, position, ast)
       init_save(parent, position, ast)
     end
-    
+
     def init_query(classname, parent, position, ast)
       name = "#{classname}$Query"
       @query = ClassDefinition.new(parent, position, name) do |classdef|
         queryinit = <<-EOF
           def initialize; end
-        
+
           def kind
             "#{kind}"
           end
@@ -54,29 +86,29 @@ class DatastorePlugin
         [Duby::AST.type('com.google.appengine.ext.duby.db.DQuery'),
          eval(classdef, queryinit)]
       end
-      ast.children << @query
+      ast << @query
     end
-    
+
     def init_read(parent, position, ast)
       @read = eval(parent, <<-EOF)
         def _read_from(e:Entity)
         end
       EOF
-      @read.body = @read.children[2] = Body.new(@read, position) {[]}
-      ast.children << @read
+      @read.body = Body.new(@read, position) {[]}
+      ast << @read
     end
-    
+
     def init_save(parent, position, ast)
       @save = eval(parent, <<-EOF)
         def _save_to(e:Entity)
         end
       EOF
-      @save.body = @save.children[2] = Body.new(@save, position) {[]}
-      ast.children << @save
+      @save.body = Body.new(@save, position) {[]}
+      ast << @save
     end
-    
+
     def init_static(parent, ast)
-      ast.children << eval(parent, <<-EOF)
+      ast << eval(parent, <<-EOF)
         import com.google.appengine.api.datastore.Entity
         import com.google.appengine.api.datastore.Blob
         import com.google.appengine.api.datastore.Category
@@ -97,7 +129,7 @@ class DatastorePlugin
           m._read_from(Model._datastore.get(key))
           m
         end
-        
+
         def self.all
           #{kind}__Query__.new
         end
@@ -105,30 +137,48 @@ class DatastorePlugin
     end
 
     def eval(parent, src)
-      ast = Duby::AST.parse_ruby(src, __FILE__)
-      transformer.transform(ast.body_node, parent)
+      transformer.eval(src, __FILE__, parent)
     end
 
     def extend_query(code)
-      query.body.children << eval(query.body, code)
+      query.body << eval(query.body, code)
     end
 
     def extend_read(code)
       code = 'e=nil;' + code
       read.body.children.concat eval(read.body, code).children[1..-1]
     end
-    
+
     def extend_save(code)
       code = 'e=nil;' + code
       save.body.children.concat eval(save.body, code).children[1..-1]
     end
   end
-  
+
   def self.find_class(node)
     node = node.parent until Duby::AST::ClassDefinition === node
     node
   end
-  
+
+  def self.to_datastore(type, value)
+    if TypeMap.include?(type)
+      "(#{value} ? #{type}.new(#{value}) : nil)"
+    else
+      value
+    end
+  end
+
+  def self.from_datastore(type, value)
+    duby_type = TypeMap[type]
+    if duby_type
+      default = Defaults.fetch(type, "#{duby_type}(nil)")
+      conversion = Conversions[type]
+      "(#{value} ? #{type}(#{value}).#{conversion} : #{default})"
+    else
+      "#{type}(#{value})"
+    end
+  end
+
   Duby::AST.defmacro("property") do |transformer, fcall, parent|
     result = Duby::AST::Body.new(parent, fcall.position) {[]}
     klass = find_class(parent)
@@ -141,31 +191,42 @@ class DatastorePlugin
     name = fcall.args_node.get(0).name
     type = fcall.args_node.get(1).name
 
+    duby_type = TypeMap.fetch(type, type)
+
     model.extend_query(<<-EOF)
-      def #{name}(value:#{type})
+      def #{name}(value:#{duby_type})
         returns :void
-        _query.addFilter("#{name}", _eq_op, value)
+        _query.addFilter("#{name}", _eq_op, #{to_datastore(type, 'value')})
       end
     EOF
-    
+
+    temp = transformer.tmp
+
     model.extend_read(<<-EOF)
-      @#{name} = #{type}(e.getProperty("#{name}"))
+      #{temp} = e.getProperty("#{name}")
+      @#{name} = #{from_datastore(type, temp)}
     EOF
-    
+
     model.extend_save(<<-EOF)
-      e.setProperty("#{name}", @#{name})
+      e.setProperty("#{name}", #{to_datastore(type, '@' + name)})
     EOF
-    
-    result.children << model.eval(parent, <<-EOF)
+
+    result << model.eval(parent, <<-EOF)
       def #{name}
         @#{name}
       end
-      
-      def #{name}=(value:#{type})
+
+      def #{name}=(value:#{duby_type})
         @#{name} = value
       end
     EOF
 
     result
   end
-end
+
+  def self.reset
+    @models = {}
+  end
+end
+
+Duby.plugins << DatastorePlugin