buildr4osgi 0.9.2 → 0.9.3

data/lib/buildr4osgi/osgi/registry.rb

@@ -13,6 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require File.join(File.dirname(__FILE__), 'execution_environment')
+
 module OSGi
   
   OSGI_GROUP_ID = "osgi"
@@ -61,6 +63,10 @@ module OSGi
         @containers = [Buildr.settings.user, Buildr.settings.build].inject([]) { |repos, hash|
           repos | Array(hash['osgi'] && hash['osgi']['containers'])
         }
+        if ENV['OSGI'] && !ENV['OSGi']
+          warn "The correct constant to define for the OSGi containers is named OSGi"
+          ENV['OSGi'] = ENV['OSGI']
+        end
         if ENV['OSGi'] 
           @containers |= ENV['OSGi'].split(';')
         end
@@ -80,19 +86,6 @@ module OSGi
     end 
   end
 
-  class OSGi #:nodoc:
-
-    attr_reader :options, :registry
-
-    def initialize(project)
-      if (project.parent)
-        @options = project.parent.osgi.options.dup
-        @registry = project.parent.osgi.registry.dup
-      end
-      @options ||= Options.new
-      @registry ||= ::OSGi::Registry.new
-    end
-
     # The options for the osgi.options method
     #   package_resolving_strategy:
     #     The package resolving strategy, it should be a symbol representing a module function in the OSGi::PackageResolvingStrategies module.
@@ -102,30 +95,31 @@ module OSGi
     #     A set of Proc objects to match a bundle to a groupId for maven.
     #     The array is examined with the latest added Procs first.
     #     The first proc to return a non-nil answer is used, otherwise the OGSGI_GROUP_ID constant is used.
-    class Options
+    class Options < ::OSGi::ExecutionEnvironmentConfiguration
       attr_accessor :package_resolving_strategy, :bundle_resolving_strategy
 
       def initialize
+        super
         @package_resolving_strategy = :all
         @bundle_resolving_strategy = :latest
       end
-
     end
-  end
-  
-  module OSGiOptions
-    include Extension
     
-    # Makes a osgi instance available to the project.
-    # The osgi object may be used to access OSGi containers
-    # or set options, currently the resolving strategies.
-    def osgi
-      @osgi ||= OSGi.new(self)
-      @osgi
+    # Calls to this method return true if the package name passed as argument
+    # is either part of the packages of the framework given by the execution environment
+    # or part of the extra packages specified by the user.
+    #
+    def is_framework_package?(name)
+      options.current_execution_environment.packages.include?(name) || options.extra_packages.include?(name)
     end
+  
+  
+  def options
+    @options ||= Options.new
   end
-end
-
-class Buildr::Project
-  include OSGi::OSGiOptions
+  
+  def registry
+    @registry ||= ::OSGi::Registry.new
+  end
+  
 end

data/lib/buildr4osgi/osgi/resolving_strategies.rb

@@ -51,6 +51,7 @@ module OSGi #:nodoc:
     # This is the default function.
     #
     def all(package, bundles)
+      warn "*** SPLIT PACKAGE: #{package} is exported by <#{bundles.join(", ")}>"
       return bundles
     end  
     

data/lib/buildr4osgi/osgi/version.rb

@@ -91,7 +91,7 @@ module OSGi #:nodoc:
     #
     def self.parse(string, max_infinite = false)
       return string if string.is_a?(VersionRange) || string.is_a?(Version)
-      if !string.nil? && (match = string.match /\s*([\[|\(])([0-9|\.]*),([0-9|\.]*)([\]|\)])/)
+      if !string.nil? && (match = string.match /\s*([\[|\(])([0-9|A-z|\.]*)\s*,\s*([0-9|A-z|\.]*)([\]|\)])/)
         range = VersionRange.new
         range.min = Version.new(match[2])
         range.max = Version.new(match[3])

data/rakelib/all-in-one.rake

@@ -0,0 +1,84 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+desc "Create JRuby all-in-one distribution"
+task "all-in-one" => :gem do
+  version = "1.4.0"
+  jruby_distro = "jruby-bin-#{version}.tar.gz"
+  url = "http://jruby.kenai.com/downloads/#{version}/#{jruby_distro}"
+  dir = "jruby-#{version}"
+
+  mkpath '_all-in-one'
+  cd '_all-in-one'
+
+  # Download and extract JRuby
+  lambda do
+    unless File.exist? jruby_distro
+      puts "Downloading JRuby from #{url} ..."
+      sh 'wget', url
+      puts "[X] Downloaded JRuby"
+    end
+
+    rm_rf dir if File.exist? dir
+
+    puts "Extracting JRuby to #{dir} ..."
+    sh 'tar', 'xzf', jruby_distro
+    puts "[X] Extracted JRuby"
+    cd dir
+  end.call
+
+  # Cleanup JRuby distribution
+  lambda do
+    rm_rf 'docs'
+    mkpath 'jruby-docs'
+    mv Dir["COPYING*"], 'jruby-docs'
+    mv Dir["LICENSE*"], 'jruby-docs'
+    mv 'README', 'jruby-docs'
+    rm_rf 'lib/ruby/1.9'
+    rm_rf 'lib/ruby/gems/1.8/doc'
+    rm_rf 'samples'
+    rm_rf 'share'
+  end.call
+
+  # Install Buildr gem and dependencies
+  lambda do
+    puts "Install Buildr gem ..."
+    sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first, FileList['../../../buildr4osgi*.gem'].first,
+       '--no-rdoc', '--no-ri'
+    puts "[X] Install Buildr gem"
+  end.call
+
+  # Add Buildr executables/scripts
+  lambda do
+    cp 'bin/jruby.exe', 'bin/_buildr.exe'
+    cp Dir["../../all-in-one/*"], 'bin'
+  end.call
+
+  # Package distribution
+  lambda do
+    puts "Zipping distribution ..."
+    cd '..'
+    new_dir  = "#{spec.name}-#{spec.version}-#{dir}"
+    mv dir, new_dir
+    zip = "#{new_dir}.zip"
+    rm zip if File.exist? zip
+    sh 'zip', '-q', '-r', zip, new_dir
+    puts "[X] Zipped distribution"
+    rm_rf new_dir
+  end.call
+
+end
+
+task(:clobber) { rm_rf '_all-in-one' }

data/rakelib/stage.rake

@@ -113,7 +113,7 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
       File.open(pkg + '.sha1', 'w') { |file| file.write Digest::SHA1.hexdigest(bytes) << ' ' << File.basename(pkg) }
       sh 'gpg2', '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
     end
-    cp 'etc/KEYS', '_staged'
+    cp 'etc/KEYS', '_staged/dist'
     puts "[X] Created and signed release packages in _staged/dist"
   end.call
 
@@ -121,10 +121,11 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
   # want to do that before generating the site/documentation.
   lambda do
     puts "Updating download page with links to release packages ... "
-    url = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
+    mirror = "http://www.apache.org/dyn/closer.cgi/#{spec.name}/#{spec.version}"
+    official = "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
     rows = FileList['_staged/dist/*.{gem,tgz,zip}'].map { |pkg|
       name, md5 = File.basename(pkg), Digest::MD5.file(pkg).to_s
-      %{| "#{name}":#{url}/#{name} | "#{md5}":#{url}/#{name}.md5 | "Sig":#{url}/#{name}.asc |}
+      %{| "#{name}":#{mirror}/#{name} | "#{md5}":#{official}/#{name}.md5 | "Sig":#{official}/#{name}.asc |}
     }
     textile = <<-TEXTILE
 h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
@@ -132,7 +133,7 @@ h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
 |_. Package |_. MD5 Checksum |_. PGP |
 #{rows.join("\n")}
 
-p>. ("Release signing keys":#{url}/KEYS)
+p>. ("Release signing keys":#{official}/KEYS)
     TEXTILE
     file_name = 'doc/download.textile'
     print "Adding download links to #{file_name} ... "

data/spec/compile/external_spec.rb

@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+describe Buildr4OSGi::CompilerSupport::ExternalC do
+  
+  before :all do
+    Buildr::Compiler.compilers.delete Buildr::Compiler::Javac
+    Buildr::Compiler.compilers.delete Buildr4OSGi::CompilerSupport::OSGiC
+  end
+  
+  describe "should compile a Java project just in the same way javac does" do  
+    javac_spec = File.read(File.join(File.dirname(__FILE__), "..", "..", "buildr", "spec", "java", "compiler_spec.rb"))
+    javac_spec = javac_spec.match(Regexp.escape("require File.join(File.dirname(__FILE__), '../spec_helpers')\n")).post_match
+    javac_spec.gsub!("javac", "externalc")
+    javac_spec.gsub!("nowarn", "warn:none")
+    eval(javac_spec)
+  end
+  
+  after :all do
+    Buildr::Compiler.compilers << Buildr::Compiler::Javac
+    Buildr::Compiler.compilers.unshift Buildr4OSGi::CompilerSupport::OSGiC
+  end
+  
+end
+
+

data/spec/eclipse/p2_spec.rb

@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+describe Buildr4OSGi::P2 do
+  
+  before(:each) do
+    Buildr::write "bar/src/main/java/Hello.java", "public class Hello {}"
+    @container = define("container") do
+      project.group = "grp"
+      @bar = define("bar", :version => "1.0.0") do
+        package(:bundle)
+        package(:sources)
+      end
+    end
+    @foo = define("foo", :version => "1.0.0") do
+      f = package(:feature)
+      f.plugins << project("container:bar")
+      f.label = "My feature"
+      f.provider = "Acme Inc"
+      f.description = "The best feature ever"
+      f.changesURL = "http://example.com/changes"
+      f.license = "The license is too long to explain"
+      f.licenseURL = "http://example.com/license"
+      f.branding_plugin = "com.musal.ui"
+      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"}]
+      #package(:sources)
+    end
+    
+    @bar = define("bar", :version => "1.0")
+    site = @bar.package(:site)
+    category = Buildr4OSGi::Category.new
+    category.name = "category.id"
+    category.label = "Some Label"
+    category.description = "The category is described here"
+    category.features<< @foo
+    site.categories << category
+    site  
+    
+  end
+  
+  it "should generate a p2 site" do
+    @p2 = project("foo") do
+      package(:p2_from_site).with :site => @bar
+    end
+    @p2.package(:p2_from_site).invoke
+    
+    
+  end
+end

data/spec/eclipse/site_spec.rb

@@ -0,0 +1,94 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require File.join(File.dirname(__FILE__), '../spec_helpers')
+
+describe Buildr4OSGi::SiteWriter do
+  
+  before(:each) do
+    class SiteWriterTester
+      
+    end
+    @f_w = SiteWriterTester.new
+    @f_w.extend Buildr4OSGi::SiteWriter
+    Buildr::write "bar/src/main/java/Hello.java", "public class Hello {}"
+    @container = define("container") do
+      project.group = "grp"
+      @bar = define("bar", :version => "1.0.0") do
+        package(:bundle)
+        package(:sources)
+      end
+    end
+    @foo = define("foo", :version => "1.0.0") do
+      f = package(:feature)
+      f.plugins << project("container:bar")
+      f.label = "My feature"
+      f.provider = "Acme Inc"
+      f.description = "The best feature ever"
+      f.changesURL = "http://example.com/changes"
+      f.license = "The license is too long to explain"
+      f.licenseURL = "http://example.com/license"
+      f.branding_plugin = "com.musal.ui"
+      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"}]
+      #package(:sources)
+    end
+  end
+  
+  it "should write a valid site.xml" do
+    @f_w.description = "Description"
+    @f_w.description_url = "http://www.example.com/description"
+    category = Buildr4OSGi::Category.new
+    category.name = "category.id"
+    category.label = "Some Label"
+    category.description = "The category is described here"
+    category.features<< @foo
+    @f_w.categories << category
+    @f_w.writeSiteXml({@foo.package(:feature).to_s => {:id => "foo", :version => "1.0.0"}}).should == <<-SITE_XML
+<?xml version="1.0" encoding="UTF-8"?>
+<site pack200="false">
+ <description url="http://www.example.com/description">Description</description>
+ <category-def name="category.id" label="Some Label">
+  <description>The category is described here</description>
+ </category-def>
+ <feature url="features/foo_1.0.0.jar" version="1.0.0" patch="false" id="foo">
+  <category name="category.id"/>
+ </feature>
+</site>
+SITE_XML
+  end
+  
+  it "should create a zip file containing site.xml at its root" do
+    @bar = define("bar", :version => "1.0")
+    site = @bar.package(:site)
+    category = Buildr4OSGi::Category.new
+    category.name = "category.id"
+    category.label = "Some Label"
+    category.description = "The category is described here"
+    category.features<< @foo
+    site.categories << category
+    site.invoke
+    File.should exist(site.to_s)
+    Zip::ZipFile.open(site.to_s) do |zip|
+      print zip.entries.join("\n")
+      print zip.read("site.xml")
+      zip.find_entry("plugins").should_not be_nil
+      zip.find_entry("features").should_not be_nil
+    end
+  end
+  
+  
+end

data/spec/osgi/bundle_package_spec.rb

@@ -27,6 +27,18 @@ describe OSGi::BundlePackage do
   it 'should be able to know if it equals another bundle package' do
     package = OSGi::BundlePackage.new("my.package", "1.0.0")
     package2 = OSGi::BundlePackage.new("my.package", "1.0.0")
-    package.eql?(package2).should be_true
+    package.should == package2
+  end
+  
+  it 'should be able to know if it equals another bundle package with version range' do
+    package = OSGi::BundlePackage.new("javax.servlet", "[2.4.0,3.0.0)")
+    package2 = OSGi::BundlePackage.new("javax.servlet", "[2.4.0,3.0.0)")
+    package.should == package2
+  end
+  
+  it 'should define the same hash when bundles are equal' do
+    package = OSGi::BundlePackage.new("my.package", "1.0.0")
+    package2 = OSGi::BundlePackage.new("my.package", "1.0.0")
+    package.hash.should == package2.hash
   end
 end