bpm 0.1.4 → 1.0.0.beta.4

data/spec/support/fake_gem_server.rb

@@ -17,7 +17,9 @@ class FakeGemServer
         index("spade",     "0.5.0"),
         index("jquery",    "1.4.3"),
         index("ivory",     "0.0.1"),
-        index("optparse",  "1.0.1")
+        index("optparse",  "1.0.1"),
+        index("uglify-js",  "1.0.4"),
+        index("custom_generator", "1.0")
       ]
       [200, {"Content-Type" => "application/octet-stream"}, compress(latest_index)]
     elsif request.path =~ /prerelease_specs/
@@ -36,7 +38,9 @@ class FakeGemServer
         index("spade",     "0.5.0"),
         index("jquery",    "1.4.3"),
         index("ivory",     "0.0.1"),
-        index("optparse",  "1.0.1")
+        index("optparse",  "1.0.1"),
+        index("uglify-js",  "1.0.4"),
+        index("custom_generator", "1.0")
       ]
       [200, {"Content-Type" => "application/octet-stream"}, compress(big_index)]
     elsif request.path =~ /\/quick\/Marshal\.4\.8\/(.*)\.gemspec\.rz$/
@@ -63,8 +67,8 @@ class FakeGemServer
   private
 
     def gem_or_bpkg(name)
-      fixture = fixtures("#{name}.gem")
-      fixture = fixtures("#{name}.bpkg") unless File.exist?(fixture)
+      fixture = fixtures('gems', "#{name}.gem")
+      fixture = fixtures('gems', "#{name}.bpkg") unless File.exist?(fixture)
       fixture
     end
 

data/spec/support/path.rb

@@ -34,6 +34,14 @@ module SpecHelpers
     root.join('spec/fixtures', *path)
   end
 
+  def project_fixture(*path)
+    fixtures 'projects', *path
+  end
+  
+  def package_fixture(*path)
+    fixtures 'packages', *path
+  end
+  
   def tmp(*path)
     root.join("tmp", *path)
   end

data/spec/support/project.rb

@@ -1,43 +1,76 @@
-module SpecHelpers
+  module SpecHelpers
   
-  def validate_dependency_in_project_file(package_name, package_version)
+  def validate_dependency_in_project_file(package_name, package_version, development=false)
     json = JSON.parse File.read(home('hello_world', 'hello_world.json'))
-    json['dependencies'][package_name].should == package_version
+    key = development ? "dependencies:development" : "dependencies"
+    json[key][package_name].should == package_version
   end
 
   def validate_installed_dependency(package_name, package_version)
-    bpm_packages = home 'hello_world', 'assets', 'bpm_packages.js'
+    bpm_libs = home 'hello_world', 'assets', 'bpm_libs.js'
     bpm_styles   = home 'hello_world', 'assets', 'bpm_styles.css'
-    exp_str = "#{package_name} (#{package_version})"
+    version_regexp = package_version ? Regexp.escape(package_version) : ".+?"
+    exp_str = /#{package_name} \(#{version_regexp}\)/
 
-    bpm_packages = File.readlines(bpm_packages)[0..6].join("")
-    bpm_styles   = File.readlines(bpm_styles)[0..6].join("")
+    if package_version
+      File.exists?(bpm_libs).should be_true
+      File.exists?(bpm_styles).should be_true
+      bpm_libs = File.readlines(bpm_libs)[0..6].join("")
+      bpm_styles = File.readlines(bpm_styles)[0..6].join("")
+    else
+      if !File.exists?(bpm_libs)
+        File.exists?(bpm_libs).should_not be_true
+        bpm_libs = nil
+      else
+        bpm_libs = File.readlines(bpm_libs)[0..6].join("")
+      end
 
+      if !File.exists?(bpm_styles)
+        File.exists?(bpm_styles).should_not be_true
+        bpm_styles = nil
+      else
+        bpm_styles = File.readlines(bpm_styles)[0..6].join("")
+      end
+    end
+      
     if package_version
-      bpm_packages.should include(exp_str)
-      bpm_styles.should   include(exp_str)
+      bpm_libs.should =~ exp_str
+      bpm_styles.should   =~ exp_str
     else
-      bpm_packages.should_not include exp_str
-      bpm_styles.should_not   include exp_str
+      # note: it's ok if the file does not exist; means asset was not built
+      bpm_libs.should_not =~ exp_str if bpm_libs
+      bpm_styles.should_not   =~ exp_str if bpm_styles
     end
   end
     
   def has_dependency(package_name, package_version, hard_version = '>= 0')
     validate_dependency_in_project_file package_name, hard_version
     validate_installed_dependency package_name, package_version
-    # TODO: Verify packages built into bpm_packages.js and css
+    # TODO: Verify packages built into bpm_libs.js and css
+  end
+
+  def has_development_dependency(package_name, package_version, hard_version = '>= 0')
+    validate_dependency_in_project_file package_name, hard_version, true
+    validate_installed_dependency package_name, package_version
+    # TODO: Verify packages built into bpm_libs.js and css
   end
 
   def has_soft_dependency(package_name, package_version)
     validate_dependency_in_project_file package_name, nil
     validate_installed_dependency package_name, package_version
-    # TODO: Verify packages built into bpm_packages.js and css
+    # TODO: Verify packages built into bpm_libs.js and css
   end
   
-  def no_dependency(package_name)
+  def no_dependency(package_name, check_installed=true)
     validate_dependency_in_project_file package_name, nil
-    validate_installed_dependency package_name, nil
-    # TODO: Verify packages not built into bpm_packages.js and css
+    validate_installed_dependency package_name, nil if check_installed
+    # TODO: Verify packages not built into bpm_libs.js and css
   end
-  
+
+  def no_development_dependency(package_name, check_installed=true)
+    validate_dependency_in_project_file package_name, nil, true
+    validate_installed_dependency package_name, nil if check_installed
+    # TODO: Verify packages not built into bpm_libs.js and css
+  end
+
 end

data/templates/init/project.json

@@ -1,18 +1,16 @@
 {
-  "name":         "<%= name %>",
-  "version":      "0.0.1",
-  "bpm":          "<%= bpm_version %>",
+  "name":  "<%= name %>",
+  "bpm":   "<%= bpm_version %>",
 
-  "description":  "DESCRIPTION HERE",
-  "author":       "YOUR NAME HERE",
-  "homepage":     "URL",
-
-  "directories": {
-    "lib":        "./lib",
-    "tests":      "./tests"
-  },
-
-  "dependencies": {
-    <%= %["#{package.name}": "#{package.version}"] if package %>
+  "bpm:build": {
+    "bpm_libs.js": {
+      "directories": [],
+      "minifier": "uglify-js"
+    },
+    
+    "bpm_styles.css": {
+      "directories": []
+    }
   }
 }
+

data/templates/project/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) <%= current_year %> YOUR NAME
+Copyright (c) <%= current_year %> <%= company_name %>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/templates/project/app/main.js

@@ -0,0 +1,6 @@
+// ==========================================================================
+// Project:   <%= name %>
+// Copyright: ©<%= current_year %> <%= company_name %> All rights reserved.
+// ==========================================================================
+
+// TODO: Your app code goes here

data/templates/project/css/main.css

@@ -0,0 +1 @@
+/* TODO: Add your app CSS here */

data/templates/project/index.html

@@ -1,13 +1,14 @@
 <html>
   <head>
-    <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" />
+    <link rel="stylesheet" href="assets/<%= name %>/bpm_styles.css" type="text/css" media="screen" charset="utf-8" />
 
     <title><%= name %></title>
   </head>
   <body>
     <h1>Hello World</h1>
   </body>
+
+  <script type="text/javascript" src="assets/bpm_libs.js"></script>
+  <script type="text/javascript" src="assets/<%= name %>/bpm_libs.js"></script>
 </html>

data/vendor/sprockets/.travis.yml

@@ -1,6 +1,7 @@
-env: CI=1
-
 rvm:
   - 1.8.7
   - 1.9.2
   - ree
+
+notifications:
+  disabled: true

data/vendor/sprockets/Gemfile

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

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

@@ -12,39 +12,39 @@ module Sprockets
 
     # Define base set of attributes to be serialized.
     def self.serialized_attributes
-      %w( environment_hexdigest
-          logical_path pathname
-          content_type mtime length digest )
+      %w( id logical_path pathname )
     end
 
     attr_reader :environment
-    attr_reader :logical_path, :pathname
+    attr_reader :id, :logical_path, :pathname
 
     def initialize(environment, logical_path, pathname)
       @environment  = environment
       @logical_path = logical_path.to_s
       @pathname     = Pathname.new(pathname)
+      @id           = environment.digest.update(object_id.to_s).to_s
     end
 
     # Initialize `Asset` from serialized `Hash`.
     def init_with(environment, coder)
       @environment = environment
+      @pathname = @mtime = @length = nil
 
       self.class.serialized_attributes.each do |attr|
         instance_variable_set("@#{attr}", coder[attr].to_s) if coder[attr]
       end
 
-      if @pathname
+      if @pathname && @pathname.is_a?(String)
         # Expand `$root` placeholder and wrapper string in a `Pathname`
         @pathname = Pathname.new(expand_root_path(@pathname))
       end
 
-      if @mtime
+      if @mtime && @mtime.is_a?(String)
         # Parse time string
         @mtime = Time.parse(@mtime)
       end
 
-      if @length
+      if @length && @length.is_a?(String)
         # Convert length to an `Integer`
         @length = Integer(@length)
       end
@@ -140,11 +140,6 @@ module Sprockets
     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))

data/vendor/sprockets/lib/sprockets/asset_attributes.rb

@@ -13,24 +13,6 @@ module Sprockets
       @pathname = path.is_a?(Pathname) ? path : Pathname.new(path.to_s)
     end
 
-    # Returns `Array` of extension `String`s.
-    #
-    #     "foo.js.coffee"
-    #     # => [".js", ".coffee"]
-    #
-    def extensions
-      @extensions ||= @pathname.basename.to_s.scan(/\.[^.]+/)
-    end
-
-    # Returns basename alone.
-    #
-    #     "foo/bar.js"
-    #     # => "bar"
-    #
-    def basename_without_extensions
-      @pathname.basename(extensions.join)
-    end
-
     # Replaces `$root` placeholder with actual environment root.
     def expand_root
       pathname.to_s.sub(/^\$root/, environment.root)
@@ -48,27 +30,66 @@ module Sprockets
         sub(/^#{Regexp.escape(environment.root)}\//, '')
     end
 
-    # Returns the index location.
-    #
-    #     "foo/bar.js"
-    #     # => "foo/bar/index.js"
+    # Returns paths search the load path for.
+    def search_paths
+      paths = [pathname.to_s]
+
+      if format_extension && engine_extensions.empty?
+        environment.engine_formats(format_extension).each do |ext, engine|
+          paths << pathname.sub(format_extension, ext).to_s
+        end
+      end
+
+      if pathname.basename(extensions.join).to_s != 'index'
+        path_without_extensions = extensions.inject(pathname) { |p, ext| p.sub(ext, '') }
+        index_path = path_without_extensions.join("index#{extensions.join}").to_s
+
+        paths << index_path
+
+        if format_extension && engine_extensions.empty?
+          environment.engine_formats(format_extension).each do |ext, engine|
+            paths << index_path.sub(format_extension, ext).to_s
+          end
+        end
+      end
+
+      paths
+    end
+
+    # Reverse guess logical path for fully expanded path.
     #
-    def index_path
-      if basename_without_extensions.to_s == 'index'
-        pathname.to_s
-      else
-        basename = "#{basename_without_extensions}/index#{extensions.join}"
-        pathname.dirname.to_s == '.' ? basename : pathname.dirname.join(basename).to_s
+    # This has some known issues. For an example if a file is
+    # shaddowed in the path, but is required relatively, its logical
+    # path will be incorrect.
+    def logical_path
+      raise ArgumentError unless pathname.absolute?
+
+      if root_path = environment.paths.detect { |path| pathname.to_s[path] }
+        path = pathname.relative_path_from(Pathname.new(root_path)).to_s
+        path = engine_extensions.inject(path) { |p, ext| p.sub(ext, '') }
+        path = "#{path}#{engine_format_extension}" unless format_extension
+        path
       end
     end
 
+    # Returns `Array` of extension `String`s.
+    #
+    #     "foo.js.coffee"
+    #     # => [".js", ".coffee"]
+    #
+    def extensions
+      @extensions ||= @pathname.basename.to_s.scan(/\.[^.]+/)
+    end
+
     # Returns the format extension.
     #
     #     "foo.js.coffee"
     #     # => ".js"
     #
     def format_extension
-      extensions.detect { |ext| @environment.mime_types(ext) }
+      extensions.detect { |ext|
+        @environment.mime_types(ext) && !@environment.engines(ext)
+      }
     end
 
     # Returns an `Array` of engine extensions.
@@ -86,17 +107,6 @@ module Sprockets
       exts.select { |ext| @environment.engines(ext) }
     end
 
-    # Returns path without any engine extensions.
-    #
-    #     "foo.js.coffee.erb"
-    #     # => "foo.js"
-    #
-    def without_engine_extensions
-      engine_extensions.inject(pathname) do |p, ext|
-        p.sub(ext, '')
-      end
-    end
-
     # Returns engine classes.
     def engines
       engine_extensions.map { |ext| @environment.engines(ext) }
@@ -109,19 +119,6 @@ module Sprockets
         environment.postprocessors(content_type)
     end
 
-    # Returns implicit engine content type.
-    #
-    # `.coffee` files carry an implicit `application/javascript`
-    # content type.
-    def engine_content_type
-      engines.reverse.each do |engine|
-        if engine.respond_to?(:default_mime_type) && engine.default_mime_type
-          return engine.default_mime_type
-        end
-      end
-      nil
-    end
-
     # Returns the content type for the pathname. Falls back to `application/octet-stream`.
     def content_type
       @content_type ||= begin
@@ -157,5 +154,25 @@ module Sprockets
         pathname.dirname.to_s == '.' ? basename : pathname.dirname.join(basename).to_s
       end
     end
+
+    private
+      # Returns implicit engine content type.
+      #
+      # `.coffee` files carry an implicit `application/javascript`
+      # content type.
+      def engine_content_type
+        engines.reverse.each do |engine|
+          if engine.respond_to?(:default_mime_type) && engine.default_mime_type
+            return engine.default_mime_type
+          end
+        end
+        nil
+      end
+
+      def engine_format_extension
+        if content_type = engine_content_type
+          environment.extension_for_mime_type(content_type)
+        end
+      end
   end
 end

data/vendor/sprockets/lib/sprockets/base.rb

@@ -97,7 +97,7 @@ module Sprockets
       pathname = Pathname.new(path)
 
       if pathname.absolute?
-        build_asset(detect_logical_path(path).to_s, pathname, options)
+        build_asset(attributes_for(pathname).logical_path, pathname, options)
       else
         find_asset_in_path(pathname, options)
       end
@@ -130,18 +130,5 @@ module Sprockets
           StaticAsset.new(self, logical_path, pathname)
         end
       end
-
-      # Reverse guess logical path for fully expanded path.#
-      #
-      # This has some known issues. For an example if a file is
-      # shaddowed in the path, but is required relatively, its logical
-      # path will be incorrect.
-      def detect_logical_path(filename)
-        if root_path = paths.detect { |path| filename.to_s[path] }
-          root_pathname = Pathname.new(root_path)
-          logical_path  = Pathname.new(filename).relative_path_from(root_pathname)
-          attributes_for(logical_path).without_engine_extensions
-        end
-      end
   end
 end