buildr 1.4.18 → 1.4.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTkzMTBlY2Q3ZmQzODRkYTIyNjYzNzVjMzczMTIwNDdhNDE1NjNhZQ==
+    YjIyMTk5OWRlMjI1NDMxODcwMmQwN2I5NjFjZjA3N2Q3YTJmY2MxZA==
   data.tar.gz: !binary |-
-    ODBkYjk1MWY1YWNlZmE4OTgyZGQ0MDJkYWYxODRjNDk4ZGIzN2JjYw==
+    NjFhYjVhMzE1MWNmMTIzYTc1MzM4ZmUwNGI2N2VkNDhmYjc0MmZlNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTQ0ODIxZmExOWI0NDk0ODVjNGNmNGJlM2NhN2Y3YzRiOWNlNWI3MTlhNGRk
-    OWFhZDRkM2Y1MmU3Y2UwYWE3OTlkMGYzNjk1ZmFlNTNlZWFlNmUzYjk2NmY1
-    N2NhNTk4MjJhNTMxZjVlMzNlOGViMTkwMTFkM2RhZDMzZmQ0YTk=
+    NjM2OGM2YzI4Y2IwNTM5Y2VhOWY2Y2YyOGYwMmE3MmQzYmViMjQxNDcxMzI3
+    MDg5MTI0MjI5NjQ2MThjYWMzOGQ1ZTA4MjA0ZDFmNDE0YjliYjE2ZDdiYmFj
+    NGNjMWMxMjRkYjVjZGJiYmFjN2VmZjFmMjcyNDQ1MzkzODg1Mzg=
   data.tar.gz: !binary |-
-    NjQ4ZWVjOWNlZjg3N2UxYzNjNGI4MjY2NWY1NjhiNzAwNTFhYjJkOWY2NDY4
-    YTA5ZWQ0MTIwZTcwZmI1NzBkMjJhODA4MjZhMmUxZDVjYWE4ODE4OWFlN2I3
-    MzM2YmI3NGJiN2RmNWRjOWJlM2E3Y2Y4OTNmYmViYjNhMDBmZjA=
+    ZGQ5OGVmNGM2NjUxMjIzM2RlNjdlNjFlN2VhNTJjODRmM2ZhNjY1YzRiNzYw
+    MGVlNjQ0ZjU0ZmUzMjg2M2RkZGM2Yjc0MTgzZjVlODRmMWI2OTcyZmIyNjdj
+    YzdjYzE5ZGQ3NTczODNjMzk5YzJmNjUyNTUxYTFkYWI4MWUzOGY=

data/CHANGELOG

@@ -1,3 +1,14 @@
+1.4.19 (2014-07-06)
+* Fixed:  BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the
+          download(artifact('group:artifact:jar:1-SNAPSHOT') =>
+          'http://example.com/...') construct will correctly download the
+          artifacts from configured URL.
+* Fixed:  BUILDR-700 - Fix bug where buildr was truncating SNAPSHOT files
+          that had not changed since last update check and HTTP was returning
+          "HTTP Not Modified" status.
+* Fixed:  Fix bug introduced in 1.4.18 version of custom_pom addon where
+          poms are created for artifacts that have a classifier.
+
 1.4.18 (2014-06-24)
 * Fixed:  BUILDR-699 - Update the custom_pom addon to avoid failure when
           used with zip packages.

data/addon/buildr/custom_pom.rb

@@ -250,7 +250,7 @@ module Buildr
 
       after_define do |project|
         project.packages.each do |pkg|
-          if pkg.type.to_s == 'jar' && !pkg.classifier
+          if pkg.type.to_s == 'jar' && pkg.classifier.nil?
             class << pkg
               def pom_xml
                 self.pom.content

data/doc/download.textile

@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.4.18 (2014-06-24)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.18-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18-java.gem | "e71adb986a066d0238325dabdfe577ff":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-java.gem.asc |
+| "buildr-1.4.18-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem | "322d4008c2b8ca45e7e78e0248b35d4a":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem.asc |
+| "buildr-1.4.18.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18.gem | "9bb3eb5085bd531ef7b2dc68baf847ad":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.gem.asc |
+| "buildr-1.4.18.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18.tgz | "f6a74d86f76abf9e7de5e2c32ec59946":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.tgz.asc |
+| "buildr-1.4.18.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18.zip | "3fba955436b4dd5f88e0f280d765f37b":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.18/KEYS)
+
+
 h3. buildr 1.4.17 (2014-05-25)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.17-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.17/buildr-1.4.17-java.gem | "0203c7bc6bbf816b58c50143816b2941":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17-java.gem.asc |
-| "buildr-1.4.17-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.17/buildr-1.4.17-x86-mswin32.gem | "722889cf25682bf804be32ec318f72d7":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17-x86-mswin32.gem.asc |
-| "buildr-1.4.17.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.17/buildr-1.4.17.gem | "8cdcc70fd881adb4608cfc21d9ffe570":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17.gem.asc |
-| "buildr-1.4.17.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.17/buildr-1.4.17.tgz | "5dcfaf71703dfb010b735af561555d3a":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17.tgz.asc |
-| "buildr-1.4.17.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.17/buildr-1.4.17.zip | "783d46ee8f198672815c408ea14851de":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.17/buildr-1.4.17.zip.asc |
+| "buildr-1.4.17-java.gem":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17-java.gem | "0203c7bc6bbf816b58c50143816b2941":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17-java.gem.asc |
+| "buildr-1.4.17-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17-x86-mswin32.gem | "722889cf25682bf804be32ec318f72d7":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17-x86-mswin32.gem.asc |
+| "buildr-1.4.17.gem":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.gem | "8cdcc70fd881adb4608cfc21d9ffe570":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.gem.asc |
+| "buildr-1.4.17.tgz":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.tgz | "5dcfaf71703dfb010b735af561555d3a":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.tgz.asc |
+| "buildr-1.4.17.zip":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.zip | "783d46ee8f198672815c408ea14851de":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.17/buildr-1.4.17.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.17/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.17/KEYS)
 
 
 h3. buildr 1.4.16 (2014-05-03)

data/doc/index.textile

@@ -46,6 +46,17 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.4.19 (2014-07-06)
+* Fixed:  BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the
+          download(artifact('group:artifact:jar:1-SNAPSHOT') =>
+          'http://example.com/...') construct will correctly download the
+          artifacts from configured URL.
+* Fixed:  BUILDR-700 - Fix bug where buildr was truncating SNAPSHOT files
+          that had not changed since last update check and HTTP was returning
+          "HTTP Not Modified" status.
+* Fixed:  Fix bug introduced in 1.4.18 version of custom_pom addon where
+          poms are created for artifacts that have a classifier.
+
 Highlights from Buildr 1.4.18 (2014-06-24)
 * Fixed:  BUILDR-699 - Update the custom_pom addon to avoid failure when
           used with zip packages.
@@ -66,30 +77,6 @@ Highlights from Buildr 1.4.18 (2014-06-24)
 * Fixed:  Fix the naming of css_lint addon file so it is made available
           as an addon.
 
-Highlights from Buildr 1.4.17 (2014-05-25)
-
-* Change: Supply a default xsl file for generating the checkstyle report.
-* Added:  Add csslint tasks css_lint:xml and css_lint:html that support source code analysis of CSS files.
-* Added:  Add scss_lint tasks scss_lint:xml and scss_lint:html that support source code analysis of SCSS files.
-* Added:  Import 'buildr/custom_pom' addon to make it easier to build POMs for projects publishing to Maven Central.
-* Added:  Add flag to allow non portable extensions in wsgen addon.
-
-Highlights from Buildr 1.4.16 (2014-05-03)
-
-* Added:  Add the ability to generate a html report when using the
-          jacoco addon. Extracted from the ode project.
-* Change: Improved the error handling when generating java from wsdl
-          in the wsgen addon.
-* Change: Upgraded the Checkstyle plugin to use checkstyle 5.7 that
-          improves Java 7 compatibility.
-* Change: Upgraded the PMD plugin to use pmd 5.0.5 which for Java 7
-          compatibility.
-* Change: Improve the 'buildr/gwt' addon to easily support different
-          gwt versions. Fix several bugs with the addon at the same
-          time.
-* Fixed:  Avoid crash in GPG addon if unable to create a pom
-          for an artifact.
-
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
 
 h2(#notices).  Credits & Notices

data/lib/buildr/core/common.rb

@@ -104,12 +104,46 @@ module Buildr #:nodoc:
       # Download to a file created by the task.
       fail unless args.keys.size == 1
       uri = URI.parse(args.values.first.to_s)
-      file(args.keys.first.to_s).tap do |task|
-        task.sources << uri
-        task.enhance { uri.download task.name }
+      key = args.keys.first
+      if key.is_a?(Buildr::Artifact)
+        if RUBY_VERSION < '1.9.0'
+          class << key
+            def singleton_class
+              class << self
+                self
+              end
+            end
+
+            def define_singleton_method(name, &block)
+              self.singleton_class.send(:define_method, name, &block)
+            end
+          end
+        end
+
+        key.define_singleton_method(:source) do
+          uri
+        end
+        key.define_singleton_method(:download) do
+          trace "Downloading #{to_spec}"
+          begin
+            download_artifact(uri)
+            true
+          rescue URI::NotFoundError
+            false
+          rescue Exception => error
+            info error
+            trace error.backtrace.join("\n")
+            false
+          end || fail_download([])
+        end
+        key
+      else
+        file(key.to_s).tap do |task|
+          task.sources << uri
+          task.enhance { uri.download task.name }
+        end
       end
     end
-
   end
 
   # A file task that concatenates all its prerequisites to create a new file.

data/lib/buildr/core/transports.rb

@@ -145,10 +145,12 @@ module URI
         modified = File.stat(target).mtime if File.exist?(target)
         temp = Tempfile.new(File.basename(target))
         temp.binmode
-        read({:progress=>verbose}.merge(options || {}).merge(:modified=>modified)) { |chunk| temp.write chunk }
+        written = false
+        read({:progress=>verbose}.merge(options || {}).merge(:modified=>modified)) { |chunk| written = true; temp.write chunk }
         temp.close
         mkpath File.dirname(target)
-        mv temp.path, target
+        # Only attempt to override file if it was actually written to, i.e. "HTTP Not Modified" was not returned.
+        mv temp.path, target if written
       when File
         read({:progress=>verbose}.merge(options || {}).merge(:modified=>target.mtime)) { |chunk| target.write chunk }
         target.flush

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.18'.freeze
+  VERSION = '1.4.19'.freeze
 end

data/rakelib/metrics.rake

@@ -18,6 +18,7 @@ namespace 'metrics' do
   task 'saikuro' do
     gem 'atoulme-Saikuro'
     require 'saikuro'
+    require 'pathname'
     output_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '_reports', 'saikuro'))
     base_dir = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
     rb_files = %w(lib addon).collect { |folder|

data/spec/addon/custom_pom_spec.rb

@@ -152,4 +152,4 @@ describe Buildr::CustomPom do
   end
 end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.18
+  version: 1.4.19
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake