buildr4osgi 0.9.3 → 0.9.4

data/lib/buildr4osgi/osgi/project_extension.rb

@@ -118,6 +118,23 @@ module OSGi
       end
     end
   end
+
+  class InstallBundlesTask < Rake::Task #:nodoc:
+    attr_accessor :project
+    def initialize(*args) #:nodoc:
+      super
+      enhance do |task|
+        puts "Deploy directory: #{OSGi.registry.release_to}/plugins"
+        mkpath "#{OSGi.registry.release_to}/plugins"
+        project.projects.each do |subp|
+          subp.packages.select {|package| package.is_a?(::OSGi::BundlePackaging)}.each do |package|
+            puts "Deploying #{subp.artifact(package)} to #{OSGi.registry.release_to}"
+            cp(subp.artifact(package).to_s, "#{OSGi.registry.release_to}/plugins") 
+          end
+        end
+      end
+    end
+  end
   
   class InstallTask < Rake::Task #:nodoc:
     include BundleCollector
@@ -168,6 +185,7 @@ module OSGi
             if local
               artifact = Buildr::artifact(bundle.to_s)
               installed = Buildr.repositories.locate(artifact)
+              rm_r installed
               mkpath File.dirname(installed)
               Buildr::artifact(bundle.to_s).from(bundle.file).install
               info "Installed #{installed}"
@@ -197,6 +215,8 @@ module OSGi
       Project.local_task('osgi:upload:dependencies') { |name| "Upload dependencies for #{name}" }
       desc 'Cleans the dependencies.yml file'
       Project.local_task('osgi:clean:dependencies') {|name| "Clean dependencies for #{name}"}
+      desc 'Installs the bundle projects into an OSGi repository'
+      Project.local_task('osgi:install:bundles') {|name| "Install bundles for #{name}"}
     end
 
     before_define do |project|
@@ -211,9 +231,11 @@ module OSGi
       
       clean = Rake::Task.define_task('osgi:clean:dependencies').enhance do
         Buildr::write File.join(project.base_dir, "dependencies.yml"), 
-          project.projects.inject({}) {|hash, p| hash.merge({p.name => []})}.merge({project.name => []}).to_yaml
+          project.projects.inject({}) {|hash, p| hash.merge({p.name => {}})}.merge({project.name => {}}).to_yaml
       end
-      install.project = project
+
+      install_bundles = InstallBundlesTask.define_task('osgi:install:bundles')
+      install_bundles.project = project
     end
 
     #
@@ -239,10 +261,8 @@ module OSGi
       # Code copied straight from Bundle.fromProject
       packaging = project.packages.select {|package| package.is_a?(BundlePackaging)}
       raise "More than one bundle packaging is defined over the project #{project.id}, see BOSGI-16." if packaging.size > 1
-      return nil if packaging.empty?   
-      m = ::Buildr::Packaging::Java::Manifest.new(File.exists?("META-INF/MANIFEST.MF") ? File.read("META-INF/MANIFEST.MF") : nil) 
-      m.main.merge!(manifest)
-      m.main.merge!(packaging.first.manifest)
+      m = ::Buildr::Packaging::Java::Manifest.new(File.exists?(project.path_to("META-INF/MANIFEST.MF")) ? File.read(project.path_to("META-INF/MANIFEST.MF")) : nil)
+      m.main.merge!(packaging.first.manifest) unless packaging.empty? 
       (Manifest.read(m.to_s).first["Bundle-RequiredExecutionEnvironment"] || {}).keys.compact.flatten.collect {|ee| OSGi.options.available_ee[ee]}
     end
     
@@ -254,4 +274,4 @@ module Buildr #:nodoc:
   class Project #:nodoc:
     include OSGi::ProjectExtension
   end
-end
+end

data/lib/buildr4osgi/osgi/registry.rb

@@ -45,6 +45,19 @@ module OSGi
   #
   class Registry
     
+    def release_to
+      unless @release_to
+        prefs = Buildr.settings.build
+        @release_to = prefs['osgi']['release_to'].strip unless prefs['osgi'].nil? || prefs['osgi']['release_to'].nil?
+        @release_to ||= "#{ENV['HOME']}/.m2/osgi"
+      end
+      @release_to
+    end
+
+    def release_to=(release_to)
+      @release_to = release_to
+    end
+
     # 
     # Sets the containers of the registry
     # Raises an exception if containers have been resolved already.
@@ -122,4 +135,4 @@ module OSGi
     @registry ||= ::OSGi::Registry.new
   end
   
-end
+end

data/lib/buildr4osgi/osgi/resolving_strategies.rb

@@ -32,7 +32,7 @@ module OSGi #:nodoc:
         puts "This package #{package} is exported by all the bundles present.\n" +
               "Choose a bundle amongst those presented or press A to select them all:\n" + bundles.sort! {|a, b| a.version <=> b.version }.
         collect {|b| "\t#{bundles.index(b) +1}. #{b.name} #{b.version}"}.join("\n")
-        number = gets.chomp
+        number = $stdin.gets.chomp
         begin
           return bundles if (number == 'A')
           number = number.to_i
@@ -104,4 +104,4 @@ module OSGi #:nodoc:
 
     module_function :latest, :oldest, :prompt
   end
-end
+end

data/rakelib/all-in-one.rake

@@ -55,7 +55,7 @@ task "all-in-one" => :gem do
   # 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,
+    sh "bin/jruby", '-S', 'gem', 'install', FileList['../../pkg/*-java.gem'].first,
        '--no-rdoc', '--no-ri'
     puts "[X] Install Buildr gem"
   end.call
@@ -70,12 +70,19 @@ task "all-in-one" => :gem do
   lambda do
     puts "Zipping distribution ..."
     cd '..'
-    new_dir  = "#{spec.name}-#{spec.version}-#{dir}"
+    new_dir  = "#{spec.name}-#{spec.version}"
     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"
+   
+    puts "Tarring distribution ..."
+    tar = "#{new_dir}.tar.gz"
+    rm tar if File.exist? tar
+    sh 'tar', 'czf', tar, new_dir
+    puts "[X] Tarred distribution"
+    
     rm_rf new_dir
   end.call
 

data/rakelib/checks.rake

@@ -18,7 +18,7 @@ desc "Check that source files contain the Apache license"
 task :license=>FileList["**/*.{rb,rake,java,gemspec,buildfile}", 'Rakefile'] do |task|
   puts "Checking that files contain the Apache license ... "
   required = task.prerequisites.select { |fn| File.file?(fn) }
-  missing = required.reject { |fn| 
+  missing = required.reject { |fn|
     comments = File.read(fn).scan(/(\/\*(.*?)\*\/)|^#\s+(.*?)$|^-#\s+(.*?)$|<!--(.*?)-->/m).
       map { |match| match.compact }.flatten.join("\n")
     comments =~ /Licensed to the Apache Software Foundation/ && comments =~ /http:\/\/www.apache.org\/licenses\/LICENSE-2.0/

data/rakelib/doc.rake

@@ -71,6 +71,13 @@ task :site=>['_site', :rdoc, '_reports/specs.html', '_reports/coverage', 'buildr
   cp_r '_reports/coverage', '_site'
   fail 'No coverage report in site directory' unless File.exist?('_site/coverage/index.html')
   cp 'CHANGELOG', '_site'
+  open("_site/.htaccess", "w") do |htaccess|
+    htaccess << %Q{
+<FilesMatch "CHANGELOG">
+ForceType 'text/plain; charset=UTF-8'
+</FilesMatch>
+}
+  end
   cp 'buildr.pdf', '_site'
   fail 'No PDF in site directory' unless File.exist?('_site/buildr.pdf')
   puts 'OK'

data/rakelib/package.rake

@@ -67,7 +67,7 @@ task :snapshot=>[:package] do
   cp FileList['pkg/{*.gem,*.tgz,*.zip}'], '_snapshot/gems'
   puts "Generating gem index ..."
   sh 'gem', 'generate_index', '--directory', '_snapshot'
-  puts "Copying gem and index back to Apache" 
+  puts "Copying gem and index back to Apache"
   sh 'rsync', '--progress', '--recursive', '_snapshot/', 'people.apache.org:public_html/buildr/snapshot/'
 end
 task(:clobber) { rm_rf '_snapshot' }

data/rakelib/release.rake

@@ -66,7 +66,7 @@ task :release do
   # Create an SVN tag for this release.
   lambda do
     info = `svn info` + `git svn info` # Using either svn or git-svn
-    if url = info[/^URL:/] && info.scan(/^URL: (.*)/)[0][0] 
+    if url = info[/^URL:/] && info.scan(/^URL: (.*)/)[0][0]
       new_url = url.sub(/(trunk$)|(branches\/\w*)$/, "tags/#{spec.version}")
       unless url == new_url
         sh 'svn', 'copy', url, new_url, '-m', "Release #{spec.version}" do |ok, res|
@@ -83,7 +83,7 @@ task :release do
 
 
   # Update CHANGELOG to next release number.
-  lambda do 
+  lambda do
     next_version = spec.version.to_s.split('.').map { |v| v.to_i }.
       zip([0, 0, 1]).map { |a| a.inject(0) { |t,i| t + i } }.join('.')
     modified = "#{next_version} (Pending)\n\n" + File.read('CHANGELOG')
@@ -92,7 +92,7 @@ task :release do
     end
     puts "[X] Updated CHANGELOG and added entry for next release"
   end.call
- 
+
 
   # Update source files to next release number.
   lambda do
@@ -101,7 +101,7 @@ task :release do
 
     ver_file = "lib/#{spec.name}.rb"
     if File.exist?(ver_file)
-      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" } 
+      modified = File.read(ver_file).sub(/(VERSION\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
       File.open ver_file, 'w' do |file|
         file.write modified
       end
@@ -110,7 +110,7 @@ task :release do
 
     spec_file = "#{spec.name}.gemspec"
     if File.exist?(spec_file)
-      modified = File.read(spec_file).sub(/(s(?:pec)?\.version\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" } 
+      modified = File.read(spec_file).sub(/(s(?:pec)?\.version\s*=\s*)(['"])(.*)\2/) { |line| "#{$1}#{$2}#{next_version}#{$2}" }
       File.open spec_file, 'w' do |file|
         file.write modified
       end
@@ -118,7 +118,7 @@ task :release do
     end
   end.call
 
- 
+
   # Prepare release announcement email.
   lambda do
     changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]

data/rakelib/rspec.rake

@@ -20,24 +20,27 @@ begin
 
   desc "Run all specs"
   Spec::Rake::SpecTask.new :spec=>['_reports', :compile] do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
     task.spec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
-    task.spec_opts = %w{--format specdoc --format failing_examples:failed --format html:_reports/specs.html --backtrace}    
+    task.spec_opts = %w{--format specdoc --format failing_examples:failed --format html:_reports/specs.html --backtrace}
     task.spec_opts << '--colour' if $stdout.isatty
   end
   file('_reports/specs.html') { task(:spec).invoke }
 
   desc 'Run all failed examples from previous run'
   Spec::Rake::SpecTask.new :failed do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
-    task.spec_opts = %w{--format specdoc --format failing_examples:failed --example failed --backtrace}    
+    task.spec_opts = %w{--format specdoc --format failing_examples:failed --example failed --backtrace}
     task.spec_opts << '--colour' if $stdout.isatty
   end
 
   desc 'Run RSpec and generate Spec and coverage reports (slow)'
   Spec::Rake::SpecTask.new :coverage=>['_reports', :compile] do |task|
+    ENV['USE_FSC'] = 'no'
     task.spec_files = FileList['spec/**/*_spec.rb']
-    task.spec_opts = %W{--format progress --format failing_examples:failed --format html:_reports/specs.html --backtrace}    
+    task.spec_opts = %W{--format progress --format failing_examples:failed --format html:_reports/specs.html --backtrace}
     task.spec_opts << '--colour' if $stdout.isatty
     task.rcov = true
     task.rcov_dir = '_reports/coverage'

data/rakelib/setup.rake

@@ -35,7 +35,14 @@ def install_gem(name, options = {})
     args = []
     args << 'sudo' << 'env' << "JAVA_HOME=#{ENV['JAVA_HOME']}" if sudo_needed? and RAKE_SUDO
     args << rb_bin << '-S' << 'gem' << 'install' << name
-    args << '--version' << dep.version_requirements.to_s
+
+    if (spec.respond_to? :requirement)
+      args << '--version' << dep.requirement.to_s
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      args << '--version' << dep.version_requirements.to_s
+    end
+
     args << '--source' << options[:source] if options[:source]
     args << '--source' << 'http://gems.rubyforge.org'
     args << '--install-dir' << ENV['GEM_HOME'] if ENV['GEM_HOME']
@@ -49,6 +56,11 @@ desc "If you're building from sources, run this task first to setup the necessar
 task :setup do
   missing = spec.dependencies.select { |dep| Gem::SourceIndex.from_installed_gems.search(dep).empty? }
   missing.each do |dep|
-    install_gem dep.name, :version=>dep.version_requirements
+    if (spec.respond_to? :requirement)
+      install_gem dep.name, :version=>dep.requirement
+    else
+      # Dependency.version_requirements deprecated in rubygems 1.3.6
+      install_gem dep.name, :version=>dep.version_requirements
+    end
   end
 end

data/rakelib/stage.rake

@@ -23,6 +23,7 @@ rescue LoadError
   task(:setup) { install_gem 'rubyforge' }
 end
 
+gpg_cmd = 'gpg2'
 
 task :prepare do |task, args|
   # Make sure we're doing a release from checked code.
@@ -47,7 +48,12 @@ task :prepare do |task, args|
   # Need GPG to sign the packages.
   lambda do
     args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
-    fail "No GPG user #{args.gpg}" if `gpg2 --list-keys #{args.gpg}`.empty?
+    gpg_ok = `gpg2 --list-keys #{args.gpg}`
+    if !$?.success?
+      gpg_ok = `gpg --list-keys #{args.gpg}` 
+      gpg_cmd = 'gpg'
+    end
+    fail "No GPG user #{args.gpg}" if gpg_ok.empty?
   end.call
 
   task(:license).invoke
@@ -73,7 +79,7 @@ task :prepare do |task, args|
   lambda do
     puts "[!] Make sure you have admin privileges to make a release on RubyForge"
     rubyforge = RubyForge.new.configure
-    rubyforge.login 
+    rubyforge.login
     rubyforge.scrape_project(spec.name)
   end.call
 
@@ -106,12 +112,12 @@ task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
     task(:package).invoke
     mkpath '_staged/dist'
     FileList['pkg/*.{gem,zip,tgz}'].each do |source|
-      pkg = source.pathmap('_staged/dist/%n%x') 
+      pkg = source.pathmap('_staged/dist/%n%x')
       cp source, pkg
       bytes = File.open(pkg, 'rb') { |file| file.read }
       File.open(pkg + '.md5', 'w') { |file| file.write Digest::MD5.hexdigest(bytes) << ' ' << File.basename(pkg) }
       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
+      sh gpg_cmd, '--local-user', args.gpg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
     end
     cp 'etc/KEYS', '_staged/dist'
     puts "[X] Created and signed release packages in _staged/dist"
@@ -162,7 +168,7 @@ p>. ("Release signing keys":#{official}/KEYS)
     sh 'rsync', '--progress', '--recursive', '_staged/', url
     puts "[X] Uploaded _staged directory to #{url}"
   end.call
-  
+
 
   # Prepare a release vote email. In the distant future this will also send the
   # email for you and vote on it.

data/spec/compile/external_spec.rb

@@ -21,13 +21,13 @@ describe Buildr4OSGi::CompilerSupport::ExternalC do
   before :all do
     Buildr::Compiler.compilers.delete Buildr::Compiler::Javac
     Buildr::Compiler.compilers.delete Buildr4OSGi::CompilerSupport::OSGiC
+    raise "ENV['EXTERNAL_COMPILER'] is not defined !" unless ENV['EXTERNAL_COMPILER']
   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
   

data/spec/eclipse/feature_spec.rb

@@ -241,10 +241,10 @@ describe Buildr4OSGi::FeatureTask, " when running" do
     f = @foo.package(:feature)
     f.plugins.clear
     @bar = define("bar", :version => "1.0.0") do
-      package(:jar).with :manifest => {"Bundle-SymbolicName" => "bar", "Bundle-Version" => "1.0.0"}
+      package(:jar).with :manifest => {"Bundle-SymbolicName" => "bar", "Bundle-Version" => "1.0.0", "Eclipse-BundleShape" => "dir"}
     end
     f.plugins.<< DEBUG_UI, :unjarred => true
-    f.plugins.<< @bar, :unjarred => true
+    f.plugins.<< @bar
     @foo.package(:feature).invoke
     feature_file = @foo.package(:feature).to_s
     File.exists?(feature_file).should be_true
@@ -254,6 +254,29 @@ describe Buildr4OSGi::FeatureTask, " when running" do
     end
   end
   
+  it "should let the user tell which plugins should be unjarred from the plugin manifests" do
+    Buildr::write "bar/META-INF/MANIFEST.MF", <<-MANIFEST
+Bundle-SymbolicName: bar
+Bundle-Version: 1.0.0
+Eclipse-BundleShape: dir
+    
+MANIFEST
+    f = @foo.package(:feature)
+    f.plugins.clear
+    @bar = define("bar", :version => "1.0.0", :base_dir => "bar") do
+      package(:bundle)
+    end
+    #f.plugins.<< DEBUG_UI, :unjarred => true
+    f.plugins.<< @bar
+    @foo.package(:feature).invoke
+    feature_file = @foo.package(:feature).to_s
+    File.exists?(feature_file).should be_true
+    Zip::ZipFile.open(feature_file) do |zip|
+      #zip.find_entry("eclipse/plugins/org.eclipse.debug.ui_3.4.1.v20080811_r341/META-INF/MANIFEST.MF").should_not be_nil
+      zip.find_entry("eclipse/plugins/bar_1.0.0/META-INF/MANIFEST.MF").should_not be_nil
+    end
+  end
+  
 end
 
 describe Buildr4OSGi::FeatureTask, " package subprojects" do
@@ -300,7 +323,7 @@ end
 
 describe Buildr4OSGi::FeatureTask, "packaged as SDK" do
   
-  before do
+  it "should create a jar file with the subproject packaged as a folder inside it when unjarred option is set" do
     Buildr::write "bar/src/main/java/Hello.java", "public class Hello {}"
     @container = define("container") do
       project.group = "grp"
@@ -325,9 +348,44 @@ describe Buildr4OSGi::FeatureTask, "packaged as SDK" do
         {:url => "http://example.com/upup", :name => "My update site in case"}]
       package(:sources)
     end
+    @foo.package(:sources).invoke
+    feature_file = @foo.package(:sources).to_s
+    File.exists?(feature_file).should be_true
+    Zip::ZipFile.open(feature_file) do |zip|
+      zip.find_entry("eclipse/features/foo.sources_1.0.0/feature.xml").should_not be_nil
+      zip.find_entry("eclipse/features/foo.sources_1.0.0/feature.properties").should_not be_nil
+      zip.find_entry("eclipse/plugins/bar.sources_1.0.0.jar").should be_nil
+      zip.find_entry("eclipse/plugins/bar.sources_1.0.0").directory?.should be_true
+      zip.find_entry("eclipse/plugins/bar.sources_1.0.0/Hello.java").should_not be_nil
+      
+    end
   end
   
-  it "should create a jar file with the subproject packaged as a jar inside it" do
+  it "should create a jar file with the subproject packaged as a folder inside it when the Eclipse-BundleShape entry is set to dir" 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).manifest.merge!({"Eclipse-BundleShape" => "dir"})
+        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
     @foo.package(:sources).invoke
     feature_file = @foo.package(:sources).to_s
     File.exists?(feature_file).should be_true
@@ -340,14 +398,13 @@ describe Buildr4OSGi::FeatureTask, "packaged as SDK" do
       
     end
   end
-  
-  
 end
 
 describe Buildr4OSGi::FeatureTask, "packaged as SDK, detecting the OSGi headers from the original build" do
   
   before 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
@@ -374,6 +431,7 @@ describe Buildr4OSGi::FeatureTask, "packaged as SDK, detecting the OSGi headers
   end
   
   it "should create a jar file with the subproject packaged as a jar inside it" do
+    project("container:bar").package(:jar).invoke
     @foo.package(:sources).invoke
     feature_file = @foo.package(:sources).to_s
     File.exists?(feature_file).should be_true