bpm 1.0.0.rc.3 → 1.0.0.rc.4

data/README.md

@@ -41,6 +41,9 @@ Install via RubyGems:
 
   `gem install bpm --pre`
 
+WARNING: Make sure you have the most recent version of RubyGems and the
+most recent version of RVM if you are using that.
+
 When we release, bpm will be also be available via PKG and EXE installers as well.
 
 # Current Development Status

data/lib/bpm/cli/base.rb

@@ -12,20 +12,63 @@ module BPM
         :aliases => ['-V'],
         :desc => 'Show additional debug information while running'
 
-      def self.help(shell, subcommand = false)
-        shell.say "\nbpm (v#{BPM::VERSION}) - the browser package manager\n\n"
-        super shell, subcommand
-      end
+      class << self
+
+        def help(shell, subcommand = false)
+          shell.say <<LONGDESC
+bpm (v#{BPM::VERSION}) - the browser package manager
+
+BPM is a tool for aiding in development of JavaScript-based web applications.
+It manages dependencies, custom file formats, minification and more.
+
+Sample Usage:
+
+  bpm init my_app
+  cd my_app
+  bpm add my_dependency
+  bpm preview
 
-      def self.start(given_args=ARGV, config={})
-        if given_args.include?('--verbose') || given_args.include?('-V')
-          BPM.show_deprecations = true
+LONGDESC
+
+          super shell, subcommand
+        end
+
+        # Hacked so long description isn't wrapped
+        def task_help(shell, task_name)
+          meth = normalize_task_name(task_name)
+          task = all_tasks[meth]
+          handle_no_task_error(meth) unless task
+
+          shell.say "Usage:"
+          shell.say "  #{banner(task)}"
+          shell.say
+          class_options_help(shell, nil => task.options.map { |_, o| o })
+          if task.long_description
+            shell.say "Description:"
+            shell.print_wrapped(task.long_description, :ident => 2)
+          else
+            shell.say task.description
+          end
         end
 
-        super
+        def start(given_args=ARGV, config={})
+          if given_args.include?('--verbose') || given_args.include?('-V')
+            BPM.show_deprecations = true
+          end
+
+          super
 
-        if BPM.deprecation_count > 0
-          puts "[WARN] #{BPM.deprecation_count} deprecation warnings were hidden. Run with --verbose to see them."
+          if BPM.deprecation_count > 0
+            puts "[WARN] #{BPM.deprecation_count} deprecation warnings were hidden. Run with --verbose to see them."
+          end
+        end
+      end
+
+      def help(*args)
+        if args.first == "owner"
+          CLI::Owner.start( [ "help" ] + args[1..-1] )
+        else
+          super
         end
       end
 
@@ -33,10 +76,19 @@ module BPM
       subcommand "owner", BPM::CLI::Owner
 
       desc "fetch [PACKAGE]", "Fetch one or many bpm packages to local cache"
+      long_desc <<-LONGDESC
+        Fetch one or many bpm packages to local cache.
+
+        If no packages are specified, BPM will use the current project.
+
+        Note: This command is used internally and should not normally need to be called directly.
+      LONGDESC
       method_option :version,    :type => :string,  :default => ">= 0", :aliases => ['-v'],    :desc => 'Specify a version to install'
       method_option :prerelease, :type => :boolean, :default => false,  :aliases => ['--pre'], :desc => 'Install a prerelease version'
+      method_option :project,    :type => :string,  :default => nil,    :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
+      method_option :package,    :type => :boolean, :default => false,  :desc => "Fetch for a package, instead of a project"
       def fetch(*packages)
-        project = BPM::Project.nearest_project(Dir.pwd) if packages.empty?
+        project = find_project(false) if packages.empty?
         if project
           success = project.fetch_dependencies options[:verbose]
           if !success
@@ -66,19 +118,35 @@ module BPM
       end
 
 
-      desc "fetched [PACKAGE]", "Display locally fetched bpm packages"
+      desc "fetched [PACKAGE]", "Displays a list of locally cached BPM packages"
       def fetched(*packages)
         local = BPM::Local.new
         index = local.installed(packages)
         print_specs(packages, index)
       end
 
-      desc "add [PACKAGE]", "Add one or more packages to a bpm project"
-      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'
+      desc "add [PACKAGE]", "Add one or more dependencies to a bpm project"
+      long_desc <<-LONGDESC
+        Adds one or more dependencies to a bpm project.
+
+        It first fetches the dependency from getbpm.org (or uses the locally vendored version)
+        and then adds it to your project's JSON config.
+
+        If multiple package names are passed they will all be added.
+
+        Run with --pre to install a prerelease version of your package.
+
+        Run with --version to specify a specific package version other than
+        the most recent.
+
+        To remove a dependency just run `bpm remove`.
+      LONGDESC
+      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'
       method_option :development, :type => :boolean, :default => false, :aliases => ['--dev'], :desc => "Add as a development dependency"
-      method_option :mode, :type => :string, :default => :production, :aliases => ['-m'], :desc => "Build mode for compile"
+      method_option :mode,        :type => :string,  :default => :production, :aliases => ['-m'], :desc => "Build mode for compile"
+      method_option :package,     :type => :boolean, :default => false, :desc => "Add to a package, instead of a project"
       def add(*package_names)
         # map to dependencies
         if package_names.empty?
@@ -106,9 +174,16 @@ module BPM
         project.build options[:mode], true
       end
 
-      desc "remove [PACKAGE]", "Remove one or more packages from a bpm project"
-      method_option :project,    :type => :string,  :default => nil, :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
-      method_option :mode, :type => :string, :default => :production, :aliases => ['-m'], :desc => "Build mode for compile"
+      desc "remove [PACKAGE]", "Remove one or more dependencies from a BPM project"
+      long_desc <<-LONGDESC
+        Remove one or more dependencies from a BPM project.
+
+        This command will remove the dependency declaration from the project JSON.
+        It will then rebuild the project without the depedency.
+      LONGDESC
+      method_option :project, :type => :string,  :default => nil,         :aliases => ['-p'], :desc => 'Specify project location other than working directory'
+      method_option :mode,    :type => :string,  :default => :production, :aliases => ['-m'], :desc => "Build mode for compile"
+      method_option :package, :type => :boolean, :default => false,       :desc => "Remove from a package, instead of a project"
       def remove(*package_names)
 
         # map to dependencies
@@ -122,20 +197,40 @@ module BPM
         project.build options[:mode], true
       end
 
-      desc "preview", "Preview server that will autocompile assets as you request them.  Useful for hacking"
-      method_option :mode, :type => :string, :default => :debug, :aliases => ['-m'], :desc => 'Build mode for compile'
-      method_option :project,    :type => :string,  :default => nil, :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
-      method_option :port,       :type => :string,  :default => '4020', :desc => "Port to host server on"
+      desc "preview", "Preview server that autocompiles assets as they are requested"
+      long_desc <<-LONGDESC
+        Preview server that autocompiles assets as they are requested.
+
+        The primary use of `bpm preview` is that it is faster to use that `bpm rebuild`.
+        When developing with the preview server changes to your code are automatically
+        recognized and will be present when the page is reloaded.
+
+        Once you are satisfied with your project you will still need to run `bpm rebuild`
+        to save your updated assets to disk.
+      LONGDESC
+      method_option :mode,    :type => :string,  :default => :debug, :aliases => ['-m'], :desc => 'Build mode for compile'
+      method_option :project, :type => :string,  :default => nil,    :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
+      method_option :port,    :type => :string,  :default => '4020', :desc => "Port to host server on"
+      method_option :package, :type => :boolean, :default => false,  :desc => "Preview a package, instead of a project"
       def preview
         project = find_project
         project.verify_and_repair options[:mode], options[:verbose]
         BPM::Server.start project, :Port => options[:port], :mode => options[:mode].to_sym
       end
 
-      desc "rebuild", "Rebuilds bpm assets, does not update versions"
-      method_option :mode, :type => :string, :default => :production, :aliases => ['-m'], :desc => 'Build mode for compile'
-      method_option :project,    :type => :string,  :default => nil, :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
-      method_option :update, :type => :boolean, :default => false, :aliases => ['-u'], :desc => 'Updates dependencies to latest compatible version'
+      desc "rebuild", "Rebuilds BPM assets"
+      long_desc <<-LONGDESC
+        Rebuilds BPM assets
+
+        `bpm rebuild` will rebuild all assets managed by BPM as declared in your project's
+        JSON config. This should always be run before deploying to the server. During active
+        development, consider using `bpm preview`. Though remember that you will have to run
+        `bpm rebuild` before deploying.
+      LONGDESC
+      method_option :mode,    :type => :string, :default => :production, :aliases => ['-m'], :desc => 'Build mode for compile'
+      method_option :project, :type => :string,  :default => nil, :aliases => ['-p'],    :desc => 'Specify project location other than working directory'
+      method_option :update,  :type => :boolean, :default => false, :aliases => ['-u'], :desc => 'Updates dependencies to latest compatible version'
+      method_option :package, :type => :boolean, :default => false, :desc => "Rebuild package, instead of a project"
       def rebuild
         find_project.fetch_dependencies(true) if options[:update]
         find_project.build options[:mode].to_sym, true
@@ -178,7 +273,14 @@ module BPM
         end
       end
 
-      desc "push PACKAGE", "Distribute your bpm package"
+      desc "push PACKAGE", "Distribute your BPM package on GetBPM.org"
+      long_desc <<-LONGDESC
+        Distribute your BPM package on GetBPM.org
+
+        Pushes your package to GetBPM.org. You will need to run
+        `bpm pack` before you can run this command. You will also need
+        an account on GetBPM.org.
+      LONGDESC
       def push(package)
         remote = BPM::Remote.new
         if remote.logged_in?
@@ -188,7 +290,15 @@ module BPM
         end
       end
 
-      desc "yank", "Remove a specific package version release from GetBPM.org"
+      desc "yank PACKAGE", "Remove a specific package version release from GetBPM.org"
+      long_desc <<-LONGDESC
+        Remove a specific package version release from GetBPM.org
+
+        This is useful if you have pushed a version in error or have discovered a serious bug.
+        Beware, however, that you cannot repush a version number. When you yank a package that
+        version number still remains active in the event that other pacakges depend on it. If
+        you need a package gone for good, please contact BPM support.
+      LONGDESC
       method_option :version, :type => :string,  :default => nil,   :aliases => ['-v'],    :desc => 'Specify a version to yank'
       method_option :undo,    :type => :boolean, :default => false,                        :desc => 'Unyank package'
       def yank(package)
@@ -209,14 +319,24 @@ module BPM
       end
 
       desc "list", "List BPM Packages"
+      long_desc <<-LONGDESC
+        List BPM Packages
+
+        By default this provides a list of all dependencies of the current project.
+
+        To see a list of all available BPM packages, run with --remote. Add --all to
+        see all possible (non-prerelease) versions and --pre to see prerelease versions.
+      LONGDESC
       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)'
+                                    :desc => 'List all (non-prerelease) 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)'
+      method_option :package,     :type => :boolean, :default => false,
+                                    :desc => "List for a package, instead of a project"
       def list(*packages)
         if options[:remote]
           remote = BPM::Remote.new
@@ -235,10 +355,21 @@ module BPM
         end
       end
 
-      desc "init [PATHS]", "Configure a project to use bpm for management"
-      method_option :name, :type => :string, :default => nil, :desc => 'Specify a different name for the project'
+      desc "init [PATHS]", "Configure a project to use BPM for management"
+      long_desc <<-LONGDESC
+        Configure a project to use BPM for management
+
+        If the specified path does not exist it will be created with a basic BPM directory
+        structure. For existing directories, BPM does not create the full directory structure,
+        assuming that the current structure is adequate. In the event that you do want BPM to
+        create its full structure, pass --app.
+
+        By default, the app is given the same name as the directory it resides
+        in. If a different name is desired, pass the --name option.
+      LONGDESC
+      method_option :name, :type => :string, :default => nil,    :desc => 'Specify a different name for the project'
       method_option :skip, :type => :boolean, :default => false, :desc => 'Skip any conflicting files'
-      method_option :app, :type => :boolean, :default => false, :desc => 'Manage app files as well as packages. (Always true for new directories.)'
+      method_option :app,  :type => :boolean, :default => false, :desc => 'Manage app files as well as packages. (Always true for new directories.)'
       #method_option :package, :type => :string, :default => nil, :desc => 'Specify a package template to build from'
       def init(*paths)
         paths = [Dir.pwd] if paths.empty?
@@ -271,7 +402,15 @@ module BPM
         end
       end
 
-      desc "pack [PACKAGE]", "Build a bpm package from a package.json"
+      desc "pack [PACKAGE]", "Build a BPM package from a package.json"
+      long_desc <<-LONGDESC
+        Build a BPM package from a package.json
+
+        This provides a .bpkg file that can be distributed directly or via GetBPM.org.
+        If distributed directly, the package can be installed with `bpm add PACKAGE.bpkg`.
+        If using GetBPM.org, run `bpm push PACKAGE.bpkg` and it can then be installed
+        via a normal `bpm add NAME`.
+      LONGDESC
       method_option :email, :type => :string,  :default => nil,   :aliases => ['-e'],    :desc => 'Specify an author email address'
       def pack(package_path=nil)
         package_path ||= Dir.pwd
@@ -289,7 +428,14 @@ module BPM
         end
       end
 
-      desc "unpack [PACKAGE]", "Extract files from a bpm package"
+      desc "unpack [PACKAGE]", "Extract files from a BPM package"
+      long_desc <<-LONGDESC
+        Extract files from a BPM package
+
+        This is primarily useful for testing. If, for instance, a package
+        is not behaving as expected, it may be useful to unpack it to review
+        the contents.
+      LONGDESC
       method_option :target, :type => :string, :default => ".", :aliases => ['-t'], :desc => 'Unpack to given directory'
       def unpack(*paths)
         local = BPM::Local.new
@@ -305,7 +451,14 @@ module BPM
         end
       end
 
-      desc "debug [OPTION]", "Display various options for debugging.\n  build - Shows all project build settings\n  repair - Verify and repair project"
+      desc "debug [OPTION]", "Display various options for debugging"
+      long_desc <<-LONGDESC
+        Display various options for debugging.
+
+        * build - Shows all project build settings
+
+        * repair - Verify and repair project
+      LONGDESC
       method_option :project, :type => :string,  :default => nil, :aliases => ['-p'], :desc => 'Specify project location other than working directory'
       method_option :mode, :type => :string, :default => :debug, :aliases => ['-m'], :desc => 'Build mode'
       def debug(option)
@@ -361,18 +514,19 @@ module BPM
           self.class.handle_argument_error(self.class.tasks[name], nil)
         end
 
-        def find_project
+        def find_project(required=true)
+          klass = options[:package] ? BPM::PackageProject : BPM::Project
           if options[:project]
             project_path = File.expand_path options[:project]
-            if !BPM::Project.is_project_root?(project_path)
-              abort "#{project_path} does not appear to be managed by bpm"
+            if required && !klass.is_project_root?(project_path)
+              abort "#{project_path} does not appear to be managed by BPM"
             else
-              project = BPM::Project.new project_path
+              project = klass.new project_path
             end
           else
-            project = BPM::Project.nearest_project Dir.pwd
-            if project.nil?
-              abort "You do not appear to be inside of a bpm project"
+            project = klass.nearest_project Dir.pwd
+            if required && project.nil?
+              abort "You do not appear to be inside of a BPM project"
             end
           end
 

data/lib/bpm/cli/owner.rb

@@ -1,8 +1,6 @@
 module BPM::CLI
   class Owner < Thor
-    default_task :list
-
-    desc "list [PACKAGE]", "Display owners of a package"
+    desc "owner list [PACKAGE]", "Display owners of a package"
     def list(package)
       remote = BPM::Remote.new
       if remote.logged_in?
@@ -22,7 +20,7 @@ module BPM::CLI
       end
     end
 
-    desc "add [PACKAGE] [EMAIL]", "Allow another user to push new versions of your bpm package"
+    desc "owner add [PACKAGE] [EMAIL]", "Allow another user to push new versions of your BPM package"
     def add(package, email)
       remote = BPM::Remote.new
       if remote.logged_in?
@@ -32,7 +30,7 @@ module BPM::CLI
       end
     end
 
-    desc "remove [PACKAGE] [EMAIL]", "Remove user's permission to push new versions of your bpm package"
+    desc "owner remove [PACKAGE] [EMAIL]", "Remove user's permission to push new versions of your BPM package"
     def remove(package, email)
       remote = BPM::Remote.new
       if remote.logged_in?

data/lib/bpm/package_project.rb

@@ -0,0 +1,23 @@
+module BPM
+  class PackageProject < Project
+    def self.project_file_path(path)
+      file = File.join(path, 'package.json')
+      File.exist?(file) ? file : nil
+    end
+
+    def self.is_project_json?(path)
+      json = JSON.load(File.read(path)) rescue nil
+      return !!json
+    end
+
+    def self.is_project_root?(path)
+      !!project_file_path(path)
+    end
+
+    def as_json
+      json = super
+      json.delete("bpm")
+      json
+    end
+  end
+end

data/lib/bpm/project.rb

@@ -91,19 +91,15 @@ module BPM
 
     def vendored_packages
       @vendored_packages ||= begin
-        # Packages path is deprecated
-        packages_path = File.join(@root_path, 'packages')
-        search_paths = [vendor_root, packages_path]
+        search_paths = [vendor_root, File.join(@root_path, 'packages')]
         paths = search_paths.map{|p| Dir.glob(File.join(p, '*')) }.flatten
         pkgs = paths.select{|p| Package.is_package_root?(p) }.map{|p| Package.new(p) }
-        if pkgs.any?{|p| p.root_path =~ /^#{Regexp.escape(packages_path)}\// }
-          BPM.deprecation_warning "Use the vendor directory instead of the packages directory for #{root_path}"
-        end
         pkgs += vendored_projects.map{|p| p.vendored_packages }.flatten
         pkgs.select do |p|
           begin
             p.load_json
-          rescue BPM::InvalidPackageError
+          rescue BPM::InvalidPackageError => e
+            raise e if ENV['DEBUG']
             false
           end
         end

data/lib/bpm/version.rb

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

data/lib/bpm.rb

@@ -14,6 +14,7 @@ module BPM
   autoload :Remote,               'bpm/remote'
   autoload :Repository,           'bpm/repository'
   autoload :Project,              'bpm/project'
+  autoload :PackageProject,       'bpm/package_project'
   autoload :Rack,                 'bpm/rack'
   autoload :Server,               'bpm/server'
   autoload :Pipeline,             'bpm/pipeline'

data/spec/cli/add_spec.rb

@@ -17,7 +17,7 @@ describe 'bpm add' do
   it "must be called from within a project" do
     cd home # outside of project
     bpm "add", "jquery", :track_stderr => true
-    stderr.read.should include("inside of a bpm project")
+    stderr.read.should include("inside of a BPM project")
   end
 
   it "should add a new hard dependency" do
@@ -177,7 +177,7 @@ describe 'bpm add' do
       bpm "add", "custom_generator", "--dev" and wait
       output = stdout.read
       output.should include("Added development package 'custom_generator' (1.0)")
-      
+
       bpm 'rebuild', '--mode=debug' and wait
       has_development_dependency 'custom_generator', '1.0'
       no_dependency 'custom_generator', false
@@ -188,7 +188,7 @@ describe 'bpm add' do
 end
 
 describe "bpm add using a vendor directory" do
-  before do 
+  before do
     goto_home
     set_host
     start_fake(FakeGemServer.new)
@@ -197,12 +197,27 @@ describe "bpm add using a vendor directory" do
     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
 
+describe "bpm add with a package" do
+  before do
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(package_fixture('spade'), '.')
+    cd home('spade')
+  end
+
+  it "should add dependency to package.json" do
+    File.read(home('spade', 'package.json')).should_not include('jquery')
+    bpm 'add', 'jquery', '--package' and wait
+    File.read(home('spade', 'package.json')).should include('jquery')
+  end
+end

data/spec/cli/fetch_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "json"
 describe 'bpm fetch' do
-  
+
   before do
     goto_home
     FileUtils.cp_r(project_fixture('hello_world'), '.')
@@ -16,7 +16,7 @@ describe 'bpm fetch' do
     package_info = JSON.load File.read(home('hello_world', 'hello_world.json'))
     package_info['dependencies']['custom_package'] = '>= 0'
     File.open(home('hello_world', 'hello_world.json'), 'w+') { |fd| fd << package_info.to_json }
-    
+
     bpm "fetch", '--verbose'
     out = stdout.read
     out.should include("Fetched dependent packages for hello_world")
@@ -28,7 +28,7 @@ describe 'bpm fetch' do
       package_name.should be_fetched
       package_name.should be_unpacked
     end
-    
+
   end
 
   it "fetches a valid package" do
@@ -141,3 +141,19 @@ describe 'bpm fetch' do
   end
 
 end
+
+describe "bpm fetch with a package" do
+  before do
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(package_fixture('coffee-1.0.1.pre'), '.')
+    cd home('coffee-1.0.1.pre')
+  end
+
+  it "should fetch dependencies" do
+    "jquery-1.4.3".should_not be_fetched
+    bpm 'fetch', '--package' and wait
+    "jquery-1.4.3".should be_fetched
+  end
+end

data/spec/cli/list_spec.rb

@@ -13,21 +13,21 @@ describe "bpm list" do
       cd home('hello_world')
       bpm 'fetch' and wait # make sure rebuild step doesn't run
     end
-    
+
     it "lists non-development dependencies by default" do
       bpm "list"
       output = stdout.read
       output.should include("ivory (0.0.1)")
       output.should_not include("jquery (1.4.3)")
     end
-    
+
     it "lists development dependencies with --dev option" do
       bpm "list", "--dev"
       output = stdout.read
       output.should_not include("ivory (0.0.1)")
       output.should include("jquery (1.4.3)")
     end
-    
+
     it "should filter output by package name" do
       bpm "list", "ivory", "spade"
       output = stdout.read
@@ -36,81 +36,96 @@ describe "bpm list" do
       output.should_not include("optparse")
       output.should_not include("core-test")
     end
-    
+
     it "should complain when called outside of a project" do
       cd home
       bpm "list", :track_stderr => true
-      stderr.read.should include("inside of a bpm project")
+      stderr.read.should include("inside of a BPM project")
     end
-    
+
   end
-  
+
   describe "remote" do
-    
+
     it "lists latest packages by default" do
       bpm "list", "--remote"
-  
+
       output = stdout.read
       output.should include("builder (3.0.0)")
       output.should include("rake (0.8.7)")
     end
-  
+
     it "lists all packages when given the all argument" do
       bpm "list", "--remote", "-a"
-  
+
       output = stdout.read
       output.should include("builder (3.0.0)")
       output.should include("rake (0.8.7, 0.8.6)")
     end
-  
+
     it "filters packages when given an argument" do
       bpm "list", "builder", "--remote"
-  
+
       output = stdout.read
       output.should include("builder (3.0.0)")
       output.should_not include("rake")
     end
-  
+
     it "filters packages when given an argument and shows all versions" do
       bpm "list", "rake", "-a", "--remote"
-  
+
       output = stdout.read
       output.should include("rake (0.8.7, 0.8.6)")
       output.should_not include("builder")
     end
-  
+
     it "filters multiple packages" do
       bpm "list", "rake", "highline", "--remote"
-  
+
       output = stdout.read
       output.should include("highline (1.6.1)")
       output.should include("rake (0.8.7)")
       output.should_not include("builder")
     end
-  
+
     it "shows prerelease packages" do
       bpm "list", "--prerelease", "--remote"
-  
+
       output = stdout.read
       output.should include("bundler (1.1.pre)")
       output.should_not include("highline")
       output.should_not include("rake")
       output.should_not include("builder")
     end
-  
+
     it "says it couldn't find any if none found" do
       bpm "list", "rails", "--remote", :track_stderr => true
-  
+
       stderr.read.strip.should == 'No packages found matching "rails".'
       exit_status.should_not be_success
     end
-  
+
     it "says it couldn't find any if none found matching multiple packages" do
       bpm "list", "rails", "bake", "--remote", :track_stderr => true
-  
+
       stderr.read.strip.should == 'No packages found matching "rails", "bake".'
       exit_status.should_not be_success
     end
   end
-  
+
+end
+
+describe "bpm list with a package" do
+  before do
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(package_fixture('coffee-1.0.1.pre'), '.')
+    cd home('coffee-1.0.1.pre')
+  end
+
+  it "should list package dependencies" do
+    bpm 'list', '--package'
+    stdout.read.should include('jquery')
+  end
 end

data/spec/cli/owner_spec.rb

@@ -106,9 +106,4 @@ describe "bpm owner with wrong arguments" do
     stderr.read.should include("called incorrectly")
   end
 
-  it "requires a package name for list with default command" do
-    bpm "owner", :track_stderr => true
-
-    stderr.read.should include("called incorrectly")
-  end
 end

data/spec/cli/preview_spec.rb

@@ -8,3 +8,15 @@ describe "bpm preview" do
   # i.e. spade:format
 
 end
+
+describe "bpm preview with a package" do
+  before do
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(package_fixture('spade'), '.')
+    cd home('spade')
+  end
+
+  it "should preview package"
+end

data/spec/cli/remove_spec.rb

@@ -2,31 +2,31 @@ require 'spec_helper'
 require 'json'
 
 describe 'bpm remove' do
-  
+
   before do
     goto_home
     set_host
     start_fake(FakeGemServer.new)
     FileUtils.cp_r(project_fixture('hello_world'), '.')
     cd home('hello_world')
-    bpm 'fetch' # make sure existing packages are installed 
+    bpm 'fetch' # make sure existing packages are installed
     wait
   end
-  
+
   it "should remove direct dependency from project" do
     bpm 'remove', 'spade'
-    
+
     output = stdout.read
     output.should include("Removed package 'spade'")
-    
+
     no_dependency 'spade'
     has_dependency 'core-test', '0.4.9', '0.4.9' # did not remove other dep
   end
-  
+
   it "should remove soft dependencies" do
     bpm 'remove', 'core-test'
     wait
-  
+
     output = stdout.read
     %w(core-test:0.4.9 ivory:0.0.1 optparse:1.0.1).each do |line|
       pkg_name, pkg_vers = line.split ':'
@@ -34,50 +34,70 @@ describe 'bpm remove' do
       no_dependency pkg_name
     end
   end
-  
+
   it "should remove soft dependencies only when they are no longer needed" do
     bpm 'add', 'ivory', '-v', '0.0.1', '--verbose' # make a hard dep
     wait
-    
+
     bpm 'remove', 'core-test', '--verbose'
     wait
-  
+
     output = stdout.read
     %w(core-test:0.4.9 optparse:1.0.1).each do |line|
       pkg_name, pkg_vers = line.split ':'
       output.should include("Removed package '#{pkg_name}'")
       no_dependency pkg_name
     end
-    
+
     has_dependency 'ivory', '0.0.1', '0.0.1'
-    
+
     bpm 'remove', 'ivory'
     wait
-    
+
     no_dependency 'ivory'
-    
+
   end
-  
+
   it "should do nothing when passed a non-existant dependency" do
     bpm 'remove', 'fake', :track_stderr => true
     wait
-    
+
     output = stderr.read
     output.should include("'fake' is not a dependency")
   end
-  
+
   it "should not uninstall local packages" do
     bpm 'add', 'custom_package'
     wait
     has_dependency 'custom_package', '2.0.0'
-    
+
     bpm 'remove', 'custom_package'
     output = stdout.read
-    
+
     no_dependency 'custom_package'
     File.exists?(home('hello_world', 'vendor', 'custom_package', 'package.json')).should be_true
   end
-  
+
   it "should remove development dependencies"
-  
+
+end
+
+describe "bpm remove with a package" do
+  before do
+    goto_home
+    set_host
+    start_fake(FakeGemServer.new)
+    FileUtils.cp_r(package_fixture('coffee-1.0.1.pre'), '.')
+    cd home('coffee-1.0.1.pre')
+
+    bpm 'fetch', '--package'
+    wait
+  end
+
+  it "should remove dependency from package.json" do
+    File.read(home('coffee-1.0.1.pre', 'package.json')).should include('jquery')
+    bpm 'remove', 'jquery', '--package'
+    puts stdout.read
+    File.read(home('coffee-1.0.1.pre', 'package.json')).should_not include('jquery')
+  end
 end

data/spec/package_project_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+describe "BPM::PackageProject class" do
+  it "should accept packages as project root" do
+    BPM::PackageProject.is_project_root?(fixtures('packages', 'backbone')).should be_true
+    BPM::PackageProject.is_project_root?(fixtures('projects', 'hello_world')).should be_false
+    BPM::PackageProject.is_project_root?(fixtures('packages', 'non_existent')).should be_false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.3
+  version: 1.0.0.rc.4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libgems
-  requirement: &70174351642100 !ruby/object:Gem::Requirement
+  requirement: &70200804575440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70174351642100
+  version_requirements: *70200804575440
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &70174351641560 !ruby/object:Gem::Requirement
+  requirement: &70200804574640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174351641560
+  version_requirements: *70200804574640
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70174351641000 !ruby/object:Gem::Requirement
+  requirement: &70200804574020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174351641000
+  version_requirements: *70200804574020
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70174351640500 !ruby/object:Gem::Requirement
+  requirement: &70200804573300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70174351640500
+  version_requirements: *70200804573300
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70174351639980 !ruby/object:Gem::Requirement
+  requirement: &70200804571720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *70174351639980
+  version_requirements: *70200804571720
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70174351639500 !ruby/object:Gem::Requirement
+  requirement: &70200804568840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70174351639500
+  version_requirements: *70200804568840
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70174351639020 !ruby/object:Gem::Requirement
+  requirement: &70200804567780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70174351639020
+  version_requirements: *70200804567780
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70174351638520 !ruby/object:Gem::Requirement
+  requirement: &70200804566780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70174351638520
+  version_requirements: *70200804566780
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70174351638040 !ruby/object:Gem::Requirement
+  requirement: &70200804565580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70174351638040
+  version_requirements: *70200804565580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70174351637660 !ruby/object:Gem::Requirement
+  requirement: &70200804564680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174351637660
+  version_requirements: *70200804564680
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70174351637080 !ruby/object:Gem::Requirement
+  requirement: &70200804563740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70174351637080
+  version_requirements: *70200804563740
 description: Browser Package Manager
 email:
 - charles@sproutcore.com
@@ -167,6 +167,7 @@ files:
 - lib/bpm/libgems_ext/spec_fetcher.rb
 - lib/bpm/local.rb
 - lib/bpm/package.rb
+- lib/bpm/package_project.rb
 - lib/bpm/pipeline.rb
 - lib/bpm/pipeline/directive_processor.rb
 - lib/bpm/pipeline/format_processor.rb
@@ -528,6 +529,7 @@ files:
 - spec/fixtures/projects/transporter/vendor/transport/transports/wrapper.js
 - spec/gauntlet_spec.rb
 - spec/package_pipeline_spec.rb
+- spec/package_project_spec.rb
 - spec/package_spec.rb
 - spec/pipeline_spec.rb
 - spec/plugins/format_spec.rb
@@ -570,7 +572,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Browser Package Manager
@@ -902,6 +904,7 @@ test_files:
 - spec/fixtures/projects/transporter/vendor/transport/transports/wrapper.js
 - spec/gauntlet_spec.rb
 - spec/package_pipeline_spec.rb
+- spec/package_project_spec.rb
 - spec/package_spec.rb
 - spec/pipeline_spec.rb
 - spec/plugins/format_spec.rb