bpm 1.0.0.rc.1 → 1.0.0.rc.2

data/lib/bpm/execjs_ext.rb

@@ -67,13 +67,6 @@ module ExecJS
   end
 
   module Runtimes
-    remove_const :JavaScriptCore
-    JavaScriptCore = ExternalRuntime.new(
-      :name        => "JavaScriptCore",
-      :command     => ["/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc", "jsc"],
-      :runner_path => ExecJS.root + "/support/jsc_runner.js"
-    )
-
     remove_const :JScript
     JScript = ExternalRuntime.new(
       :name        => "JScript",
@@ -81,7 +74,7 @@ module ExecJS
       :runner_path => ExecJS.root + "/support/jscript_runner.js",
       :encoding    => 'UTF-16LE' # CScript with //U returns UTF-16LE
     )
-    
+
     instance_variable_set(:@runtimes, [
       RubyRacer,
       RubyRhino,
@@ -95,5 +88,5 @@ module ExecJS
   end
 
   self.runtime = Runtimes.autodetect
-  
+
 end

data/lib/bpm/package.rb

@@ -196,22 +196,6 @@ module BPM
       end.compact
     end
 
-    def pipeline_libs
-      (pipeline && pipeline['libs']) || ['lib']
-    end
-
-    def pipeline_css
-      (pipeline && pipeline['css']) || ['css']
-    end
-
-    def pipeline_assets
-      (pipeline && pipeline['assets']) || ['assets', 'resources']
-    end
-
-    def pipeline_tests
-      (pipeline && pipeline['tests']) || ['tests']
-    end
-    
     # Returns a hash of dependencies inferred from the build settings.
     def dependencies_build
       ret = {}

data/lib/bpm/pipeline/generated_asset.rb

@@ -5,8 +5,8 @@ module BPM
   class GeneratedAsset < Sprockets::BundledAsset
 
     FORMAT_METHODS = {
-      'text/css' => ['css', 'pipeline_css'],
-      'application/javascript' => ['lib', 'pipeline_libs']
+      'text/css' => ['css'],
+      'application/javascript' => ['lib']
     }
 
     def self.generating_asset
@@ -142,8 +142,7 @@ module BPM
     end
 
     def build_dependency_context_and_body
-
-      project       = environment.project
+      project  = environment.project
       settings = project.build_settings(environment.mode)[asset_name]
       pkgs     = settings.keys.map do |pkg_name|
         if pkg_name == project.name
@@ -180,13 +179,20 @@ EOF
       context.require_asset(pathname) # start with self
 
       if pathname.to_s =~ /_tests\.js$/
-        dir_name, dir_method = ['tests', 'pipeline_tests']
+        dir_name, dir_method = ['tests']
       else
-        dir_name, dir_method = FORMAT_METHODS[content_type] || ['lib', 'pipeline_libs']
+        dir_name, dir_method = FORMAT_METHODS[content_type] || ['lib']
       end
 
-      pkgs.map do |pkg|
-        settings[pkg.name].each do |file|
+      require_assets(pkgs, settings, context)
+
+      return context, body
+    end
+
+    def require_assets(packages, settings, context)
+      packages.map do |pkg|
+        files = settings[pkg.name] || ['lib']
+        files.each do |file|
           dir = pkg.directories.find{|name, path| file =~ /^#{Regexp.escape(name)}(\/|$)/ }
           if dir
             dir_alias = dir[0]
@@ -209,8 +215,6 @@ EOF
           end
         end
       end
-
-      return context, body
     end
 
   end

data/lib/bpm/pipeline/plugin_asset.rb

@@ -35,6 +35,8 @@ module BPM
     def build_dependency_context_and_body
 
       project = environment.project
+      # We hardcode this to bpm_libs.js since that's what the plugin should be depending on
+      settings = project.build_settings(environment.mode)["bpm_libs.js"]
       pkg_name, module_id = plugin_module
       pkg  = project.package_from_name pkg_name
 
@@ -51,18 +53,7 @@ module BPM
       # 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_assets(deps, settings, context)
 
       # require asset itself - this should be included directly in the body
       # we don't want to use any processors

data/lib/bpm/version.rb

@@ -1,4 +1,4 @@
 module BPM
-  VERSION = "1.0.0.rc.1"
+  VERSION = "1.0.0.rc.2"
   COMPAT_VERSION = '1.0.0'
 end

data/spec/cli/pack_spec.rb

@@ -2,24 +2,24 @@ require "spec_helper"
 require "libgems/format"
 
 describe "bpm pack" do
-  
+
   describe "when logged in" do
     let(:email) { "who@example.com" }
-  
+
     before do
       goto_home
       write_creds(email, "deadbeef")
     end
-  
+
     it "builds a bpm from a given package.json" do
       FileUtils.cp_r package_fixture("core-test"), "."
       cd "core-test"
       bpm "pack"
-  
+
       exit_status.should be_success
       output = stdout.read
       output.should include("Successfully built package: core-test-0.4.9.bpkg")
-  
+
       package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
       package.spec.name.should == "core-test"
       package.spec.version.should == LibGems::Version.new("0.4.9")
@@ -36,67 +36,67 @@ describe "bpm pack" do
     end
 
   end
-  
+
   describe "without logging in" do
     before do
       goto_home
     end
-  
+
     it "pack a bpm from a given package.json" do
       FileUtils.cp_r package_fixture("core-test"), "."
       cd "core-test"
       bpm "pack", "-e", "joe@example.com"
-  
+
       exit_status.should be_success
-  
+
       package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
       package.spec.name.should == "core-test"
       package.spec.version.should == LibGems::Version.new("0.4.9")
     end
-  
+
     it "builds a bpm when given a path to a package" do
       FileUtils.cp_r package_fixture("core-test"), "."
       bpm "pack", "core-test", "-e", "joe@example.com"
-  
+
       exit_status.should be_success
-    
+
       cd 'core-test'
       package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
       package.spec.name.should == "core-test"
       package.spec.version.should == LibGems::Version.new("0.4.9")
     end
-  
+
     it "sets the email address if one is given" do
       FileUtils.cp_r package_fixture("core-test"), "."
       cd "core-test"
       bpm "pack", "-e", "lucy@allen.com"
-  
+
       exit_status.should be_success
       output = stdout.read
-  
+
       package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
       package.spec.name.should == "core-test"
       package.spec.version.should == LibGems::Version.new("0.4.9")
       package.spec.email.should == "lucy@allen.com"
     end
   end
-  
+
   describe "with an invalid package.json" do
     before do
       goto_home
       write_api_key("deadbeef")
     end
-  
+
     it "reports error messages" do
       FileUtils.touch "package.json"
       bpm "pack", :track_stderr => true
-  
+
       exit_status.should_not be_success
       output = stderr.read
       output.should include("There was a problem parsing package.json")
     end
   end
-  
+
   describe "npm-compatible package" do
     before do
       goto_home
@@ -104,42 +104,54 @@ describe "bpm pack" do
       cd home("backbone")
       bpm "pack", :track_stderr => true and wait
     end
-  
+
     it "successfully packs" do
       exit_status.should be_success
     end
-  
+
     it "gets name and version" do
       package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
       package.spec.name.should == "backbone"
       package.spec.version.should == LibGems::Version.new("0.5.1")
     end
-  
+
     it "gets the homepage" do
       package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
       package.spec.homepage.should == 'http://documentcloud.github.com/backbone/'
     end
-   
+
   end
-  
+
   describe "package with plugins" do
     before do
       goto_home
       FileUtils.cp_r project_fixture('coffee', 'vendor'), '.'
     end
-    
+
     it "should pack transports" do
       cd home('vendor', 'spade')
       bpm "pack" and wait
-      puts stdout.read
       exit_status.should be_success
-      
+
       package = LibGems::Format.from_file_by_path 'spade-1.0.0.bpkg'
       package.spec.files.should include('lib/main.js')
       package.spec.files.should include('transport.js')
     end
   end
-  
+
+  describe "lib-less package" do
+    before do
+      goto_home
+      FileUtils.cp_r package_fixture("sproutcore-handlebars-format"), '.'
+    end
+
+    it "should pack without requiring lib" do
+      cd home('sproutcore-handlebars-format')
+      bpm "pack" and wait
+      exit_status.should be_success
+    end
+  end
+
 end
 
-    
+

data/spec/fixtures/packages/sproutcore-handlebars-format/format.js

@@ -0,0 +1,5 @@
+/*globals exports */
+exports.compileFormat = function(code, context, filename) {
+  return "return SC.Handlebars.compile("+JSON.stringify(code)+");";
+};
+

data/spec/fixtures/packages/sproutcore-handlebars-format/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "sproutcore-handlebars-format",
+  "author": "Yehuda Katz",
+  "version": "2.0.beta.3.1",
+  "description": "Adds format support for handlebars templates",
+  "summary": "Adds format support for handlebars templates",
+  "homepage": "http://www.sproutcore.com",
+
+  "directories": {
+    "lib": []
+  },
+
+  "bpm:provides": {
+    "format": {
+      "mime:default": "application/javascript",
+      "main": "sproutcore-handlebars-format/format"
+    }
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0.rc.2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libgems
-  requirement: &70138028498600 !ruby/object:Gem::Requirement
+  requirement: &70191052678920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70138028498600
+  version_requirements: *70191052678920
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &70138028497340 !ruby/object:Gem::Requirement
+  requirement: &70191052677960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70138028497340
+  version_requirements: *70191052677960
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70138028496760 !ruby/object:Gem::Requirement
+  requirement: &70191052672680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70138028496760
+  version_requirements: *70191052672680
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70138028496200 !ruby/object:Gem::Requirement
+  requirement: &70191052671720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70138028496200
+  version_requirements: *70191052671720
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70138028495460 !ruby/object:Gem::Requirement
+  requirement: &70191052670660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *70138028495460
+  version_requirements: *70191052670660
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70138028494700 !ruby/object:Gem::Requirement
+  requirement: &70191052669580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70138028494700
+  version_requirements: *70191052669580
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70138028493980 !ruby/object:Gem::Requirement
+  requirement: &70191052668620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138028493980
+  version_requirements: *70191052668620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70138028493280 !ruby/object:Gem::Requirement
+  requirement: &70191052667680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138028493280
+  version_requirements: *70191052667680
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70138028492180 !ruby/object:Gem::Requirement
+  requirement: &70191052666080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70138028492180
+  version_requirements: *70191052666080
 description: Browser Package Manager
 email:
 - charles@sproutcore.com
@@ -400,6 +400,8 @@ files:
 - spec/fixtures/packages/rake-0.8.7/test/capture_stdout.rb
 - spec/fixtures/packages/spade/lib/main.js
 - spec/fixtures/packages/spade/package.json
+- spec/fixtures/packages/sproutcore-handlebars-format/format.js
+- spec/fixtures/packages/sproutcore-handlebars-format/package.json
 - spec/fixtures/packages/uglify-js/README.html
 - spec/fixtures/packages/uglify-js/README.org
 - spec/fixtures/packages/uglify-js/bin/uglifyjs
@@ -772,6 +774,8 @@ test_files:
 - spec/fixtures/packages/rake-0.8.7/test/capture_stdout.rb
 - spec/fixtures/packages/spade/lib/main.js
 - spec/fixtures/packages/spade/package.json
+- spec/fixtures/packages/sproutcore-handlebars-format/format.js
+- spec/fixtures/packages/sproutcore-handlebars-format/package.json
 - spec/fixtures/packages/uglify-js/README.html
 - spec/fixtures/packages/uglify-js/README.org
 - spec/fixtures/packages/uglify-js/bin/uglifyjs