bpm 1.0.0.beta.6 → 1.0.0.beta.8

data/lib/bpm/project.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'set'
 require 'bpm/version'
 
 module BPM
@@ -49,7 +50,7 @@ module BPM
       end
 
       @name = name || File.basename(root_path)
-      @json_path = project_file
+      @json_path = project_file || File.join(root_path, "#{File.basename(root_path)}.json")
 
       load_json && validate
     end
@@ -88,8 +89,12 @@ module BPM
       File.join([@root_path, BPM_DIR, 'packages', package_name].compact)
     end
 
+    def assets_path
+      'assets'
+    end
+    
     def assets_root(*paths)
-      File.join @root_path, 'assets', *paths
+      File.join @root_path, assets_path, *paths
     end
     
     def preview_root(*paths)
@@ -174,7 +179,7 @@ module BPM
       all_hard_deps = all_dependencies.merge(new_deps)
       exp_deps = find_non_local_dependencies(all_hard_deps, true)
       
-      puts "Fetching packages from remote..." if verbose
+      say "Fetching packages from remote..." if verbose
       core_fetch_dependencies(exp_deps, verbose)
       
       if development
@@ -187,7 +192,7 @@ module BPM
 
       local_deps.each do |dep|
         next if old_deps.find { |pkg| (pkg.name == dep.name) && (pkg.version == dep.version) }
-        puts "Added #{development ? "development " : ""}package '#{dep.name}' (#{dep.version})"
+        say "Added #{development ? "development " : ""}package '#{dep.name}' (#{dep.version})"
       end
 
       save!
@@ -213,7 +218,7 @@ module BPM
 
       old_deps.each do |dep|
         next if local_deps.find { |pkg| (pkg.name == dep.name) && (pkg.version == dep.version) }
-        puts "Removed package '#{dep.name}' (#{dep.version})"
+        say "Removed package '#{dep.name}' (#{dep.version})"
       end
 
       save!
@@ -234,7 +239,7 @@ module BPM
     # Get dependencies from server if not installed
 
     def fetch_dependencies(verbose=false)
-      puts "Fetching packages from remote..." if verbose
+      say "Fetching packages from remote..." if verbose
       exp_deps = find_non_local_dependencies(all_dependencies, true)
       core_fetch_dependencies(exp_deps, verbose)
     end
@@ -246,7 +251,7 @@ module BPM
       
       verify_and_repair mode, verbose
 
-      puts "Building static assets..." if verbose
+      say "Building static assets..." if verbose
 
       report_package_locations if verbose
       
@@ -264,7 +269,7 @@ module BPM
         FileUtils.mkdir_p File.dirname(dst_path)
 
         if asset.kind_of? Sprockets::StaticAsset
-          puts "~ Copying #{asset.logical_path}" if verbose
+          say "~ Copying #{asset.logical_path}" if verbose
           FileUtils.rm dst_path if File.exists? dst_path
           FileUtils.cp asset.pathname, dst_path
         else
@@ -278,7 +283,7 @@ module BPM
         end
       end
 
-      puts "\n" if verbose
+      say "\n" if verbose
     end
 
 
@@ -286,7 +291,7 @@ module BPM
     # package is removed from the project to cleanup any assets
 
     def unbuild(verbose=false)
-      puts "Removing stale assets..." if verbose
+      say "Removing stale assets..." if verbose
 
       pipeline = BPM::Pipeline.new self
       asset_root = File.join root_path, 'assets'
@@ -294,7 +299,7 @@ module BPM
         next if asset.logical_path =~ /^bpm_/
         asset_path = File.join asset_root, asset.logical_path
         next unless File.exists? asset_path
-        puts "~ Removing #{asset.logical_path}" if verbose
+        say "~ Removing #{asset.logical_path}" if verbose
         FileUtils.rm asset_path
 
         # cleanup empty directories
@@ -302,12 +307,12 @@ module BPM
           asset_path = File.dirname asset_path
           FileUtils.rmdir(asset_path) if File.directory?(asset_path)
           if verbose && !File.exists?(asset_path)
-            puts "~ Removed empty directory #{File.basename asset_path}"
+            say "~ Removed empty directory #{File.basename asset_path}"
           end
         end
       end
 
-      puts "\n" if verbose
+      say "\n" if verbose
     end
 
 
@@ -400,6 +405,12 @@ module BPM
       @local_deps ||= build_local_dependency_list
     end
 
+    def map_to_packages(deps)
+      Array(deps).map do |dep_name, vers| 
+        local_deps.find { |x| x.name==dep_name }
+      end
+    end
+    
     # List of local dependency names in order of dependency
 
     def sorted_deps
@@ -477,12 +488,23 @@ module BPM
 
     def load_json
       return super if has_json?
-      FIELDS.keys.each{|f| send("#{c2u(f)}=", DEFAULT_CONFIG[f]) }
+      (FIELDS.keys + %w(description summary homepage)).each do |f| 
+        send("#{c2u(f)}=", DEFAULT_CONFIG[f])
+      end
+      
       self.name = File.basename(@json_path, '.json')
       self.version = "0.0.1"
       true
     end
 
+    # Tell if package is vendored
+
+    def has_local_package?(package_name)
+      !!locate_local_package(package_name)
+    end
+
+
+
 
   private
 
@@ -570,7 +592,7 @@ module BPM
       end
 
       installed.each do |i|
-        puts "~ Fetched #{i.name} (#{i.version}) from remote" if verbose
+        say "~ Fetched #{i.name} (#{i.version}) from remote" if verbose
       end
 
     end
@@ -595,13 +617,6 @@ module BPM
       end
     end
 
-    # Tell if package is vendored
-
-    def has_local_package?(package_name)
-      !!locate_local_package(package_name)
-    end
-
-
     # Tell if given version is satisfied by the passed version
 
     def satisfied_by?(req_vers, new_vers)
@@ -612,7 +627,7 @@ module BPM
 
 
     # Get list of dependencies, searching only the project and fetched 
-    # packages.  Does not query remote server.  Raises if not found or 
+    # packages.  Raises if not found or 
     # conflicting.
     def find_dependencies(deps=nil, verbose=false)
        
@@ -621,7 +636,11 @@ module BPM
       search_list = Array(deps)
       found = []
       ret = []
-
+      
+      # if we discover a new local package via indirect dependencies then
+      # it's dependencies will be fetchable one time.
+      fetchable = Set.new
+      
       until search_list.empty?
         name, version = search_list.shift
 
@@ -632,17 +651,24 @@ module BPM
         end
 
         pkg = locate_package(name, version, verbose)
+        if pkg.nil? && fetchable.include?(name)
+          fetchable.reject! { |x| x == name }
+          core_fetch_dependency(name, version, :runtime, true) 
+          pkg = locate_package name, version, verbose
+        end
+          
         raise PackageNotFoundError.new(name, version) unless pkg
 
         found << pkg
 
         # Look up dependencies of dependencies
-        search_list += Array(pkg.dependencies)
-        search_list += Array(pkg.dependencies_build)
-
+        new_deps = Array(pkg.dependencies) + Array(pkg.dependencies_build)
         if has_local_package? pkg.name
-          search_list += Array(pkg.dependencies_development)
+          new_deps += Array(pkg.dependencies_development)
+          new_deps.each { |dep| fetchable.add dep.first }
         end
+        
+        search_list += new_deps
 
         ret << pkg
       end
@@ -685,7 +711,7 @@ module BPM
       deps ||= local_deps
       deps.each do |dep|
         is_local = has_local_package?(dep.name) ? 'local' : 'fetched'
-        puts "~ Using #{is_local} package '#{dep.name}' (#{dep.version})"
+        say "~ Using #{is_local} package '#{dep.name}' (#{dep.version})"
       end
     end
       

data/lib/bpm/version.rb

@@ -1,4 +1,4 @@
 module BPM
-  VERSION = "1.0.0.beta.6"
+  VERSION = "1.0.0.beta.8"
   COMPAT_VERSION = '1.0.0'
 end

data/lib/bpm.rb

@@ -16,10 +16,12 @@ module BPM
   autoload :Pipeline,             'bpm/pipeline'
   autoload :DirectiveProcessor,   'bpm/pipeline/directive_processor'
   autoload :GeneratedAsset,       'bpm/pipeline/generated_asset'
-  autoload :TransportProcessor,   'bpm/pipeline/transport_processor'
   autoload :SourceURLProcessor,   'bpm/pipeline/source_url_processor'
   autoload :PluginAsset,          'bpm/pipeline/plugin_asset'
   autoload :PluginContext,        'bpm/pipeline/plugin_context'
+  autoload :PackagePipeline,      'bpm/pipeline/package_pipeline'
+  autoload :FormatProcessor,      'bpm/pipeline/format_processor'
+  autoload :PluginProcessor,        'bpm/pipeline/plugin_processor'
 end
 
 # The BPM constants need to be defined first

data/spec/cli/list_spec.rb

@@ -11,6 +11,7 @@ describe "bpm list" do
     before do
       FileUtils.cp_r project_fixture('hello_world'), home
       cd home('hello_world')
+      bpm 'fetch' and wait # make sure rebuild step doesn't run
     end
     
     it "lists non-development dependencies by default" do

data/spec/cli/pack_spec.rb

@@ -1,118 +1,140 @@
 require "spec_helper"
 require "libgems/format"
 
-describe "bpm pack when logged in" do
-  let(:email) { "who@example.com" }
-
-  before do
-    goto_home
-    write_creds(email, "deadbeef")
-  end
-
-  it "builds a bpm from a given package.json" do
-    FileUtils.cp_r package_fixture("core-test"), "."
-    cd "core-test"
-    bpm "pack"
-
-    exit_status.should be_success
-    output = stdout.read
-    output.should include("Successfully built package: core-test-0.4.9.bpkg")
-
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
-    package.spec.name.should == "core-test"
-    package.spec.version.should == LibGems::Version.new("0.4.9")
-    package.spec.email.should == email
-  end
-end
-
-describe "bpm pack without logging in" do
-  before do
-    goto_home
-  end
-
-  it "pack a bpm from a given package.json" do
-    FileUtils.cp_r package_fixture("core-test"), "."
-    cd "core-test"
-    bpm "pack", "-e", "joe@example.com"
-
-    exit_status.should be_success
+describe "bpm pack" do
+  
+  describe "when logged in" do
+    let(:email) { "who@example.com" }
+  
+    before do
+      goto_home
+      write_creds(email, "deadbeef")
+    end
+  
+    it "builds a bpm from a given package.json" do
+      FileUtils.cp_r package_fixture("core-test"), "."
+      cd "core-test"
+      bpm "pack"
   
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
-    package.spec.name.should == "core-test"
-    package.spec.version.should == LibGems::Version.new("0.4.9")
+      exit_status.should be_success
+      output = stdout.read
+      output.should include("Successfully built package: core-test-0.4.9.bpkg")
+  
+      package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
+      package.spec.name.should == "core-test"
+      package.spec.version.should == LibGems::Version.new("0.4.9")
+      package.spec.email.should == email
+    end
   end
-
-  it "builds a bpm when given a path to a package" do
-    FileUtils.cp_r package_fixture("core-test"), "."
-    bpm "pack", "core-test", "-e", "joe@example.com"
-
-    exit_status.should be_success
+  
+  describe "without logging in" do
+    before do
+      goto_home
+    end
+  
+    it "pack a bpm from a given package.json" do
+      FileUtils.cp_r package_fixture("core-test"), "."
+      cd "core-test"
+      bpm "pack", "-e", "joe@example.com"
+  
+      exit_status.should be_success
+  
+      package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
+      package.spec.name.should == "core-test"
+      package.spec.version.should == LibGems::Version.new("0.4.9")
+    end
+  
+    it "builds a bpm when given a path to a package" do
+      FileUtils.cp_r package_fixture("core-test"), "."
+      bpm "pack", "core-test", "-e", "joe@example.com"
+  
+      exit_status.should be_success
     
-    cd 'core-test'
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
-    package.spec.name.should == "core-test"
-    package.spec.version.should == LibGems::Version.new("0.4.9")
-  end
-
-  it "sets the email address if one is given" do
-    FileUtils.cp_r package_fixture("core-test"), "."
-    cd "core-test"
-    bpm "pack", "-e", "lucy@allen.com"
-
-    exit_status.should be_success
-    output = stdout.read
-
-    package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
-    package.spec.name.should == "core-test"
-    package.spec.version.should == LibGems::Version.new("0.4.9")
-    package.spec.email.should == "lucy@allen.com"
-  end
-end
-
-describe "bpm pack with an invalid package.json" do
-  before do
-    goto_home
-    write_api_key("deadbeef")
-  end
-
-  it "reports error messages" do
-    FileUtils.touch "package.json"
-    bpm "pack", :track_stderr => true
-
-    exit_status.should_not be_success
-    output = stderr.read
-    output.should include("There was a problem parsing package.json")
-  end
-end
-
-describe "bpm pack npm-compatible package" do
-  before do
-    FileUtils.cp_r package_fixture("backbone"), "."
-    cd "backbone"
-    bpm "pack", :track_stderr => true and wait
-  end
-
-  it "successfully packs" do
-    exit_status.should be_success
-  end
-
-  it "implies the summary field" do
-    package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
-    package.spec.summary.should == package.spec.description
+      cd 'core-test'
+      package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
+      package.spec.name.should == "core-test"
+      package.spec.version.should == LibGems::Version.new("0.4.9")
+    end
+  
+    it "sets the email address if one is given" do
+      FileUtils.cp_r package_fixture("core-test"), "."
+      cd "core-test"
+      bpm "pack", "-e", "lucy@allen.com"
+  
+      exit_status.should be_success
+      output = stdout.read
+  
+      package = LibGems::Format.from_file_by_path("core-test-0.4.9.bpkg")
+      package.spec.name.should == "core-test"
+      package.spec.version.should == LibGems::Version.new("0.4.9")
+      package.spec.email.should == "lucy@allen.com"
+    end
   end
   
-  it "gets name and version" do
-    package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
-    package.spec.name.should == "backbone"
-    package.spec.version.should == LibGems::Version.new("0.5.1")
+  describe "with an invalid package.json" do
+    before do
+      goto_home
+      write_api_key("deadbeef")
+    end
+  
+    it "reports error messages" do
+      FileUtils.touch "package.json"
+      bpm "pack", :track_stderr => true
+  
+      exit_status.should_not be_success
+      output = stderr.read
+      output.should include("There was a problem parsing package.json")
+    end
   end
-
-  it "gets the homepage" do
-    package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
-    package.spec.homepage.should == 'http://documentcloud.github.com/backbone/'
+  
+  describe "npm-compatible package" do
+    before do
+      goto_home
+      FileUtils.cp_r package_fixture("backbone"), "."
+      cd home("backbone")
+      bpm "pack", :track_stderr => true and wait
+    end
+  
+    it "successfully packs" do
+      exit_status.should be_success
+    end
+  
+    it "implies the summary field" do
+      package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
+      package.spec.summary.should == package.spec.description
+    end
+  
+    it "gets name and version" do
+      package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
+      package.spec.name.should == "backbone"
+      package.spec.version.should == LibGems::Version.new("0.5.1")
+    end
+  
+    it "gets the homepage" do
+      package = LibGems::Format.from_file_by_path("backbone-0.5.1.bpkg")
+      package.spec.homepage.should == 'http://documentcloud.github.com/backbone/'
+    end
+   
   end
   
+  describe "package with plugins" do
+    before do
+      goto_home
+      FileUtils.cp_r project_fixture('coffee', 'packages'), '.'
+    end
     
+    it "should pack transports" do
+      cd home('packages', 'spade')
+      bpm "pack" and wait
+      puts stdout.read
+      exit_status.should be_success
+      
+      package = LibGems::Format.from_file_by_path 'spade-1.0.0.bpkg'
+      package.spec.files.should include('lib/main.js')
+      package.spec.files.should include('transport.js')
+    end
+  end
+  
 end
 
     

data/spec/fixtures/projects/coffee/coffee.json

@@ -0,0 +1,17 @@
+{
+  "name": "coffee",
+  "bpm":  "1.0.0",
+  
+  "dependencies": {
+    "spade":         "~> 1.0.0",
+    "coffee-script": "~> 1.0.0",
+    "handlebars":    "~> 1.0.0"
+  },
+  
+  "bpm:build": {
+    "bpm_libs.js": {
+      "directories": ["lib", "templates"]
+    }
+  }
+}
+

data/spec/fixtures/projects/coffee/index.html.handlebars

@@ -0,0 +1 @@
+{{INDEX}}

data/spec/fixtures/projects/coffee/lib/main.coffee

@@ -0,0 +1 @@
+//coffee/lib/main

data/spec/fixtures/projects/coffee/packages/coffee-script/compiler.js

@@ -0,0 +1,4 @@
+
+exports.compileFormat = function(body, context, filename) {
+  return "COFFEE("+body+")";
+};

data/spec/fixtures/projects/coffee/packages/coffee-script/lib/main.js

@@ -0,0 +1 @@
+//coffee-script/lib/main

data/spec/fixtures/projects/coffee/packages/coffee-script/package.json

@@ -0,0 +1,15 @@
+{
+  "name":        "coffee-script",
+  "version":     "1.0.0",
+  "description": "DESC",
+  "summary":     "SUMMARY",
+  "author":      "AUTHOR",
+  "homepage":    "HOMEPAGE",
+
+  "bpm:provides": {
+    "format:coffee": {
+      "mime:default": "application/javascript",
+      "main":         "coffee-script/compiler"
+    }
+  }
+}

data/spec/fixtures/projects/coffee/packages/handlebars/format.js

@@ -0,0 +1,6 @@
+
+exports.compileFormat = function(body, context, filename) {
+  var runtime = typeof RUNTIME === undefined ? '(NO runtime)' : RUNTIME;
+  return "HANDLEBARS("+body+" "+runtime+")";
+};
+

data/spec/fixtures/projects/coffee/packages/handlebars/lib/main.js

@@ -0,0 +1,2 @@
+//handlebars/lib/main
+RUNTIME = "RUNTIME";

data/spec/fixtures/projects/coffee/packages/handlebars/package.json

@@ -0,0 +1,16 @@
+{
+  "name":        "handlebars",
+  "version":     "1.0.0",
+  "description": "DESC",
+  "summary":     "SUMMARY",
+  "author":      "AUTHOR",
+  "homepage":    "HOMEPAGE",
+
+  "bpm:provides": {
+    "format:handlebars": {
+      "mime:default": "application/javascript",
+      "main":         "handlebars/format"
+    }
+  }
+  
+}

data/spec/fixtures/projects/coffee/packages/spade/lib/main.js

@@ -0,0 +1 @@
+//spade/lib/main

data/spec/fixtures/projects/coffee/packages/spade/package.json

@@ -0,0 +1,14 @@
+{
+  "name":        "spade",
+  "version":     "1.0.0",
+  "description": "DESC",
+  "summary":     "SUMMARY",
+  "author":      "AUTHOR",
+  "homepage":    "http://example.com",
+
+  "bpm:provides": {
+    "transport": {
+      "main": "spade/transport"
+    }    
+  }
+}

data/spec/fixtures/projects/coffee/packages/spade/transport.js

@@ -0,0 +1,3 @@
+exports.compileTransport = function(body, context, filename) {
+  return "spade("+body+")";
+};

data/spec/fixtures/projects/coffee/templates/section.handlebars

@@ -0,0 +1 @@
+//coffee/templates/section

data/spec/fixtures/projects/minitrans/packages/transport/package.json

@@ -16,6 +16,10 @@
     
   },
   
-  "bpm:transport": "transport/transports/wrapper"
+  "bpm:provides": {
+    "transport": {
+      "main": "transport/transports/wrapper"
+    }
+  }
   
 }

data/spec/fixtures/projects/transporter/packages/transport/package.json

@@ -16,6 +16,10 @@
     
   },
   
-  "bpm:transport": "transport/transports/wrapper"
+  "bpm:provides": {
+    "transport": {
+      "main": "transport/transports/wrapper"
+    }
+  }
   
 }

data/spec/package_pipeline_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe BPM::PackagePipeline do
+  
+  before do
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(project_fixture('coffee'), '.')
+    cd home('coffee')
+  end
+  
+  subject do
+    project = BPM::Project.new home('coffee')
+    BPM::Pipeline.new project
+  end
+
+  it "should get package pipelines for each package" do
+    names = subject.package_pipelines.map { |pipeline| pipeline.package.name }
+    names.sort.should == %w(coffee coffee-script handlebars spade)
+  end
+  
+  it "should get an asset for the coffee file" do
+    asset = subject.find_asset 'coffee/lib/main.js'
+    asset.should_not be_nil
+    asset.pathname.should == home('coffee', 'lib', 'main.coffee')
+  end
+  
+end
+