buildr4osgi 0.9.5 → 0.9.6

data/buildr4osgi.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr4osgi'
-  spec.version        = '0.9.5'
+  spec.version        = '0.9.6'
   spec.author         = 'Antoine Toulme'
   spec.email          = "atoulme@intalio.com"
   spec.homepage       = "http://buildr.apache.org/"

data/lib/buildr4osgi/eclipse/feature.rb

@@ -121,6 +121,7 @@ PROPERTIES
     
     attr_accessor :feature_xml
     attr_accessor :feature_properties
+    attr_accessor :p2_inf
     
     FeatureWriter::VARS << :plugins
     FeatureWriter::VARS << :feature_xml
@@ -138,6 +139,7 @@ PROPERTIES
       mkpath File.join(project.base_dir, 'target')
       resolved_plugins = create_resolved_plugins
       enhance(resolved_plugins.values)
+      enhance([p2_inf]) if p2_inf
       unless feature_xml
         File.open(File.join(project.base_dir, 'target', 'feature.xml'), 'w') do |f|
           f.write(writeFeatureXml(resolved_plugins.keys, feature_xml.nil? && feature_properties.nil? ))
@@ -154,6 +156,7 @@ PROPERTIES
       else
         path("eclipse/features/#{feature_id}_#{project.version}").include feature_properties if feature_properties
       end
+      path("eclipse/features/#{feature_id}_#{project.version}").include(p2_inf.to_s, :as => "p2.inf") if p2_inf
       
       resolved_plugins.each_pair do |info, plugin| 
         unless info[:manifest].nil?
@@ -341,7 +344,7 @@ PROPERTIES
           artifact = Buildr::artifact(artifact.to_hash.merge(:classifier => "sources")) if artifact.is_a?(Buildr::Artifact)
           info, as_dir = adapt_plugin(artifact)
           if !info.nil? 
-            info[:unjarred] = as_dir || (!@unjarred[plugin].nil? && @unjarred[plugin][:unjarred])
+            info[:unjarred] = false #as_dir || (!@unjarred[plugin].nil? && @unjarred[plugin][:unjarred]) never explode a sources bundle.
             resolved_plugins[info] = artifact
           end
         end
@@ -394,7 +397,7 @@ PROPERTIES
         raise "Cannot use same feature.xml file for both binary and source features packaging" if (!featurePackage.feature_xml.nil?) && featurePackage.feature_xml == sdkTask.feature_xml
         sdkTask.label += " - Sources" if featurePackage.label == sdkTask.label
         sdkTask.description = "Sources for " + sdkTask.description if featurePackage.description == sdkTask.description
-        sdkTask.feature_id += ".sources" if featurePackage.feature_id == sdkTask.feature_id
+        sdkTask.feature_id += ".source" if featurePackage.feature_id == sdkTask.feature_id
         sdkTask.generateFeature(project)
       end
       

data/spec/eclipse/feature_spec.rb

@@ -116,6 +116,7 @@ end
 describe Buildr4OSGi::FeatureTask, "configuration" do
   
   it "should accept the feature parameters" do
+    Buildr::write "p2.inf", ""
     foo = define("foo", :version => "1.0.0")
     f = foo.package(:feature)
     lambda {
@@ -131,6 +132,7 @@ describe Buildr4OSGi::FeatureTask, "configuration" do
     f.update_sites << {:url => "http://example.com/update", :name => "My update site"}
     f.discovery_sites = [{:url => "http://example.com/update2", :name => "My update site2"}, 
       {:url => "http://example.com/upup", :name => "My update site in case"}]
+    f.p2_inf = "p2.inf"
     }.should_not raise_error
   end
   
@@ -205,6 +207,7 @@ end
 describe Buildr4OSGi::FeatureTask, " when running" do
   
   before do
+    Buildr::write "myp2.inf", "#p2 properties\n"
     @foo = define("foo", :version => "1.0.0")
     f = @foo.package(:feature)
     f.plugins << DEBUG_UI
@@ -218,6 +221,7 @@ describe Buildr4OSGi::FeatureTask, " when running" do
     f.update_sites << {:url => "http://example.com/update", :name => "My update site"}
     f.discovery_sites = [{:url => "http://example.com/update2", :name => "My update site2"}, 
       {:url => "http://example.com/upup", :name => "My update site in case"}]
+    f.p2_inf = "myp2.inf"
   end
   
   it "should create a jar file with a eclipse/plugins and a eclipse/features structure" do
@@ -227,6 +231,7 @@ describe Buildr4OSGi::FeatureTask, " when running" do
     Zip::ZipFile.open(feature_file) do |zip|
       zip.find_entry("eclipse/features/foo_1.0.0/feature.xml").should_not be_nil
       zip.find_entry("eclipse/features/foo_1.0.0/feature.properties").should_not be_nil
+      zip.find_entry("eclipse/features/foo_1.0.0/p2.inf").should_not be_nil
       zip.find_entry("eclipse/plugins/org.eclipse.debug.ui_3.4.1.v20080811_r341.jar").should_not be_nil
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr4osgi
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Antoine Toulme
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -07:00
+date: 2010-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency