bpm 0.1.0 → 0.1.2

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/sprockets"]
+	path = vendor/sprockets
+	url = git://github.com/sstephenson/sprockets.git

data/Gemfile

@@ -1,16 +1,3 @@
-# A sample Gemfile
 source "http://rubygems.org"
 
-if ENV["SPADE_PATH"]
-  gem 'spade', :path => ENV["SPADE_PATH"]
-else
-  gem 'spade', :git => "git://github.com/sproutcore/spade-ruby"
-end
-
-if ENV["SPOCKETS_PATH"]
-  gem 'sprockets', :path => ENV["SPROCKETS_PATH"]
-else
-  gem 'sprockets', :git => "git://github.com/sstephenson/sprockets"
-end
-
 gemspec

data/TODO.md

@@ -1,3 +1,4 @@
 
 * Better support for using plugins during builds.  Ideal solution would create a .js file for each plugin and load it in a separate context.  This would  allow each plugin to actually require other dependencies, etc.  This is required to properly support format plugins.
 
+* Development dependencies

data/bpm.gemspec

@@ -21,14 +21,19 @@ Gem::Specification.new do |s|
   s.add_dependency "highline",     "~> 1.6.1"
   s.add_dependency "json_pure",    "~> 1.4.6"
   s.add_dependency "thor",         "~> 0.14.3"
-  s.add_dependency "sprockets"
-  s.add_dependency "spade"
+  s.add_dependency "therubyracer", "~> 0.9.2"
+
+  # Begin Sprockets Deps
+  s.add_dependency "hike", "~> 1.1"
+  s.add_dependency "rack", "~> 1.0"
+  s.add_dependency "tilt", ["~> 1.1", "!= 1.3.0"]
+  # End Sprockets Deps
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rack", "~> 1.2.1"
 
   paths = `git submodule`.split("\n").map do |line|
-    path = line.gsub(/^ \w+ ([^\s]+) .+$/,'\1')
+    path = line.gsub(/^.\w+\s+(\S+).*/,'\1')
     `cd #{path}; git ls-files`.split("\n").map { |p| File.join(path, p) }
   end
   paths << `git ls-files`.split("\n")

data/lib/bpm/cli/base.rb

@@ -56,27 +56,27 @@ module BPM
       end
 
       desc "add [PACKAGE]", "Add package to project"
-      method_option :version,    :type => :string,  :default => ">= 0", :aliases => ['-v'],    :desc => 'Specify a version to install'
+      method_option :version,    :type => :string,  :default => nil, :aliases => ['-v'],    :desc => 'Specify a version to install'
       method_option :project,    :type => :string,  :default => nil, :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
       method_option :prerelease, :type => :boolean, :default => false,  :aliases => ['--pre'], :desc => 'Install a prerelease version'
       def add(*package_names)
-
         # map to dependencies
-        if package_names.size.zero?
+        if package_names.empty?
           abort "You must specify at least one package"
-        elsif package_names.size == 1
-          deps = {}
-          vers = options[:version]
-          vers = '>= 0-pre' if vers == '>= 0' && options[:prerelease]
-          deps[package_names.first] = vers
         else
-          if options[:version] != '>= 0'
+          if package_names.size > 1 && options[:version]
             abort "You can only name one package with the version option"
           end
-          
+
           deps = {}
-          vers = options[:prerelease] ? '>= 0-pre' : '>= 0'
-          package_names.each { |name| deps[name] = vers }
+          package_names.each do |name|
+            vers = options[:version] || (options[:prerelease] ? '>= 0-pre' : '>= 0')
+            if name =~ /^(.+?)(-(\d[\w\.]*))?\.bpkg$/
+              name = $1
+              vers = $3 if $3
+            end
+            deps[name] = vers
+          end
         end
 
         # find project
@@ -85,8 +85,8 @@ module BPM
         begin
           project.add_dependencies deps, true
           project.build :debug, true
-        # rescue Exception => e
-        #   abort e.message
+        rescue Exception => e
+          abort e.message
         end
       end
 
@@ -220,7 +220,7 @@ module BPM
 
         path = File.expand_path(options[:path] || underscore(name))
         generator = get_generator(:project, package)
-        success = generator.new(self, name, path, template_path).run
+        success = generator.new(self, name, path, template_path, package).run
 
         run_init(name, path, package) if success
       end
@@ -287,7 +287,7 @@ module BPM
           template_path = package ? package.template_path(:init) : nil
 
           generator = get_generator(:init, package)
-          generator.new(self, name, path, package && template_path).run
+          generator.new(self, name, path, template_path, package).run
 
           project = BPM::Project.new(path, name)
           project.fetch_dependencies true
@@ -335,10 +335,12 @@ module BPM
 
         def install_package(pkg_name)
           return nil unless pkg_name
-          dep = LibGems::Dependency.new(pkg_name)
-          installed = LibGems.source_index.search(dep)
-          if installed.empty?
-            installed = BPM::Remote.new.install(pkg_name)
+          begin
+            # Try remote first to get the latest versions
+            installed = BPM::Remote.new.install(pkg_name, ">= 0", false)
+          rescue LibGems::GemNotFoundException
+            dep = LibGems::Dependency.new(pkg_name)
+            installed = LibGems.source_index.search(dep)
           end
           spec = installed.find{|p| p.name == pkg_name }
           abort "Unable to find package: #{pkg_name}" unless spec

data/lib/bpm/generator.rb

@@ -29,10 +29,10 @@ module BPM
   class Generator
     include Thor::Actions
 
-    attr_reader :name
+    attr_reader :name, :package
 
-    def initialize(thor, name, root, template_path=nil)
-      @thor, @name, @template_path = thor, name, template_path
+    def initialize(thor, name, root, template_path=nil, package=nil)
+      @thor, @name, @template_path, @package = thor, name, template_path, package
 
       self.destination_root = root
     end

data/lib/bpm/libgems_ext/dependency_installer.rb

@@ -3,7 +3,7 @@ require 'libgems/dependency_installer'
 module LibGems
   class DependencyInstaller
 
-    # Had to overwrite this all just to change the match from /gem$/ to /spd$/
+    # Had to overwrite this all just to change the match from /gem$/ to /bpkg$/
     # TODO: Consider whether extension should be settable in LibGems
     def find_spec_by_name_and_version(gem_name,
                                       version = LibGems::Requirement.default,
@@ -20,7 +20,7 @@ module LibGems
 
       unless local_gems.empty? then
         local_gems.each do |gem_file|
-          next unless gem_file =~ /spd$/
+          next unless gem_file =~ /bpkg$/
           begin
             spec = LibGems::Format.from_file_by_path(gem_file).spec
             spec_and_source = [spec, gem_file]
@@ -69,7 +69,7 @@ module LibGems
           next if @source_index.any? { |n,_| n == spec.full_name } and not last
 
           # TODO: make this sorta_verbose so other users can benefit from it
-          say "Installing spd #{spec.full_name}" if LibGems.configuration.really_verbose
+          say "Installing bpkg #{spec.full_name}" if LibGems.configuration.really_verbose
 
           _, source_uri = @specs_and_sources.assoc spec
           begin
@@ -108,7 +108,7 @@ module LibGems
       gems_and_sources = []
 
       if @domain == :both or @domain == :local then
-        Dir[File.join(Dir.pwd, "#{dep.name}-[0-9]*.spd")].each do |gem_file|
+        Dir[File.join(Dir.pwd, "#{dep.name}-[0-9]*.bpkg")].each do |gem_file|
           spec = LibGems::Format.from_file_by_path(gem_file).spec
           gems_and_sources << [spec, gem_file] if spec.name == dep.name
         end

data/lib/bpm/libgems_ext/installer.rb

@@ -9,7 +9,7 @@ module LibGems
 #
 # This file was generated by BPM.
 #
-# The application '#{@spec.name}' is installed as part of an spd, and
+# The application '#{@spec.name}' is installed as part of an bpkg, and
 # this file is here to facilitate running it.
 #
 

data/lib/bpm/package.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module BPM
   class Package
-    EXT      = "spd"
+    EXT      = "bpkg"
     METADATA = %w[keywords licenses engines main bin directories]
     FIELDS   = %w[name version description author homepage summary]
     attr_accessor :metadata, :lib_path, :tests_path, :errors, :json_path, :attributes, :directories, :dependencies, :root_path
@@ -24,10 +24,6 @@ module BPM
       @metadata = {}
     end
 
-    def bpm
-      @bpm || BPM::VERSION
-    end
-
     def bpkg=(spec)
       unless spec.is_a?(LibGems::Specification)
         spec = LibGems::Format.from_file_by_path(spec.to_s).spec
@@ -46,7 +42,7 @@ module BPM
         spec.summary           = summary
         spec.description       = description
         spec.requirements      = [metadata.to_json]
-        spec.files             = directory_files + template_files + ["package.json"]
+        spec.files             = directory_files + template_files + transport_files + ["package.json"]
         spec.test_files        = glob_files(tests_path)
         spec.bindir            = bin_path
         spec.executables       = bin_files.map{|p| File.basename(p) } if bin_path
@@ -151,6 +147,10 @@ module BPM
       glob_files("templates")
     end
 
+    def transport_files
+      glob_files("transports")
+    end
+
     def bin_path
       @directories["bin"] || "bin"
     end
@@ -164,11 +164,15 @@ module BPM
     end
 
     def transport_plugins(project)
-      plugin_modules('plugin:transport', project)
+      plugin_modules('plugin:transport', project, false)
+    end
+    
+    def minifier_plugins(project)
+      [@attributes['plugin:minifier']].compact
     end
 
-    def plugin_modules(key_name, project)
-      return [@attributes[key_name]] if @attributes[key_name]
+    def plugin_modules(key_name, project, own=true)
+      return [@attributes[key_name]] if own && @attributes[key_name]
       dependencies.keys.map do |pkg_name| 
         dep = project.local_deps.find do |pkg| 
           pkg.load_json

data/lib/bpm/pipeline/generated_asset.rb

@@ -17,11 +17,38 @@ module BPM
 
   private
 
+    def build_source
+      minify super
+    end
+
+    def minify(body)
+      project = environment.project
+      minifier_name = project.minifier_name
+      if minifier_name && content_type == 'application/javascript' 
+        pkg = project.package_from_name minifier_name
+        minifier_plugin = pkg.minifier_plugins(project).first
+        
+        minifier_path = blank_context.resolve(project.path_from_module(minifier_plugin))
+        
+        ctx = environment.js_context_for minifier_path
+        out = ''
+
+        V8::C::Locker() do
+          ctx["PACKAGE_INFO"] = pkg.attributes
+          ctx["DATA"]         = body
+          body = ctx.eval("exports.minify(DATA, PACKAGE_INFO);")
+        end
+      end
+      
+      body
+    end
+    
     def build_dependency_context_and_body
 
       project = environment.project
-      if project.local_deps.size > 0
-        manifest = project.local_deps.map do |x| 
+      pkgs = pathname.to_s =~ /app_/ ? [project] : project.local_deps
+      if pkgs.size > 0
+        manifest = pkgs.map do |x| 
           "#{x.name} (#{x.version})"
         end.join " "
       else
@@ -48,7 +75,7 @@ EOF
 
       dir_name, dir_method = FORMAT_METHODS[content_type] || ['lib', 'pipeline_libs']
 
-      project.local_deps.map do |pkg|
+      pkgs.map do |pkg|
         pkg.load_json
         pkg.send(dir_method).each do |dir|
           dir_name = pkg.directories[dir] || dir 

data/lib/bpm/pipeline/transport_processor.rb

@@ -8,23 +8,31 @@ module BPM
       project = context.environment.project
       pkg, module_id = project.package_and_module_from_path file
       transport_plugins = pkg.transport_plugins(project)
-      
+
+      # No transport, just return the existing data
+      return data if transport_plugins.empty?
+
       if transport_plugins.size > 1
-        raise "#{pkg.name} depends on #{transport_plugins.size} packages that define transport plugins.  Select a plugin by adding a `plugin:transport` property to the package.json"
-      elsif transport_plugins.size == 1
-        transport_module = transport_plugins.first
-        
-        transport_path   = context.resolve project.path_from_module(transport_module)
+        # TODO: Maybe make custom error for this
+        raise "#{pkg.name} depends on #{transport_plugins.size} packages that define transport plugins. " \
+                "Select a plugin by adding a `plugin:transport` property to the package.json"
+      end
+
+      project_path = project.root_path.to_s
+      project_path << '/' if project_path !~ /\/$/
+      filepath = file.sub(/^#{project_path}/,'') # relative file path from project
 
-        ctx = context.environment.js_context_for transport_path
+      transport_path = context.resolve project.path_from_module(transport_plugins.first)
+      ctx = context.environment.js_context_for transport_path
+      out = ''
+
+      V8::C::Locker() do
         ctx["PACKAGE_INFO"] = pkg.attributes
         ctx["DATA"]         = data
-        wrapped = ctx.eval "exports.compileTransport(DATA, PACKAGE_INFO, '#{module_id}');"
-
-        wrapped
-      else
-        data
+        out = ctx.eval("exports.compileTransport(DATA, PACKAGE_INFO, '#{module_id}', '#{filepath}');")
       end
+
+      out + "\n\n"
     end
     
   end

data/lib/bpm/pipeline.rb

@@ -1,4 +1,5 @@
 require 'sprockets'
+require 'v8'
 
 module BPM
 
@@ -26,9 +27,11 @@ module BPM
         unregister_processor kind, Sprockets::DirectiveProcessor
         register_processor   kind, BPM::DirectiveProcessor
       end
-      
+
       register_postprocessor 'application/javascript', BPM::TransportProcessor
-      
+
+      # This gunks things up. I'm not a fan - PDW
+      unregister_postprocessor 'application/javascript', Sprockets::SafetyColons
 
       # configure search paths
       append_path File.join project_path, '.bpm', 'packages'
@@ -49,7 +52,7 @@ module BPM
       
       # make sure the logical_path can be used to simply build into the 
       # assets directory when we are done
-      ret = ['bpm_packages.js', 'bpm_styles.css']
+      ret = ['bpm_packages.js', 'bpm_styles.css', "#{project.name}/app_package.js", "#{project.name}/app_styles.css"]
       
       project.local_deps.each do |pkg|
         pkg.load_json
@@ -74,6 +77,10 @@ module BPM
         File.join project.root_path, 'assets', filename
       end
 
+      magic_paths += %w(app_package.js app_styles.css).map do |filename|
+        File.join project.root_path, 'assets', project.name, filename
+      end
+            
       if magic_paths.include? pathname.to_s
         BPM::GeneratedAsset.new(self, logical_path, pathname, options)
       else
@@ -84,14 +91,15 @@ module BPM
   private
   
     def build_js_context(path)
-      require 'v8'
-      
-      ctx = V8::Context.new do |ctx|
-        ctx['exports'] = {}
-        ctx.eval "(function(exports) { #{File.read path} })(exports);"
+      ctx = nil
+      V8::C::Locker() do
+        ctx = V8::Context.new do |ctx|
+          ctx['exports'] = {}
+          ctx.eval "(function(exports) { #{File.read path} })(exports);"
+        end
       end
+      ctx
       
-      @js_contexts[path] = ctx
     end
     
         

data/lib/bpm/project.rb

@@ -9,9 +9,12 @@ module BPM
     BPM_DIR = '.bpm'
 
     def self.project_file_path(path)
-      json_path = File.join path, "#{File.basename(path)}.json"
-      json = JSON.load(File.read(json_path)) rescue nil
-      return json && json["bpm"] && json_path
+      Dir[File.join(path, '*.json')].find{|p| is_project_json?(p) }
+    end
+
+    def self.is_project_json?(path)
+      json = JSON.load(File.read(path)) rescue nil
+      return !!(json && json["bpm"])
     end
 
     def self.is_project_root?(path)
@@ -36,12 +39,22 @@ module BPM
     def initialize(root_path, name=nil)
       super root_path
 
+      if !name
+        # If no name, try to find project json and get name from it
+        project_file = self.class.project_file_path(root_path)
+        name = File.basename(project_file, '.json') if project_file
+      end
+
       @name = name || File.basename(root_path)
-      @json_path = File.join root_path, "#{@name}.json"
+      @json_path = File.join(root_path, "#{@name}.json")
 
       load_json && validate
     end
 
+    def bpm
+      @bpm || BPM::VERSION
+    end
+
     def add_dependencies(new_deps, verbose=false)
 
       old_deps  = build_local_deps(false) || []
@@ -94,7 +107,8 @@ module BPM
     end
     
     def fetch_dependencies(verbose=false)
-      core_fetch_dependencies(dependencies, :runtime, verbose)
+      exp_deps = expand_local_packages dependencies, true
+      core_fetch_dependencies(exp_deps, :runtime, verbose)
     end
 
     # Builds assets directory for dependent packages
@@ -148,11 +162,15 @@ module BPM
       puts "\n" if verbose
     end
     
+    def package_from_name(package_name)
+      return self if package_name == self.name
+      local_deps.find { |pkg| pkg.name == package_name }
+    end
+    
     # Returns the path on disk to reach a given package name
     def path_from_package(package_name)
-      return root_path if package_name == self.name
-      path = local_deps.find { |pkg| pkg.name == package_name }
-      path && path.root_path
+      ret = package_from_name package_name
+      ret && ret.root_path
     end
     
     # Returns the path on disk for a given module id (relative to the project)
@@ -229,7 +247,17 @@ module BPM
       
       @local_deps = nil
     end
+
+    def as_json
+      json = super
+      json["bpm"] = self.bpm
+      json
+    end
     
+    def minifier_name
+      @attributes['pipeline'] && @attributes['pipeline']['minifier']
+    end
+
   private
 
     def read
@@ -314,8 +342,12 @@ module BPM
       dep = LibGems::Dependency.new(package_name, vers, kind)
       cur_installed = LibGems.source_index.search(dep)
 
-      # TODO: Why are we fetching even if we already have it? Are we looking for newer versions?
-      installed = BPM::Remote.new.install(package_name, vers, prerelease)
+      begin
+        installed = BPM::Remote.new.install(package_name, vers, prerelease)
+      rescue LibGems::GemNotFoundException
+        # If we have it locally but not remote, that's ok
+        installed = []
+      end
 
       cur_installed.each do |ci|
         installed.reject! { |i| ci.name == i.name && ci.version == i.version }

data/lib/bpm/server.rb

@@ -37,6 +37,11 @@ module BPM
         map '/assets' do
           run BPM::Trial.new(BPM::Pipeline.new cur_project)
         end
+        
+        map '/' do
+          run Rack::Directory.new cur_project.root_path
+        end
+        
       end.to_app
     end
     

data/lib/bpm/version.rb

@@ -1,3 +1,3 @@
 module BPM
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/bpm.rb

@@ -1,3 +1,5 @@
+require 'vendored_sprockets'
+
 module BPM
   BPM_DIR = ".bpm"
   TEMPLATES_DIR = File.expand_path("../../templates", __FILE__)

data/lib/vendored_sprockets.rb

@@ -0,0 +1,7 @@
+if defined?(Sprockets)
+  warn "Sprockets has already been required. " +
+    "This may cause BPM to malfunction in unexpected ways."
+end
+$:.unshift File.expand_path('../../vendor/sprockets/lib', __FILE__)
+require 'sprockets'
+