bpm 0.1.2 → 0.1.3

data/lib/bpm/cli/base.rb

@@ -1,5 +1,4 @@
 require 'thor'
-require 'highline'
 
 module BPM
   module CLI
@@ -144,6 +143,7 @@ module BPM
         password = options[:password]
 
         unless email && password
+          require 'highline'
           highline = HighLine.new
           say "Enter your BPM credentials."
 

data/lib/bpm/pipeline.rb

@@ -3,10 +3,6 @@ require 'v8'
 
 module BPM
 
-  autoload :DirectiveProcessor,   'bpm/pipeline/directive_processor'
-  autoload :GeneratedAsset,       'bpm/pipeline/generated_asset'
-  autoload :TransportProcessor,   'bpm/pipeline/transport_processor'
-  
   # A BPM package-aware asset pipeline.  Asset lookup respects package.json
   # directory configurations as well as loading preprocessors, formats, and
   # postprocessors from the package config.

data/lib/bpm/project.rb

@@ -203,27 +203,40 @@ module BPM
     # a package known to the project.
     def package_and_module_from_path(path)
       path = File.expand_path path.to_s
-      pkg = local_deps.find {|cur| path =~ /^#{Regexp.escape cur.root_path.to_s}/}
+      pkg = local_deps.find {|cur| path =~ /^#{Regexp.escape cur.root_path.to_s}\//}
       pkg = self if pkg.nil? && path =~ /^#{Regexp.escape root_path.to_s}/
       raise "#{path} is not within a known package" if pkg.nil?
-      
-      path = Pathname.new(path).relative_path_from(Pathname.new(pkg.root_path)).split.map { |x| x.to_s }
-      
-      dir_name = pkg.directories.find do |dir_key, dname| 
-        Array(dname).include?(path.first)
+
+      dir_name = nil
+      pkg.directories.each do |dname, dpath|
+        dpaths = Array(dpath).map{|d| File.expand_path(d, pkg.root_path) }
+        dpaths.each do |d|
+          # Find a match and see if we can replace
+          if path.gsub!(/^#{Regexp.escape(d)}\//, "#{dname}/")
+            dir_name = dname
+            break
+          end
+        end
+        break if dir_name
       end
-      
-      dir_name = dir_name ? dir_name.first : path.first
+
+      if dir_name
+        parts = path.split("/")
+      else
+        parts = Pathname.new(path).relative_path_from(Pathname.new(pkg.root_path)).to_s.split("/")
+        dir_name = parts.first
+      end
+
       if dir_name == 'lib'
-        path.shift
+        parts.shift
       else
-        path[0] = "~#{dir_name}"
+        parts[0] = "~#{dir_name}"
       end
-            
-      path[path.size-1] = File.basename path.last, '.*'
-      [pkg, path.join('/')]
+
+      parts[parts.size-1] = File.basename(parts.last, '.*')
+      [pkg, parts.join('/')]
     end
-    
+
     def local_deps(verbose=false)
       @local_deps ||= build_local_deps
     end

data/lib/bpm/version.rb

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

data/lib/bpm.rb

@@ -1,4 +1,5 @@
-require 'vendored_sprockets'
+# Included vendored sprockets
+$:.unshift File.expand_path('../../vendor/sprockets/lib', __FILE__)
 
 module BPM
   BPM_DIR = ".bpm"
@@ -12,9 +13,12 @@ module BPM
   autoload :Repository,           'bpm/repository'
   autoload :Project,              'bpm/project'
   autoload :Server,               'bpm/server'
-
+  autoload :Pipeline,             'bpm/pipeline'
+  autoload :DirectiveProcessor,   'bpm/pipeline/directive_processor'
+  autoload :GeneratedAsset,       'bpm/pipeline/generated_asset'
+  autoload :TransportProcessor,   'bpm/pipeline/transport_processor'
 end
 
+# The BPM constants need to be defined first
 require 'bpm/libgems_ext'
-require 'bpm/pipeline'
 

data/spec/project_spec.rb

@@ -144,3 +144,23 @@ describe BPM::Project, "converting" do
     subject["bpm"].should == BPM::VERSION
   end
 end
+
+describe BPM::Project, "package_and_module_from_path" do
+
+  it "should find package in deps"
+
+  it "should fallback to self if not found in deps"
+
+  it "should throw error if no package"
+
+  it "should not match partial directories"
+  # i.e. packages/sproutcore should not match for packages/sproutcore-runtime
+
+  it "should handle and valid directory reference in package directories array"
+  # i.e. "lib": ["./lib", "./vendor/lib"]
+
+  it "should replace with directory names"
+
+  it "should not include lib directory in module name"
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-07-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libgems
-  requirement: &2152900100 !ruby/object:Gem::Requirement
+  requirement: &2152430900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152900100
+  version_requirements: *2152430900
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &2152899580 !ruby/object:Gem::Requirement
+  requirement: &2152429720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152899580
+  version_requirements: *2152429720
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2152892580 !ruby/object:Gem::Requirement
+  requirement: &2152428900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152892580
+  version_requirements: *2152428900
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2152892040 !ruby/object:Gem::Requirement
+  requirement: &2152427980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152892040
+  version_requirements: *2152427980
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152891520 !ruby/object:Gem::Requirement
+  requirement: &2152427400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152891520
+  version_requirements: *2152427400
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2152890860 !ruby/object:Gem::Requirement
+  requirement: &2152426800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152890860
+  version_requirements: *2152426800
 - !ruby/object:Gem::Dependency
   name: hike
-  requirement: &2152890280 !ruby/object:Gem::Requirement
+  requirement: &2152426080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152890280
+  version_requirements: *2152426080
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152889680 !ruby/object:Gem::Requirement
+  requirement: &2152424780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152889680
+  version_requirements: *2152424780
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2152889020 !ruby/object:Gem::Requirement
+  requirement: &2152423440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,10 +113,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152889020
+  version_requirements: *2152423440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152888020 !ruby/object:Gem::Requirement
+  requirement: &2152420620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,10 +124,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152888020
+  version_requirements: *2152420620
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152886700 !ruby/object:Gem::Requirement
+  requirement: &2152418640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -135,7 +135,7 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *2152886700
+  version_requirements: *2152418640
 description: Package Manager for JavaScript
 email:
 - charles@sproutcore.com
@@ -334,7 +334,6 @@ files:
 - lib/bpm/repository.rb
 - lib/bpm/server.rb
 - lib/bpm/version.rb
-- lib/vendored_sprockets.rb
 - spec/cli/add_spec.rb
 - spec/cli/build_spec.rb
 - spec/cli/fetch_spec.rb

data/lib/vendored_sprockets.rb

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