allow any version of bundler and mime mapping

[woodie, 2009-11-08 23:53:27]

bundler 0.7.0 is out but we still need to patch.

http://codereview.appspot.com/150058/diff/1/2
File appengine-tools/Rakefile (left):

http://codereview.appspot.com/150058/diff/1/2#oldcode32
appengine-tools/Rakefile:32: s.add_dependency('bundler', ["0.6.0"])
we can drop our patch by 0.8.0, not sure when that will be.
so maybe this should be 0.7.0

[woodie, 2009-11-09 05:28:34]

Doing this the "right way" seems unnecessarily complex.
I suppose there is value in create example middleware,
then others can copy it, but that seems like a lot of work,
then we need to worry about breaking other people's stuff.

http://codereview.appspot.com/150058/diff/7/1014
File appengine-tools/lib/appengine-tools/web-xml.rb (right):

http://codereview.appspot.com/150058/diff/7/1014#newcode39
appengine-tools/lib/appengine-tools/web-xml.rb:39: def mime_mapping(mapping)
WebXmlBuilder beeds to learn to ignore skip_rack_servlet
and mime_mapping. Unclear if we need to wait for the next
rev of appengine-rack (and the jars).

mime_mapping(
    :xpi => 'application/x-xpinstall',
    :ru  => 'text/plain' ) if respond_to? :mime_mapping
skip_rack_servlet if respond_to? :skip_rack_servlet

[woodie, 2009-11-09 05:36:27]

we can release our gems when bundler 0.8.0 ships,
not sure if adding tests is helping anyone

http://codereview.appspot.com/150058/diff/7/1013
File appengine-tools/lib/appengine-tools/gem_bundler.rb (right):

http://codereview.appspot.com/150058/diff/7/1013#newcode68
appengine-tools/lib/appengine-tools/gem_bundler.rb:68: # TODO: this temporary
hack should be fixed properly
I can add a test to see if we are less than bundler 0.8.0

[woodie, 2009-12-01 21:36:11]

I need to add the appengine-rack changes we discussed, to that our next version
of jruby-jars won't require a rev to appengine-rack or appengine-tools

http://codereview.appspot.com/150058/diff/3003/3004
File appengine-rack/lib/appengine-rack.rb (right):

http://codereview.appspot.com/150058/diff/3003/3004#newcode35
appengine-rack/lib/appengine-rack.rb:35: :rails_excludes => %w(README Rakefile
db/** doc/** bin/**
the bin dir is added by bundler

http://codereview.appspot.com/150058/diff/3003/3005
File appengine-tools/Rakefile (right):

http://codereview.appspot.com/150058/diff/3003/3005#newcode32
appengine-tools/Rakefile:32: s.add_dependency('bundler')
any version of bundler should be fine

http://codereview.appspot.com/150058/diff/3003/3006
File appengine-tools/lib/appengine-tools/gem_bundler.rb (left):

http://codereview.appspot.com/150058/diff/3003/3006#oldcode73
appengine-tools/lib/appengine-tools/gem_bundler.rb:73: RubyGemsVersion = "0.0.0"
unless defined? RubyGemsVersion
this should not be a problem with Rails 3

http://codereview.appspot.com/150058/diff/3003/3006
File appengine-tools/lib/appengine-tools/gem_bundler.rb (right):

http://codereview.appspot.com/150058/diff/3003/3006#newcode74
appengine-tools/lib/appengine-tools/gem_bundler.rb:74: def self.path;       
ENV['GEM_PATH']; end
gem bundler should be adding this stuff

http://codereview.appspot.com/150058/diff/3003/3007
File appengine-tools/lib/appengine-tools/web-xml.rb (right):

http://codereview.appspot.com/150058/diff/3003/3007#newcode39
appengine-tools/lib/appengine-tools/web-xml.rb:39: def mime_mapping(mapping)
I'd like to leave this in place until we have real middleware

http://codereview.appspot.com/150058/diff/3003/3008
File google-appengine/Rakefile (right):

http://codereview.appspot.com/150058/diff/3003/3008#newcode20
google-appengine/Rakefile:20: s.add_dependency "appengine-jruby-jars", "0.0.5"
these need to be in alpha order for sanity

[do_not_use, 2009-12-01 21:44:23]

http://codereview.appspot.com/150058/diff/3003/3007
File appengine-tools/lib/appengine-tools/web-xml.rb (right):

http://codereview.appspot.com/150058/diff/3003/3007#newcode39
appengine-tools/lib/appengine-tools/web-xml.rb:39: def mime_mapping(mapping)
On 2009/12/01 21:36:12, woodie wrote:
> I'd like to leave this in place until we have real middleware

In that case move this method and skip_rack_servlet to Rack::Builder.

[woodie, 2009-12-02 08:19:21]

Just a couple issues:

1. I need to find another place to require
   'bundler_gems/environment'

2. I moved those methods, but I got it wrong:
   undefined local variable or method 
   `skip_rack_servlet' for WebXmlBuilder

http://codereview.appspot.com/150058/diff/3013/2013
File appengine-rack/lib/appengine-rack.rb (right):

http://codereview.appspot.com/150058/diff/3013/2013#newcode19
appengine-rack/lib/appengine-rack.rb:19: require 'bundler_gems/environment'
This needs to move someplace else, 
now that we bundle appengine-rack.

I assume dev_appserver can pick it up from rubygems

http://codereview.appspot.com/150058/diff/3013/2013#newcode30
appengine-rack/lib/appengine-rack.rb:30: class Builder
I'm lost here...

[do_not_use, 2009-12-02 21:40:39]

http://codereview.appspot.com/150058/diff/3013/2013
File appengine-rack/lib/appengine-rack.rb (right):

http://codereview.appspot.com/150058/diff/3013/2013#newcode19
appengine-rack/lib/appengine-rack.rb:19: require 'bundler_gems/environment'
Ok, I guess this should go in the RACKUP var in bundler.rb.

On 2009/12/02 08:19:21, woodie wrote:
> This needs to move someplace else, 
> now that we bundle appengine-rack.
> 
> I assume dev_appserver can pick it up from rubygems

http://codereview.appspot.com/150058/diff/3013/2013#newcode30
appengine-rack/lib/appengine-rack.rb:30: class Builder
On 2009/12/02 08:19:21, woodie wrote:
> I'm lost here...

This looks about right. What's the problem?

[woodie, 2009-12-03 05:57:17]

looks good. Only problem is that the meta-gem is goofy

http://codereview.appspot.com/150058/diff/3013/2013
File appengine-rack/lib/appengine-rack.rb (right):

http://codereview.appspot.com/150058/diff/3013/2013#newcode19
appengine-rack/lib/appengine-rack.rb:19: require 'bundler_gems/environment'
I looked into this, I cannot imagine it will work

http://codereview.appspot.com/150058/diff/2024/3020#newcode27
appengine-rack/lib/appengine-rack.rb:27: end
this works as long as I have the "if respond_to"

skip_rack_servlet # if respond_to? :skip_rack_servlet

config.ru:17:in `generate_xml': 
undefined local variable or method `skip_rack_servlet'
for #<WebXmlBuilder:0x3b48a8e6>

http://codereview.appspot.com/150058/diff/2024/3022
File appengine-tools/lib/appengine-tools/boot.rb (right):

http://codereview.appspot.com/150058/diff/2024/3022#newcode20
appengine-tools/lib/appengine-tools/boot.rb:20: require
'bundler_gems/environment'
I need this to get the XML generators to work

http://codereview.appspot.com/150058/diff/2024/3023
File appengine-tools/lib/appengine-tools/bundler.rb (right):

http://codereview.appspot.com/150058/diff/2024/3023#newcode105
appengine-tools/lib/appengine-tools/bundler.rb:105: %q{begin; require
'bundler_gems/environment'; } +
Why don't we require appengine-rack here as well?
We'd need to require it in boot as well (I suppose)

http://rails-on.appspot.com/src?path=WEB-INF%2Fweb.xml

http://codereview.appspot.com/150058/diff/2024/3028
File jruby-abridged/Rakefile (right):

http://codereview.appspot.com/150058/diff/2024/3028#newcode54
jruby-abridged/Rakefile:54: # require 'appengine-rack'
I'm not totally following what you were doing here
but things seems to be working

[do_not_use, 2009-12-04 00:03:49]

http://codereview.appspot.com/150058/diff/3013/2013
File appengine-rack/lib/appengine-rack.rb (right):

http://codereview.appspot.com/150058/diff/3013/2013#newcode19
appengine-rack/lib/appengine-rack.rb:19: require 'bundler_gems/environment'
On 2009/12/03 05:57:17, woodie wrote:
> I looked into this, I cannot imagine it will work

Why not?

http://codereview.appspot.com/150058/diff/2024/3020#newcode27
appengine-rack/lib/appengine-rack.rb:27: end
Maybe try "class ::Rack::Builder"? Otherwise I really have no idea why it's not
working. We need to come up with a new way of doing this anyway though.

On 2009/12/03 05:57:17, woodie wrote:
> this works as long as I have the "if respond_to"
> 
> skip_rack_servlet # if respond_to? :skip_rack_servlet
> 
> config.ru:17:in `generate_xml': 
> undefined local variable or method `skip_rack_servlet'
> for #<WebXmlBuilder:0x3b48a8e6>

http://codereview.appspot.com/150058/diff/2024/3021
File appengine-tools/Rakefile (right):

http://codereview.appspot.com/150058/diff/2024/3021#newcode29
appengine-tools/Rakefile:29: s.add_dependency 'appengine-rack'
Please put the parenthesis back.

http://codereview.appspot.com/150058/diff/2024/3022
File appengine-tools/lib/appengine-tools/boot.rb (right):

http://codereview.appspot.com/150058/diff/2024/3022#newcode20
appengine-tools/lib/appengine-tools/boot.rb:20: require
'bundler_gems/environment'
On 2009/12/03 05:57:17, woodie wrote:
> I need this to get the XML generators to work

This doesn't seem right. What's the problem you had?

http://codereview.appspot.com/150058/diff/2024/3023
File appengine-tools/lib/appengine-tools/bundler.rb (right):

http://codereview.appspot.com/150058/diff/2024/3023#newcode105
appengine-tools/lib/appengine-tools/bundler.rb:105: %q{begin; require
'bundler_gems/environment'; } +
I suppose we could, but I'm not really sure that's a good idea.

On 2009/12/03 05:57:17, woodie wrote:
> Why don't we require appengine-rack here as well?
> We'd need to require it in boot as well (I suppose)
> 
> http://rails-on.appspot.com/src?path=WEB-INF%252Fweb.xml

http://codereview.appspot.com/150058/diff/2024/3028
File jruby-abridged/Rakefile (right):

http://codereview.appspot.com/150058/diff/2024/3028#newcode39
jruby-abridged/Rakefile:39: # s.add_development_dependency('appengine-rack')
We should never be checking in things with commented out code. Just delete it.
It's in the revision history if we ever need it back.

[woodie, 2009-12-04 01:31:57]

tested the middleware, it works
I'd like to commit, and test some more

http://codereview.appspot.com/150058/diff/3013/2013
File appengine-rack/lib/appengine-rack.rb (right):

http://codereview.appspot.com/150058/diff/3013/2013#newcode19
appengine-rack/lib/appengine-rack.rb:19: require 'bundler_gems/environment'
sorry, old comment. works like a champ

http://codereview.appspot.com/150058/diff/2024/3021
File appengine-tools/Rakefile (right):

http://codereview.appspot.com/150058/diff/2024/3021#newcode29
appengine-tools/Rakefile:29: s.add_dependency 'appengine-rack'
On 2009/12/04 00:03:49, ribrdb wrote:
> Please put the parenthesis back.

DONE

http://codereview.appspot.com/150058/diff/2024/3022
File appengine-tools/lib/appengine-tools/boot.rb (right):

http://codereview.appspot.com/150058/diff/2024/3022#newcode20
appengine-tools/lib/appengine-tools/boot.rb:20: require
'bundler_gems/environment'
we never get to the point where we can generate the RACKUP section of the XML,
because the require appengine-rack rails when config.ru is evaluated

http://codereview.appspot.com/150058/diff/2024/3023
File appengine-tools/lib/appengine-tools/bundler.rb (right):

http://codereview.appspot.com/150058/diff/2024/3023#newcode105
appengine-tools/lib/appengine-tools/bundler.rb:105: %q{begin; require
'bundler_gems/environment'; } +
right, we should behave like proper middleware

http://codereview.appspot.com/150058/diff/2024/3028
File jruby-abridged/Rakefile (right):

http://codereview.appspot.com/150058/diff/2024/3028#newcode39
jruby-abridged/Rakefile:39: # s.add_development_dependency('appengine-rack')
Yup, I was not confident this was going to happen

http://codereview.appspot.com/150058/diff/2024/3028#newcode86
jruby-abridged/Rakefile:86: #     File.join(one_eight, 'appengine-rack'))
Also gone now

[do_not_use, 2009-12-04 18:51:55]

http://codereview.appspot.com/150058/diff/2024/3023
File appengine-tools/lib/appengine-tools/bundler.rb (right):

http://codereview.appspot.com/150058/diff/2024/3023#newcode262
appengine-tools/lib/appengine-tools/bundler.rb:262: eval IO.read('config.ru'),
nil, 'config.ru', 1
This is where we should load the environment.

[woodie, 2009-12-04 19:54:39]

testing now...