buildr-bnd 0.0.5 → 0.0.6

data/spec/buildr/bnd/defaults_spec.rb

@@ -1,74 +1,78 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
-describe "project.bnd defaults" do
-
-  before do
-    write "src/main/java/com/biz/Foo.java", <<SRC
-package com.biz;
-public class Foo {}
-SRC
-    write "bar/src/main/java/com/biz/bar/Bar.java", <<SRC
-package com.biz.bar;
-public class Bar {}
-SRC
-
-    @foo = define "foo" do
-      project.version = "2.1.3"
-      project.group = "mygroup"
-      package :bundle
-      compile.with Buildr::Ant.dependencies
-      desc "My Bar Project"
-      define "bar" do
-        package :bundle
-      end
-    end
-    @bar = @foo.project('bar')
-  end
-
-  it "defaults Bundle-Version to project.version" do
-    @foo.packages[0].to_params['Bundle-Version'].should eql('2.1.3')
-    @bar.packages[0].to_params['Bundle-Version'].should eql('2.1.3')
-  end
-
-  it "defaults -classpath to compile path and dependencies" do
-    @foo.packages[0].to_params['-classpath'].should include(@foo.compile.target.to_s)
-    @foo.packages[0].to_params['-classpath'].should include(Buildr.artifacts(Buildr::Ant.dependencies[0]).to_s)
-    @bar.packages[0].to_params['-classpath'].should include(@bar.compile.target.to_s)
-  end
-
-  it "classpath method returns compile path and dependencies" do
-    @foo.packages[0].classpath.should include(@foo.compile.target)
-    Buildr::Ant.dependencies.each do |dependency|
-      @foo.packages[0].classpath.to_s.should include(Buildr.artifacts(dependency).to_s)
-    end
-    @bar.packages[0].classpath.should include(@bar.compile.target)
-  end
-
-  it "defaults Bundle-SymbolicName to combination of group and name" do
-    @foo.packages[0].to_params['Bundle-SymbolicName'].should eql('mygroup.foo')
-    @bar.packages[0].to_params['Bundle-SymbolicName'].should eql('mygroup.foo.bar')
-  end
-
-  it "defaults Export-Package to nil" do
-    @foo.packages[0].to_params['Export-Package'].should be_nil
-    @bar.packages[0].to_params['Export-Package'].should be_nil
-  end
-
-  it "defaults Import-Package to nil" do
-    @foo.packages[0].to_params['Import-Package'].should be_nil
-    @bar.packages[0].to_params['Import-Package'].should be_nil
-  end
-
-  it "defaults Bundle-Name to project.name if comment not present" do
-    @foo.packages[0].to_params['Bundle-Name'].should eql('foo')
-  end
-
-  it "defaults Bundle-Name to comment if present" do
-    @bar.packages[0].to_params['Bundle-Name'].should eql('My Bar Project')
-  end
-
-  it "defaults Bundle-Description to project.full_comment" do
-    @foo.packages[0].to_params['Bundle-Description'].should be_nil
-    @bar.packages[0].to_params['Bundle-Description'].should eql('My Bar Project')
-  end
-end
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe "project.bnd defaults" do
+
+  before do
+    write "src/main/java/com/biz/Foo.java", <<SRC
+package com.biz;
+public class Foo {}
+SRC
+    write "bar/src/main/java/com/biz/bar/Bar.java", <<SRC
+package com.biz.bar;
+public class Bar {}
+SRC
+
+    @foo = define "foo" do
+      project.version = "2.1.3"
+      project.group = "mygroup"
+      package :bundle
+      compile.with Buildr::Ant.dependencies
+      desc "My Bar Project"
+      define "bar" do
+        package :bundle
+      end
+    end
+    @bar = @foo.project('bar')
+  end
+
+  it "defaults Bundle-Version to project.version" do
+    @foo.packages[0].to_params['Bundle-Version'].should eql('2.1.3')
+    @bar.packages[0].to_params['Bundle-Version'].should eql('2.1.3')
+  end
+
+  it "defaults -classpath to compile path and dependencies" do
+    @foo.packages[0].to_params['-classpath'].should include(@foo.compile.target.to_s)
+    @foo.packages[0].to_params['-classpath'].should include(Buildr.artifacts(Buildr::Ant.dependencies[0]).to_s)
+    @bar.packages[0].to_params['-classpath'].should include(@bar.compile.target.to_s)
+  end
+
+  it "classpath method returns compile path and dependencies" do
+    @foo.packages[0].classpath.should include(@foo.compile.target)
+    Buildr::Ant.dependencies.each do |dependency|
+      @foo.packages[0].classpath.to_s.should include(Buildr.artifacts(dependency).to_s)
+    end
+    @bar.packages[0].classpath.should include(@bar.compile.target)
+  end
+
+  it "defaults Bundle-SymbolicName to combination of group and name" do
+    @foo.packages[0].to_params['Bundle-SymbolicName'].should eql('mygroup.foo')
+    @bar.packages[0].to_params['Bundle-SymbolicName'].should eql('mygroup.foo.bar')
+  end
+
+  it "defaults Export-Package to nil" do
+    @foo.packages[0].to_params['Export-Package'].should be_nil
+    @bar.packages[0].to_params['Export-Package'].should be_nil
+  end
+
+  it "defaults Import-Package to nil" do
+    @foo.packages[0].to_params['Import-Package'].should be_nil
+    @bar.packages[0].to_params['Import-Package'].should be_nil
+  end
+
+  it "defaults Bundle-Name to project.name if comment not present" do
+    @foo.packages[0].to_params['Bundle-Name'].should eql('foo')
+  end
+
+  it "defaults Bundle-Name to comment if present" do
+    @bar.packages[0].to_params['Bundle-Name'].should eql('My Bar Project')
+  end
+
+  it "defaults Bundle-Description to project.full_comment" do
+    @foo.packages[0].to_params['Bundle-Description'].should be_nil
+    @bar.packages[0].to_params['Bundle-Description'].should eql('My Bar Project')
+  end
+
+  it "defaults -removeheaders to" do
+    @foo.packages[0].to_params['-removeheaders'].should eql("Include-Resource,Bnd-LastModified,Created-By,Implementation-Title,Tool")
+  end
+end

data/spec/buildr/bnd/project_extension_spec.rb

@@ -1,11 +1,11 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
-describe "project extension" do
-  it "provides an 'bnd:print' task" do
-    Rake::Task.tasks.detect{|task| task.to_s == "bnd:print"}.should_not be_nil
-  end
-
-  it "documents the 'bnd:print' task" do
-    Rake::Task.tasks.detect{|task| task.to_s == "bnd:print"}.comment.should_not be_nil
-  end
-end
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe "project extension" do
+  it "provides an 'bnd:print' task" do
+    Rake::Task.tasks.detect{|task| task.to_s == "bnd:print"}.should_not be_nil
+  end
+
+  it "documents the 'bnd:print' task" do
+    Rake::Task.tasks.detect{|task| task.to_s == "bnd:print"}.comment.should_not be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -1,32 +1,39 @@
-require 'spec'
-
-DEFAULT_BUILDR_DIR=File.expand_path(File.dirname(__FILE__) + '/../../buildr')
-BUILDR_DIR =
-  begin
-    if ENV['BUILDR_DIR']
-      ENV['BUILDR_DIR']
-    elsif File.exist?(File.expand_path('../buildr_dir', __FILE__))
-      File.read(File.expand_path('../buildr_dir', __FILE__)).strip
-    else
-      DEFAULT_BUILDR_DIR
-    end
-  end
-
-unless File.exist?("#{BUILDR_DIR}/buildr.gemspec")
-  raise "Unable to find buildr.gemspec in #{BUILDR_DIR == DEFAULT_BUILDR_DIR ? 'guessed' : 'specified'} $BUILDR_DIR (#{BUILDR_DIR})"
-end
-
-# hook into buildr's spec_helpers load process
-module SandboxHook
-  def SandboxHook.included(spec_helpers)
-    $LOAD_PATH.unshift(File.dirname(__FILE__))
-    $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-    require 'buildr_bnd'
-  end
-end
-
-require "#{BUILDR_DIR}/spec/spec_helpers.rb"
-
-# Download deps into real local dir
-Buildr::repositories.remote << Buildr::Bnd.remote_repository
-Buildr::Bnd.requires.each { |spec| artifact(spec).invoke }
+require 'spec'
+
+DEFAULT_BUILDR_DIR=File.expand_path(File.dirname(__FILE__) + '/../../buildr')
+BUILDR_DIR =
+  begin
+    if ENV['BUILDR_DIR']
+      ENV['BUILDR_DIR']
+    elsif File.exist?(File.expand_path('../buildr_dir', __FILE__))
+      File.read(File.expand_path('../buildr_dir', __FILE__)).strip
+    else
+      DEFAULT_BUILDR_DIR
+    end
+  end
+
+unless File.exist?("#{BUILDR_DIR}/buildr.gemspec")
+  raise "Unable to find buildr.gemspec in #{BUILDR_DIR == DEFAULT_BUILDR_DIR ? 'guessed' : 'specified'} $BUILDR_DIR (#{BUILDR_DIR})"
+end
+
+# hook into buildr's spec_helpers load process
+module SandboxHook
+  def SandboxHook.included(spec_helpers)
+    $LOAD_PATH.unshift(File.dirname(__FILE__))
+    $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+    require 'buildr_bnd'
+  end
+end
+
+begin
+  require File.expand_path("#{BUILDR_DIR}/lib/buildr/version.rb")
+  require File.expand_path("#{BUILDR_DIR}/spec/spec_helpers.rb")
+rescue Exception => e
+  $stderr.puts "Error initializing the build environment\n"
+  $stderr.puts "Cause: #{e.inspect}\n"
+  exit(22)
+end
+
+# Download deps into real local dir
+Buildr::repositories.remote << Buildr::Bnd.remote_repository
+Buildr::Bnd.requires.each { |spec| artifact(spec).invoke }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 5
-  version: 0.0.5
+    - 6
+  version: 0.0.6
 platform: ruby
 authors: 
   - Peter Donald
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 +10:00
+date: 2010-10-12 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -33,15 +33,14 @@ extra_rdoc_files:
   - CHANGELOG
 files: 
   - lib/buildr_bnd.rb
-  - lib/buildr/bnd/version.rb
   - lib/buildr/bnd/bundle_task.rb
-  - lib/buildr/bnd/project_extension.rb
   - lib/buildr/bnd/core.rb
+  - lib/buildr/bnd/project_extension.rb
+  - lib/buildr/bnd/version.rb
   - spec/spec_helper.rb
-  - spec/spec.opts
-  - spec/buildr/bnd/project_extension_spec.rb
   - spec/buildr/bnd/bundle_package_spec.rb
   - spec/buildr/bnd/defaults_spec.rb
+  - spec/buildr/bnd/project_extension_spec.rb
   - buildr-bnd.gemspec
   - LICENSE
   - README.rdoc
@@ -54,7 +53,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
   - --title
-  - buildr-bnd 0.0.5
+  - buildr-bnd 0.0.6
   - --main
   - README.rdoc
 require_paths: 

data/spec/spec.opts

@@ -1 +0,0 @@
---color