bpm 0.1.4 → 1.0.0.beta.4

data/spec/pipeline_spec.rb

@@ -4,7 +4,10 @@ describe BPM::Pipeline, "asset_path" do
 
   before do
     goto_home
-    FileUtils.cp_r(fixtures('hello_world'), '.')
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(project_fixture('hello_world'), '.')
+    cd home('hello_world')
   end
   
   subject do
@@ -13,31 +16,22 @@ describe BPM::Pipeline, "asset_path" do
   end
   
   it "should find any asset in the assets directory" do
+    bpm '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
-    goto_home
-    set_host
-    start_fake(FakeGemServer.new)
-    cd home('hello_world')
-    
-    bpm 'add', 'custom_package'
-    wait
+    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')
   end
   
   it "should find any asset in installed packages" do
-    goto_home
-    set_host
-    start_fake(FakeGemServer.new)
-    cd home('hello_world')
-    
-    bpm 'compile'
-    wait
+    bpm 'fetch' and wait
+    bpm 'compile' and wait
   
     asset = subject.find_asset 'core-test/resources/runner.css'
     asset.pathname.should == home('hello_world', '.bpm', 'packages', 'core-test', 'resources', 'runner.css')
@@ -46,37 +40,33 @@ describe BPM::Pipeline, "asset_path" do
   describe "generated assets" do
 
     before do
-      goto_home
-      set_host
-      start_fake(FakeGemServer.new)
-      cd home('hello_world')
-
-      bpm 'add', 'custom_package'
-      wait
+      bpm 'fetch' and wait
+      bpm 'add', 'custom_package' and wait
 
       @project = BPM::Project.new home('hello_world')
     end
 
-    describe "bpm_packages.js" do
-  
+    describe "bpm_libs.js" do
+      
       subject do
-        BPM::Pipeline.new(@project).find_asset 'bpm_packages.js'
+        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_packages.js" do
-        subject.pathname.should == home('hello_world', 'assets', 'bpm_packages.js')
+      it "should find the bpm_libs.js" do
+        subject.pathname.should == home('hello_world', 'assets', 'bpm_libs.js')
       end
-  
-      it "should find bpm_packages as well" do
-        BPM::Pipeline.new(@project).find_asset('bpm_packages').should == subject
+      
+      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
-        subject.to_s.should include('MANIFEST: core-test (0.4.9) custom_package (2.0.0) ivory (0.0.1) optparse (1.0.1) rake (0.8.6) spade (0.5.0)')
+        # 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) 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
@@ -88,9 +78,9 @@ describe BPM::Pipeline, "asset_path" do
       end
     
     end
-  
+      
     describe "bpm_styles.css" do
-  
+      
       subject do
         BPM::Pipeline.new(@project).find_asset 'bpm_styles.css'
       end
@@ -102,78 +92,106 @@ describe BPM::Pipeline, "asset_path" do
       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')))
       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')))
       end
     
     end
-
-    describe "hello_world/app_package.js" do
+    
+    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
+    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', 'app_package.js')
+        FileUtils.touch home('hello_world', 'assets', 'hello_world', 'bpm_styles.css')
       end
     
       subject do
-        BPM::Pipeline.new(@project).find_asset 'hello_world/app_package.js'
+        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_package.js" do
-        subject.pathname.should == home('hello_world', 'assets', 'hello_world', 'app_package.js')
+      it "should find the app_styles.css" do
+        subject.pathname.should == home('hello_world', 'assets', 'hello_world', 'bpm_styles.css')
       end
-  
-      it "should find app_package as well" do
-        BPM::Pipeline.new(@project).find_asset('hello_world/app_package').should == subject
+    
+      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 app_package" do
-        subject.to_s.should include(File.read(home('hello_world', 'lib', 'main.js')))
+      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_styles.css" do
-
+    
+    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_styles.css')
+        FileUtils.touch home('hello_world', 'assets', 'hello_world', 'app_tests.js')
       end
-
+    
       subject do
-        BPM::Pipeline.new(@project).find_asset 'hello_world/app_styles.css'
+        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_styles.css" do
-        subject.pathname.should == home('hello_world', 'assets', 'hello_world', 'app_styles.css')
+    
+      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_styles as well" do
-        BPM::Pipeline.new(@project).find_asset('hello_world/app_styles').should == subject
+    
+      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 app_package" do
-        subject.to_s.should include(File.read(home('hello_world', 'css', 'dummy.css')))
+    
+      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
@@ -184,14 +202,14 @@ describe BPM::Pipeline, "buildable_assets" do
   before do
     set_host
     goto_home
-    FileUtils.cp_r(fixtures('hello_world'), '.')
+    FileUtils.cp_r(project_fixture('hello_world'), '.')
     reset_libgems bpm_dir.to_s
 
     start_fake(FakeGemServer.new)
     cd home('hello_world')
 
-    bpm 'add', 'custom_package', '--verbose'
-    wait
+    bpm 'fetch' and wait
+    bpm 'add', 'custom_package', '--verbose' and wait
 
     @project = BPM::Project.new home('hello_world')
   end
@@ -208,10 +226,10 @@ describe BPM::Pipeline, "buildable_assets" do
     subject.find { |x| x.logical_path == logical_path }
   end
   
-  it "should include bpm_packages.js" do
-    asset = find_asset 'bpm_packages.js'
+  it "should include bpm_libs.js" do
+    asset = find_asset 'bpm_libs.js'
     asset.should_not be_nil
-    asset.pathname.should == project('assets', 'bpm_packages.js')
+    asset.pathname.should == project('assets', 'bpm_libs.js')
   end
   
   it "should include bpm_styles.css" do
@@ -238,4 +256,4 @@ describe BPM::Pipeline, "buildable_assets" do
   end
   
 end
-
+ 

data/spec/plugins/minifier_spec.rb

@@ -8,7 +8,7 @@ describe BPM::Pipeline, 'minifier' do
     reset_libgems bpm_dir.to_s
     start_fake(FakeGemServer.new)
     
-    FileUtils.cp_r fixtures('minitest'), '.'
+    FileUtils.cp_r project_fixture('minitest'), '.'
     cd home('minitest')
 
     bpm 'compile'
@@ -17,23 +17,21 @@ describe BPM::Pipeline, 'minifier' do
   
   subject do
     project = BPM::Project.new home('minitest')
-    BPM::Pipeline.new project
+    BPM::Pipeline.new project, :production
   end
   
-  it "should wrap bpm_packages.js" do
-    asset = subject.find_asset 'bpm_packages.js'
-    file_path = home('minitest', 'packages', 'uglyduck', 'lib', 'main.js')
+  it "should wrap bpm_libs.js" do
+    asset = subject.find_asset 'bpm_libs.js'
     expected = <<EOF
-//MINIFIED START
-UGLY DUCK IS UGLY
 /* ===========================================================================
-   BPM Static Dependencies
-   MANIFEST: uglyduck (1.0.0)
+   BPM Combined Asset File
+   MANIFEST: (none)
    This file is generated automatically by the bpm (http://www.bpmjs.org)    
-   To use this file, load this file in your HTML head.
    =========================================================================*/
+//MINIFIED START
+UGLY DUCK IS UGLY
+
 
-#{File.read file_path}
 //MINIFIED END
 EOF
 
@@ -41,17 +39,16 @@ EOF
   end
 
   it "should wrap app_package.js" do
-    asset = subject.find_asset 'minitest/app_package.js'
+    asset = subject.find_asset 'minitest/bpm_libs.js'
     file_path = home('minitest', 'lib', 'main.js')
     expected = <<EOF
-//MINIFIED START
-UGLY DUCK IS UGLY
 /* ===========================================================================
-   BPM Static Dependencies
+   BPM Combined Asset File
    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.
    =========================================================================*/
+//MINIFIED START
+UGLY DUCK IS UGLY
 
 #{File.read(file_path)}
 //MINIFIED END
@@ -59,6 +56,18 @@ EOF
     asset.to_s.should == expected
   end
 
+  subject do
+    project = BPM::Project.new home('minitest')
+    BPM::Pipeline.new project, :production
+  end
+  
+  it "should not wrap bpm_libs.js in debug mode" do
+    project  = BPM::Project.new home('minitest')
+    pipeline = BPM::Pipeline.new project, :debug
+    asset    = pipeline.find_asset 'minitest/app_package.js'
+    asset.to_s.should_not include('//MINIFIED START')
+  end
+  
 end
 
   

data/spec/plugins/transport_spec.rb

@@ -8,7 +8,7 @@ describe BPM::Pipeline, 'transport processor' do
     reset_libgems bpm_dir.to_s
     start_fake(FakeGemServer.new)
     
-    FileUtils.cp_r fixtures('transporter'), '.'
+    FileUtils.cp_r project_fixture('transporter'), '.'
     cd home('transporter')
 
     bpm 'compile'

data/spec/project_spec.rb

@@ -3,23 +3,23 @@ require "spec_helper"
 describe BPM::Project, "project_file_path" do
 
   it "should return project file path" do
-    path = fixtures('hello_world')
+    path = project_fixture('hello_world')
     expected = File.join(path, 'hello_world.json')
     BPM::Project.project_file_path(path).should == expected
   end
 
   it "should return nil on a package" do
-    path = fixtures('core-test')
+    path = package_fixture('core-test')
     BPM::Project.project_file_path(path).should == nil
   end
 
   it "should return nil on a project with no file" do
-    path = fixtures('simple_hello')
+    path = project_fixture('simple_hello')
     BPM::Project.project_file_path(path).should == nil
   end
 
   it "should return project path with different name" do
-    path = fixtures('custom_name')
+    path = project_fixture('custom_name')
     expected = File.join(path, 'MyProject.json')
     BPM::Project.project_file_path(path).should == expected
   end
@@ -29,15 +29,15 @@ end
 describe BPM::Project, "is_project_root?" do
 
   it "should return true for a project path" do
-    BPM::Project.is_project_root?(fixtures('hello_world')).should == true
+    BPM::Project.is_project_root?(project_fixture('hello_world')).should == true
   end
 
   it "should return false for a package" do
-    BPM::Project.is_project_root?(fixtures('core-test')).should == false
+    BPM::Project.is_project_root?(package_fixture('core-test')).should == false
   end
   
   it "should return true for a project with no project file" do
-    BPM::Project.is_project_root?(fixtures('simple_hello')).should == true
+    BPM::Project.is_project_root?(project_fixture('simple_hello')).should == true
   end
 
 end
@@ -46,7 +46,7 @@ describe BPM::Project, "nearest_project" do
 
   describe "standard project" do
     subject do
-      fixtures('hello_world').to_s # string not Pathname
+      project_fixture('hello_world').to_s # string not Pathname
     end
     
     it "should return project instance for project path" do
@@ -61,7 +61,7 @@ describe BPM::Project, "nearest_project" do
 
   describe "simple project" do
     subject do
-      fixtures('simple_hello').to_s # string not Pathname
+      project_fixture('simple_hello').to_s # string not Pathname
     end
     
     it "should return project instance for project path" do
@@ -75,7 +75,7 @@ describe BPM::Project, "nearest_project" do
   end
 
   it "should return nil for a package" do
-    BPM::Project.nearest_project(fixtures('core-test')).should == nil
+    BPM::Project.nearest_project(package_fixture('core-test')).should == nil
   end
   
 end
@@ -84,13 +84,11 @@ describe BPM::Project, "project metadata" do
 
   describe "standard project" do
     subject do
-      BPM::Project.new fixtures('hello_world')
+      BPM::Project.new project_fixture('hello_world')
     end
 
-    it "should be valid" do
-      subject.valid?.should == true
-    end
-    
+    it { should be_valid }
+
     it "should get project name" do
       subject.name.should == "hello_world"
     end
@@ -105,18 +103,42 @@ describe BPM::Project, "project metadata" do
         "core-test" => "0.4.9"
       }
     end
-    
+
+    it "should get development dependencies" do
+      subject.dependencies_development.should == {
+        "custom_generator" => "1.0",
+        "jquery" => "1.4.3"
+      }
+    end
+
   end
 
+  describe "project with different name" do
+    before do
+      goto_home
+      FileUtils.cp_r project_fixture('hello_world'), 'HelloWorld2'
+    end
+    
+    subject do
+      BPM::Project.new home('HelloWorld2')
+    end
+    
+    # packages do not allow the directory and "name" to be different. make 
+    # sure project doesn't inherit this.
+    it "should not raise exception when loading json" do
+      lambda {
+        subject.load_json
+      }.should_not raise_error
+    end
+  end
+  
   describe "simple project" do
     subject do
-      BPM::Project.new fixtures('simple_hello')
+      BPM::Project.new project_fixture('simple_hello')
     end
 
-    it "should be valid" do
-      subject.valid?.should == true
-    end
-    
+    it { should be_valid }
+
     it "should get project name" do
       subject.name.should == "simple_hello"
     end
@@ -126,7 +148,8 @@ describe BPM::Project, "project metadata" do
       subject.version.should == "0.0.1"
     end
     
-    it "should get dependencies read from bpm_packages.js file" do
+    # FIXME: Is this test even useful?
+    it "should get dependencies read from bpm_libs.js file" do
       subject.dependencies.should == {
       }
     end
@@ -137,30 +160,70 @@ end
 
 describe BPM::Project, "converting" do
   subject do
-    BPM::Project.nearest_project(fixtures("hello_world")).as_json
+    BPM::Project.nearest_project(project_fixture("hello_world")).as_json
   end
 
-  it "should have bpm set to current version" do
-    subject["bpm"].should == BPM::VERSION
+  it "should have bpm set to current compatible version" do
+    subject["bpm"].should == BPM::COMPAT_VERSION
   end
 end
 
 describe BPM::Project, "package_and_module_from_path" do
 
-  it "should find package in deps"
+  before do
+    # This seems a bit overkill, but we need our dependencies installed
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(project_fixture('hello_world'), '.')
+    cd home('hello_world')
+  end
 
-  it "should fallback to self if not found in deps"
+  subject do
+    proj = BPM::Project.nearest_project('.')
+    with_env{ proj.fetch_dependencies }
+    proj
+  end
 
-  it "should throw error if no package"
+  # TODO: Make into a nice matcher
+  def check_package_and_module(proj, path, pkg_name, module_id)
+    pkg, id = proj.package_and_module_from_path(path)
+    pkg.name.should == pkg_name
+    id.should == module_id
+  end
 
-  it "should not match partial directories"
-  # i.e. packages/sproutcore should not match for packages/sproutcore-runtime
+  it "should find path in self" do
+    check_package_and_module(subject, home("hello_world", "css", "dummy.css"),
+                              "hello_world", "~css/dummy")
+  end
 
-  it "should handle and valid directory reference in package directories array"
-  # i.e. "lib": ["./lib", "./vendor/lib"]
+  it "should find path in dependencies" do
+    check_package_and_module(subject, home("hello_world", ".bpm", "packages", "core-test", "resources", "runner.css"),
+                              "core-test", "~resources/runner")
+  end
+
+  it "should throw error if no package" do
+    l = lambda{ subject.package_and_module_from_path(project_fixture("simple_hello")) }
+    l.should raise_error(/simple_hello is not within a known package/)
+  end
 
-  it "should replace with directory names"
+  it "should not match partial directories" do
+    # We're verifying that core-testing doesn't match core-test
+    # Since there is no core-testing package it will fall back to the base package, hello_world
+    check_package_and_module(subject, home("hello_world", ".bpm", "packages", "core-testing", "resources", "runner.css"),
+                              "hello_world", "~.bpm/packages/core-testing/resources/runner")
+  end
 
-  it "should not include lib directory in module name"
+  it "should handle directory reference in package directories array" do
+    check_package_and_module(subject, home("hello_world", "lib", "main.js"),
+                              "hello_world", "main")
+    check_package_and_module(subject, home("hello_world", "vendor", "lib", "something.js"),
+                              "hello_world", "something")
+  end
+
+  it "should replace with directory names" do
+    check_package_and_module(subject, home("hello_world", "custom_dir", "custom.js"),
+                              "hello_world", "~custom/custom")
+  end
 
 end

data/spec/spec_helper.rb

@@ -21,6 +21,47 @@ module SpecHelpers
     LibGems.host = @original_host if @original_host
     LibGems.sources = @original_sources if @original_sources
   end
+
+  # Use to avoid throwing errors just because an extra newline shows up
+  # somewhere
+  def normalize_whitespace(string)
+    string.gsub(/ +/, ' ').gsub(/\n+/,"\n")
+  end
+  
+  def compare_file_contents(actual_path, expected_path)
+    actual_contents   = normalize_whitespace File.read(actual_path)
+    expected_contents = normalize_whitespace File.read(expected_path)
+    actual_contents.should == expected_contents
+  end
+    
+  # compares the contents of two directories to ensure they are the same.
+  # ignores any whitespaces on files.
+  def compare_contents(actual_root, expected_root)
+    actual_root    = actual_root.to_s
+    expected_root  = expected_root.to_s # incase Pathname is passed
+
+    if File.directory? expected_root
+      # first make sure the same files are in each.
+      expected_files = Dir.glob(File.join(expected_root, '**', '*')).sort
+      actual_files   = Dir.glob(File.join(actual_root, '**', '*')).sort
+    
+      actual_files.map! { |path| expected_root + path[actual_root.size..-1] }
+      actual_files.should == expected_files
+
+      expected_files.each do |expected_path|
+        display_path = expected_path[expected_root.size..-1]
+        actual_path = @project_path + display_path
+        if File.directory? expected_path
+          File.directory?(actual_path).should be_true
+        else
+          compare_file_contents actual_path, expected_path
+        end
+      end
+    else
+      compare_file_contents actual_path, expected_path
+    end
+  end
+
 end
 
 RSpec.configure do |config|