buildr 1.4.16 → 1.4.17

data/spec/addon/custom_pom_spec.rb

@@ -0,0 +1,149 @@
+# 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.expand_path('../spec_helpers', File.dirname(__FILE__))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'xpath_matchers'))
+
+Sandbox.require_optional_extension 'buildr/custom_pom'
+
+describe Buildr::CustomPom do
+
+  def xml_document(filename)
+    File.should be_exist(filename)
+    REXML::Document.new(File.read(filename))
+  end
+
+  def project_pom_xml(project)
+    xml_document(project.packages[0].pom.to_s)
+  end
+
+  def verify_license(pom_xml, name, url)
+    pom_xml.should match_xpath("/project/licenses/license/url[../name/text() = '#{name}']", url)
+  end
+
+  def dependency_xpath(artifact_id)
+    "/project/dependencies/dependency[artifactId/text() = '#{artifact_id}']"
+  end
+
+  def verify_dependency_group(pom_xml, artifact_id, group)
+    pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/groupId", group)
+  end
+
+  def verify_dependency_version(pom_xml, artifact_id, version)
+    pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/version", version)
+  end
+
+  def verify_dependency_scope(pom_xml, artifact_id, scope)
+    pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/scope", scope)
+  end
+
+  def verify_dependency_optional(pom_xml, artifact_id, optional)
+    pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/optional", optional)
+  end
+
+  def verify_dependency(pom_xml, artifact_id, group, version, scope, optional)
+    verify_dependency_group(pom_xml, artifact_id, group)
+    verify_dependency_version(pom_xml, artifact_id, version)
+    verify_dependency_scope(pom_xml, artifact_id, scope)
+    verify_dependency_optional(pom_xml, artifact_id, optional)
+  end
+
+  describe "with explicitly specified pom details" do
+    before do
+      ['id-provided', 'id-optional', 'id-runtime', 'id-test'].each do |artifact_id|
+        artifact("group:#{artifact_id}:jar:1.0") do |t|
+          mkdir_p File.dirname(t.to_s)
+          Zip::ZipOutputStream.open t.to_s do |zip|
+            zip.put_next_entry 'empty.txt'
+          end
+        end
+      end
+      write 'src/main/java/Example.java', "public class Example {}"
+
+      @foo = define 'foo' do
+        project.group = 'org.myproject'
+        project.version = '1.0'
+
+        pom.licenses['The Apache Software License, Version 2.0'] = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+        pom.licenses['GNU General Public License (GPL) version 3.0'] = 'http://www.gnu.org/licenses/gpl-3.0.html'
+        pom.scm_connection = pom.scm_developer_connection = 'scm:git:git@github.com:jbloggs/myproject'
+        pom.scm_url = 'git@github.com:jbloggs/myproject'
+        pom.url = 'https://github.com/jbloggs/myproject'
+        pom.issues_url = 'https://github.com/jbloggs/myproject/issues'
+        pom.issues_system = 'GitHub Issues'
+        pom.add_developer('jbloggs', 'Joe Bloggs', 'jbloggs@example.com', ['Project Lead'])
+        pom.provided_dependencies = ['group:id-provided:jar:1.0']
+        pom.optional_dependencies = ['group:id-optional:jar:1.0']
+
+        compile.with 'group:id-runtime:jar:1.0', 'group:id-optional:jar:1.0', 'group:id-provided:jar:1.0'
+
+        test.with 'group:id-test:jar:1.0'
+
+        package(:jar)
+      end
+      task('package').invoke
+      @pom_xml = project_pom_xml(@foo)
+      #$stderr.puts @pom_xml.to_s
+    end
+
+    it "has correct static metadata" do
+      @pom_xml.should match_xpath("/project/modelVersion", '4.0.0')
+      @pom_xml.should match_xpath("/project/parent/groupId", 'org.sonatype.oss')
+      @pom_xml.should match_xpath("/project/parent/artifactId", 'oss-parent')
+      @pom_xml.should match_xpath("/project/parent/version", '7')
+    end
+
+    it "has correct project level metadata" do
+      @pom_xml.should match_xpath("/project/groupId", 'org.myproject')
+      @pom_xml.should match_xpath("/project/artifactId", 'foo')
+      @pom_xml.should match_xpath("/project/version", '1.0')
+      @pom_xml.should match_xpath("/project/packaging", 'jar')
+      @pom_xml.should match_xpath("/project/name", 'foo')
+      @pom_xml.should match_xpath("/project/description", 'foo')
+      @pom_xml.should match_xpath("/project/url", 'https://github.com/jbloggs/myproject')
+    end
+
+    it "has correct scm details" do
+      @pom_xml.should match_xpath("/project/scm/connection", 'scm:git:git@github.com:jbloggs/myproject')
+      @pom_xml.should match_xpath("/project/scm/developerConnection", 'scm:git:git@github.com:jbloggs/myproject')
+      @pom_xml.should match_xpath("/project/scm/url", 'git@github.com:jbloggs/myproject')
+    end
+
+    it "has correct issueManagement details" do
+      @pom_xml.should match_xpath("/project/issueManagement/url", 'https://github.com/jbloggs/myproject/issues')
+      @pom_xml.should match_xpath("/project/issueManagement/system", 'GitHub Issues')
+    end
+
+    it "has correct developers details" do
+      @pom_xml.should match_xpath("/project/developers/developer/id", 'jbloggs')
+      @pom_xml.should match_xpath("/project/developers/developer/name", 'Joe Bloggs')
+      @pom_xml.should match_xpath("/project/developers/developer/email", 'jbloggs@example.com')
+      @pom_xml.should match_xpath("/project/developers/developer/roles/role", 'Project Lead')
+    end
+
+    it "has correct license details" do
+      verify_license(@pom_xml, 'The Apache Software License, Version 2.0', 'http://www.apache.org/licenses/LICENSE-2.0.txt')
+      verify_license(@pom_xml, 'GNU General Public License (GPL) version 3.0', 'http://www.gnu.org/licenses/gpl-3.0.html')
+    end
+
+    it "has correct dependency details" do
+      verify_dependency(@pom_xml, 'id-runtime', 'group', '1.0', nil, nil)
+      verify_dependency(@pom_xml, 'id-optional', 'group', '1.0', nil, 'true')
+      verify_dependency(@pom_xml, 'id-provided', 'group', '1.0', 'provided', nil)
+      verify_dependency(@pom_xml, 'id-test', 'group', '1.0', 'test', nil)
+    end
+  end
+end

data/spec/addon/drb_spec.rb

@@ -325,4 +325,3 @@ describe Buildr::DRbApplication do
 
   end
 end
-

data/spec/addon/jaxb_xjc_spec.rb

@@ -1,130 +1,130 @@
-# 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.expand_path('../spec_helpers', File.dirname(__FILE__))
-
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-Sandbox.require_optional_extension 'buildr/jaxb_xjc'
-
-XSD_CONTENT = <<XSD
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
-  <xsd:simpleType name="agency">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="DSE"/>
-      <xsd:enumeration value="PV"/>
-      <xsd:enumeration value="CFA"/>
-      <xsd:enumeration value="DPI"/>
-      <xsd:enumeration value="VF"/>
-      <xsd:enumeration value="Unknown"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="latLongCoordinate">
-    <xsd:all>
-      <xsd:element name="latitude" type="xsd:float"/>
-      <xsd:element name="longitude" type="xsd:float"/>
-    </xsd:all>
-  </xsd:complexType>
-
-  <xsd:element name="wildfire">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="name" type="xsd:string"/>
-        <xsd:element name="district" type="xsd:string">
-          <xsd:annotation>
-            <xsd:documentation xml:lang="en">
-              The name of the district WITHOUT the "FIRE DISTRICT" suffix.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="status">
-          <xsd:simpleType>
-            <xsd:restriction base="xsd:string">
-              <xsd:enumeration value="GOING"/>
-              <xsd:enumeration value="CONTAINED"/>
-              <xsd:enumeration value="UNDER CONTROL - 1"/>
-              <xsd:enumeration value="UNDER CONTROL - 2"/>
-              <xsd:enumeration value="SAFE"/>
-              <xsd:enumeration value="SAFE - OVERRUN"/>
-              <xsd:enumeration value="SAFE - NOT FOUND"/>
-              <xsd:enumeration value="SAFE - FALSE ALARM"/>
-              <xsd:enumeration value="NOT FOUND"/>
-              <xsd:enumeration value="UNKNOWN"/>
-            </xsd:restriction>
-          </xsd:simpleType>
-        </xsd:element>
-        <xsd:element name="reported-at" type="xsd:dateTime"/>
-        <xsd:element name="lead-agency" type="xsd:string"/>
-        <xsd:element name="origin" type="latLongCoordinate" minOccurs="0">
-          <xsd:annotation>
-            <xsd:documentation xml:lang="en">
-              This is a grid reference in lat/long format.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="area" type="xsd:decimal" minOccurs="0"/>
-        <xsd:element name="number">
-          <xsd:simpleType>
-            <xsd:restriction base="xsd:integer">
-              <xsd:minInclusive value="0"/>
-            </xsd:restriction>
-          </xsd:simpleType>
-        </xsd:element>
-        <xsd:element name="global-id">
-          <xsd:simpleType>
-            <xsd:restriction base="xsd:integer">
-              <xsd:minInclusive value="0"/>
-            </xsd:restriction>
-          </xsd:simpleType>
-        </xsd:element>
-        <xsd:element name="data-source" type="xsd:string"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
-XSD
-
-describe Buildr::JaxbXjc do
-  describe "compiled with specified xsd" do
-    before do
-      write "src/main/xsd/wildfire-1.3.xsd", XSD_CONTENT
-      @foo = define "foo" do
-        project.version = "2.1.3"
-        compile.from compile_jaxb("src/main/xsd/wildfire-1.3.xsd", "-quiet", :package => "org.foo.api")
-        package :jar
-      end
-      task('compile').invoke
-    end
-
-    it "produce .java files in the correct location" do
-      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Agency.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/LatLongCoordinate.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/ObjectFactory.java"))
-      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Wildfire.java"))
-    end
-
-    it "produce .class files in the correct location" do
-      File.should be_exist(@foo._("target/classes/org/foo/api/Agency.class"))
-      File.should be_exist(@foo._("target/classes/org/foo/api/LatLongCoordinate.class"))
-      File.should be_exist(@foo._("target/classes/org/foo/api/ObjectFactory.class"))
-      File.should be_exist(@foo._("target/classes/org/foo/api/Wildfire.class"))
-    end
-  end
-end
-
-elsif Buildr::VERSION >= '1.5'
-  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
-end
+# 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.expand_path('../spec_helpers', File.dirname(__FILE__))
+
+if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
+Sandbox.require_optional_extension 'buildr/jaxb_xjc'
+
+XSD_CONTENT = <<XSD
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+  <xsd:simpleType name="agency">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="DSE"/>
+      <xsd:enumeration value="PV"/>
+      <xsd:enumeration value="CFA"/>
+      <xsd:enumeration value="DPI"/>
+      <xsd:enumeration value="VF"/>
+      <xsd:enumeration value="Unknown"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:complexType name="latLongCoordinate">
+    <xsd:all>
+      <xsd:element name="latitude" type="xsd:float"/>
+      <xsd:element name="longitude" type="xsd:float"/>
+    </xsd:all>
+  </xsd:complexType>
+
+  <xsd:element name="wildfire">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="name" type="xsd:string"/>
+        <xsd:element name="district" type="xsd:string">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+              The name of the district WITHOUT the "FIRE DISTRICT" suffix.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="status">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+              <xsd:enumeration value="GOING"/>
+              <xsd:enumeration value="CONTAINED"/>
+              <xsd:enumeration value="UNDER CONTROL - 1"/>
+              <xsd:enumeration value="UNDER CONTROL - 2"/>
+              <xsd:enumeration value="SAFE"/>
+              <xsd:enumeration value="SAFE - OVERRUN"/>
+              <xsd:enumeration value="SAFE - NOT FOUND"/>
+              <xsd:enumeration value="SAFE - FALSE ALARM"/>
+              <xsd:enumeration value="NOT FOUND"/>
+              <xsd:enumeration value="UNKNOWN"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:element>
+        <xsd:element name="reported-at" type="xsd:dateTime"/>
+        <xsd:element name="lead-agency" type="xsd:string"/>
+        <xsd:element name="origin" type="latLongCoordinate" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+              This is a grid reference in lat/long format.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="area" type="xsd:decimal" minOccurs="0"/>
+        <xsd:element name="number">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:integer">
+              <xsd:minInclusive value="0"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:element>
+        <xsd:element name="global-id">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:integer">
+              <xsd:minInclusive value="0"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:element>
+        <xsd:element name="data-source" type="xsd:string"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
+XSD
+
+describe Buildr::JaxbXjc do
+  describe "compiled with specified xsd" do
+    before do
+      write "src/main/xsd/wildfire-1.3.xsd", XSD_CONTENT
+      @foo = define "foo" do
+        project.version = "2.1.3"
+        compile.from compile_jaxb("src/main/xsd/wildfire-1.3.xsd", "-quiet", :package => "org.foo.api")
+        package :jar
+      end
+      task('compile').invoke
+    end
+
+    it "produce .java files in the correct location" do
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Agency.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/LatLongCoordinate.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/ObjectFactory.java"))
+      File.should be_exist(@foo._("target/generated/jaxb/main/java/org/foo/api/Wildfire.java"))
+    end
+
+    it "produce .class files in the correct location" do
+      File.should be_exist(@foo._("target/classes/org/foo/api/Agency.class"))
+      File.should be_exist(@foo._("target/classes/org/foo/api/LatLongCoordinate.class"))
+      File.should be_exist(@foo._("target/classes/org/foo/api/ObjectFactory.class"))
+      File.should be_exist(@foo._("target/classes/org/foo/api/Wildfire.class"))
+    end
+  end
+end
+
+elsif Buildr::VERSION >= '1.5'
+  raise "JVM version guard in #{__FILE__} should be removed since it is assumed that Java 1.5 is no longer supported."
+end

data/spec/core/application_spec.rb

@@ -575,4 +575,3 @@ describe Rake do
    end
  end
 end
-

data/spec/core/build_spec.rb

@@ -227,7 +227,7 @@ A README
     it 'should return an empty array on a clean repository' do
       Hg.should_receive(:`).with('hg status').and_return "\n"
       Hg.uncommitted_files.should be_empty
-    end   
+    end
   end
 
   describe '#remote' do

data/spec/core/console_spec.rb

@@ -63,4 +63,3 @@ describe Buildr::Console do
     end
   end
 end
-

data/spec/core/doc_spec.rb

@@ -192,4 +192,3 @@ describe Project, '#doc' do
     project('foo').doc.invoke
   end
 end
-

data/spec/core/extension_spec.rb

@@ -198,4 +198,3 @@ module ExtensionThreeFour
     project.after_order << :four
   end
 end
-

data/spec/core/generate_from_eclipse_spec.rb

@@ -16,7 +16,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 module EclipseHelper
-  
+
   def setupExample(group, projectName, options = {})
 	options[:symName] ? symName = options[:symName] :symName = File.basename(projectName)
 	requiredPlugins = nil
@@ -102,12 +102,12 @@ describe Buildr::Generate do
   include EclipseHelper
   describe 'it should find a single eclipse project' do
     top = "top_#{__LINE__}"
-    
+
     before do
       setupExample(top, 'single')
       File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
     end
-    
+
     it 'should create a valid buildfile' do
       define('first')
       File.exists?(File.join(top, 'single', '.project')).should be_true
@@ -149,7 +149,7 @@ describe Buildr::Generate do
       file(buildFile).should contain('layout[:source, :main, :scala]')
       lambda { Buildr.application.run }.should_not raise_error
     end
-    
+
     it "should pass output in build.properties to layout[:target, :main], etc" do
       define('layout_target')
       buildFile = File.join(top, 'buildfile')
@@ -161,7 +161,7 @@ describe Buildr::Generate do
       file(buildFile).should contain('layout[:target, :main, :scala]')
       lambda { Buildr.application.run }.should_not raise_error
     end
-    
+
     it "should package an eclipse plugin" do
       define('layout_target')
       buildFile = File.join(top, 'buildfile')
@@ -186,14 +186,14 @@ describe Buildr::Generate do
       lambda { Buildr.application.run }.should_not raise_error
     end
   end
-    
+
   describe 'it should accecpt singleton SymbolicName in MANIFEST.MF' do
     top = "top_#{__LINE__}"
     before do
       setupExample(top, 'single', { :symName => 'singleSymbolicName;singleton:=true'})
       File.open(File.join(top, 'buildfile'), 'w') { |file| file.write Generate.from_eclipse(File.join(Dir.pwd, top)).join("\n") }
     end
-    
+
     it "should not get confused if SymbolicName in MANIFEST.MF is a singleton:=true" do
       buildFile = File.join(top, 'buildfile')
       file(buildFile).should exist
@@ -220,7 +220,7 @@ describe Buildr::Generate do
       file(buildFile).should contain('define "single"')
       lambda { Buildr.application.run }.should_not raise_error
     end
-    
+
     it "should correct the path for a nested plugin" do
       define('base_dir')
       buildFile = File.join(top, 'buildfile')
@@ -264,7 +264,7 @@ describe Buildr::Generate do
       file(buildFile).should contain(/define "second".*do.*dependencies << projects\("first"\).* end/m)
       lambda { Buildr.application.run }.should_not raise_error
     end
-    
+
     # Fragments are only supported with buildr4osi which is not (yet?) part of buildr
     it 'should skip fragments.'  do
       define('base_dir')