opal 0.3.9 → 0.3.10

data/lib/opal/nodes.rb

@@ -225,7 +225,8 @@ module Opal
       # code << super(opts, level)
       code << @statements.generate(opts, level)
 
-      pre = 'function $$(){'
+      pre  = "function($rb, self, __FILE__) {"
+      pre += 'function $$(){'
       post = "\n}\n"
 
       unless @scope_vars.empty?
@@ -250,6 +251,7 @@ module Opal
       end
 
       post += "return $$();\n"
+      post += "}"
 
       pre + code.join('') + post
     end

data/lib/opal/rake/bundle_task.rb

@@ -0,0 +1,62 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Opal
+  module Rake
+
+    class BundleTask
+
+      # The output file to bundle this package to. This should be a full
+      # path including '.js' extension. This defaults to
+      # name-version.js
+      #
+      # @return [String] full path to bundle package to.
+      attr_accessor :out
+
+      # The path to the package.yml file for the package to build. This
+      # defaults to package.yml in the current directory.
+      #
+      # @return [String] path to package.yml
+      attr_accessor :package
+
+      # A hash of parser options passed to each compile stage. This
+      # accepts various options such as `:method_missing`. See
+      # [Parser] for more information.
+      #
+      # @return [Hash] hash of parser options
+      attr_accessor :options
+
+      def initialize(name = :bundle)
+        @name    = name
+        @options = {}
+        @package = 'package.yml'
+
+        yield self if block_given?
+
+        define
+      end
+
+      def define
+        desc "Bundle this package ready for a web browser"
+        task(@name) do
+          # lazy load rbp/bundle incase not installed yet - we dont want to
+          # disrupt other take tasks.
+          require 'opal/bundle'
+
+          path = File.expand_path(@package || 'package.yml')
+          raise "Cannot find package: `#{path}'" unless File.exists? path
+
+          package = Rbp::Package.load_path path
+          bundle  = Bundle.new package
+          bundle.options = options
+          code    = bundle.build
+
+          File.open("#{package.name}-#{package.version}.js", 'w+') do |out|
+            out.write code
+          end
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies: []
 description: Ruby runtime and core library for javascript
 email:
@@ -20,17 +20,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/opal
-- lib/opal/browserify.rb
 - lib/opal/builder.rb
+- lib/opal/bundle.rb
 - lib/opal/command.rb
 - lib/opal/context.rb
 - lib/opal/lexer.rb
 - lib/opal/nodes.rb
 - lib/opal/parser.rb
 - lib/opal/parser.y
+- lib/opal/rake/bundle_task.rb
 - lib/opal.rb
-- lib/rbp/package.rb
-- lib/rbp.rb
 - runtime/class.js
 - runtime/fs.js
 - runtime/init.js

data/lib/opal/browserify.rb

@@ -1,34 +0,0 @@
-module Opal
-
-  # Takes a package and builds it ready for the browser
-  class Browserify
-
-    def initialize(package)
-      @package = package
-      @builder = Builder.new
-    end
-
-    # Simple build - returns a string which can be written to a file
-    # FIXME: hardcoded lib directory to './lib'
-    def build
-      libs = @package.lib_files
-      libs.map! do |f|
-        path = File.join @package.root, './lib', f
-        src = @builder.compile_source path
-        "\"#{f}\": #{src}"
-      end
-
-      bundle = []
-      bundle << %[opal.package({\n]
-      bundle << %[  name: "#{@package.name}",\n]
-      bundle << %[  version: "#{@package.version}",\n]
-      bundle << %[  libs: {\n]
-      bundle << %[    #{libs.join ",\n    "}\n]
-      bundle << %[  }\n]
-      bundle << %[});\n]
-
-      bundle.join ''
-    end
-  end
-end
-

data/lib/rbp.rb

@@ -1,2 +0,0 @@
-require 'rbp/package'
-

data/lib/rbp/package.rb

@@ -1,49 +0,0 @@
-require 'yaml'
-
-module RBP
-
-  class Package
-
-    attr_reader :root
-
-    def initialize(root = Dir.getwd)
-      @root = root
-      __load_yml
-    end
-
-    def __load_yml
-      yml_path = File.join @root, 'package.yml'
-
-      unless File.exists? yml_path
-        raise "Missing package.yml in `#{@root}'"
-      end
-
-      @yml = YAML.load File.read(yml_path)
-
-      raise "Bad package.yml" unless @yml and @yml['name'] and @yml['version']
-    end
-
-    # Returns an array of lib files relative to the root of
-    # this package
-    def lib_files
-      libs = nil
-
-      Dir.chdir(File.join @root, 'lib') do
-        libs = Dir['**/*.rb']
-      end
-
-      libs
-    end
-
-    # package name
-    def name
-      @yml['name']
-    end
-
-    # package version
-    def version
-      @yml['version']
-    end
-  end
-end
-