buildr4osgi 0.9.2 → 0.9.3

data/spec/osgi/bundle_spec.rb

@@ -193,9 +193,9 @@ MANIFEST
   
   it "should find the bundle fragments" do
     foo = define("foo")
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     
-    @bundle.fragments(foo).should == [@fragment]
+    @bundle.fragments.should == [@fragment]
   end
   
 end

data/spec/osgi/execution_environment_spec.rb

@@ -0,0 +1,48 @@
+# 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 OSGi::ExecutionEnvironment do
+  
+  it 'should create a frozen object' do
+    ee = OSGi::ExecutionEnvironment.new("example", "hello", ["com", "org"])
+    ee.should be_frozen
+    ee.packages.should be_frozen
+  end
+end
+
+describe OSGi::ExecutionEnvironmentConfiguration do 
+  
+  before :all do
+    @conf = OSGi::ExecutionEnvironmentConfiguration.new
+  end
+    
+  
+  it "should add the default execution environments" do
+    @conf.send( :available_ee).values.should include OSGi::NONE, OSGi::CDC10FOUNDATION10, OSGi::CDC10FOUNDATION11, OSGi::J2SE12, OSGi::J2SE13, OSGi::J2SE14, OSGi::J2SE15, OSGi::JAVASE16, OSGi::JAVASE17, OSGi::OSGIMINIMUM10, OSGi::OSGIMINIMUM11, OSGi::OSGIMINIMUM12
+  end
+  
+  it "should set JavaSE1.6 as the default execution environment" do
+    @conf.current_execution_environment.should == OSGi::JAVASE16
+  end
+  
+  it "should let the user define extra packages to be part of the execution environment" do
+    @conf.extra_packages << "com.sum.nedia"
+    @conf.extra_packages.should include("com.sum.nedia")
+  end
+end
+     
+  

data/spec/osgi/library_extension_spec.rb

@@ -92,7 +92,7 @@ describe Buildr4OSGi::BuildLibraries do
     library_project(SLF4J, "group", "foo", "1.0.0")
     foo = project("foo")
     lambda {foo.package(:sources).invoke}.should_not raise_error
-    sources = File.join(foo.base_dir, "target", "foo-1.0.0-sources.zip")
+    sources = File.join(foo.base_dir, "target", "foo-1.0.0-sources.jar")
     File.exists?(sources).should be_true
     Zip::ZipFile.open(sources) {|zip|
       zip.find_entry("org/slf4j/Marker.java").should_not be_nil
@@ -155,5 +155,18 @@ describe Buildr4OSGi::BuildLibraries do
       lambda {library_project(SLF4J, "org.nuxeo.libs", "org.nuxeo.logging", "1.1.2",
       		 :manifest => {"Require-Bundle" => "org.apache.log4j"})}.should_not raise_error(NoMethodError)
     end
-  end 
+  end
+  
+  it "should not add a manifest Export-Package entry if that package was excluded" do
+    library_project(SLF4J, "org.hello.libs", "org.hello.logging", "1.1.2", :exclude => "org/slf4j/impl/*")
+    foo = project("org.hello.logging")
+    foo.package(:library_project).invoke
+    jar = File.join(foo.base_dir, "target", "org.hello.logging-1.1.2.jar")
+    File.exists?(jar).should be_true
+    Zip::ZipFile.open(jar) {|zip|
+      zip.find_entry("org/slf4j/impl").should be_nil
+      zip.find_entry("org/slf4j/helpers").should_not be_nil
+      zip.read("META-INF/MANIFEST.MF").should_not match /org\.slf4j\.impl/
+    }
+  end
 end

data/spec/osgi/project_extension_spec.rb

@@ -19,6 +19,14 @@ Spec::Runner.configure do |config|
   config.include Buildr4OSGi::SpecHelpers
 end
 
+describe OSGi::BundleCollector do
+  
+  it 'should be able to cache a resolved bundle' do
+    pending "TODO"
+  end
+  
+end
+
 describe OSGi::ProjectExtension do
   
   it 'should give a way to take project dependencies' do
@@ -47,6 +55,65 @@ describe OSGi::ProjectExtension do
     }
   end
   
+  it 'should get the execution environments from the project manifest' do
+    write 'META-INF/MANIFEST.MF', <<-MANIFEST
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
+ JavaSE-1.7
+MANIFEST
+    foo = define("foo", :version => "1.0") do
+      package(:bundle)
+    end
+    foo.execution_environments.should == [OSGi::JAVASE16, OSGi::JAVASE17]
+  end
+  
+  it 'should get the execution environment from the project manifest (bis)' do
+    write 'META-INF/MANIFEST.MF', <<-MANIFEST
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: uh-core
+Bundle-SymbolicName: org.thingy
+Bundle-Version: 3.6.2.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: blah,
+ blob
+MANIFEST
+    foo = define("foo", :version => "1.0") do
+      package(:bundle)
+    end
+    foo.execution_environments.should == [OSGi::J2SE15]
+  end
+  
+  it 'should return an empty array when no execution environment is specified' do
+    write 'META-INF/MANIFEST.MF', <<-MANIFEST
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: uh-core
+Bundle-SymbolicName: org.thingy
+Bundle-Version: 3.6.2.qualifier
+Import-Package: blah,
+ blob
+MANIFEST
+    foo = define("foo", :version => "1.0") do
+      package(:bundle)
+    end
+    foo.execution_environments.should == []
+  end
+  
+  it 'should return nil when no bundle packaging is specified' do
+    write 'META-INF/MANIFEST.MF', <<-MANIFEST
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: uh-core
+Bundle-SymbolicName: org.thingy
+Bundle-Version: 3.6.2.qualifier
+Import-Package: blah,
+ blob
+MANIFEST
+    foo = define("foo", :version => "1.0") do
+      package(:jar)
+    end
+    foo.execution_environments.should be_nil
+  end
 end
 
 describe OSGi::DependenciesTask do
@@ -87,7 +154,7 @@ MANIFEST
     foo = define('foo', :version=> "1.0", :group => "grp" ) {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     foo.manifest_dependencies.select {|b| b.name == "com.ibm.icu"}.should_not be_empty
   end
   
@@ -153,7 +220,7 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     foo.manifest_dependencies.select {|b| b.name == "com.ibm.icu"}.should_not be_empty
     foo.manifest_dependencies.select {|b| b.name == "com.ibm.icu" && b.version="[3.4.0,3.5.0)"}.should_not be_empty
     foo.manifest_dependencies.select {|b| b.name == "org.eclipse.core.resources" && b.version="3.5.0.R_20090512"}.should_not be_empty
@@ -182,7 +249,7 @@ MANIFEST
         package(:bundle)
       end
     end
-    project('container').osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     project('container:foo').manifest_dependencies.should include(project('container:bar'))
   
   end
@@ -198,7 +265,8 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
+    foo.manifest_dependencies
     foo.manifest_dependencies.select {|b| b.name == "com.ibm.icu"}.should_not be_empty
   end
   
@@ -235,7 +303,7 @@ MANIFEST
         package(:bundle)
       end
     end
-    project('container').osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     project('container:foo').manifest_dependencies.should include(project('container:bar'))
     project('container:foo').manifest_dependencies.should_not include(project('container:bar2'))
   end
@@ -251,7 +319,7 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     foo.manifest_dependencies.select {|b| b.name == "com.ibm.icu"}.should_not be_empty
   end
   
@@ -288,7 +356,7 @@ MANIFEST
         package(:bundle)
       end
     end
-    project('container').osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     project('container:foo').manifest_dependencies.should include(project('container:bar'))
     project('container:foo').manifest_dependencies.should_not include(project('container:bar2'))
   
@@ -305,7 +373,7 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     foo.task('osgi:resolve:dependencies').invoke
     File.exist?('dependencies.yml').should be_true
     deps = YAML::load(File.read('dependencies.yml'))
@@ -339,7 +407,7 @@ MANIFEST
         package(:bundle)
       end
     end
-    project('container').osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     project('container').task('osgi:resolve:dependencies').invoke
     File.exist?('dependencies.yml').should be_true
     deps = YAML::load(File.read('dependencies.yml'))
@@ -371,7 +439,7 @@ MANIFEST
         package(:bundle)
       end
     end
-    project('container').osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     project('container').task('osgi:resolve:dependencies').invoke
     File.exist?('dependencies.yml').should be_true
     deps = YAML::load(File.read('dependencies.yml'))
@@ -403,7 +471,7 @@ MANIFEST
         package(:bundle)
       end
     end
-    project('container').osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     project('container:foo').task('osgi:resolve:dependencies').invoke
     project('container:bar').task('osgi:resolve:dependencies').invoke
     File.exist?('dependencies.yml').should be_true
@@ -432,7 +500,7 @@ MANIFEST
       package(:bundle)
     }
     end
-    project('container').osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     project('container').task('osgi:resolve:dependencies').invoke
     File.exist?('dependencies.yml').should be_true
     File.read('dependencies.yml').should == <<-CONTENTS
@@ -481,7 +549,7 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     foo.task('osgi:resolve:dependencies').invoke
     File.exist?('dependencies.yml').should be_true
     deps = YAML::load(File.read('dependencies.yml'))
@@ -514,7 +582,7 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = [e2]
+    OSGi.registry.containers = [e2]
     foo.task('osgi:resolve:dependencies').invoke
     File.exist?('dependencies.yml').should be_true
     deps = YAML::load(File.read('dependencies.yml'))
@@ -548,7 +616,7 @@ MANIFEST
       foo = define('foo', :version => "1.0", :group => "grp") {
         package(:bundle)
       }
-      foo.osgi.registry.containers = [e2]
+      OSGi.registry.containers = [e2]
       foo.task('osgi:resolve:dependencies').invoke
       File.exist?('dependencies.yml').should be_true
       deps = YAML::load(File.read('dependencies.yml'))
@@ -587,7 +655,7 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     foo.dependencies
     foo.task('osgi:install:dependencies').invoke  
     File.exist?(artifact("org.eclipse:org.eclipse.debug.ui:jar:3.4.1.v20080811_r341").to_s).should be_true
@@ -605,7 +673,7 @@ Require-Bundle: org.eclipse.debug.ui,
  org.eclipse.core.runtime.compatibility.registry
 MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") do package(:bundle) end
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     
     foo.task('osgi:resolve:dependencies').invoke
     foo.task('osgi:install:dependencies').invoke
@@ -632,7 +700,7 @@ MANIFEST
     foo = define('foo', :version => "1.0", :group => "grp") {
       package(:bundle)
     }
-    foo.osgi.registry.containers = @eclipse_instances.dup
+    OSGi.registry.containers = @eclipse_instances.dup
     repositories.release_to = 'sftp://example.com/base'
     
     foo.task('osgi:resolve:dependencies').invoke

data/spec/osgi/registry_spec.rb

@@ -15,49 +15,59 @@
 
 require File.join(File.dirname(__FILE__), '../spec_helpers')
 
+Spec::Runner.configure do |config|
+  config.include Buildr4OSGi::SpecHelpers
+end
+
 describe OSGi::Registry do
 
   it 'should be possible to set containers from the Buildr settings' do
     pending "Doesn't work when using rake coverage"
     yaml = {"osgi" => ({"containers" => ["myContainer"]})}
     write 'home/.buildr/settings.yaml', yaml.to_yaml
-    define("foo").osgi.registry.containers.should == ["myContainer"]
+    OSGi.registry.containers.should == ["myContainer"]
   end
   
-  it 'should be accessible from a project' do
-    define('foo').osgi.registry.should be_instance_of(OSGi::Registry)
+  it 'should be possible to set the containers from the OSGi environment variables' do
+    ENV['OSGi'] = "foo;bar"
+    OSGi.registry.containers.should == ["foo","bar"]
   end
   
+  it 'should fall back on OSGI if the constant OSGi is not defined, issuing a warning' do
+    ENV['OSGi'] = nil
+    ENV['OSGI'] = "foo;bar"
+    lambda {OSGi.registry.resolved_containers}.should show_warning "The correct constant to define for the OSGi containers is named OSGi"
+    ENV['OSGi'].should == ENV['OSGI']
+  end
   
-  
-  it 'should be possible to set the containers from the OSGi environment variables' do
-    ENV['OSGi'] = "foo;bar"
-    define('foo').osgi.registry.containers.should == ["foo","bar"]
+  it 'should not complain if OSGI is set and OSGi is also set' do
+    ENV['OSGI'] = nil
+    lambda {OSGi.registry.resolved_containers}.should_not show_warning "The correct constant to define for the OSGi containers is named OSGi"
   end
   
-  it 'should be possible to modify the containers in the registry before the resolved_instances method is called' do
-    foo = define('foo')
-    lambda {foo.osgi.registry.containers << "hello"}.should_not raise_error
-    lambda {foo.osgi.registry.containers = ["hello"]}.should_not raise_error
+  it 'should be possible to modify the containers in the registry before the resolved_containers method is called' do
+    lambda {OSGi.registry.containers << "hello"}.should_not raise_error
+    lambda {OSGi.registry.containers = ["hello"]}.should_not raise_error
   end
   
-  it 'should throw an exception when modifying the containers in the registry after the resolved_instances method is called' do
+  it 'should throw an exception when modifying the containers in the registry after the resolved_containers method is called' do
     foo = define('foo')
-    foo.osgi.registry.resolved_containers
-    lambda {foo.osgi.registry.containers << "hello"}.should raise_error(TypeError)
-    lambda {foo.osgi.registry.containers = ["hello"]}.should raise_error(RuntimeError, /Cannot set containers, containers have been resolved already/)
+    OSGi.registry.resolved_containers
+    lambda {OSGi.registry.containers << "hello"}.should raise_error(TypeError)
+    lambda {OSGi.registry.containers = ["hello"]}.should raise_error(RuntimeError, /Cannot set containers, containers have been resolved already/)
   end
 end
 
 
-describe OSGi::OSGi do
+describe OSGi do
   
-  it 'should add a new osgi method to projects' do
-    define('foo').osgi.should be_instance_of(::OSGi::OSGi)
+  it 'should give a handle over the OSGi containers registry' do
+    OSGi.registry.should be_instance_of(::OSGi::Registry)
   end
   
-  it 'should give a handle over the OSGi containers registry' do
-    define('foo').osgi.registry.should be_instance_of(::OSGi::Registry)
+  it 'should help determine whether a package is part of the framework given by the execution environment' do
+    OSGi.is_framework_package?("com.mypackage").should be_false
+    OSGi.is_framework_package?(OSGi::JAVASE16.packages.first).should be_true
   end
   
 end

data/spec/osgi/resolving_strategies_spec.rb

@@ -24,7 +24,7 @@ describe OSGi::BundleResolvingStrategies do
   end
   
   it 'should use latest by default to resolve bundle dependencies' do
-    define('foo').osgi.options.bundle_resolving_strategy.should eql(:latest)
+    OSGi.options.bundle_resolving_strategy.should eql(:latest)
   end
   
   describe 'latest' do
@@ -70,7 +70,7 @@ describe OSGi::PackageResolvingStrategies do
   end
   
   it 'should use all by default to resolve package dependencies' do
-    define('foo').osgi.options.package_resolving_strategy.should eql(:all)
+    OSGi.options.package_resolving_strategy.should eql(:all)
   end
   
   describe 'all' do

data/spec/osgi/version_spec.rb

@@ -124,4 +124,10 @@ describe OSGi::VersionRange do
     r2.to_s.should eql("[1.0.0,2.0.0)")
   end
   
+  it 'should be able to consume a range with a space before or after the two limits' do
+    OSGi::VersionRange.parse("[1.0.0, 2.0.0)").should be_instance_of(OSGi::VersionRange)
+    OSGi::VersionRange.parse("[1.0.0 , 2.0.0)").should be_instance_of(OSGi::VersionRange)
+    OSGi::VersionRange.parse("[1.0.0 ,2.0.0)").should be_instance_of(OSGi::VersionRange)
+  end
+  
 end

data/spec/spec_helpers.rb

@@ -51,14 +51,26 @@ unless defined?(SpecHelpers)
 
     OSGi_REPOS = File.expand_path File.join(File.dirname(__FILE__), "..", "tmp", "osgi")
 
+    module MockInstanceWriter
+      def registry=(i)
+        @registry=i
+      end
+    end
+    
     class << self
 
       def included(config)
+        config.before(:all) {
+          OSGi.extend MockInstanceWriter
+        }
+        
         config.before(:each) {
           remoteRepositoryForHelpers()
+          OSGi.registry = OSGi::Registry.new
         }
         config.after(:all) {
           FileUtils.rm_rf Buildr4OSGi::SpecHelpers::OSGi_REPOS
+          
         }
       end
     end