bpm 1.0.0.rc.2 → 1.0.0.rc.3

data/bpm.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   s.add_dependency "thor",         "~> 0.14.3"
   s.add_dependency "execjs",       "~> 1.2.4"
   s.add_dependency "sprockets",    "~> 2.0.0"
+  s.add_dependency "eventmachine", "~> 1.0.0.beta.4" # There are issues with 0.12.10 and thin
+  s.add_dependency "thin",         "~> 1.2"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "rack", "~> 1.3.2"

data/lib/bpm.rb

@@ -1,5 +1,7 @@
 Encoding.default_external = 'UTF-8'
 
+require 'bpm/railtie' if defined?(Rails)
+
 module BPM
   BPM_DIR = ".bpm"
   TEMPLATES_DIR = File.expand_path("../../templates", __FILE__)
@@ -12,6 +14,7 @@ module BPM
   autoload :Remote,               'bpm/remote'
   autoload :Repository,           'bpm/repository'
   autoload :Project,              'bpm/project'
+  autoload :Rack,                 'bpm/rack'
   autoload :Server,               'bpm/server'
   autoload :Pipeline,             'bpm/pipeline'
   autoload :DirectiveProcessor,   'bpm/pipeline/directive_processor'

data/lib/bpm/package.rb

@@ -401,19 +401,13 @@ module BPM
     # TODO: Make better errors
     # TODO: This might not work well with conflicting versions
     def local_deps(search_paths=nil)
-      # Using the packages directory is deprecated
-      packages_path = File.join(root_path, "packages")
-      search_paths ||= [File.join(root_path, "vendor"), packages_path]
+      search_paths ||= [File.join(root_path, "vendor"), File.join(root_path, "packages")]
 
       dependencies.inject([]) do |list, (name, version)|
         packages = search_paths.map{|p| Package.new(File.join(p, name)) }.select{|p| p.has_json? }
 
         raise "Can't find package #{name} required in #{self.name}" if packages.empty?
 
-        if packages.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
-
         packages.each{|p| p.load_json }
 
         unless satisfied_by?(version, package.version)

data/lib/bpm/pipeline.rb

@@ -154,6 +154,12 @@ module BPM
       asset
     end
 
+    # Index is for caching, but it causes us problem,
+    # we don't need the caching
+    def index
+      self
+    end
+
   protected
 
     def build_magic_paths

data/lib/bpm/pipeline/generated_asset.rb

@@ -118,7 +118,7 @@ module BPM
 
       hash = environment.cache_hash("#{pathname}:minify", id) do
         data = minify_body hash['source']
-        { 'length' => Rack::Utils.bytesize(data),
+        { 'length' => ::Rack::Utils.bytesize(data),
           'digest' => environment.digest.update(data).hexdigest,
           'source' => data }
       end

data/lib/bpm/pipeline/package_pipeline.rb

@@ -73,7 +73,12 @@ module BPM
     rescue Sprockets::FileNotFound => e
       raise Sprockets::FileNotFound, "#{e.message} in package '#{package_name}'"
     end
-      
+
+    # Index is for caching, but it causes us problem,
+    # we don't need the caching
+    def index
+      self
+    end
 
   end
 end

data/lib/bpm/rack.rb

@@ -0,0 +1,20 @@
+module BPM
+  class Rack
+    def initialize(app, project, opts={})
+      mode = opts[:mode] || :debug
+
+      @app = app
+      @prefix = File.join('/', opts[:url_prefix] || '', 'assets')
+      @pipeline = BPM::Pipeline.new(project, mode, true)
+    end
+
+    def call(env)
+      if env['PATH_INFO'] =~ /^#{@prefix}\/(.+)$/
+        env['PATH_INFO'] = $1
+        @pipeline.call(env)
+      else
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/bpm/railtie.rb

@@ -0,0 +1,17 @@
+module BPM
+  class Railtie < Rails::Railtie
+    railtie_name :bpm_rails
+
+    config.preview_bpm_app = false
+    config.bpm_app_dir = 'app'
+
+    initializer "bpm_rails.insert_bpm_pipeline" do |app|
+      if app.config.preview_bpm_app
+        path = app.config.bpm_app_dir
+        full_path = File.join(app.paths['public'].first, app.config.bpm_app_dir)
+        project = BPM::Project.new(full_path)
+        app.config.middleware.insert_before 'ActionDispatch::Static', 'BPM::Rack', project, :mode => :debug, :url_prefix => path
+      end
+    end
+  end
+end

data/lib/bpm/server.rb

@@ -1,12 +1,14 @@
 require 'rack'
 require 'sprockets'
+require 'thin'
 
 module BPM
 
-  class Server < Rack::Server
+  class Server < ::Rack::Server
 
     def initialize(project, options={})
       options = default_options.merge(options)
+      options[:server] ||= 'thin'
       @project = project
       @mode    = options[:mode] || :debug
       super options
@@ -29,14 +31,9 @@ module BPM
       cur_project = @project
       cur_mode    = @mode
 
-      @app ||= Rack::Builder.new do
-        map '/assets' do
-          run BPM::Pipeline.new cur_project, cur_mode, true
-        end
-
-        map '/' do
-          run Rack::Directory.new cur_project.root_path
-        end
+      @app ||= ::Rack::Builder.new do
+        use BPM::Rack, cur_project, :mode => cur_mode
+        run ::Rack::Directory.new cur_project.root_path
       end.to_app
     end
   end

data/lib/bpm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bpm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.2
+  version: 1.0.0.rc.3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libgems
-  requirement: &70191052678920 !ruby/object:Gem::Requirement
+  requirement: &70174351642100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70191052678920
+  version_requirements: *70174351642100
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &70191052677960 !ruby/object:Gem::Requirement
+  requirement: &70174351641560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70191052677960
+  version_requirements: *70174351641560
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70191052672680 !ruby/object:Gem::Requirement
+  requirement: &70174351641000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70191052672680
+  version_requirements: *70174351641000
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70191052671720 !ruby/object:Gem::Requirement
+  requirement: &70174351640500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70191052671720
+  version_requirements: *70174351640500
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70191052670660 !ruby/object:Gem::Requirement
+  requirement: &70174351639980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *70191052670660
+  version_requirements: *70174351639980
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70191052669580 !ruby/object:Gem::Requirement
+  requirement: &70174351639500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70191052669580
+  version_requirements: *70174351639500
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70191052668620 !ruby/object:Gem::Requirement
+  requirement: &70174351639020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,32 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70191052668620
+  version_requirements: *70174351639020
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70174351638520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70174351638520
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70174351638040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70174351638040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70191052667680 !ruby/object:Gem::Requirement
+  requirement: &70174351637660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191052667680
+  version_requirements: *70174351637660
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70191052666080 !ruby/object:Gem::Requirement
+  requirement: &70174351637080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +132,7 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70191052666080
+  version_requirements: *70174351637080
 description: Browser Package Manager
 email:
 - charles@sproutcore.com
@@ -156,6 +178,8 @@ files:
 - lib/bpm/pipeline/source_url_processor.rb
 - lib/bpm/project.rb
 - lib/bpm/project_generator.rb
+- lib/bpm/rack.rb
+- lib/bpm/railtie.rb
 - lib/bpm/remote.rb
 - lib/bpm/repository.rb
 - lib/bpm/server.rb