bpm 1.0.0.beta.13 → 1.0.0.rc.1

data/spec/fixtures/projects/coffee/{packages/handlebars → vendor/handlebars-format}/package.json

@@ -1,5 +1,5 @@
 {
-  "name":        "handlebars",
+  "name":        "handlebars-format",
   "version":     "1.0.0",
   "description": "DESC",
   "summary":     "SUMMARY",
@@ -9,7 +9,7 @@
   "bpm:provides": {
     "format:handlebars": {
       "mime:default": "application/javascript",
-      "main":         "handlebars/format"
+      "main":         "handlebars-format/format"
     }
   }
   

data/spec/fixtures/projects/coffee/vendor/handlebars/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "handlebars",
+  "version": "1.0.0",
+  "dependencies": {
+    "spade": ">= 0",
+    "handlebars-format": ">= 0"
+  },
+
+  "bpm:provides": {
+    "format:handlebars": {
+      "mime:default": "application/javascript",
+      "main":         "handlebars-format/format"
+    }
+  }
+}

data/spec/fixtures/projects/coffee/vendor/spade-coffee/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "spade-coffee",
+  "version": "1.0.0",
+  "dependencies": {
+    "spade": ">= 0",
+    "coffee-script": ">= 0"
+  },
+
+  "bpm:provides": {
+    "format:coffee": {
+      "mime:default": "application/javascript",
+      "main":         "coffee-script/compiler"
+    }
+  }
+}

data/spec/fixtures/projects/coffee/vendor/spade-handlebars/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "spade-handlebars",
+  "version": "1.0.0",
+  "dependencies": {
+    "spade": ">= 0",
+    "handlebars": ">= 0"
+  },
+
+  "bpm:provides": {
+    "format:handlebars": {
+      "mime:default": "application/javascript",
+      "main":         "handlebars-format/format"
+    }
+  }
+}

data/spec/fixtures/projects/coffee/vendor/spade/lib/main.js

@@ -0,0 +1 @@
+//spade/lib/main

data/spec/fixtures/projects/hello_world/another/one.js

@@ -0,0 +1 @@
+// ANOTHER ONE

data/spec/fixtures/projects/hello_world/another/two.js

@@ -0,0 +1 @@
+// ANOTHER TWO

data/spec/fixtures/projects/hello_world/hello_world.json

@@ -8,9 +8,10 @@
   "homepage":     "URL",
 
   "directories": {
-    "lib":        ["./lib", "./vendor/lib"],
+    "lib":        ["./lib", "./lib2"],
     "test":       "./tests",
-    "custom":     "./custom_dir"
+    "custom":     "./custom_dir",
+    "different":  "./another"
   },
 
   "dependencies": {
@@ -26,15 +27,15 @@
   "bpm:build": {
     
     "hello_world/bpm_libs.js": {
-      "directories": ["lib", "custom"]
+      "files": ["lib", "custom", "different/one.js"]
     },
     
     "hello_world/bpm_styles.css": {
-      "directories": ["css"]
+      "files": ["css"]
     },
     
     "hello_world/bpm_tests.js": {
-      "directories": ["test"]
+      "files": ["test"]
     }
   }
 

data/spec/fixtures/projects/hello_world/lib2/something.js

@@ -0,0 +1 @@
+// SOMETHING

data/spec/fixtures/projects/hello_world/{packages → vendor}/custom_package/package.json

@@ -18,7 +18,7 @@
   
   "bpm:build": {
     "bpm_libs.js": {
-      "directories": ["lib", "not-normal"],
+      "files": ["lib", "not-normal"],
       "minifier": "uglify-js"
     }
   }

data/spec/fixtures/projects/hello_world/vendor/prerelease_package/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "prerelease_package",
+  "version": "1.0.0.pre"
+}

data/spec/fixtures/projects/init_app/new_project.json

@@ -4,15 +4,15 @@
 
   "bpm:build": {
     "bpm_libs.js": {
-      "directories": [
+      "files": [
         "lib"
       ],
       "minifier": "uglify-js"
     },
     "bpm_styles.css": {
-      "directories": [
+      "files": [
         "css"
       ]
     }
   }
-}
+}

data/spec/fixtures/projects/init_default/new_project.json

@@ -4,12 +4,12 @@
 
   "bpm:build": {
     "bpm_libs.js": {
-      "directories": [],
+      "files": [],
       "minifier": "uglify-js"
     },
     
     "bpm_styles.css": {
-      "directories": []
+      "files": []
     }
   }
 }

data/spec/fixtures/projects/minitest/minitest.json

@@ -19,7 +19,7 @@
     },
     
     "minitest/bpm_libs.js": {
-      "directories": ["lib"],
+      "files": ["lib"],
       "minifier": { "uglyduck": ">= 0" },
       "uglyduck:where": "sanfran"
     }

data/spec/fixtures/projects/minitrans/minitrans.json

@@ -17,7 +17,7 @@
   
   "bpm:build": {
     "bpm_libs.js": {
-      "directories": ["lib"],
+      "files": ["lib"],
       "minifier": "uglyduck"
     }
   }

data/spec/package_pipeline_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe BPM::PackagePipeline do
-  
+
   before do
     goto_home
     set_host
@@ -9,7 +9,7 @@ describe BPM::PackagePipeline do
     FileUtils.cp_r(project_fixture('coffee'), '.')
     cd home('coffee')
   end
-  
+
   subject do
     project = BPM::Project.new home('coffee')
     BPM::Pipeline.new project
@@ -17,14 +17,17 @@ describe BPM::PackagePipeline do
 
   it "should get package pipelines for each package" do
     names = subject.package_pipelines.map { |pipeline| pipeline.package.name }
-    names.sort.should == %w(coffee coffee-script handlebars spade)
+    # NOTE: We handlebars is so deeply nested to test a very specific issue with
+    # formats that are re-provided at least twice by packages that have a transport.
+    # There is currently a fix for this in BPM::PluginProcessor
+    names.sort.should == %w(coffee coffee-script handlebars handlebars-format spade spade-handlebars)
   end
-  
+
   it "should get an asset for the coffee file" do
     asset = subject.find_asset 'coffee/lib/main.js'
     asset.should_not be_nil
     asset.pathname.should == home('coffee', 'lib', 'main.coffee')
   end
-  
+
 end
 

data/spec/package_spec.rb

@@ -1,5 +1,15 @@
 require "spec_helper"
 
+describe "BPM::Package class" do
+  it "should create from_spec"
+
+  it "should tell if package root" do
+    BPM::Package.is_package_root?(fixtures('packages', 'backbone')).should be_true
+    BPM::Package.is_package_root?(fixtures('projects', 'hello_world')).should be_false
+    BPM::Package.is_package_root?(fixtures('packages', 'non_existent')).should be_false
+  end
+end
+
 describe BPM::Package do
   it "should have 'lib' as default lib_path'" do
     subject.send(:lib_path).should == 'lib'
@@ -21,7 +31,7 @@ describe BPM::Package, "#to_spec" do
   end
 
   subject do
-    package = BPM::Package.new(nil, email)
+    package = BPM::Package.new(nil, :email => email)
     package.json_path = package_fixture("core-test", "package.json")
     if spec = package.to_spec
       spec
@@ -194,7 +204,7 @@ describe BPM::Package, "validation errors" do
   end
 
   subject do
-    BPM::Package.new(nil, email)
+    BPM::Package.new(nil, :email => email)
   end
 
   def write_package
@@ -207,27 +217,10 @@ describe BPM::Package, "validation errors" do
     subject.json_path = path
   end
 
-  %w[name description summary homepage author version].each do |field|
+  %w[name summary version].each do |field|
     it "is invalid without a #{field} field" do
       write_package do |package|
-        if %w(description summary).include?(field)
-          package.delete 'description'
-          package.delete 'summary'
-        else
-          package.delete(field)
-        end
-      end
-
-      subject.should have_error("Package requires a '#{field}' field")
-    end
-
-    it "is invalid with a blank #{field} field" do
-      write_package do |package|
-        if %w(description summary).include?(field)
-          package['description'] = package['summary'] = ''
-        else
-          package[field] = ''
-        end
+        package.delete(field)
       end
 
       subject.should have_error("Package requires a '#{field}' field")
@@ -306,17 +299,19 @@ describe BPM::Package, "validation errors" do
     subject.should have_error "'./fake', specified for lib directory, is not a directory"
   end
 
-  it "is invalid if the lib directory array is empty" do
+  it "is valid if the lib directory array is empty" do
+    # This provides a mean to make a libless package
+    # Since this is rare, you have to explicitly specify an empty array
     write_package do |package|
       package["directories"]["lib"] = []
     end
 
-    subject.should have_error("A lib directory is required")
+    subject.should be_valid
   end
 
 end
 
-describe BPM::Package, 'InvalidPackageError' do
+describe BPM::Package, 'InvalidPackagePathError' do
   
   it "should raise exception when loading invalid JSON" do
     package = BPM::Package.new(package_fixture('invalid_json'))
@@ -339,9 +334,19 @@ describe BPM::Package, 'InvalidPackageError' do
     package = BPM::Package.new home('jquery2')
     lambda {
       package.load_json
-    }.should raise_error(BPM::InvalidPackageNameError)
+    }.should raise_error(BPM::InvalidPackagePathError)
   end
-  
+
+  it "should not raise exception for standalone packages" do
+    goto_home
+    FileUtils.cp_r package_fixture('jquery'), 'jquery2'
+    package = BPM::Package.new home('jquery2'), :standalone => true
+    lambda {
+      package.load_json
+    }.should_not raise_error
+  end
+
+
 end
 
 describe BPM::Package, "templates" do

data/spec/pipeline_spec.rb

@@ -9,34 +9,34 @@ describe BPM::Pipeline, "asset_path" do
     FileUtils.cp_r(project_fixture('hello_world'), '.')
     cd home('hello_world')
   end
-  
+
   subject do
     project = BPM::Project.new home('hello_world')
     BPM::Pipeline.new project
   end
-  
+
   it "should find any asset in the assets directory" do
     bpm 'rebuild', '--update' and wait
     asset = subject.find_asset 'papa-smurf.jpg'
     asset.pathname.should == home('hello_world', 'assets', 'papa-smurf.jpg')
   end
-  
+
   it "should find any asset in packages" do
     bpm 'fetch' and wait
     bpm 'add', 'custom_package' and wait
-    
+
     asset = subject.find_asset 'custom_package/assets/dummy.txt'
-    asset.pathname.should == home('hello_world', '.bpm', 'packages', 'custom_package', 'assets', 'dummy.txt')
+    asset.pathname.should == home('hello_world', 'vendor', 'custom_package', 'assets', 'dummy.txt')
   end
-  
+
   it "should find any asset in installed packages" do
     bpm 'fetch' and wait
     bpm 'rebuild' and wait
-  
+
     asset = subject.find_asset 'core-test/resources/runner.css'
-    asset.pathname.should == home('hello_world', '.bpm', 'packages', 'core-test', 'resources', 'runner.css')
+    asset.pathname.should == home('.bpm', 'gems', 'core-test-0.4.9', 'resources', 'runner.css')
   end
-  
+
   describe "generated assets" do
 
     before do
@@ -47,153 +47,162 @@ describe BPM::Pipeline, "asset_path" do
     end
 
     describe "bpm_libs.js" do
-      
+
       subject do
         BPM::Pipeline.new(@project).find_asset 'bpm_libs.js'
       end
-    
+
       it "should return an asset of type BPM::GeneratedAsset" do
         subject.class.should == BPM::GeneratedAsset
       end
-    
+
       it "should find the bpm_libs.js" do
         subject.pathname.should == home('hello_world', 'assets', 'bpm_libs.js')
       end
-      
+
       it "should find bpm_libs as well" do
         BPM::Pipeline.new(@project).find_asset('bpm_libs').should == subject
       end
-    
+
       it "should have a manifest line" do
         # Right now we're including dev deps
         subject.to_s.should include('MANIFEST: core-test (0.4.9) custom_generator (1.0) custom_package (2.0.0) ivory (0.0.1) jquery (1.4.3) optparse (1.0.1) rake (0.8.6) spade (0.5.0)')
       end
-    
+
       it "should include any required modules in the bpm_package.js" do
-        subject.to_s.should include(File.read(home('hello_world', 'packages', 'custom_package', 'lib', 'main.js')))
+        subject.to_s.should include(File.read(home('hello_world', 'vendor', 'custom_package', 'lib', 'main.js')))
       end
-    
+
       it "should reference package.json directories when resolving modules" do
-        subject.to_s.should include(File.read(home('hello_world', 'packages', 'custom_package', 'custom_dir', 'basic-module.js')))
+        subject.to_s.should include(File.read(home('hello_world', 'vendor', 'custom_package', 'custom_dir', 'basic-module.js')))
       end
-    
+
     end
-      
+
     describe "bpm_styles.css" do
-      
+
       subject do
         BPM::Pipeline.new(@project).find_asset 'bpm_styles.css'
       end
-    
+
       it "should find bpm_styles.css" do
         subject.pathname.should == home('hello_world', 'assets', 'bpm_styles.css')
       end
-    
+
       it "should include any required modules in the bpm_styles.css" do
-        subject.to_s.should include(File.read(home('hello_world', 'packages', 'custom_package', 'css', 'sample_styles.css')))
+        subject.to_s.should include(File.read(home('hello_world', 'vendor', 'custom_package', 'css', 'sample_styles.css')))
       end
-      
+
       it "should reference installed package styles as well" do
-        subject.to_s.should include(File.read(home('hello_world', '.bpm', 'packages', 'core-test', 'resources', 'runner.css')))
+        subject.to_s.should include(File.read(home('.bpm', 'gems', 'core-test-0.4.9', 'resources', 'runner.css')))
       end
-    
+
     end
-    
+
     describe "hello_world/bpm_libs.js" do
-  
+
       subject do
         BPM::Pipeline.new(@project).find_asset 'hello_world/bpm_libs.js'
       end
-    
+
       it "should return an asset of type BPM::GeneratedAsset" do
         subject.class.should == BPM::GeneratedAsset
       end
-          
+
       it "should find the bpm_libs.js" do
         subject.pathname.should == home('hello_world', 'assets', 'hello_world', 'bpm_libs.js')
       end
-        
+
       it "should find bpm_libs as well" do
         BPM::Pipeline.new(@project).find_asset('hello_world/bpm_libs').should == subject
       end
-    
+
       it "should have a manifest line" do
         subject.to_s.should include('MANIFEST: hello_world (2.0.0)')
       end
-    
+
       it "should include any required modules in the bpm_libs" do
         subject.to_s.should include(File.read(home('hello_world', 'lib', 'main.js')))
       end
+
+      it "should load from secondary lib" do
+        subject.to_s.should include(File.read(home('hello_world', 'lib2', 'something.js')))
+      end
+
+      it "should use singly loaded files" do
+        subject.to_s.should include(File.read(home('hello_world', 'another', 'one.js')))
+      end
+
     end
 
     describe "hello_world/bpm_styles.css" do
-    
+
       before do
         FileUtils.mkdir_p home('hello_world', 'assets', 'hello_world')
         FileUtils.touch home('hello_world', 'assets', 'hello_world', 'bpm_styles.css')
       end
-    
+
       subject do
         BPM::Pipeline.new(@project).find_asset 'hello_world/bpm_styles.css'
       end
-    
+
       it "should return an asset of type BPM::GeneratedAsset" do
         subject.class.should == BPM::GeneratedAsset
       end
-    
+
       it "should find the app_styles.css" do
         subject.pathname.should == home('hello_world', 'assets', 'hello_world', 'bpm_styles.css')
       end
-    
+
       it "should find bpm_styles as well" do
         BPM::Pipeline.new(@project).find_asset('hello_world/bpm_styles').should == subject
       end
-    
+
       it "should have a manifest line" do
         subject.to_s.should include('MANIFEST: hello_world (2.0.0)')
       end
-    
+
       it "should include any required modules in the bpm_styles" do
         subject.to_s.should include(File.read(home('hello_world', 'css', 'dummy.css')))
       end
-    
+
     end
-    
+
     describe "hello_world/app_tests.js" do
-    
+
       before do
         FileUtils.mkdir_p home('hello_world', 'assets', 'hello_world')
         FileUtils.touch home('hello_world', 'assets', 'hello_world', 'app_tests.js')
       end
-    
+
       subject do
         BPM::Pipeline.new(@project).find_asset 'hello_world/bpm_tests.js'
       end
-    
+
       it "should return an asset of type BPM::GeneratedAsset" do
         subject.class.should == BPM::GeneratedAsset
       end
-    
+
       it "should find the app_tests.js" do
         subject.pathname.should == home('hello_world', 'assets', 'hello_world', 'bpm_tests.js')
       end
-    
+
       it "should find app_tests as well" do
         BPM::Pipeline.new(@project).find_asset('hello_world/bpm_tests').should == subject
       end
-    
+
       it "should have a manifest line" do
         subject.to_s.should include('MANIFEST: hello_world (2.0.0)')
       end
-    
+
       it "should include any required modules in the bpm_tests" do
         subject.to_s.should include(File.read(home('hello_world', 'tests', 'main-test.js')))
       end
-    
+
     end
-    
+
   end
-  
+
 end
 
 
@@ -213,11 +222,11 @@ describe BPM::Pipeline, "buildable_assets" do
 
     @project = BPM::Project.new home('hello_world')
   end
-  
+
   subject do
     BPM::Pipeline.new(@project).buildable_assets
   end
-  
+
   def project(*asset_names)
     Pathname.new File.join @project.root_path, *asset_names
   end
@@ -225,35 +234,34 @@ describe BPM::Pipeline, "buildable_assets" do
   def find_asset(logical_path)
     subject.find { |x| x.logical_path == logical_path }
   end
-  
+
   it "should include bpm_libs.js" do
     asset = find_asset 'bpm_libs.js'
     asset.should_not be_nil
     asset.pathname.should == project('assets', 'bpm_libs.js')
   end
-  
+
   it "should include bpm_styles.css" do
     asset = find_asset 'bpm_styles.css'
     asset.should_not be_nil
     asset.pathname.should == project('assets', 'bpm_styles.css')
   end
-  
+
   it "should include custom_package assets" do
     asset = find_asset 'custom_package/assets/dummy.txt'
     asset.should_not be_nil
-    asset.pathname.should == project('.bpm', 'packages', 'custom_package', 'assets', 'dummy.txt')
+    asset.pathname.should == project('vendor', 'custom_package', 'assets', 'dummy.txt')
   end
-  
+
   it "should include installed package assets" do
     asset = find_asset 'core-test/extras/extra_file.html'
     asset.should_not be_nil
-    asset.pathname.should == project('.bpm', 'packages', 'core-test', 'extras', 'extra_file.html')
+    asset.pathname.should == home('.bpm', 'gems', 'core-test-0.4.9', 'extras', 'extra_file.html')
   end
-  
+
   it "should exclude libs" do
     asset = find_asset 'custom_package/assets/lib/main.js'
     asset.should be_nil
   end
-  
+
 end
-