ropenlaszlo 0.4.0 → 0.4.1

data/doc/CHANGES

@@ -1,5 +1,10 @@
 = Change Log
 
+== Version 0.4.1 (2006/01/25)
+* bug fix: don't use popen on Windows
+* bug fix: default LPS_HOME from OPENLASZLO_HOME
+* added note about OpenLaszlo windows bug
+
 == Version 0.4.0 (2006/01/19)
 * new feature: command-line compiler detects compilation warnings
 * bug fix: command-line compilation in qualified directory places object in same directory

data/doc/README

@@ -2,7 +2,7 @@
 
 ROpenLaszo is a Ruby interface to the OpenLaszlo[openlaszlo.org] compiler.  It allows you to compile Open<tt></tt>Laszlo programs from within Ruby, in order to integrate Open<tt></tt>Laszlo development into Rake or Rails applications.
 
-If you are using Open<tt></tt>Laszlo with Ruby on Rails, you probably want the {OpenLaszlo Rails plugin}[laszlo-plugin.rubyforge.org] instead.
+If you are using Open<tt></tt>Laszlo with Ruby on Rails, you probably want the {OpenLaszlo Rails plugin}[laszlo-plugin.rubyforge.org] as well.
 
 OpenLaszlo[openlaszlo.org] programs are written in XML with embedded JavaScript, and compiled into Flash (swf) binary files, or DHTML.  (As of this writing, the DHTML target is in pre-beta form.)  The APIs in this library make it easy for Ruby code to invoke the Open<tt></tt>Laszlo compiler.  For example, if hello.lzx contains the following text:
   <canvas>
@@ -39,6 +39,8 @@ You can turn this into a Rake task that will compile any Open<tt></tt>Laszlo sou
 
 3:: (Optional)  Set your +OPENLASZLO_URL+ environment variable to the web location of the Open<tt></tt>Laszlo server; for example, <tt>http</tt><tt>://localhost:8080/lps-3.1</tt>.  If you omit this step, the module will use the command line compiler, which is slower but is not limited to compiling files inside of +OPENLASZLO_HOME+.
 
+<b>Note:</b> The command-line compiler is broken in the Windows version of Open<tt></tt>Laszlo 3.1.1.  If you are running Windows, step (3) is required.  ({OpenLaszlo bug 1428}[http://www.openlaszlo.org/jira/browse/LPP-1428])
+
 == Additional Resources
 
 * The {OpenLaszlo web site}[openlaszlo.org] is a rich source of information about the Open<tt></tt>Laszlo platform.  It includes links to the wiki, mailing lists, and forums.
@@ -49,6 +51,8 @@ You can turn this into a Rake task that will compile any Open<tt></tt>Laszlo sou
 
 * {This OpenLaszlo Blog entry}[weblog.openlaszlo.org/archives/2006/01/deploying-openlaszlo-applications-with-rake/] has additional information and some examples of using ROpenLaszlo in a Rakefile.
 
+* The RubyForge project page is here[http://rubyforge.org/projects/ropenlaszlo/].
+
 == License
 
 ROpenLaszlo is copyright (c) 2006 Oliver Steele.  It is open-source software, and may be redistributed

data/lib/compiler.rb

@@ -133,11 +133,10 @@ module OpenLaszlo
       unless @lzc
         home = options[:openlaszlo_home] || ENV['OPENLASZLO_HOME']
         raise ":compiler_script or :openlaszlo_home must be specified" unless home
-        search = lzc_directories.map{|f| File.join(home, f, 'lzc')}
+        search = bin_directories.map{|f| File.join(home, f, 'lzc')}
         found = search.select{|f| File.exists? f}
-        raise "couldn't find bin/lzc in #{search.join(' or ')}" if found.empty?
+        raise "couldn't find bin/lzc in #{bin_directories.join(' or ')}" if found.empty?
         @lzc = found.first
-        # Adjust the name for Windows:
         @lzc += '.bat' if windows?
       end
     end
@@ -149,8 +148,6 @@ module OpenLaszlo
       default_output = File.join(File.dirname(source_file),
                                  File.basename(source_file, '.lzx') + '.swf')
       output = options[:output] || default_output
-      # TODO: could handle this case by compiling to a temporary directory and
-      # renaming from there
       raise "#{source_file} and #{output} do not have the same basename." unless File.basename(source_file, '.lzx') == File.basename(output, '.swf')
       args = []
       args << '--runtime=#{options[:runtime]}' if options[:runtime]
@@ -158,27 +155,35 @@ module OpenLaszlo
       args << '--profile' if options[:profile]
       args << "--dir '#{File.dirname output}'" unless File.dirname(source_file) == File.dirname(output)
       args << source_file
-      # The compiler writes errors to stdout, warnings to stderr
-      require "open3"
-      stdin, stdout, stderr = Open3.popen3("#{@lzc} #{args.join(' ')}")
-      text = stdout.read
-      text.gsub!(/^\d+\s+/, '') # work around a bug in OpenLaszlo 3.1
-      results = {:output => output}
-      if text =~ /^Compilation errors occurred:\n/
+      command = "\"#{@lzc}\" #{args.join(' ')}"
+      ENV['LPS_HOME'] ||= ENV['OPENLASZLO_HOME']
+      begin
+        #raise NotImplementedError --- for testing Windows
+        require "open3"
+        # The compiler writes errors to stdout, warnings to stderr
+        stdin, stdout, stderr = Open3.popen3(command)
+        errors = stdout.read
+        warnings = stderr.readlines
+      rescue NotImplementedError
+        # Windows doesn't have popen
+        errors = `#{command}`
+        warnings = []
+      end
+      errors.gsub!(/^\d+\s+/, '') # work around a bug in OpenLaszlo 3.1
+      if errors =~ /^Compilation errors occurred:\n/
         raise CompilationError.new($'.strip)
-      else
-        results[:warnings] = stderr.readlines
       end
+      results = {:output => output, :warnings => warnings}
       return results
     end
     
     private
     
     # Locations in which to look for the lzc script, relative to OPENLASZLO_HOME
-    def lzc_directories
+    def bin_directories
       [# binary distro location
         'bin',
-        # binary distro location
+        # source distro location
         'WEB-INF/lps/server/bin'
       ]
     end

data/test/compiler_test.rb

@@ -69,7 +69,7 @@ class CompileServerTest < Test::Unit::TestCase
   def setup
     OpenLaszlo::compiler = nil
     @test_dir = File.join(ENV['OPENLASZLO_HOME'], 'tmp/ropenlaszlo-tests')
-    mkdir @test_dir
+    mkdir_p @test_dir
   end
   
   def teardown

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ropenlaszlo
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2006-01-19 00:00:00 -05:00
+  version: 0.4.1
+date: 2006-01-25 00:00:00 -05:00
 summary: Ruby interface to OpenLaszlo.
 require_paths: 
 - lib