warbler 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.4
+
+* Update bundled JRuby to 1.1RC3 and Goldspike to 1.6.
+* Fix inclusion of gems with platform-specific bits (e.g., Hpricot)
+
 == 0.9.3
 
 * Update bundled JRuby to 1.1RC2, and Goldspike to 1.5.

data/Manifest.txt

@@ -11,8 +11,8 @@ generators/warble/templates/warble.rb
 generators/warble/warble_generator.rb
 lib/activation-1.1.jar
 lib/commons-pool-1.3.jar
-lib/goldspike-1.5.jar
-lib/jruby-complete-1.1RC2.jar
+lib/goldspike-1.6.jar
+lib/jruby-complete-1.1RC3.jar
 lib/warbler
 lib/warbler/config.rb
 lib/warbler/gems.rb

data/Rakefile

@@ -39,7 +39,9 @@ end
 
 Spec::Rake::SpecTask.new("spec:rcov") do |t|
   t.rcov = true
+  t.rcov_opts << '--exclude gems/*'
 end
+
 # so we don't confuse autotest
 RCov::VerifyTask.new(:rcov) do |t|
   t.threshold = 100

data/lib/warbler/task.rb

@@ -240,6 +240,16 @@ module Warbler
       spec = matched.last
       
       gem_name = "#{spec.name}-#{spec.version}"
+      unless spec.platform.nil? || spec.platform == Gem::Platform::RUBY
+        [spec.platform, spec.original_platform].each do |p|
+          name = "#{gem_name}-#{p}"
+          if File.exist?(File.join(Gem.dir, 'cache', "#{name}.gem"))
+            gem_name = name
+            break
+          end
+        end
+      end
+
       gem_unpack_task_name = "gem:#{gem_name}"
       return if Rake::Task.task_defined?(gem_unpack_task_name)
 

data/lib/warbler/version.rb

@@ -5,5 +5,5 @@
 #++
 
 module Warbler
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/warbler/task_spec.rb

@@ -179,6 +179,20 @@ describe Warbler::Task do
     }.should raise_error
   end
 
+  it "should handle platform-specific gems" do
+    spec = mock "gem spec"
+    spec.stub!(:name).and_return "hpricot"
+    spec.stub!(:version).and_return "0.6.157"
+    spec.stub!(:platform).and_return "java"
+    spec.stub!(:original_platform).and_return "java"
+    spec.stub!(:loaded_from).and_return "hpricot.gemspec"
+    spec.stub!(:dependencies).and_return []
+    Gem.source_index.should_receive(:search).with("hpricot", nil).and_return [spec]
+    File.should_receive(:exist?).with(File.join(Gem.dir, 'cache', "hpricot-0.6.157-java.gem")).and_return true
+    @config.gems = ["hpricot"]
+    define_tasks "gems"
+  end
+
   it "should define a java_classes task for copying loose java classes" do
     @config.java_classes = FileList["Rakefile"]
     define_tasks "java_classes"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warbler
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Nick Sieger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-18 00:00:00 -08:00
+date: 2008-03-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,8 +46,8 @@ files:
 - generators/warble/warble_generator.rb
 - lib/activation-1.1.jar
 - lib/commons-pool-1.3.jar
-- lib/goldspike-1.5.jar
-- lib/jruby-complete-1.1RC2.jar
+- lib/goldspike-1.6.jar
+- lib/jruby-complete-1.1RC3.jar
 - lib/warbler
 - lib/warbler/config.rb
 - lib/warbler/gems.rb