warbler 1.3.1 → 1.3.2

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org/"
 
-gem "rake", "~> 0.8.7"
+gem "rake"
 gem "rubyzip"
 gem "jruby-jars"
 gem "jruby-rack"

data/History.txt

@@ -1,3 +1,9 @@
+== 1.3.2
+
+- Compatibility with rake 0.9.x, avoid deprecation warnings and deal
+  with new FileList exclusion behavior
+- Exclude config.bundle_without groups properly
+
 == 1.3.1
 
 - Pin rake version to ~> 0.8.7 for now. Rake 0.9.0 compatibility will

data/Manifest.txt

@@ -15,6 +15,7 @@ lib/warbler/application.rb
 lib/warbler/config.rb
 lib/warbler/gems.rb
 lib/warbler/jar.rb
+lib/warbler/rake_helper.rb
 lib/warbler/task.rb
 lib/warbler/templates
 lib/warbler/templates/bundler.erb

data/Rakefile

@@ -11,8 +11,6 @@ rescue LoadError
   puts "Please install Bundler and run 'bundle install' to ensure you have all dependencies"
 end
 
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
 
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "Gemfile",
                     "LICENSE.txt", "Rakefile", "*.erb", "*.rb", "bin/*",
@@ -33,7 +31,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.8.7'], ['jruby-jars', '>= 1.4.0'], ['jruby-rack', '>= 1.0.0'], ['rubyzip', '>= 0.9.4']]
+    p.extra_deps += [['rake', '>= 0.8.7'], ['jruby-jars', '>= 1.4.0'], ['jruby-rack', '>= 1.0.0'], ['rubyzip', '>= 0.9.4']]
     p.clean_globs += %w(MANIFEST web.xml init.rb).map{|f| "spec/sample*/#{f}*" }
   end
   hoe.spec.files = MANIFEST
@@ -47,13 +45,10 @@ rescue LoadError
   puts "You really need Hoe installed to be able to package this gem"
 end
 
-# Leave my tasks alone, Hoe
-%w(default spec rcov).each do |task|
-  Rake::Task[task].prerequisites.clear
-  Rake::Task[task].actions.clear
-end
+require 'spec/rake/spectask'
+require 'spec/rake/verify_rcov'
 
-Spec::Rake::SpecTask.new do |t|
+Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts ||= []
   t.spec_opts << "--options" << "spec/spec.opts"
 end

data/lib/warbler.rb

@@ -29,5 +29,6 @@ module Warbler
 end
 
 require 'warbler/version'
+require 'warbler/rake_helper'
 require 'warbler/task'
 require 'warbler/application'

data/lib/warbler/application.rb

@@ -11,6 +11,8 @@ require 'rake'
 # report its name properly and inject its own tasks without a
 # Rakefile.
 class Warbler::Application < Rake::Application
+  include Warbler::RakeHelper
+
   def initialize
     super
     Warbler.application = self

data/lib/warbler/config.rb

@@ -12,6 +12,8 @@ require 'warbler/traits'
 module Warbler
   # Warbler archive assembly configuration class.
   class Config
+    include RakeHelper
+
     TOP_DIRS = %w(app config lib log vendor)
     FILE = "config/warble.rb"
     BUILD_GEMS = %w(warbler rake rcov)
@@ -171,7 +173,7 @@ module Warbler
 
       @compiled_ruby_files ||= FileList[*@dirs.map {|d| "#{d}/**/*.rb"}]
 
-      @excludes += ["tmp/war"] if File.directory?("tmp/war")
+      @excludes += ["tmp/war", "tmp/war/**/*"] if File.directory?("tmp/war")
       @excludes += warbler_vendor_excludes(warbler_home)
       @excludes += FileList["**/*.log"] if @exclude_logs
     end

data/lib/warbler/jar.rb

@@ -17,6 +17,8 @@ module Warbler
   # * Any object responding to +read+ representing an in-memory blob
   # * A String filename pointing to a file on disk
   class Jar
+    include RakeHelper
+
     DEFAULT_MANIFEST = %{Manifest-Version: 1.0\nCreated-By: Warbler #{Warbler::VERSION}\n\n}
 
     attr_reader :files

data/lib/warbler/rake_helper.rb

@@ -0,0 +1,29 @@
+#--
+# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2007-2009 Sun Microsystems, Inc.
+# This source code is available under the MIT license.
+# See the file LICENSE.txt for details.
+#++
+
+module Warbler
+  # This module exists for compatibility with Rake 0.9.
+  module RakeHelper
+    def self.included(base)
+      base.class_eval do
+        include Rake::DSL if defined?(Rake::DSL)
+        if defined?(Rake::FileUtilsExt)
+          include FileUtils
+          include Rake::FileUtilsExt
+        end
+      end
+    end
+
+    def self.extended(base)
+      base.extend Rake::DSL if defined?(Rake::DSL)
+      if defined?(Rake::FileUtilsExt)
+        base.extend FileUtils
+        base.extend Rake::FileUtilsExt
+      end
+    end
+  end
+end

data/lib/warbler/task.rb

@@ -29,6 +29,8 @@ module Warbler
   # With this setup, you can create two separate war files two
   # different configurations by running <tt>rake war1 war2</tt>.
   class Task < Rake::TaskLib
+    include RakeHelper
+
     # Task name
     attr_accessor :name
 

data/lib/warbler/traits/bundler.rb

@@ -30,12 +30,12 @@ module Warbler
       end
 
       def add_bundler_gems
+	require 'bundler'
         config.gems.clear
         config.gem_dependencies = false # Bundler takes care of these
         config.bundler = {}
-        ENV['BUNDLE_WITHOUT'] ||= config.bundle_without.join(':')
-        require 'bundler'
-        ::Bundler.setup.requested_specs.each do |spec|
+
+        bundler_specs.each do |spec|
           # Bundler HAX -- fixup bad #loaded_from attribute in fake
           # bundler gemspec from bundler/source.rb
           if spec.name == "bundler"
@@ -60,7 +60,8 @@ module Warbler
         config.bundler[:gemfile]  = ::Bundler.default_gemfile
         config.bundler[:lockfile] = ::Bundler.default_lockfile
         config.bundler[:frozen] = ::Bundler.settings[:frozen]
-        config.excludes += [::Bundler.settings[:path]] if ::Bundler.settings[:path]
+        path = ::Bundler.settings[:path]
+        config.excludes += [path, "#{path}/**/*"] if path
         config.init_contents << "#{config.warbler_templates}/bundler.erb"
       end
 
@@ -91,6 +92,18 @@ module Warbler
           end
         end
       end
+
+      private
+
+      def bundler_specs
+	original_without = ::Bundler.settings.without
+	::Bundler.settings.without = config.bundle_without
+
+	::Bundler::Definition.build(::Bundler.default_gemfile, ::Bundler.default_lockfile, nil).requested_specs
+      ensure
+	# need to set the settings back, otherwise they get persisted in .bundle/config
+	::Bundler.settings[:without] = original_without.join(':')
+      end
     end
   end
 end

data/lib/warbler/traits/war.rb

@@ -11,6 +11,7 @@ module Warbler
   module Traits
     # The War trait sets up the layout and generates web.xml for the war project.
     class War
+      include RakeHelper
       include Trait
 
       DEFAULT_GEM_PATH = '/WEB-INF/gems'

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/spec/spec_helper.rb

@@ -83,9 +83,9 @@ module Spec::Example::ExampleGroupMethods
 
     let(:drbclient) do
       drb
-      DRbObject.new(nil, 'druby://127.0.0.1:7890').tap do |drbclient|
+      DRbObject.new(nil, 'druby://127.0.0.1:7890').tap {|drbclient|
         loop { (drbclient.alive? && break) rescue nil }
-      end
+      }
     end
 
     let(:drb) do
@@ -102,6 +102,9 @@ module Spec::Example::ExampleGroupMethods
 end
 
 Spec::Runner.configure do |config|
+  config.include Warbler::RakeHelper
+  config.extend Warbler::RakeHelper
+
   config.after(:each) do
     class << Object
       public :remove_const

data/spec/warbler/jar_spec.rb

@@ -635,6 +635,7 @@ describe Warbler::Jar do
         config.dirs += ["tmp"]
       end
       jar.apply(config)
+      file_list(%r{WEB-INF/tmp/war}).should be_empty
       file_list(%r{WEB-INF/tmp/war/index\.html}).should be_empty
     end
 

metadata

@@ -2,7 +2,7 @@
 name: warbler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
   - Nick Sieger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -05:00
+date: 2011-08-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
     version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ~>
+        - - ">="
           - !ruby/object:Gem::Version 
             version: 0.8.7
     requirement: *id001
@@ -73,9 +73,9 @@ dependencies:
     version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: 2.9.1
+            version: "2.12"
     requirement: *id006
     prerelease: false
     type: :development
@@ -111,6 +111,7 @@ files:
   - lib/warbler/config.rb
   - lib/warbler/gems.rb
   - lib/warbler/jar.rb
+  - lib/warbler/rake_helper.rb
   - lib/warbler/task.rb
   - lib/warbler/templates/bundler.erb
   - lib/warbler/templates/config.erb