Permalink
Browse files

Unbundle jruby-rack

  • Loading branch information...
1 parent c97309f commit 11b8fad2a786b7066b17a9936c45fcf1207bb08b @nicksieger nicksieger committed Mar 8, 2010
Showing with 19 additions and 10 deletions.
  1. +6 −0 History.txt
  2. +4 −5 Manifest.txt
  3. +1 −1 Rakefile
  4. BIN lib/jruby-rack-0.9.5.jar
  5. +2 −1 lib/warbler/config.rb
  6. +6 −3 warbler.gemspec
View
@@ -1,3 +1,9 @@
+== 0.9.x
+
+* Allow override of gem.home which prevents Warbler from doing its own
+ gem bundling. For stop-gap use with Bundler (Daniel Harrington).
+* Stop bundling jruby-rack, as promised.
+
== 0.9.14
* So, jruby-rack is bundled for one more release. 1.0 will not contain
View
@@ -7,27 +7,26 @@ web.xml.erb
bin/warble
generators/warble
generators/warble/templates
-generators/warble/templates/warble.rb
generators/warble/warble_generator.rb
-lib/jruby-rack-0.9.5.jar
+generators/warble/templates/warble.rb
lib/warbler
+lib/warbler.rb
lib/warbler/config.rb
lib/warbler/gems.rb
lib/warbler/task.rb
lib/warbler/version.rb
-lib/warbler.rb
+spec/spec_helper.rb
spec/sample/app/controllers/application.rb
spec/sample/app/helpers/application_helper.rb
spec/sample/config/boot.rb
spec/sample/config/environment.rb
+spec/sample/config/routes.rb
spec/sample/config/environments/development.rb
spec/sample/config/environments/production.rb
spec/sample/config/environments/test.rb
spec/sample/config/initializers/inflections.rb
spec/sample/config/initializers/mime_types.rb
spec/sample/config/initializers/new_rails_defaults.rb
-spec/sample/config/routes.rb
-spec/spec_helper.rb
spec/warbler/config_spec.rb
spec/warbler/gems_spec.rb
spec/warbler/task_spec.rb
View
@@ -17,7 +17,7 @@ begin
p.summary = "Warbler chirpily constructs .war files of your Rails applications."
p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
p.description = p.paragraphs_of('README.txt', 1...2).join("\n\n")
- p.extra_deps += [['rake', '>= 0.7.3'], ['jruby-jars', '>= 1.3.1']]
+ p.extra_deps += [['rake', '>= 0.7.3'], ['jruby-jars', '>= 1.3.1'], ['jruby-rack', '>= 0.9.7']]
p.test_globs = ["spec/**/*_spec.rb"]
end
hoe.spec.files = MANIFEST
View
Binary file not shown.
View
@@ -150,7 +150,8 @@ def default_webxml_config
def default_jar_files
require 'jruby-jars'
- FileList["#{@warbler_home}/lib/*.jar", JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path]
+ require 'jruby-rack'
+ FileList[JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path, JRubyJars.jruby_rack_jar_path]
end
def auto_detect_frameworks
View
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Nick Sieger"]
- s.date = %q{2009-08-26}
+ s.date = %q{2010-03-08}
s.default_executable = %q{warble}
s.description = %q{Warbler is a gem to make a .war file out of a Rails, Merb, or Rack-based
application. The intent is to provide a minimal, flexible, ruby-like way to
@@ -15,12 +15,12 @@ server.}
s.email = %q{nick@nicksieger.com}
s.executables = ["warble"]
s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "LICENSES.txt"]
- s.files = ["History.txt", "Manifest.txt", "README.txt", "LICENSES.txt", "Rakefile", "web.xml.erb", "bin/warble", "generators/warble/templates/warble.rb", "generators/warble/warble_generator.rb", "lib/jruby-rack-0.9.5.jar", "lib/warbler/config.rb", "lib/warbler/gems.rb", "lib/warbler/task.rb", "lib/warbler/version.rb", "lib/warbler.rb", "spec/sample/app/controllers/application.rb", "spec/sample/app/helpers/application_helper.rb", "spec/sample/config/boot.rb", "spec/sample/config/environment.rb", "spec/sample/config/environments/development.rb", "spec/sample/config/environments/production.rb", "spec/sample/config/environments/test.rb", "spec/sample/config/initializers/inflections.rb", "spec/sample/config/initializers/mime_types.rb", "spec/sample/config/initializers/new_rails_defaults.rb", "spec/sample/config/routes.rb", "spec/spec_helper.rb", "spec/warbler/config_spec.rb", "spec/warbler/gems_spec.rb", "spec/warbler/task_spec.rb", "tasks/warbler.rake"]
+ s.files = ["History.txt", "Manifest.txt", "README.txt", "LICENSES.txt", "Rakefile", "web.xml.erb", "bin/warble", "generators/warble", "generators/warble/templates", "generators/warble/warble_generator.rb", "generators/warble/templates/warble.rb", "lib/warbler", "lib/warbler.rb", "lib/warbler/config.rb", "lib/warbler/gems.rb", "lib/warbler/task.rb", "lib/warbler/version.rb", "spec/spec_helper.rb", "spec/sample/app/controllers/application.rb", "spec/sample/app/helpers/application_helper.rb", "spec/sample/config/boot.rb", "spec/sample/config/environment.rb", "spec/sample/config/routes.rb", "spec/sample/config/environments/development.rb", "spec/sample/config/environments/production.rb", "spec/sample/config/environments/test.rb", "spec/sample/config/initializers/inflections.rb", "spec/sample/config/initializers/mime_types.rb", "spec/sample/config/initializers/new_rails_defaults.rb", "spec/warbler/config_spec.rb", "spec/warbler/gems_spec.rb", "spec/warbler/task_spec.rb", "tasks/warbler.rake"]
s.homepage = %q{http://caldersphere.rubyforge.org/warbler}
s.rdoc_options = ["--main", "README.txt"]
s.require_paths = ["lib"]
s.rubyforge_project = %q{caldersphere}
- s.rubygems_version = %q{1.3.5}
+ s.rubygems_version = %q{1.3.6}
s.summary = %q{Warbler chirpily constructs .war files of your Rails applications.}
s.test_files = ["spec/warbler/config_spec.rb", "spec/warbler/gems_spec.rb", "spec/warbler/task_spec.rb"]
@@ -31,12 +31,15 @@ server.}
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rake>, [">= 0.7.3"])
s.add_runtime_dependency(%q<jruby-jars>, [">= 1.3.1"])
+ s.add_runtime_dependency(%q<jruby-rack>, [">= 0.9.7"])
else
s.add_dependency(%q<rake>, [">= 0.7.3"])
s.add_dependency(%q<jruby-jars>, [">= 1.3.1"])
+ s.add_dependency(%q<jruby-rack>, [">= 0.9.7"])
end
else
s.add_dependency(%q<rake>, [">= 0.7.3"])
s.add_dependency(%q<jruby-jars>, [">= 1.3.1"])
+ s.add_dependency(%q<jruby-rack>, [">= 0.9.7"])
end
end

0 comments on commit 11b8fad

Please sign in to comment.