bpm 1.0.0.beta.10 → 1.0.0.beta.11

data/lib/bpm/cli/base.rb

@@ -66,7 +66,7 @@ module BPM
       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 (default production)"
+      method_option :mode, :type => :string, :default => :production, :aliases => ['-m'], :desc => "Build mode for compile"
       def add(*package_names)
         # map to dependencies
         if package_names.empty?
@@ -100,7 +100,7 @@ module BPM
 
       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 (default production)"
+      method_option :mode, :type => :string, :default => :production, :aliases => ['-m'], :desc => "Build mode for compile"
       def remove(*package_names)
 
         # map to dependencies
@@ -119,7 +119,7 @@ module BPM
       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 (default debug)'
+      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"
       def preview
@@ -129,7 +129,7 @@ module BPM
       end
       
       desc "rebuild", "Rebuilds bpm assets, does not update versions"
-      method_option :mode, :type => :string, :default => :production, :aliases => ['-m'], :desc => 'Build mode for compile (default production)'
+      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'
       def rebuild
@@ -176,7 +176,7 @@ module BPM
         end
       end
 
-      desc "push", "Distribute your bpm package"
+      desc "push PACKAGE", "Distribute your bpm package"
       def push(package)
         remote = BPM::Remote.new
         if remote.logged_in?
@@ -236,8 +236,8 @@ module BPM
       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'
       method_option :skip, :type => :boolean, :default => false, :desc => 'Skip any conflicting files'
-      method_option :app, :type => :boolean, :default => false, :desc => 'Manage app as well as packages'
-      method_option :package, :type => :string, :default => nil, :desc => 'Specify a package template to build from'
+      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?
         paths.map!{|p| File.expand_path(p) }
@@ -259,7 +259,8 @@ module BPM
           if File.directory?(path)
             run_init(name, options[:app], path)
           else
-            package = install_package(options[:package])
+            #package = install_package(options[:package])
+            package = nil
             template_path = package ? package.template_path(:project) : nil
             generator = get_generator(:project, package)
             success = generator.new(self, name, path, template_path, package).run
@@ -308,9 +309,9 @@ module BPM
         end
       end
 
-      desc "debug [OPTION]", "Display various options for debugging"
-      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 (default debug)'
+      desc "debug [OPTION]", "Display various options for debugging.\n  build - Shows all project build settings\n  repair - Verify and repair project"
+      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)
         case option
         when 'build'

data/lib/bpm/cli/owner.rb

@@ -32,7 +32,7 @@ module BPM::CLI
       end
     end
 
-    desc "remove [PACKAGE] [EMAIL]", "Allow another user to push new versions of your bpm package"
+    desc "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.rb

@@ -24,19 +24,17 @@ module BPM
       "dependencies:development" => :hash,
       "bpm:build"         => :hash,
       "bpm:formats"       => :hash,
-      "bpm:transport"     => :string,
       "bpm:use:transport" => :string,
-      "bpm:minifier"      => :string,
       "bpm:provides"      => :hash
     }
 
-    PLUGIN_FIELDS = %w[bpm:minifier]
-    
+    PLUGIN_TYPES = %w[minifier]
+
     # Fields that can be loaded straight into the gemspec
     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]
+    METADATA_FIELDS = %w[keywords licenses engines main bin directories pipeline bpm:build bpm:formats]
 
     REQUIRED_FIELDS = %w[name author version]
 
@@ -150,8 +148,8 @@ module BPM
         hash['directories'] || hash['assets']
       end
 
-      build_names += PLUGIN_FIELDS.map do |field_name|
-        val = self.send(c2u(field_name))
+      build_names += PLUGIN_TYPES.map do |type|
+        val = bpm_provides[type]
         val = val && val =~ /^#{name}\// ? val[name.size+1..-1]+'.js' : nil
         val
       end
@@ -190,7 +188,7 @@ module BPM
           pkg.name == pkg_name
         end
         raise "Could not find dependency: #{pkg_name}" unless dep
-        dep.bpm_transport
+        dep.provided_transport
       end.compact
     end
 
@@ -399,9 +397,12 @@ module BPM
     def used_transports(project)
       pkgs=project.map_to_packages used_dependencies(project)
       pkgs.map { |pkg| pkg.provided_transport }.compact.flatten
-    end      
-      
-          
+    end
+
+    def provided_minifier
+      bpm_provides['minifier']
+    end
+
     # TODO: Make better errors
     # TODO: This might not work well with conflicting versions
     def local_deps(search_path=nil)

data/lib/bpm/pipeline/generated_asset.rb

@@ -39,7 +39,7 @@ module BPM
           raise MinifierNotFoundError.new(minifier_name)
         end
 
-        minifier_plugin_name = pkg.bpm_minifier
+        minifier_plugin_name = pkg.provided_minifier
         if minifier_plugin_name.nil?
           raise MinifierNotFoundError.new(minifier_name)
         end
@@ -111,7 +111,6 @@ module BPM
       project       = environment.project
       settings = project.build_settings(environment.mode)[asset_name]
       pkgs     = settings.keys.map do |pkg_name|
-        next if pkg_name == 'bpm:minifier'
         if pkg_name == project.name
           project
         else

data/lib/bpm/project.rb

@@ -483,7 +483,9 @@ module BPM
     # Name of minifier
 
     def minifier_name(asset_name)
-      build_settings[asset_name] && build_settings[asset_name]['bpm:minifier']
+      build_settings[asset_name] &&
+        build_settings[asset_name]['bpm:provides'] &&
+        build_settings[asset_name]['bpm:provides']['minifier']
     end
 
     def load_json
@@ -754,11 +756,12 @@ module BPM
       end
       
       if opts['minifier']
+        ret[target_name]['bpm:provides'] ||= {}
         if opts['minifier'].is_a? String
-          ret[target_name]['bpm:minifier'] = {}
-          ret[target_name]['bpm:minifier'][opts['minifier']] = '>= 0'
+          ret[target_name]['bpm:provides']['minifier'] = {}
+          ret[target_name]['bpm:provides']['minifier'][opts['minifier']] = '>= 0'
         else
-          ret[target_name]['bpm:minifier'] = opts['minifier']
+          ret[target_name]['bpm:provides']['minifier'] = opts['minifier']
         end
       end
 

data/lib/bpm/version.rb

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

data/spec/cli/init_spec.rb

@@ -118,7 +118,7 @@ describe "bpm init on a non-existant directory" do
       bpm 'init', 'BpmTest'
 
 
-      files = %w(LICENSE README.md index.html app/main.js BpmTest.json)
+      files = %w(LICENSE README.md index.html lib/main.js BpmTest.json)
       generated_files = %w(assets/bpm_libs.js assets/bpm_styles.css)
 
       # output without coloration
@@ -145,6 +145,7 @@ describe "bpm init on a non-existant directory" do
 
   end
 
+=begin
   describe "package templates" do
 
     describe "with custom generator" do
@@ -201,5 +202,6 @@ describe "bpm init on a non-existant directory" do
     end
 
   end
+=end
 
 end

data/spec/fixtures/packages/uglify-js/package.json

@@ -15,7 +15,9 @@
         
         "homepage": "http://github.com/getbpm/UglifyJS",
         
-        "bpm:minifier": "uglify-js/plugins/minifier",
+        "bpm:provides": {
+          "minifier": "uglify-js/plugins/minifier"
+        },
         
         "directories": {
           "lib": "lib",

data/spec/fixtures/projects/minitest/packages/uglyduck/package.json

@@ -15,7 +15,8 @@
 
   "dependencies": {
   },
-  
-  "bpm:minifier": "uglyduck/minifier/main"
-  
+
+  "bpm:provides": {
+    "minifier": "uglyduck/minifier/main"
+  }
 }

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

@@ -15,7 +15,8 @@
 
   "dependencies": {
   },
-  
-  "bpm:minifier": "uglyduck/minifier/main"
-  
+
+  "bpm:provides": {
+    "minifier": "uglyduck/minifier/main"
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.10
+  version: 1.0.0.beta.11
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000Z
+date: 2011-08-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libgems
-  requirement: &2153010600 !ruby/object:Gem::Requirement
+  requirement: &2151996900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153010600
+  version_requirements: *2151996900
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &2153009800 !ruby/object:Gem::Requirement
+  requirement: &2152165560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153009800
+  version_requirements: *2152165560
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153009080 !ruby/object:Gem::Requirement
+  requirement: &2156015900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153009080
+  version_requirements: *2156015900
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2153008380 !ruby/object:Gem::Requirement
+  requirement: &2156555820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153008380
+  version_requirements: *2156555820
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153007560 !ruby/object:Gem::Requirement
+  requirement: &2157061380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153007560
+  version_requirements: *2157061380
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2153006600 !ruby/object:Gem::Requirement
+  requirement: &2157268420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.3beta1
   type: :runtime
   prerelease: false
-  version_requirements: *2153006600
+  version_requirements: *2157268420
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2153005700 !ruby/object:Gem::Requirement
+  requirement: &2157683060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.0.0.beta.12
   type: :runtime
   prerelease: false
-  version_requirements: *2153005700
+  version_requirements: *2157683060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153004800 !ruby/object:Gem::Requirement
+  requirement: &2158161380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153004800
+  version_requirements: *2158161380
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153003580 !ruby/object:Gem::Requirement
+  requirement: &2158272440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *2153003580
+  version_requirements: *2158272440
 description: Browser Package Manager
 email:
 - charles@sproutcore.com