bpm 0.1.0 → 0.1.2

data/spec/pipeline_spec.rb

@@ -43,81 +43,139 @@ describe BPM::Pipeline, "asset_path" do
     asset.pathname.should == home('hello_world', '.bpm', 'packages', 'core-test', 'resources', 'runner.css')
   end
   
-  describe "bpm_packages.js" do
-  
+  describe "generated assets" do
+
     before do
       goto_home
       set_host
       start_fake(FakeGemServer.new)
       cd home('hello_world')
-  
+
       bpm 'add', 'custom_package'
       wait
-  
+
       @project = BPM::Project.new home('hello_world')
     end
+
+    describe "bpm_packages.js" do
+  
+      subject do
+        BPM::Pipeline.new(@project).find_asset 'bpm_packages.js'
+      end
     
+      it "should return an asset of type BPM::GeneratedAsset" do
+        subject.class.should == BPM::GeneratedAsset
+      end
     
-    subject do
-      BPM::Pipeline.new(@project).find_asset 'bpm_packages.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')
-    end
+      it "should find the bpm_packages.js" do
+        subject.pathname.should == home('hello_world', 'assets', 'bpm_packages.js')
+      end
   
-    it "should find bpm_packages as well" do
-      BPM::Pipeline.new(@project).find_asset('bpm_packages').should == subject
-    end
+      it "should find bpm_packages as well" do
+        BPM::Pipeline.new(@project).find_asset('bpm_packages').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)')
-    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)')
+      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')))
-    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')))
+      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')))
-    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')))
+      end
     
-  end
+    end
   
-  describe "bpm_styles.css" do
+    describe "bpm_styles.css" do
   
-    before do
-      goto_home
-      set_host
-      start_fake(FakeGemServer.new)
-      cd home('hello_world')
+      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')))
+      end
   
-      bpm 'add', 'custom_package'
-      wait
-    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
     
-    subject do
-      project = BPM::Project.new home('hello_world')
-      BPM::Pipeline.new(project).find_asset 'bpm_styles.css'
     end
+
+    describe "hello_world/app_package.js" do
+  
+      before do
+        FileUtils.mkdir_p home('hello_world', 'assets', 'hello_world')
+        FileUtils.touch home('hello_world', 'assets', 'hello_world', 'app_package.js')
+      end
     
-    it "should find bpm_styles.css" do
-      subject.pathname.should == home('hello_world', 'assets', 'bpm_styles.css')
-    end
+      subject do
+        BPM::Pipeline.new(@project).find_asset 'hello_world/app_package.js'
+      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')))
-    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')
+      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
+      it "should find app_package as well" do
+        BPM::Pipeline.new(@project).find_asset('hello_world/app_package').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')))
+      end
+    end
+
+    describe "hello_world/app_styles.css" do
+
+      before do
+        FileUtils.mkdir_p home('hello_world', 'assets', 'hello_world')
+        FileUtils.touch home('hello_world', 'assets', 'hello_world', 'app_styles.css')
+      end
+
+      subject do
+        BPM::Pipeline.new(@project).find_asset 'hello_world/app_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', 'app_styles.css')
+      end
+
+      it "should find app_styles as well" do
+        BPM::Pipeline.new(@project).find_asset('hello_world/app_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', 'css', 'dummy.css')))
+      end
+
+    end
+      
   end
+  
 end
 
 
@@ -192,8 +250,8 @@ describe BPM::Pipeline, 'transport processor' do
     FileUtils.cp_r fixtures('transporter'), '.'
     cd home('transporter')
 
-    # bpm 'compile'
-    # wait
+    bpm 'compile'
+    wait
   end
   
   subject do
@@ -201,13 +259,76 @@ describe BPM::Pipeline, 'transport processor' do
     BPM::Pipeline.new project
   end
   
-  it "should wrap main.js" do
+  it "should wrap the project's main.js" do
     asset = subject.find_asset 'transporter/lib/main.js'
-    asset.to_s.should include('define_transport(function() {');
+    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/project_spec.rb

@@ -2,22 +2,28 @@ require "spec_helper"
 
 describe BPM::Project, "project_file_path" do
 
-  it "should return both project file paths" do
+  it "should return project file path" do
     path = fixtures('hello_world')
     expected = File.join(path, 'hello_world.json')
     BPM::Project.project_file_path(path).should == expected
   end
 
-  it "should return [] on a package" do
+  it "should return nil on a package" do
     path = fixtures('core-test')
     BPM::Project.project_file_path(path).should == nil
   end
 
-  it "should return [] on a project with no file" do
+  it "should return nil on a project with no file" do
     path = fixtures('simple_hello')
     BPM::Project.project_file_path(path).should == nil
   end
 
+  it "should return project path with different name" do
+    path = fixtures('custom_name')
+    expected = File.join(path, 'MyProject.json')
+    BPM::Project.project_file_path(path).should == expected
+  end
+
 end
 
 describe BPM::Project, "is_project_root?" do
@@ -128,3 +134,13 @@ describe BPM::Project, "project metadata" do
   end
   
 end
+
+describe BPM::Project, "converting" do
+  subject do
+    BPM::Project.nearest_project(fixtures("hello_world")).as_json
+  end
+
+  it "should have bpm set to current version" do
+    subject["bpm"].should == BPM::VERSION
+  end
+end

data/spec/support/fake_gem_server.rb

@@ -41,12 +41,12 @@ class FakeGemServer
       [200, {"Content-Type" => "application/octet-stream"}, compress(big_index)]
     elsif request.path =~ /\/quick\/Marshal\.4\.8\/(.*)\.gemspec\.rz$/
 
-      spec  = LibGems::Format.from_file_by_path(gem_or_spade($1).to_s).spec
+      spec  = LibGems::Format.from_file_by_path(gem_or_bpkg($1).to_s).spec
       value = LibGems.deflate(Marshal.dump(spec))
 
       [200, {"Content-Type" => "application/octet-stream"}, value]
     elsif request.path =~ /\/gems\/(.*)\.gem$/
-      [200, {"Content-Type" => "application/octet-stream"}, File.read(gem_or_spade($1))]
+      [200, {"Content-Type" => "application/octet-stream"}, File.read(gem_or_bpkg($1))]
     else
       [200, {"Content-Type" => "text/plain"}, "fake gem server"]
     end
@@ -62,9 +62,9 @@ class FakeGemServer
 
   private
 
-    def gem_or_spade(name)
+    def gem_or_bpkg(name)
       fixture = fixtures("#{name}.gem")
-      fixture = fixtures("#{name}.spd") unless File.exist?(fixture)
+      fixture = fixtures("#{name}.bpkg") unless File.exist?(fixture)
       fixture
     end
 

data/templates/init/project.json

@@ -12,5 +12,7 @@
     "tests":      "./tests"
   },
 
-  "dependencies": {}
+  "dependencies": {
+    <%= %["#{package.name}": "#{package.version}"] if package %>
+  }
 }

data/templates/project/index.html

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <script type="text/javascript" src="assets/bpm_packages.css"></script>
+    <script type="text/javascript" src="assets/bpm_packages.js"></script>
     <script type="text/javascript" src="app.js"></script>
 
     <link rel="stylesheet" href="assets/bpm_styles.css" type="text/css" media="screen" charset="utf-8" />

data/vendor/sprockets/.gitignore

@@ -0,0 +1,7 @@
+Gemfile.lock
+README.html
+doc
+docs
+pkg
+tmp
+*.rbc

data/vendor/sprockets/.travis.yml

@@ -0,0 +1,6 @@
+env: CI=1
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree

data/vendor/sprockets/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gemspec
+
+group :test do
+  gem 'therubyrhino', :platform => :jruby
+  gem 'therubyracer', :platform => :ruby
+end

data/vendor/sprockets/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Sam Stephenson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/sprockets/README.md

@@ -0,0 +1,22 @@
+<div style="border: 1px solid #c00; background: #fff; padding: 5px 10px"><strong>This is an in-progress rewrite of Sprockets</strong> to be released as version 2.0. Please see the <a href="https://github.com/sstephenson/sprockets/tree/1.0.x">1.0.x branch</a> for information on the current release.</div>
+
+Sprockets 2
+===========
+
+Sprockets 2 is a Rack-based asset packaging system that concatenates
+and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.
+
+This version is a rewrite of Sprockets that addresses a number of issues
+with the original version's design.
+
+* Emphasis on serving, not generating.
+* Support for multiple concatenations.
+* Support for CSS concatenations.
+* Support for CoffeeScript, LESS, Sass and SCSS preprocessing.
+* Simplified, header-comment-based dependency declarations.
+* Opt-in interpolation with ERB support.
+* Serve images and other assets from anywhere in the load path.
+
+More coming soon.
+
+[![Build Status](http://travis-ci.org/sstephenson/sprockets.png)](http://travis-ci.org/sstephenson/sprockets)

data/vendor/sprockets/Rakefile

@@ -0,0 +1,8 @@
+require "rake/testtask"
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.warning = true
+end

data/vendor/sprockets/lib/sprockets/asset.rb

@@ -0,0 +1,203 @@
+require 'time'
+
+module Sprockets
+  # `Asset` is the base class for `BundledAsset` and `StaticAsset`.
+  class Asset
+    # Internal initializer to load `Asset` from serialized `Hash`.
+    def self.from_hash(environment, hash)
+      asset = allocate
+      asset.init_with(environment, hash)
+      asset
+    end
+
+    # Define base set of attributes to be serialized.
+    def self.serialized_attributes
+      %w( environment_hexdigest
+          logical_path pathname
+          content_type mtime length digest )
+    end
+
+    attr_reader :environment
+    attr_reader :logical_path, :pathname
+
+    def initialize(environment, logical_path, pathname)
+      @environment  = environment
+      @logical_path = logical_path.to_s
+      @pathname     = Pathname.new(pathname)
+    end
+
+    # Initialize `Asset` from serialized `Hash`.
+    def init_with(environment, coder)
+      @environment = environment
+
+      self.class.serialized_attributes.each do |attr|
+        instance_variable_set("@#{attr}", coder[attr].to_s) if coder[attr]
+      end
+
+      if @pathname
+        # Expand `$root` placeholder and wrapper string in a `Pathname`
+        @pathname = Pathname.new(expand_root_path(@pathname))
+      end
+
+      if @mtime
+        # Parse time string
+        @mtime = Time.parse(@mtime)
+      end
+
+      if @length
+        # Convert length to an `Integer`
+        @length = Integer(@length)
+      end
+    end
+
+    # Copy serialized attributes to the coder object
+    def encode_with(coder)
+      coder['class'] = self.class.name.sub(/Sprockets::/, '')
+
+      self.class.serialized_attributes.each do |attr|
+        coder[attr] = send(attr).to_s
+      end
+
+      coder['pathname'] = relativize_root_path(coder['pathname'])
+    end
+
+    # Returns `Content-Type` from pathname.
+    def content_type
+      @content_type ||= environment.content_type_of(pathname)
+    end
+
+    # Get mtime at the time the `Asset` is built.
+    def mtime
+      @mtime ||= environment.stat(pathname).mtime
+    end
+
+    # Get length at the time the `Asset` is built.
+    def length
+      @length ||= environment.stat(pathname).size
+    end
+
+    # Get content digest at the time the `Asset` is built.
+    def digest
+      @digest ||= environment.file_digest(pathname).hexdigest
+    end
+
+    # Return an `Array` of `Asset` files that are declared dependencies.
+    def dependencies
+      []
+    end
+
+    # Expand asset into an `Array` of parts.
+    #
+    # Appending all of an assets body parts together should give you
+    # the asset's contents as a whole.
+    #
+    # This allows you to link to individual files for debugging
+    # purposes.
+    def to_a
+      [self]
+    end
+
+    # Add enumerator to allow `Asset` instances to be used as Rack
+    # compatible body objects.
+    def each
+      yield to_s
+    end
+
+    # Checks if Asset is fresh by comparing the actual mtime and
+    # digest to the inmemory model.
+    #
+    # Used to test if cached models need to be rebuilt.
+    #
+    # Subclass must override `fresh?` or `stale?`.
+    def fresh?
+      !stale?
+    end
+
+    # Checks if Asset is stale by comparing the actual mtime and
+    # digest to the inmemory model.
+    #
+    # Subclass must override `fresh?` or `stale?`.
+    def stale?
+      !fresh?
+    end
+
+    # Pretty inspect
+    def inspect
+      "#<#{self.class}:0x#{object_id.to_s(16)} " +
+        "pathname=#{pathname.to_s.inspect}, " +
+        "mtime=#{mtime.inspect}, " +
+        "digest=#{digest.inspect}" +
+        ">"
+    end
+
+    # Assets are equal if they share the same path, mtime and digest.
+    def eql?(other)
+      other.class == self.class &&
+        other.relative_pathname == self.relative_pathname &&
+        other.mtime == self.mtime &&
+        other.digest == self.digest
+    end
+    alias_method :==, :eql?
+
+    protected
+      # Stores the environment digest from when the asset was first created.
+      def environment_hexdigest
+        @environment_hexdigest ||= environment.digest.hexdigest
+      end
+
+      # Get pathname with its root stripped.
+      def relative_pathname
+        Pathname.new(relativize_root_path(pathname))
+      end
+
+      # Replace `$root` placeholder with actual environment root.
+      def expand_root_path(path)
+        environment.attributes_for(path).expand_root
+      end
+
+      # Replace actual environment root with `$root` placeholder.
+      def relativize_root_path(path)
+        environment.attributes_for(path).relativize_root
+      end
+
+      # Check if dependency is fresh.
+      #
+      # `dep` is a `Hash` with `path`, `mtime` and `hexdigest` keys.
+      #
+      # A `Hash` is used rather than other `Asset` object because we
+      # want to test non-asset files and directories.
+      def dependency_fresh?(dep = {})
+        path, mtime, hexdigest = dep.values_at('path', 'mtime', 'hexdigest')
+
+        stat = environment.stat(path)
+
+        # If path no longer exists, its definitely stale.
+        if stat.nil?
+          return false
+        end
+
+        # Compare dependency mime to the actual mtime. If the
+        # dependency mtime is newer than the actual mtime, the file
+        # hasn't changed since we created this `Asset` instance.
+        #
+        # However, if the mtime is newer it doesn't mean the asset is
+        # stale. Many deployment environments may recopy or recheckout
+        # assets on each deploy. In this case the mtime would be the
+        # time of deploy rather than modified time.
+        if mtime >= stat.mtime
+          return true
+        end
+
+        digest = environment.file_digest(path)
+
+        # If the mtime is newer, do a full digest comparsion. Return
+        # fresh if the digests match.
+        if hexdigest == digest.hexdigest
+          return true
+        end
+
+        # Otherwise, its stale.
+        false
+      end
+  end
+end