bpm 0.1.3 → 0.1.4

data/.gitignore

@@ -2,3 +2,4 @@ tmp
 devbin
 .bundle
 Gemfile.lock
+*.gem

data/lib/bpm/cli/base.rb

@@ -81,12 +81,9 @@ module BPM
         # find project
         project = find_project
 
-        begin
-          project.add_dependencies deps, true
-          project.build :debug, true
-        rescue Exception => e
-          abort e.message
-        end
+        # This was wrapped in a begin/rescue Exception, but we should be selective if we rescue
+        project.add_dependencies deps, true
+        project.build :debug, true
       end
 
       desc "remove [PACKAGE]", "Remove package from project"
@@ -128,7 +125,7 @@ module BPM
         
         begin
           project = find_project
-          project.fetch_dependencies options[:verbose]
+          project.rebuild_dependencies nil, options[:verbose]
           project.build options[:mode], options[:verbose]
         rescue Exception => e
           abort e.message

data/lib/bpm/init_generator.rb

@@ -31,9 +31,8 @@ module BPM
       def convert_package(destination_root)
         package = BPM::Package.new(destination_root)
         package.load_json
-        File.open("#{name}.json", "w") do |f|
-          f.write JSON.pretty_generate(package.as_json)
-        end
+        new_json = JSON.pretty_generate(package.as_json)
+        File.open("#{name}.json", "w"){|f| f.write new_json }
         puts "created #{name}.json from package.json"
       end
 

data/lib/bpm/package.rb

@@ -108,6 +108,28 @@ module BPM
       read && parse
     end
 
+    def expanded_deps(project)
+      ret  = []
+      seen = []
+      todo = [self]
+      while todo.size > 0
+        pkg = todo.shift
+        pkg.dependencies.each do |dep_name, dep_vers|
+          next if seen.include? dep_name
+          seen << dep_name
+          found = project.local_deps.find { |x| x.name == dep_name }
+          if found
+            todo << found
+            ret  << found
+          else
+            puts "COULD NOT FIND DEP: #{dep_name}"
+          end
+        end
+        
+      end
+      ret
+    end
+    
     # TODO: Make better errors
     # TODO: This might not work well with conflicting versions
     def local_deps(search_path=nil)
@@ -178,7 +200,13 @@ module BPM
           pkg.load_json
           pkg.name == pkg_name
         end
-        dep.attributes[key_name]
+        
+        if dep
+          dep.attributes[key_name]
+        else
+          puts "COULD NOT FIND DEP: #{pkg_name}"
+        end
+        
       end.compact
     end
       

data/lib/bpm/pipeline/generated_asset.rb

@@ -26,17 +26,13 @@ module BPM
       minifier_name = project.minifier_name
       if minifier_name && content_type == 'application/javascript' 
         pkg = project.package_from_name minifier_name
-        minifier_plugin = pkg.minifier_plugins(project).first
+        minifier_plugin_name = pkg.minifier_plugins(project).first
+        plugin_ctx = environment.plugin_context_for minifier_plugin_name
         
-        minifier_path = blank_context.resolve(project.path_from_module(minifier_plugin))
-        
-        ctx = environment.js_context_for minifier_path
-        out = ''
-
         V8::C::Locker() do
-          ctx["PACKAGE_INFO"] = pkg.attributes
-          ctx["DATA"]         = body
-          body = ctx.eval("exports.minify(DATA, PACKAGE_INFO);")
+          plugin_ctx["PACKAGE_INFO"] = pkg.attributes
+          plugin_ctx["DATA"]         = body
+          body = plugin_ctx.eval("BPM_PLUGIN.minify(DATA, PACKAGE_INFO)")
         end
       end
       

data/lib/bpm/pipeline/plugin_asset.rb

@@ -0,0 +1,74 @@
+require 'sprockets'
+
+module BPM
+
+  # Defines an asset that represents a build plugin (such as a transport or
+  # a minifier.)  The generated asset will include dependencies of the plugin
+  # module as well as the module itself.
+  class PluginAsset < Sprockets::BundledAsset
+
+    def initialize(environment, module_name)
+      pathname = Pathname.new(File.join(environment.project.root_path, '.bpm', 'plugins', module_name+'.js'))
+      super(environment, module_name, pathname, {})
+    end
+    
+  protected
+
+    def dependency_context_and_body
+      @dependency_context_and_body ||= build_dependency_context_and_body
+    end
+
+  private
+
+    # Note: logical path must be hte module
+    def plugin_module
+      project      = environment.project
+      parts        = logical_path.split('/')
+      [parts.shift, parts.join('/')]
+    end
+   
+    def build_dependency_context_and_body
+
+      project = environment.project
+      pkg_name, module_id = plugin_module
+      pkg  = project.package_from_name pkg_name
+
+      # Add in the generated header
+      body = ["// BPM PLUGIN: #{logical_path}\n\n"]
+
+      pkg.load_json
+      deps = pkg.expanded_deps project
+      deps << pkg # always load pkg too
+
+      # Prime digest cache with data, since we happen to have it
+      environment.file_digest(pathname, body)
+
+      # add requires for each depedency to context
+      context = blank_context
+
+      deps.map do |pkg|
+        pkg.load_json
+        pkg.pipeline_libs.each do |dir|
+          dir_name = pkg.directories[dir] || dir 
+          search_path = File.expand_path File.join(pkg.root_path, dir_name)
+      
+          Dir[File.join(search_path, '**', '*')].sort.each do |fn|
+            context.depend_on File.dirname(fn)
+            context.require_asset(fn) if context.asset_requirable? fn
+          end
+        end
+      end
+
+      # require asset itself - this should be included directly in the body
+      # we don't want to use any processors
+      module_path = context.resolve project.path_from_module(logical_path)
+      context.depend_on module_path
+      body << "(function(exports) {"
+      body << File.read(module_path)
+      body << "})(BPM_PLUGIN);\n"
+      
+      return context, body.join("\n")
+    end
+
+  end
+end

data/lib/bpm/pipeline/transport_processor.rb

@@ -5,31 +5,28 @@ module BPM
   class TransportProcessor < Sprockets::Processor
     
     def evaluate(context, locals)
-      project = context.environment.project
+      environment = context.environment
+      project = environment.project
       pkg, module_id = project.package_and_module_from_path file
       transport_plugins = pkg.transport_plugins(project)
 
       # No transport, just return the existing data
-      return data if transport_plugins.empty?
+      return data if transport_plugins.size == 0
 
       if transport_plugins.size > 1
         # TODO: Maybe make custom error for this
         raise "#{pkg.name} depends on #{transport_plugins.size} packages that define transport plugins. " \
                 "Select a plugin by adding a `plugin:transport` property to the package.json"
       end
-
-      project_path = project.root_path.to_s
-      project_path << '/' if project_path !~ /\/$/
-      filepath = file.sub(/^#{project_path}/,'') # relative file path from project
-
-      transport_path = context.resolve project.path_from_module(transport_plugins.first)
-      ctx = context.environment.js_context_for transport_path
+      
+      plugin_ctx = environment.plugin_context_for transport_plugins.first
+      filepath   = file.to_s
       out = ''
 
       V8::C::Locker() do
-        ctx["PACKAGE_INFO"] = pkg.attributes
-        ctx["DATA"]         = data
-        out = ctx.eval("exports.compileTransport(DATA, PACKAGE_INFO, '#{module_id}', '#{filepath}');")
+        plugin_ctx["PACKAGE_INFO"] = pkg.attributes
+        plugin_ctx["DATA"]         = data
+        out = plugin_ctx.eval("BPM_PLUGIN.compileTransport(DATA, PACKAGE_INFO, '#{module_id}', '#{filepath}');")
       end
 
       out + "\n\n"

data/lib/bpm/pipeline.rb

@@ -3,6 +3,12 @@ require 'v8'
 
 module BPM
 
+  class Console
+    def log(str)
+      puts str
+    end
+  end
+  
   # A BPM package-aware asset pipeline.  Asset lookup respects package.json
   # directory configurations as well as loading preprocessors, formats, and
   # postprocessors from the package config.
@@ -14,6 +20,8 @@ module BPM
     # Pass in the project you want the pipeline to manage.
     def initialize(project)
       @project = project
+      @plugin_contexts = {}
+      
       project_path = project.root_path
 
       super project_path
@@ -35,11 +43,8 @@ module BPM
       append_path File.join project_path, 'assets'
     end    
       
-    # Loads the passed JavaScript file and evals it.  Used for loading 
-    # transport and other plugins.
-    def js_context_for(path)
-      @js_contexts ||= {}
-      @js_contexts[path] ||= build_js_context(path)
+    def plugin_context_for(module_id)
+      @plugin_contexts[module_id] ||= build_plugin_context(module_id)
     end
     
     # Returns an array of all the buildable assets in the current directory.
@@ -76,8 +81,12 @@ module BPM
       magic_paths += %w(app_package.js app_styles.css).map do |filename|
         File.join project.root_path, 'assets', project.name, filename
       end
-            
-      if magic_paths.include? pathname.to_s
+      
+      plugin_path = File.join project.root_path, '.bpm', 'plugins'
+      
+      if pathname.to_s =~ /^#{Regexp.escape plugin_path}/
+         BPM::PluginAsset.new(self, "spade/~transports/spade", pathname, options)     
+      elsif magic_paths.include? pathname.to_s
         BPM::GeneratedAsset.new(self, logical_path, pathname, options)
       else
         super logical_path, pathname, options
@@ -86,18 +95,23 @@ module BPM
     
   private
   
-    def build_js_context(path)
+    def build_plugin_context(module_id)
+      asset = BPM::PluginAsset.new(self, module_id)
+      plugin_text = asset.to_s
+      
       ctx = nil
       V8::C::Locker() do
         ctx = V8::Context.new do |ctx|
-          ctx['exports'] = {}
-          ctx.eval "(function(exports) { #{File.read path} })(exports);"
+          ctx['window'] = ctx # make browser-like environment
+          ctx['console'] = BPM::Console.new
+          
+          ctx['BPM_PLUGIN'] = {}
+          ctx.eval plugin_text
         end
       end
-      ctx
       
+      ctx
     end
-    
         
   end
   

data/lib/bpm/project.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'bpm/version'
 
 module BPM
 

data/lib/bpm/version.rb

@@ -1,3 +1,3 @@
 module BPM
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/bpm.rb

@@ -17,6 +17,7 @@ module BPM
   autoload :DirectiveProcessor,   'bpm/pipeline/directive_processor'
   autoload :GeneratedAsset,       'bpm/pipeline/generated_asset'
   autoload :TransportProcessor,   'bpm/pipeline/transport_processor'
+  autoload :PluginAsset,          'bpm/pipeline/plugin_asset'
 end
 
 # The BPM constants need to be defined first

data/spec/fixtures/minitest/packages/uglyduck/lib/main.js

@@ -1 +1,3 @@
 //UGLY DUCK
+UGLYDUCK = "IS UGLY";
+

data/spec/fixtures/minitest/packages/uglyduck/minifier/main.js

@@ -1,4 +1,6 @@
+/*globals BPM_PLUGIN UGLYDUCK */
 
-exports.minify = function(body, pkg, moduleId, pathname) {
-  return "//MINIFIED START\n"+body+"\n//MINIFIED END\n";
+BPM_PLUGIN.minify = function(body, pkg, moduleId, pathname) {
+  var whatIsUglyDuck = 'undefined' === typeof UGLYDUCK ? '(main not loaded)' : UGLYDUCK;
+  return "//MINIFIED START\nUGLY DUCK "+UGLYDUCK+"\n"+body+"\n//MINIFIED END\n";
 };

data/spec/fixtures/transporter/packages/transport/transports/wrapper.js

@@ -1,5 +1,5 @@
 
-exports.compileTransport = function(body, pkg, moduleId, filename) {
+BPM_PLUGIN.compileTransport = function(body, pkg, moduleId, filename) {
   return "define_transport(function() {\n"+body+"\n}), '"+pkg.name+"', '"+moduleId+"', '"+filename+"');";
 };
 

data/spec/pipeline_spec.rb

@@ -239,96 +239,3 @@ describe BPM::Pipeline, "buildable_assets" do
   
 end
 
-describe BPM::Pipeline, 'transport processor' do
-
-  before do
-    goto_home
-    set_host
-    reset_libgems bpm_dir.to_s
-    start_fake(FakeGemServer.new)
-    
-    FileUtils.cp_r fixtures('transporter'), '.'
-    cd home('transporter')
-
-    bpm 'compile'
-    wait
-  end
-  
-  subject do
-    project = BPM::Project.new home('transporter')
-    BPM::Pipeline.new project
-  end
-  
-  it "should wrap the project's main.js" do
-    asset = subject.find_asset 'transporter/lib/main.js'
-    asset.to_s.should == "define_transport(function() {\n//TRANSPORT\ntransporter();\n//TRANSPORT\n\n}), 'transporter', 'main', 'lib/main.js');\n\n"
-    asset.pathname.to_s.should == File.join(Dir.pwd, 'lib', 'main.js')
-  end
-
-  it "should not wrap transport/main.js" do
-    asset = subject.find_asset 'transport/lib/main.js'
-    asset.to_s.should == "// TRANSPORT DEMO\n"
-  end
-
-end
-
-describe BPM::Pipeline, 'minifier' do
-
-  before do
-    goto_home
-    set_host
-    reset_libgems bpm_dir.to_s
-    start_fake(FakeGemServer.new)
-    
-    FileUtils.cp_r fixtures('minitest'), '.'
-    cd home('minitest')
-
-    bpm 'compile'
-    wait
-  end
-  
-  subject do
-    project = BPM::Project.new home('minitest')
-    BPM::Pipeline.new project
-  end
-  
-  it "should wrap bpm_packages.js" do
-    asset = subject.find_asset 'bpm_packages.js'
-    file_path = home('minitest', 'packages', 'uglyduck', 'lib', 'main.js')
-    expected = <<EOF
-//MINIFIED START
-/* ===========================================================================
-   BPM Static Dependencies
-   MANIFEST: uglyduck (1.0.0)
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
-   To use this file, load this file in your HTML head.
-   =========================================================================*/
-
-#{File.read file_path}
-//MINIFIED END
-EOF
-
-    asset.to_s.should == expected
-  end
-
-  it "should wrap app_package.js" do
-    asset = subject.find_asset 'minitest/app_package.js'
-    file_path = home('minitest', 'lib', 'main.js')
-    expected = <<EOF
-//MINIFIED START
-/* ===========================================================================
-   BPM Static Dependencies
-   MANIFEST: minitest (2.0.0)
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
-   To use this file, load this file in your HTML head.
-   =========================================================================*/
-
-#{File.read(file_path)}
-//MINIFIED END
-EOF
-    asset.to_s.should == expected
-  end
-
-end
-
-  

data/spec/plugins/minifier_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+
+describe BPM::Pipeline, 'minifier' do
+
+  before do
+    goto_home
+    set_host
+    reset_libgems bpm_dir.to_s
+    start_fake(FakeGemServer.new)
+    
+    FileUtils.cp_r fixtures('minitest'), '.'
+    cd home('minitest')
+
+    bpm 'compile'
+    wait
+  end
+  
+  subject do
+    project = BPM::Project.new home('minitest')
+    BPM::Pipeline.new project
+  end
+  
+  it "should wrap bpm_packages.js" do
+    asset = subject.find_asset 'bpm_packages.js'
+    file_path = home('minitest', 'packages', 'uglyduck', 'lib', 'main.js')
+    expected = <<EOF
+//MINIFIED START
+UGLY DUCK IS UGLY
+/* ===========================================================================
+   BPM Static Dependencies
+   MANIFEST: uglyduck (1.0.0)
+   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   To use this file, load this file in your HTML head.
+   =========================================================================*/
+
+#{File.read file_path}
+//MINIFIED END
+EOF
+
+    asset.to_s.should == expected
+  end
+
+  it "should wrap app_package.js" do
+    asset = subject.find_asset 'minitest/app_package.js'
+    file_path = home('minitest', 'lib', 'main.js')
+    expected = <<EOF
+//MINIFIED START
+UGLY DUCK IS UGLY
+/* ===========================================================================
+   BPM Static Dependencies
+   MANIFEST: minitest (2.0.0)
+   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   To use this file, load this file in your HTML head.
+   =========================================================================*/
+
+#{File.read(file_path)}
+//MINIFIED END
+EOF
+    asset.to_s.should == expected
+  end
+
+end
+
+  

data/spec/plugins/transport_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe BPM::Pipeline, 'transport processor' do
+
+  before do
+    goto_home
+    set_host
+    reset_libgems bpm_dir.to_s
+    start_fake(FakeGemServer.new)
+    
+    FileUtils.cp_r fixtures('transporter'), '.'
+    cd home('transporter')
+
+    bpm 'compile'
+    wait
+  end
+  
+  subject do
+    project = BPM::Project.new home('transporter')
+    BPM::Pipeline.new project
+  end
+  
+  it "should wrap the project's main.js" do
+    asset = subject.find_asset 'transporter/lib/main.js'
+    exp_path = home('transporter', 'lib', 'main.js')
+    asset.to_s.should == "define_transport(function() {\n//TRANSPORT\ntransporter();\n//TRANSPORT\n\n}), 'transporter', 'main', '#{exp_path}');\n\n"
+    asset.pathname.to_s.should == File.join(Dir.pwd, 'lib', 'main.js')
+  end
+
+  it "should not wrap transport/main.js" do
+    asset = subject.find_asset 'transport/lib/main.js'
+    asset.to_s.should == "// TRANSPORT DEMO\n"
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-02 00:00:00.000000000Z
+date: 2011-07-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libgems
-  requirement: &2152430900 !ruby/object:Gem::Requirement
+  requirement: &2152534360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152430900
+  version_requirements: *2152534360
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &2152429720 !ruby/object:Gem::Requirement
+  requirement: &2152533760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152429720
+  version_requirements: *2152533760
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2152428900 !ruby/object:Gem::Requirement
+  requirement: &2152533080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152428900
+  version_requirements: *2152533080
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2152427980 !ruby/object:Gem::Requirement
+  requirement: &2152532460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152427980
+  version_requirements: *2152532460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152427400 !ruby/object:Gem::Requirement
+  requirement: &2152531400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152427400
+  version_requirements: *2152531400
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2152426800 !ruby/object:Gem::Requirement
+  requirement: &2152530740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152426800
+  version_requirements: *2152530740
 - !ruby/object:Gem::Dependency
   name: hike
-  requirement: &2152426080 !ruby/object:Gem::Requirement
+  requirement: &2152530180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152426080
+  version_requirements: *2152530180
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152424780 !ruby/object:Gem::Requirement
+  requirement: &2152529460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152424780
+  version_requirements: *2152529460
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2152423440 !ruby/object:Gem::Requirement
+  requirement: &2152528620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,10 +113,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152423440
+  version_requirements: *2152528620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152420620 !ruby/object:Gem::Requirement
+  requirement: &2152526860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,10 +124,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152420620
+  version_requirements: *2152526860
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152418640 !ruby/object:Gem::Requirement
+  requirement: &2152525900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -135,7 +135,7 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *2152418640
+  version_requirements: *2152525900
 description: Package Manager for JavaScript
 email:
 - charles@sproutcore.com
@@ -327,6 +327,7 @@ files:
 - lib/bpm/pipeline.rb
 - lib/bpm/pipeline/directive_processor.rb
 - lib/bpm/pipeline/generated_asset.rb
+- lib/bpm/pipeline/plugin_asset.rb
 - lib/bpm/pipeline/transport_processor.rb
 - lib/bpm/project.rb
 - lib/bpm/project_generator.rb
@@ -555,6 +556,8 @@ files:
 - spec/gauntlet_spec.rb
 - spec/package_spec.rb
 - spec/pipeline_spec.rb
+- spec/plugins/minifier_spec.rb
+- spec/plugins/transport_spec.rb
 - spec/project_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli.rb
@@ -818,6 +821,8 @@ test_files:
 - spec/gauntlet_spec.rb
 - spec/package_spec.rb
 - spec/pipeline_spec.rb
+- spec/plugins/minifier_spec.rb
+- spec/plugins/transport_spec.rb
 - spec/project_spec.rb
 - spec/spec_helper.rb
 - spec/support/cli.rb