bpm 1.0.0.beta.8 → 1.0.0.beta.9

data/spec/cli/init_spec.rb

@@ -7,7 +7,7 @@ describe "bpm init on existing directory" do
     goto_home
     set_host
     start_fake(FakeGemServer.new)
-    
+
     @project_path = home("new_project").to_s
     FileUtils.mkdir @project_path
     cd @project_path
@@ -17,86 +17,86 @@ describe "bpm init on existing directory" do
   def compare_to(project_name)
     compare_contents @project_path, project_fixture(project_name)
   end
-  
+
   it "should create files" do
     bpm 'init' and wait
     compare_to 'init_default'
   end
-  
+
   it "should create app files with --app option" do
     bpm 'init', '--app' and wait
     compare_to 'init_app'
   end
-  
+
   it "should not overwrite existing project file" do
-    
+
     dummy_project = {
       "name" => "custom_project",
       "bpm"  => "1.0.0"
     }
-    
+
     File.open("new_project.json", 'w'){|f| f.print dummy_project.to_json }
-  
+
     bpm 'init', '--skip' and wait # skip, since we can't test the prompt
     File.read("new_project.json").should == dummy_project.to_json
   end
 
   it "should not overwrite existing project file (with different name)" do
-    
+
     dummy_project = {
       "name" => "custom_project",
       "bpm"  => "1.0.0"
     }
-    
+
     File.open("package.json", 'w'){|f| f.print dummy_project.to_json }
-  
+
     bpm 'init' and wait
     exit_status.should be_success
-    
+
     File.read("package.json").should == dummy_project.to_json
     File.exists?('new_project.json').should_not be_true
   end
-  
+
   it "should update the project with app but save other settings" do
     bpm 'init' and wait
-    
+
     # write a custom property
     project_json = File.join @project_path, 'new_project.json'
     json = JSON.load File.read(project_json)
     json["custom_property"] = "I haz it"
     File.open(project_json, 'w') { |fd| fd << json.to_json }
-  
+
     bpm 'init', '--app' and wait
-    
+
     json = JSON.load File.read(project_json)
     json["custom_property"].should == "I haz it"
     json["bpm:build"]["bpm_libs.js"].should_not be_nil
-    
+
   end
-  
+
   it "should rebuild assets" do
-  
+
     bpm 'init' and wait
-    
-    files = %w(bpm_libs.js bpm_styles.css).map do |fn| 
+
+    files = %w(bpm_libs.js bpm_styles.css).map do |fn|
       File.join(@project_path, 'assets', fn)
     end
-    
+
     files.each do |path|
       FileUtils.mkdir_p File.dirname(path)
       File.open(path, 'w') { |fd| fd.print "Not valuable info!" }
     end
-    
+
     bpm 'init' and wait
-    
+
     files.each do |path|
       File.read(path).should_not include("Not valuable info!")
     end
   end
-  
+
   it "should allow a name to be specified" do
     bpm 'init', '--name=DifferentName' and wait
-  
+
     File.join(@project_path, "DifferentName.json").should exist
     File.join(@project_path, "new_project.json").should_not exist
   end
@@ -106,17 +106,17 @@ end
 describe "bpm init on a non-existant directory" do
 
   describe "normal" do
-  
+
     before do
       goto_home
       set_host
       start_fake(FakeGemServer.new)
       cd home
     end
-  
+
     it "should create files" do
       bpm 'init', 'BpmTest'
-      
+
 
       files = %w(LICENSE README.md index.html app/main.js BpmTest.json)
       generated_files = %w(assets/bpm_libs.js assets/bpm_styles.css)
@@ -133,71 +133,71 @@ describe "bpm init on a non-existant directory" do
         home('bpm_test', *file.split('/')).should exist
       end
     end
-   
+
     it "should allow a path to be specified" do
       bpm 'init', 'DifferentLocation', '--name=BpmTest' and wait
-  
+
       home("DifferentLocation").should exist
       home("DifferentLocation", "BpmTest.json").should exist
       home("DifferentLocation", "DifferentLocation.json").should_not exist
       home("bpm_test").should_not exist
     end
-  
+
   end
-   
+
   describe "package templates" do
-  
+
     describe "with custom generator" do
-  
+
       before do
         goto_home
         set_host
         start_fake(FakeGemServer.new)
       end
-  
+
       it "should create custom files" do
         bpm 'init', 'BpmTest', '--package=custom_generator'
-  
+
         files = %w(lib lib/main.js app.js BpmTest.json)
-  
+
         # output without coloration
         output = stdout.read.gsub(/\e\[\d+m/,'')
-  
+
         files.each do |file|
           output.should =~ /create\s+#{file}$/
           home("bpm_test", file).should exist
         end
       end
-  
+
       it "should create custom app.js with explicit generator" do
         bpm 'init', 'BpmTest', '--package=custom_generator' and wait
-  
+
         File.read(home("bpm_test", "app.js")).should == "require('BpmTest/main.js')\n"
       end
-  
+
       it "should create custom project.json without explicit generator" do
         bpm 'init', 'BpmTest', '--package=core-test' and wait
-  
+
         File.read(home("bpm_test", "BpmTest.json")).should =~ /"core-test": "0.4.9"/
       end
-  
+
     end
-  
+
     describe "without custom generator" do
-  
+
       before do
         goto_home
         set_host
         start_fake(FakeGemServer.new)
         cd home
       end
-  
+
       it "should add package as a dependency even if it doesn't have custom generator" do
         bpm 'init', 'BpmTest', '--package=jquery' and wait
-  
+
         File.read(home("bpm_test", "BpmTest.json")).should =~ /"dependencies": {\n\s+"jquery": "1.4.3"\n\s+}/
       end
-  
+
     end
 
   end

data/spec/cli/rebuild_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'json'
 
 describe 'bpm compile' do
-  
+
   describe 'complex dependencies' do
 
     before do
@@ -16,13 +16,13 @@ describe 'bpm compile' do
     it "should order the packages property with dependencies" do
       bpm 'rebuild', '--mode=debug' # avoid minification.
       wait
-    
+
       file = File.read home('hello2', 'assets', 'bpm_libs.js')
       expected = <<EOF
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: a (1.0.0) b (1.0.0) c (1.0.0)
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/
 
 // HELLO C
@@ -38,7 +38,7 @@ EOF
   end
 
   describe 'development dependencies' do
-    
+
     before do
       goto_home
       set_host
@@ -49,7 +49,7 @@ EOF
       bpm 'fetch'
       wait
     end
-    
+
     def test_include(does_include, build_file, *source_file)
       contents_path = home('hello_dev', 'assets', build_file)
       expected_path = home('hello_dev', *source_file)
@@ -59,70 +59,70 @@ EOF
       else
         File.read(contents_path).should_not include(File.read(expected_path))
       end
-        
+
     end
-    
+
     def test_development_dependencies(should_include)
-      
+
       js_reg = [
         # fetch regular dependency
         %w(.bpm packages spade lib main.js)
       ]
-      
+
       js_dev = [
         # fetched development dependency
         %w(.bpm packages uglify-js lib parse-js.js),
-        
+
         # required dependency of development dependency
         %w(.bpm packages optparse lib optparse.js)
       ]
-      
+
       css_dev = [
         # css of a locally installed development dependency
         %w(packages style_package css some_style.css)
       ]
-    
+
       if should_include
         expected_manifest = 'optparse (1.0.1) spade (0.5.0) style_package (1.0.0) uglify-js (1.0.4)'
       else
         expected_manifest = 'spade (0.5.0)'
       end
-      
+
       # validate manifest
       expected_manifest = "MANIFEST: #{expected_manifest}"
       File.read(home('hello_dev', 'assets', 'bpm_libs.js')).should include(expected_manifest)
-      
+
       js_reg.each do |path|
         test_include true, 'bpm_libs.js', *path
       end
-      
+
       js_dev.each do |path|
         test_include(should_include, 'bpm_libs.js', *path)
       end
-      
+
       css_dev.each do |path|
         test_include(should_include, 'bpm_styles.css', *path)
       end
     end
-    
+
     it "building in debug mode" do
       bpm 'rebuild', '--mode=debug'
       wait
-      
+
       test_development_dependencies true
     end
 
     it "building in production mode" do
       bpm 'rebuild', '--mode=production'
       wait
-      
+
       test_development_dependencies false
     end
-    
+
   end
-  
+
   describe "update" do
-    
+
     before do
       goto_home
       set_host
@@ -130,7 +130,7 @@ EOF
       FileUtils.cp_r project_fixture('needs_rake'), '.'
       cd home('needs_rake')
     end
-  
+
     it "should not update dependencies with no-update if they can be met" do
       bpm 'fetch', 'rake', '--version=0.8.6' and wait
       bpm 'rebuild', '--no-update', '--verbose'
@@ -153,11 +153,11 @@ EOF
       out.should include('Fetching packages from remote...')
       out.should include("'rake' (0.8.7)")
     end
-    
+
   end
-  
+
   describe "error conditions" do
-    
+
     before do
       goto_home
       set_host
@@ -165,17 +165,17 @@ EOF
       FileUtils.cp_r(project_fixture('hello_dev'), '.')
       cd home('hello_dev')
     end
-      
+
     it "should automatically recover if packages are damaged" do
-      bpm 'rebuild' and wait 
+      bpm 'rebuild' and wait
       out = stdout.read
       out.should include('~ Building bpm_libs.js')
-      
+
       FileUtils.rm_r home('.bpm') # delete linked directories.
       bpm 'rebuild', '--verbose', :track_stderr => true
       err = stderr.read
       err.should_not include('Could not find eligible')
     end
   end
-      
+
 end

data/spec/fixtures/projects/init_app/assets/bpm_libs.js

@@ -1,6 +1,6 @@
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: new_project ()
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/
 // MINIFIED

data/spec/fixtures/projects/init_app/assets/bpm_styles.css

@@ -1,5 +1,5 @@
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: new_project ()
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/

data/spec/fixtures/projects/init_default/assets/bpm_libs.js

@@ -1,6 +1,6 @@
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: (none)
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/
 // MINIFIED

data/spec/fixtures/projects/init_default/assets/bpm_styles.css

@@ -1,5 +1,5 @@
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: (none)
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/

data/spec/plugins/minifier_spec.rb

@@ -7,26 +7,26 @@ describe BPM::Pipeline, 'minifier' do
     set_host
     reset_libgems bpm_dir.to_s
     start_fake(FakeGemServer.new)
-    
+
     FileUtils.cp_r project_fixture('minitest'), '.'
     cd home('minitest')
 
     bpm 'rebuild'
     wait
   end
-  
+
   subject do
     project = BPM::Project.new home('minitest')
     BPM::Pipeline.new project, :production
   end
-  
+
   it "should wrap bpm_libs.js" do
     asset = subject.find_asset 'bpm_libs.js'
     expected = <<EOF
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: (none)
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/
 //MINIFIED START
 UGLY DUCK IS UGLYboston
@@ -45,7 +45,7 @@ EOF
 /* ===========================================================================
    BPM Combined Asset File
    MANIFEST: minitest (2.0.0)
-   This file is generated automatically by the bpm (http://www.bpmjs.org)    
+   This file is generated automatically by the bpm (http://www.bpmjs.org)
    =========================================================================*/
 //MINIFIED START
 UGLY DUCK IS UGLYsanfran
@@ -60,14 +60,14 @@ EOF
     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/templates/project/index.html

@@ -1,7 +1,6 @@
 <html>
   <head>
     <link rel="stylesheet" href="assets/bpm_styles.css" type="text/css" media="screen" charset="utf-8" />
-    <link rel="stylesheet" href="assets/<%= name %>/bpm_styles.css" type="text/css" media="screen" charset="utf-8" />
 
     <title><%= name %></title>
   </head>
@@ -10,5 +9,4 @@
   </body>
 
   <script type="text/javascript" src="assets/bpm_libs.js"></script>
-  <script type="text/javascript" src="assets/<%= name %>/bpm_libs.js"></script>
 </html>