warbler 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.3
+
+* Tracking recent Bundler changes - handle locked Gemfiles differently
+  than unlocked ones
+* Handle file-based symlinks, and warn about inoperational directory
+  symlinks under non-JRuby versions of Ruby.
+
 == 1.0.2
 
 * Add 'warble pluginize' task back. This task now just creates a

data/Rakefile

@@ -18,7 +18,7 @@ require 'spec/rake/verify_rcov'
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "Gemfile",
                     "LICENSE.txt", "Rakefile", "*.erb", "*.rb", "bin/*",
                     "ext/**/*", "lib/**/*", "spec/**/*.rb", "spec/sample/**/*.*"
-                   ].to_a.reject{|f| f=~%r{spec/sample/(MANIFEST|web.xml)}}.sort.uniq
+                   ].to_a.reject{|f| f=~%r{spec/sample/(MANIFEST|link|web.xml)}}.sort.uniq
 
 begin
   File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }

data/ext/WarblerWar.java

@@ -48,7 +48,9 @@ public class WarblerWar {
                 close(file);
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            if (runtime.isDebug()) {
+                e.printStackTrace();
+            }
             throw runtime.newIOErrorFromException(e);
         }
 

data/lib/warbler/config.rb

@@ -201,13 +201,26 @@ module Warbler
       if @bundler && File.exist?("Gemfile")
         @gems.clear
         @gem_dependencies = false # Bundler takes care of these
-        require 'bundler'
-        env = Bundler.respond_to?(:runtime) ? Bundler.runtime : Bundler.load
-        def Bundler.env_file; root.join(::Warbler::Runtime::WAR_ENV); end
-        env.extend Warbler::Runtime
-        env.gem_path = @gem_path
-        env.write_war_environment
-        env.war_specs.each {|spec| @gems << spec }
+        begin
+          require 'bundler'
+          env = Bundler::Runtime.new(Bundler.root, Bundler.definition)
+          if bundler_env_file = Bundler.respond_to?(:env_file)
+            class << Bundler
+              alias orig_env_file env_file
+              def env_file; root.join(::Warbler::Runtime::WAR_ENV); end
+            end
+          end
+          env.extend Warbler::Runtime
+          env.gem_path = @gem_path
+          env.write_war_environment
+          env.war_specs.each {|spec| @gems << spec }
+        ensure
+          if bundler_env_file
+            class << Bundler
+              alias env_file orig_env_file
+            end
+          end
+        end
       else
         @bundler = false
       end

data/lib/warbler/runtime.rb

@@ -24,9 +24,10 @@ module Warbler
       end
     end
 
-    def rb_lock_file
-      root.join(WAR_ENV)
-    end
+    # deprecated; compatibility with Bundler <= 0.9.14
+    def rb_lock_file            #:nocov:
+      root.join(WAR_ENV)        #:nocov:
+    end                         #:nocov:
 
     def specs_for_lock_file
       super.map {|s| Spec.new(s, gem_path)}

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/warbler/war.rb

@@ -137,7 +137,10 @@ module Warbler
     def add_bundler_files(config)
       if config.bundler
         @files[apply_pathmaps(config, 'Gemfile', :application)] = 'Gemfile'
-        @files[apply_pathmaps(config, '.bundle/environment.rb', :application)] = '.bundle/war-environment.rb'
+        if File.exist?('Gemfile.lock')
+          @files[apply_pathmaps(config, 'Gemfile.lock', :application)] = 'Gemfile.lock'
+          @files[apply_pathmaps(config, '.bundle/environment.rb', :application)] = '.bundle/war-environment.rb'
+        end
       end
     end
 
@@ -175,7 +178,11 @@ module Warbler
           if src.respond_to?(:read)
             zipfile.get_output_stream(entry) {|f| f << src.read }
           elsif src.nil? || File.directory?(src)
+            warn "directory symlinks are not followed unless using JRuby; #{entry} contents not in archive" \
+              if File.symlink?(entry) && !defined?(JRUBY_VERSION)
             zipfile.mkdir(entry)
+          elsif File.symlink?(src)
+            zipfile.get_output_stream(entry) {|f| f << File.read(src) }
           else
             zipfile.add(entry, src)
           end

data/spec/warbler/task_spec.rb

@@ -28,7 +28,8 @@ describe Warbler::Task do
     Rake::Task["warble:clean"].invoke
     rm_rf "log"
     rm_f FileList["config.ru", "*web.xml", "config/web.xml*", "config/warble.rb",
-                  "tmp/gems.jar", "file.txt", 'manifest', 'Gemfile']
+                  "config/special.txt", "config/link.txt", "tmp/gems.jar",
+                  "file.txt", 'Gemfile', 'lib/rakelib']
     Dir.chdir(@pwd)
   end
 
@@ -64,6 +65,38 @@ describe Warbler::Task do
   it "should be able to define all tasks successfully" do
     Warbler::Task.new "warble", @config
   end
+
+  it "should process symlinks by storing a file in the archive that has the same contents as the source" do
+    File.open("config/special.txt", "wb") {|f| f << "special"}
+    Dir.chdir("config") { ln_s "special.txt", "link.txt" }
+    silence { Rake::Task["warble"].invoke }
+    Zip::ZipFile.open("#{@config.war_name}.war") do |zf|
+      special = zf.get_input_stream('WEB-INF/config/special.txt') {|io| io.read }
+      link = zf.get_input_stream('WEB-INF/config/link.txt') {|io| io.read }
+      link.should == special
+    end
+  end
+
+  it "should process directory symlinks by copying the whole subdirectory" do
+    Dir.chdir("lib") { ln_s "tasks", "rakelib" }
+    silence { Rake::Task["warble"].invoke }
+    Zip::ZipFile.open("#{@config.war_name}.war") do |zf|
+      zf.find_entry("WEB-INF/lib/tasks/utils.rake").should_not be_nil
+      zf.find_entry("WEB-INF/lib/rakelib/").should_not be_nil
+      zf.find_entry("WEB-INF/lib/rakelib/utils.rake").should_not be_nil if defined?(JRUBY_VERSION)
+    end
+  end
+
+  it "should use a Bundler Gemfile to include gems" do
+    File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
+    @config.bundler = true
+    @config.send(:detect_bundler_gems)
+    silence { Rake::Task["warble"].invoke }
+    Zip::ZipFile.open("#{@config.war_name}.war") do |zf|
+      rspec_version = @config.gems.keys.detect {|k| k.name == 'rspec'}.version
+      zf.find_entry("WEB-INF/gems/specifications/rspec-#{rspec_version}.gemspec").should_not be_nil
+    end
+  end
 end
 
 describe "Debug targets" do

data/spec/warbler/war_spec.rb

@@ -382,6 +382,16 @@ describe Warbler::War do
   it "should write a Bundler environment file into the war" do
     File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
     @war.apply(Warbler::Config.new)
+    file_list(%r{WEB-INF/Gemfile}).should_not be_empty
+    file_list(%r{WEB-INF/Gemfile.lock}).should be_empty
+    file_list(%r{WEB-INF/\.bundle/environment\.rb}).should be_empty
+  end
+
+  it "should only include Bundler lockfiles if Gemfile.lock exists" do
+    File.open("Gemfile", "w") {|f| f << "gem 'rspec'"}
+    `ruby -S bundle lock`
+    @war.apply(Warbler::Config.new)
+    file_list(%r{WEB-INF/Gemfile.lock}).should_not be_empty
     file_list(%r{WEB-INF/\.bundle/environment\.rb}).should_not be_empty
   end
 

metadata

@@ -3,90 +3,90 @@ name: warbler
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+    - 1
+    - 0
+    - 3
+  version: 1.0.3
 platform: ruby
 authors: 
-- Nick Sieger
+  - Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -05:00
+date: 2010-05-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jruby-jars
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jruby-rack
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 7
-        version: 0.9.7
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 8
+              - 7
+            version: 0.8.7
+    prerelease: false
+    type: :runtime
+    requirement: *id001
+  - !ruby/object:Gem::Dependency 
+    name: jruby-jars
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 4
+              - 0
+            version: 1.4.0
+    prerelease: false
+    type: :runtime
+    requirement: *id002
+  - !ruby/object:Gem::Dependency 
+    name: jruby-rack
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 9
+              - 7
+            version: 0.9.7
+    prerelease: false
+    type: :runtime
+    requirement: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rubyzip
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 9
+              - 4
+            version: 0.9.4
+    prerelease: false
+    type: :runtime
+    requirement: *id004
+  - !ruby/object:Gem::Dependency 
+    name: rubyforge
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+              - 4
+            version: 2.0.4
+    prerelease: false
+    type: :development
+    requirement: *id005
 description: |-
   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
@@ -94,87 +94,87 @@ description: |-
   server.
 email: nick@nicksieger.com
 executables: 
-- warble
+  - warble
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
+  - History.txt
+  - LICENSE.txt
+  - Manifest.txt
+  - README.txt
 files: 
-- Gemfile
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- bin/warble
-- ext/WarblerWar.java
-- ext/WarblerWarService.java
-- lib/warbler.rb
-- lib/warbler/application.rb
-- lib/warbler/config.rb
-- lib/warbler/gems.rb
-- lib/warbler/runtime.rb
-- lib/warbler/task.rb
-- lib/warbler/version.rb
-- lib/warbler/war.rb
-- lib/warbler_war.jar
-- spec/sample/app/controllers/application.rb
-- spec/sample/app/helpers/application_helper.rb
-- spec/sample/config/boot.rb
-- spec/sample/config/database.yml
-- 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/sample/lib/tasks/utils.rake
-- spec/sample/public/404.html
-- spec/sample/public/422.html
-- spec/sample/public/500.html
-- spec/sample/public/favicon.ico
-- spec/sample/public/index.html
-- spec/sample/public/robots.txt
-- spec/spec_helper.rb
-- spec/warbler/application_spec.rb
-- spec/warbler/config_spec.rb
-- spec/warbler/gems_spec.rb
-- spec/warbler/task_spec.rb
-- spec/warbler/war_spec.rb
-- warble.rb
-- web.xml.erb
+  - Gemfile
+  - History.txt
+  - LICENSE.txt
+  - Manifest.txt
+  - README.txt
+  - Rakefile
+  - bin/warble
+  - ext/WarblerWar.java
+  - ext/WarblerWarService.java
+  - lib/warbler.rb
+  - lib/warbler/application.rb
+  - lib/warbler/config.rb
+  - lib/warbler/gems.rb
+  - lib/warbler/runtime.rb
+  - lib/warbler/task.rb
+  - lib/warbler/version.rb
+  - lib/warbler/war.rb
+  - lib/warbler_war.jar
+  - spec/sample/app/controllers/application.rb
+  - spec/sample/app/helpers/application_helper.rb
+  - spec/sample/config/boot.rb
+  - spec/sample/config/database.yml
+  - 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/sample/lib/tasks/utils.rake
+  - spec/sample/public/404.html
+  - spec/sample/public/422.html
+  - spec/sample/public/500.html
+  - spec/sample/public/favicon.ico
+  - spec/sample/public/index.html
+  - spec/sample/public/robots.txt
+  - spec/spec_helper.rb
+  - spec/warbler/application_spec.rb
+  - spec/warbler/config_spec.rb
+  - spec/warbler/gems_spec.rb
+  - spec/warbler/task_spec.rb
+  - spec/warbler/war_spec.rb
+  - warble.rb
+  - web.xml.erb
 has_rdoc: true
 homepage: http://caldersphere.rubyforge.org/warbler
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
-- -SHN
-- -f
-- darkfish
+  - --main
+  - README.txt
+  - -SHN
+  - -f
+  - darkfish
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: caldersphere