Return-Path: X-Original-To: apmail-buildr-commits-archive@www.apache.org Delivered-To: apmail-buildr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5145C18988 for ; Sat, 6 Jun 2015 00:48:50 +0000 (UTC) Received: (qmail 62840 invoked by uid 500); 6 Jun 2015 00:48:50 -0000 Delivered-To: apmail-buildr-commits-archive@buildr.apache.org Received: (qmail 62816 invoked by uid 500); 6 Jun 2015 00:48:50 -0000 Mailing-List: contact commits-help@buildr.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@buildr.apache.org Delivered-To: mailing list commits@buildr.apache.org Received: (qmail 62806 invoked by uid 99); 6 Jun 2015 00:48:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Jun 2015 00:48:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F252E0777; Sat, 6 Jun 2015 00:48:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: donaldp@apache.org To: commits@buildr.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: buildr git commit: Prefer %w sytax and single quotes Date: Sat, 6 Jun 2015 00:48:50 +0000 (UTC) Repository: buildr Updated Branches: refs/heads/master e417eea9b -> 5ee78600f Prefer %w sytax and single quotes Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/5ee78600 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/5ee78600 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/5ee78600 Branch: refs/heads/master Commit: 5ee78600f0081b9b39cec2b293b8c315e897a9de Parents: e417eea Author: Peter Donald Authored: Sat Jun 6 10:48:20 2015 +1000 Committer: Peter Donald Committed: Sat Jun 6 10:48:20 2015 +1000 ---------------------------------------------------------------------- addon/buildr/jacoco.rb | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/5ee78600/addon/buildr/jacoco.rb ---------------------------------------------------------------------- diff --git a/addon/buildr/jacoco.rb b/addon/buildr/jacoco.rb index 6722357..e02acec 100644 --- a/addon/buildr/jacoco.rb +++ b/addon/buildr/jacoco.rb @@ -130,15 +130,7 @@ module Buildr project.test.setup do agent_jar = Buildr.artifacts(Buildr::JaCoCo.agent_spec).each(&:invoke).map(&:to_s).join('') options = [] - ["destfile", - "append", - "exclclassloader", - "sessionid", - "dumponexit", - "output", - "address", - "port", - "classdumpdir"].each do |option| + %w(destfile append exclclassloader sessionid dumponexit output address port classdumpdir).each do |option| value = project.jacoco.send(option.to_sym) options << "#{option}=#{value}" unless value.nil? end @@ -150,10 +142,10 @@ module Buildr end namespace 'jacoco' do if project.jacoco.generate_xml? - desc "Generate JaCoCo reports." + desc 'Generate JaCoCo reports.' task 'reports' do - Buildr.ant "jacoco" do |ant| - ant.taskdef(:resource => "org/jacoco/ant/antlib.xml") do |ant| + Buildr.ant 'jacoco' do |ant| + ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant| ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR) end ant.report do |ant| @@ -167,7 +159,7 @@ module Buildr ant.fileset :dir => project.compile.target end end - ant.sourcefiles(:encoding => "UTF-8") do |ant| + ant.sourcefiles(:encoding => 'UTF-8') do |ant| project.compile.sources.each do |path| ant.fileset :dir => path.to_s end @@ -184,10 +176,10 @@ module Buildr end end namespace 'jacoco' do - desc "Generate JaCoCo reports." + desc 'Generate JaCoCo reports.' task 'report' do - Buildr.ant "jacoco" do |ant| - ant.taskdef(:resource => "org/jacoco/ant/antlib.xml") do |ant| + Buildr.ant 'jacoco' do |ant| + ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant| ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR) end ant.report do |ant| @@ -197,22 +189,22 @@ module Buildr end end - ant.structure(:name => "Jacoco Report") do |ant| + ant.structure(:name => 'Jacoco Report') do |ant| ant.classfiles do |ant| Buildr.projects.map(&:compile).map(&:target).flatten.map(&:to_s).each do |src| ant.fileset :dir=>src.to_s if File.exist?(src) end end - ant.sourcefiles(:encoding => "UTF-8") do |ant| + ant.sourcefiles(:encoding => 'UTF-8') do |ant| Buildr.projects.map(&:compile).map(&:sources).flatten.map(&:to_s).each do |src| ant.fileset :dir=>src.to_s if File.exist?(src) end end end - ant.html :destdir => "reports/jacoco" - ant.xml :destfile => "reports/jacoco/jacoco.xml" - ant.csv :destfile => "reports/jacoco/jacoco.csv" + ant.html :destdir => 'reports/jacoco' + ant.xml :destfile => 'reports/jacoco/jacoco.xml' + ant.csv :destfile => 'reports/jacoco/jacoco.csv' end end end