- ensure java libraries are in manifest

- add war:debug task that shows your configuration
- fix main war task to include war:webxml


git-svn-id: http://svn.caldersphere.net/svn/main/rubyforge/warbler/trunk@126 b03c2d0b-2f10-0410-a2f9-fc8001506dfa

Rakefile

@@ -1,7 +1,7 @@
 require 'spec/rake/spectask'
 
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "LICENSES.txt", "Rakefile",
-  "*.erb", "bin/*", "generators/**/*", "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"]
+  "*.erb", "bin/*", "generators/**/*", "lib/**/*", "spec/**/*.rb", "tasks/**/*.rake"]
 
 begin
   File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }

lib/warbler/task.rb

@@ -45,11 +45,12 @@ def define_tasks
       define_webxml_task
       define_app_task
       define_jar_task
+      define_debug_task
     end
 
     def define_main_task
-      desc "Create #{@name}.war"
-      task @name => ["#{@name}:app", "#{@name}:public", "#{@name}:jar"]
+      desc "Create #{@config.war_name}.war"
+      task @name => ["#{@name}:app", "#{@name}:public", "#{@name}:webxml", "#{@name}:jar"]
     end
 
     def define_clean_task
@@ -136,6 +137,15 @@ def define_jar_task
       end
     end
 
+    def define_debug_task
+      with_namespace_and_config do |name, config|
+        task "debug" do
+          require 'pp'
+          pp config
+        end
+      end
+    end
+
     def define_public_file_tasks
       @config.public_html.map do |f|
         define_file_task(f, "#{@config.staging_dir}/#{f.sub(%r{public/},'')}")

spec/warbler/task_spec.rb

@@ -107,11 +107,13 @@ def files_should_contain(regex)
     app_ran = false; task "warble:app" do; app_ran = true; end
     public_ran = false; task "warble:public" do; public_ran = true; end
     jar_ran = false; task "warble:jar" do; jar_ran = true; end
+    webxml_ran = false; task "warble:webxml" do; webxml_ran = true; end
     define_tasks "main"
     Rake::Task["warble"].invoke
     app_ran.should == true
     public_ran.should == true
     jar_ran.should == true
+    webxml_ran.should == true
   end
 
   it "should be able to define all tasks successfully" do

tasks/warbler.rake

@@ -4,10 +4,13 @@
 
 begin
   gem 'warbler'
-  require 'warbler'
-rescue Gem::LoadError, LoadError
-  $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-  require 'warbler'
+rescue Gem::LoadError
+  begin
+    require 'warbler'
+  rescue LoadError
+    $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+    require 'warbler'
+  end
 end
 
 Warbler::Task.new