bpm 1.0.0.beta.4 → 1.0.0.beta.5

data/backbone/test/view.js

@@ -0,0 +1,137 @@
+$(document).ready(function() {
+
+  module("Backbone.View");
+
+  var view = new Backbone.View({
+    id        : 'test-view',
+    className : 'test-view'
+  });
+
+  test("View: constructor", function() {
+    equals(view.el.id, 'test-view');
+    equals(view.el.className, 'test-view');
+    equals(view.options.id, 'test-view');
+    equals(view.options.className, 'test-view');
+  });
+
+  test("View: jQuery", function() {
+    view.el = document.body;
+    ok(view.$('#qunit-header a').get(0).innerHTML.match(/Backbone Test Suite/));
+    ok(view.$('#qunit-header a').get(1).innerHTML.match(/Backbone Speed Suite/));
+  });
+
+  test("View: make", function() {
+    var div = view.make('div', {id: 'test-div'}, "one two three");
+    equals(div.tagName.toLowerCase(), 'div');
+    equals(div.id, 'test-div');
+    equals($(div).text(), 'one two three');
+  });
+
+  test("View: initialize", function() {
+    var View = Backbone.View.extend({
+      initialize: function() {
+        this.one = 1;
+      }
+    });
+    var view = new View;
+    equals(view.one, 1);
+  });
+
+  test("View: delegateEvents", function() {
+    var counter = counter2 = 0;
+    view.el = document.body;
+    view.increment = function(){ counter++; };
+    $(view.el).bind('click', function(){ counter2++; });
+    var events = {"click #qunit-banner": "increment"};
+    view.delegateEvents(events);
+    $('#qunit-banner').trigger('click');
+    equals(counter, 1);
+    equals(counter2, 1);
+    $('#qunit-banner').trigger('click');
+    equals(counter, 2);
+    equals(counter2, 2);
+    view.delegateEvents(events);
+    $('#qunit-banner').trigger('click');
+    equals(counter, 3);
+    equals(counter2, 3);
+  });
+
+  test("View: _ensureElement with DOM node el", function() {
+    var ViewClass = Backbone.View.extend({
+      el: document.body
+    });
+    var view = new ViewClass;
+    equals(view.el, document.body);
+  });
+
+  test("View: _ensureElement with string el", function() {
+    var ViewClass = Backbone.View.extend({
+      el: "body"
+    });
+    var view = new ViewClass;
+    equals(view.el, document.body);
+
+    ViewClass = Backbone.View.extend({
+      el: "body > h2"
+    });
+    view = new ViewClass;
+    equals(view.el, $("#qunit-banner").get(0));
+
+    ViewClass = Backbone.View.extend({
+      el: "#nonexistent"
+    });
+    view = new ViewClass;
+    ok(!view.el);
+  });
+
+  test("View: with attributes", function() {
+    var view = new Backbone.View({attributes : {'class': 'one', id: 'two'}});
+    equals(view.el.className, 'one');
+    equals(view.el.id, 'two');
+  });
+
+  test("View: multiple views per element", function() {
+    var count = 0, ViewClass = Backbone.View.extend({
+      el: $("body"),
+      events: {
+        "click": "click"
+      },
+      click: function() {
+        count++;
+      }
+    });
+
+    var view1 = new ViewClass;
+    $("body").trigger("click");
+    equals(1, count);
+
+    var view2 = new ViewClass;
+    $("body").trigger("click");
+    equals(3, count);
+
+    view1.delegateEvents();
+    $("body").trigger("click");
+    equals(5, count);
+  });
+
+  test("View: custom events, with namespaces", function() {
+    var count = 0;
+    var ViewClass = Backbone.View.extend({
+      el: $('body'),
+      events: {
+        "fake$event.namespaced": "run"
+      },
+      run: function() {
+        count++;
+      }
+    });
+
+    var view = new ViewClass;
+    $('body').trigger('fake$event').trigger('fake$event');
+    equals(count, 2);
+    $('body').unbind('.namespaced');
+    $('body').trigger('fake$event');
+    equals(count, 2);
+  });
+
+});

data/lib/bpm/cli/base.rb

@@ -207,12 +207,27 @@ module BPM
       end
 
       desc "list", "View available packages for download"
-      method_option :all,        :type => :boolean, :default => false, :aliases => ['-a'],    :desc => 'List all versions available'
-      method_option :prerelease, :type => :boolean, :default => false, :aliases => ['--pre'], :desc => 'List prerelease versions available'
+      method_option :remote,     :type => :boolean, :default => false, :aliases => ['-r'], :desc => 'List packages on remote server'
+      method_option :all,        :type => :boolean, :default => false, :aliases => ['-a'],    :desc => 'List all versions available (remote only)'
+      method_option :prerelease, :type => :boolean, :default => false, :aliases => ['--pre'], :desc => 'List prerelease versions available (remote only)'
+      method_option :development, :type => :boolean, :default => false,
+:aliases => ['--dev'], :desc => 'List development dependencies instead of runtime (local only)'
       def list(*packages)
-        remote = BPM::Remote.new
-        index  = remote.list_packages(packages, options[:all], options[:prerelease])
-        print_specs(packages, index)
+        if options[:remote]
+          remote = BPM::Remote.new
+          index  = remote.list_packages(packages, options[:all], options[:prerelease])
+          print_specs(packages, index)
+        else
+          packages = nil if packages.size == 0
+          project  = find_project
+          project.verify_and_repair
+          
+          deps = options[:development] ? project.sorted_development_deps : project.sorted_runtime_deps
+          deps.each do |dep|
+            next if packages && !packages.include?(dep.name)
+            say "#{dep.name} (#{dep.version})"
+          end
+        end
       end
 
       desc "init [PATHS]", "Configure a project to use bpm for management"
@@ -325,7 +340,7 @@ module BPM
           end
 
           # make sure the project app status matches
-          project = BPM::Project.new(path, name)
+          project = BPM::Project.new path
 
           if project.build_app? != !!include_app
             project.build_app = include_app
@@ -349,7 +364,7 @@ module BPM
         def find_project
           if options[:project]
             project_path = File.expand_path options[:project]
-            if BPM::Project.is_project_root? project_path
+            if !BPM::Project.is_project_root?(project_path)
               abort "#{project_path} does not appear to be managed by bpm"
             else
               project = BPM::Project.new project_path

data/lib/bpm/package.rb

@@ -19,6 +19,7 @@ module BPM
       "author"      => :string,
       "homepage"    => :string,
       "summary"     => :string,
+      "url"         => :string,
       "dependencies"             => :hash,
       "dependencies:development" => :hash,
       "bpm:build"         => :hash,
@@ -31,12 +32,12 @@ module BPM
     PLUGIN_FIELDS = %w[bpm:formats bpm:minifier bpm:transport bpm:use:transport]
     
     # Fields that can be loaded straight into the gemspec
-    SPEC_FIELDS = %w[name email homepage summary description]
+    SPEC_FIELDS = %w[name email]
 
     # Fields that should be bundled up into JSON in the gemspec
     METADATA_FIELDS = %w[keywords licenses engines main bin directories pipeline bpm:build bpm:formats bpm:transport]
 
-    REQUIRED_FIELDS = %w[name description summary homepage author version directories]
+    REQUIRED_FIELDS = %w[name author version]
 
     attr_accessor *FIELDS.keys.map{|f| f.gsub(':', '_') }
 
@@ -74,6 +75,10 @@ module BPM
         spec.licenses     = licenses.map{|l| l["type"]}
         spec.executables  = bin_files.map{|p| File.basename(p) } if bin_path
 
+        spec.homepage     = homepage || url
+        spec.description  = description || summary
+        spec.summary      = summary || description
+
         metadata = Hash[METADATA_FIELDS.map{|f| [f, send(c2u(f)) ] }]
         spec.requirements = [metadata.to_json]
 
@@ -136,7 +141,6 @@ module BPM
       build_names += PLUGIN_FIELDS.map do |field_name|
         val = self.send(c2u(field_name))
         val = val && val =~ /^#{name}\// ? val[name.size+1..-1]+'.js' : nil
-        puts "FIELD: #{field_name} #{self.send(c2u(field_name))} val=#{val}"
         val
       end
 
@@ -191,7 +195,7 @@ module BPM
     # Returns a hash of dependencies inferred from the build settings.
     def dependencies_build
       ret = {}
-        
+
       bpm_build.each do |target_name, opts|
         next unless opts.is_a?(Hash)
         
@@ -221,7 +225,7 @@ module BPM
     end
 
     def validate
-      validate_fields && validate_version && validate_paths
+      validate_fields && validate_version && validate_paths && validate_summary && validate_homepage
     end
 
     def valid?
@@ -390,6 +394,14 @@ module BPM
         end
       end
 
+      def validate_summary
+        summary || description
+      end
+      
+      def validate_homepage
+        homepage || url
+      end
+      
       def add_error(message)
         self.errors << message
       end

data/lib/bpm/project.rb

@@ -44,10 +44,12 @@ module BPM
         # 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
+      else
+        project_file = File.join root_path, "#{name}.json"
       end
 
       @name = name || File.basename(root_path)
-      @json_path = File.join(root_path, "#{@name}.json")
+      @json_path = project_file
 
       load_json && validate
     end
@@ -78,6 +80,10 @@ module BPM
       File.join([@root_path, 'packages', package_name].compact)
     end
 
+    def vendor_root(*paths)
+      File.join @root_path, 'vendor', *paths
+    end
+    
     def internal_package_root(package_name=nil)
       File.join([@root_path, BPM_DIR, 'packages', package_name].compact)
     end
@@ -91,31 +97,33 @@ module BPM
     end
     
     def build_app?
-      !!(bpm_build && bpm_build["#{name}/bpm_libs.js"])
+      !!(bpm_build && bpm_build["bpm_libs.js"] && 
+                      bpm_build["bpm_libs.js"]["directories"] && 
+                      bpm_build["bpm_libs.js"]["directories"].size>0)
     end
     
     def build_app=(value)
       
-      bpm_libs = "#{name}/bpm_libs.js"
-      bpm_styles = "#{name}/bpm_styles.css"
+      bpm_libs = "bpm_libs.js"
+      bpm_styles = "bpm_styles.css"
       
       if value
-        if bpm_build[bpm_libs].nil?
-          bpm_build[bpm_libs] = {
-            "directories" => ["app"],
-            "minifier" =>    "uglify-js"
-          }
-        end
+        bpm_build[bpm_libs] ||= {}
+        hash = bpm_build[bpm_libs]
+        hash['directories'] ||= []
+        hash['directories'] << 'lib' if hash['directories'].size==0
+        hash['minifier']    ||= 'uglify-js'
         
-        if bpm_build[bpm_styles].nil?
-          bpm_build[bpm_styles] = {
-            "directories" => ["css"]
-          }
-        end
-
+        bpm_build[bpm_styles] ||= {}
+        hash = bpm_build[bpm_styles]
+        hash['directories'] ||= []
+        hash['directories'] << 'css' if hash['directories'].size==0
+        
+        directories ||= {}
+        directories['lib'] ||= ['app']
       else
-        bpm_build.delete bpm_libs
-        bpm_build.delete bpm_styles
+        bpm_build[bpm_libs]['directories'] = []
+        bpm_build[bpm_styles]['directories'] = []
       end
       value
     end
@@ -135,9 +143,9 @@ module BPM
     end
     
     def rebuild_preview(verbose=false)
-
+      
       needs_rebuild = true
-
+      
       if File.directory?(preview_root)
         cur_previews  = Dir[preview_root('**', '*')].sort.reject { |x| File.directory?(x) }
         exp_filenames = buildable_asset_filenames(:debug)
@@ -159,22 +167,22 @@ module BPM
     # Add a new dependency
     #
     # Adds to the project json and installs dependency
-
+    
     def add_dependencies(new_deps, development=false, verbose=false)
       old_deps  = build_local_dependency_list(false) || []
       hard_deps = (development ? dependencies_development : dependencies).merge(new_deps)
       all_hard_deps = all_dependencies.merge(new_deps)
-      exp_deps = find_non_local_dependencies(hard_deps, true)
-
+      exp_deps = find_non_local_dependencies(all_hard_deps, true)
+      
       puts "Fetching packages from remote..." if verbose
       core_fetch_dependencies(exp_deps, verbose)
-
+      
       if development
         self.dependencies_development = hard_deps
       else
         self.dependencies = hard_deps
       end
-
+      
       rebuild_dependency_list(all_hard_deps, verbose)
 
       local_deps.each do |dep|
@@ -263,7 +271,7 @@ module BPM
           $stdout << "~ Building #{asset.logical_path}..." if verbose
           File.open(dst_path, 'w+') { |fd| fd << asset.to_s }
           if verbose
-            gzip_size = `gzip -c #{dst_path}`.size
+            gzip_size = `gzip -c #{dst_path}`.bytesize
             gzip_size = gzip_size < 1024 ? "#{gzip_size} bytes" : "#{gzip_size / 1024} Kb"
             $stdout << " (gzipped size: #{gzip_size})\n"
           end
@@ -506,8 +514,8 @@ module BPM
         next if seen.include?(name)
         seen << name
 
-        package_root = local_package_root(name)
-        if File.exists?(package_root)
+        package_root = locate_local_package(name)
+        if package_root
           pkg = BPM::Package.new(package_root)
           pkg.load_json
 
@@ -590,7 +598,7 @@ module BPM
     # Tell if package is vendored
 
     def has_local_package?(package_name)
-      File.directory?(local_package_root(package_name))
+      !!locate_local_package(package_name)
     end
 
 
@@ -640,6 +648,16 @@ module BPM
     end
 
 
+    def locate_local_package(package_name)
+      src_path = local_package_root package_name
+      unless File.directory?(src_path)
+        src_path = Dir[vendor_root('*','packages','*')].find do |path|
+          File.basename(path)==package_name && File.directory?(path)
+        end
+      end
+      src_path
+    end
+
     # Find package locally or in global cache
 
     def locate_package(package_name, vers, verbose)
@@ -649,9 +667,8 @@ module BPM
       # previous one we had didn't do anything, so it's better to have
       # none than one that doesn't work
       vers = ">= 0" if vers == ">= 0-pre"
-      src_path = local ?
-        local_package_root(package_name) :
-        BPM::Local.new.source_root(package_name, vers)
+      src_path = local ? locate_local_package(package_name) :  
+                         BPM::Local.new.source_root(package_name, vers)
 
       return nil unless src_path
 

data/lib/bpm/version.rb

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

data/spec/cli/add_spec.rb

@@ -127,7 +127,7 @@ describe 'bpm add' do
   end
 
   it "should make a soft dependency a hard dependency" do
-    bpm 'compile'
+    bpm 'rebuild'
     wait
     has_soft_dependency 'ivory', '0.0.1'  # precond
 
@@ -154,8 +154,6 @@ describe 'bpm add' do
     no_dependency 'custom_package'
   end
 
-  it "should verify working with config-less projects"
-
   it "should work with .bpkg file" do
     FileUtils.cp fixtures('gems', "custom_generator-1.0.bpkg"), '.'
     bpm "add", "custom_generator-1.0.bpkg" and wait
@@ -171,7 +169,7 @@ describe 'bpm add' do
       output = stdout.read
       output.should include("Added development package 'custom_generator' (1.0)")
       
-      bpm 'compile', '--mode=debug' and wait
+      bpm 'rebuild', '--mode=debug' and wait
       has_development_dependency 'custom_generator', '1.0'
       no_dependency 'custom_generator', false
     end
@@ -179,3 +177,23 @@ describe 'bpm add' do
   end
 
 end
+
+describe "bpm add using a vendor directory" do
+  before do 
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r project_fixture('hello_dev'), '.'
+    FileUtils.mkdir_p home('hello_dev', 'vendor')
+    FileUtils.cp_r project_fixture('hello_world'), home('hello_dev', 'vendor', 'hello_world')
+    cd home('hello_dev')
+  end
+  
+  it "should include custom_package defined in a project found vendor" do
+    bpm 'add', 'custom_package' and wait
+    
+    File.read(home('hello_dev', 'assets', 'bpm_libs.js')).should include("custom_package (2.0.0)")
+  end
+    
+end
+

data/spec/cli/fetch_spec.rb

@@ -19,7 +19,6 @@ describe 'bpm fetch' do
     
     bpm "fetch", '--verbose'
     out = stdout.read
-    puts out
     out.should include("Fetched dependent packages for hello_world")
 
     # note: ivory is a soft dependency from core-test

data/spec/cli/init_spec.rb

@@ -29,14 +29,32 @@ describe "bpm init on existing directory" do
   end
   
   it "should not overwrite existing project file" do
-    File.open("new_project.json", 'w'){|f| f.print "Valuable info!" }
-  
-    bpm 'init', '--skip' # skip, since we can't test the prompt
+    
+    dummy_project = {
+      "name" => "custom_project",
+      "bpm"  => "1.0.0"
+    }
+    
+    File.open("new_project.json", 'w'){|f| f.print dummy_project.to_json }
   
-    output = stdout.read.gsub(/\e\[\d+m/,'') # without colors
+    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 }
   
-    output.should =~ /skip\s+new_project.json/
-    File.read("new_project.json").should == "Valuable info!"
+    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
@@ -50,9 +68,6 @@ describe "bpm init on existing directory" do
   
     bpm 'init', '--app' and wait
     
-    app_package = home 'new_project', 'assets', 'new_project', 'bpm_libs.js'
-    File.exists?(app_package).should be_true
-    
     json = JSON.load File.read(project_json)
     json["custom_property"].should == "I haz it"
     json["bpm:build"]["bpm_libs.js"].should_not be_nil
@@ -104,7 +119,7 @@ describe "bpm init on a non-existant directory" do
       
 
       files = %w(LICENSE README.md index.html app/main.js BpmTest.json)
-      generated_files = %w(assets/bpm_libs.js assets/bpm_styles.css assets/BpmTest/bpm_libs.js assets/BpmTest/bpm_styles.css)
+      generated_files = %w(assets/bpm_libs.js assets/bpm_styles.css)
 
       # output without coloration
       output = stdout.read.gsub(/\e\[\d+m/,'')