ruby-dart2js 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 748fcd906fe848f58b3b000f3abf965438bbec85
-  data.tar.gz: 381841cc0d61b3f48b17beef9f5b37127a85b6e7
+  metadata.gz: 8975f5f12c70378910a52d911d2ed746c684af68
+  data.tar.gz: a943e00afd8467cee2885bded0b32b597d9d41fc
 SHA512:
-  metadata.gz: b53ef16275b7a195cc36ca1398424b211a229ef1f63d21e926f2fcc94ebbd7dd20ffb905a1edc01bd006edf9b168ab9a6ed4fe77995a5fa8c6f9992ec296727d
-  data.tar.gz: 41a5b4bc1c4ca6c205926f9bdc7fc87b709e6ca2d49018bcf014b8d7374e3476b68515198796ffe0d43733e130cbf9c17f526fdf3b3655fa3b841bbdf60b63e1
+  metadata.gz: 7cb646a3b2b75f61f9477c6d76703ea1100bd0cb576053b4434929e1759fd1d469568539b0aed9389a514533b54f07e03e1a9296bd57ab590bf0df697476e2be
+  data.tar.gz: ae9137727ed687af98990ac5c0e8f549022333e1c9842e13adfbe46e4ec6dfbcb45ae6acc137fd4aff05d629d4b20191fd4b8626f9117ebe0b1766f7d6f5a742

data/README.md

@@ -10,7 +10,7 @@ Provide automated transcoding from [Dart](https://www.dartlang.org/ 'dartlang.or
 
 `Gemfile`
 
-    gem 'ruby-dart2js', :git => https://github.com/m0gg/ruby-dart2js.git
+    gem 'ruby-dart2js'
 
 ###### Find SDK ######
 

data/lib/dart2js.rb

@@ -2,6 +2,8 @@ require 'tempfile'
 require 'dart2js_exceptions'
 
 class Dart2Js
+  include Dart2JsExceptions
+
   class << self
     attr_writer :dart2js_binary
 
@@ -11,7 +13,7 @@ class Dart2Js
 
     private
     def find_dart2js_in_path
-      system('dart2js -h') ? 'dart2js' : false
+      system('dart2js --version') ? 'dart2js' : false
     end
 
     def find_dart2js_in_sdk
@@ -22,49 +24,90 @@ class Dart2Js
     end
   end
 
-  attr_reader :data, :input_file, :result
-  attr_accessor :out_file, :out_dir, :dart2js_binary
+  attr_reader :data, :in_file, :result
+  attr_accessor :pwd, :out_file, :out_dir, :dart2js_binary
 
   def initialize(file_or_data, options = {})
     @dart2js_binary = options[:dart2js_binary] || self.class.dart2js_binary
-    @out_dir = options[:out_dir] if options[:out_dir]
-    @out_file = options[:out_file] || File.join((@out_dir || Dir::tmpdir), "dart2js_#{self.object_id}_#{Time.now.usec}.js")
-    if file_or_data.respond_to?(:path)
-      if File.exists?(file_or_data)
-        @input_file = file_or_data
-      else
-        throw 'File not found!'
-      end
+
+    if options[:out_file].is_a?(File)
+      @out_file     = options[:out_file]
+    elsif options[:out_file]
+      @out_file     = File.new(options[:out_file])
+    end
+
+    if options[:out_dir]
+      @out_dir      = options[:out_dir]
+      @out_file   ||= File.join(@out_dir, uniqe_tmpfile_name)
+    else
+      @out_file   ||= Tempfile.open('dart2js_output')
+    end
+
+    if file_or_data.is_a?(File)
+      @in_file = file_or_data
+    elsif File.exist?(file_or_data)
+      @in_file = File.new(file_or_data)
     else
       @data = file_or_data
+      @pwd  = options[:pwd]
     end
   end
 
-  def compile minify=true
+  def compile(minify = true)
+    prepare_input
+    prepare_output
     cmd = [ @dart2js_binary,
-            minify ? ' -m ' : '',
-            %Q{-o"#{out_file}"},
-            in_file = prepare_input.path ].join(' ')
+            minify ? ' -m ': nil,
+            %Q{-o"#{output_path}"},
+            input_path ].join(' ')
     process = IO.popen(cmd, 'r')
     @result = process.read
     process.close
     return_code = $?.to_i
-    return_code == 0 ? true : Dart2JsExceptions::CompilationException.new(cmd, in_file, @result)
+    if return_code != 0
+      raise CompilationException.new(self, cmd)
+    else
+      get_js_content
+    end
   end
 
   def get_js_content
     File.read(@out_file)
   end
 
+  def close
+    [@in_file, @out_file].each do |f|
+      f.close! if f.respond_to?(:close!)
+    end
+  end
+
   private
+  def input_path
+    @in_file.path
+  end
+
+  def output_path
+    @out_file.path
+  end
+
   def prepare_input
     if data
-      tmp_file = Tempfile.open(%w(dart2js_tmpread .dart))
-      tmp_file.write data
-      tmp_file.flush
-      tmp_file
-    else
-      @input_file
+      @in_file = Tempfile.open('dart2js_input', @pwd)
+      @in_file.write data
+      @in_file.close
     end
+    unless File.exists?(input_path)
+      raise PrepareInputException.new(self, "prepare_input ran but 'in_file' does not exist!")
+    end
+  end
+
+  def prepare_output
+    if !@out_file.is_a?(Tempfile) && File.exists?(output_path)
+      raise PrepareOutputException.new(self, "Won't overwrite existing file that is not a 'Tempfile''")
+    end
+  end
+
+  def uniqe_tmpfile_name(ext = 'js')
+    "dart2js_#{self.object_id}_#{Time.now.usec}.#{ext}"
   end
 end

data/lib/dart2js_exceptions.rb

@@ -1,12 +1,40 @@
 module Dart2JsExceptions
-  class CompilationException < RuntimeError
-    attr_reader :cmd, :in_file, :result
+  class Dart2JsException < Exception
+    def initialize(compiler)
+      @instance = compiler
+    end
+  end
 
-    def initialize cmd, in_file, result
-      super("dart2js failed to compile '#{in_file}'")
-      @result = result;
+  class CompilationException < Dart2JsException
+    def initialize(compiler, cmd)
+      super(compiler)
       @cmd = cmd;
-      @in_file = in_file;
+    end
+
+    def message
+      "dart2js compilation '#{@cmd}' failed:\n #{@instance.result}"
+    end
+
+  end
+  class PrepareInputException < Dart2JsException
+    def initialize(compiler, reason)
+      super(compiler)
+      @reason = reason
+    end
+
+    def message
+      "dart2js prepare_input failed\n in_file: #{@instance.in_file}\n input_path: #{@instance.input_path}\n reason: #{@reason}"
+    end
+  end
+
+  class PrepareOutputException < Dart2JsException
+    def initialize(compiler, reason)
+      super(compiler)
+      @reason = reason
+    end
+
+    def message
+      "dart2js prepare_output failed\n out_file: #{@instance.out_file}\n output_path: #{@instance.output_path}\n reason: #{@reason}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dart2js
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Marcel Sackermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Provides dart2js compiling for compatibility.