You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2018/11/20 02:40:34 UTC

[1/2] buildr git commit: Prefer %w syntax

Repository: buildr
Updated Branches:
  refs/heads/master 6e9ca80a9 -> 01f082444


Prefer %w syntax


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/1caac4d0
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/1caac4d0
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/1caac4d0

Branch: refs/heads/master
Commit: 1caac4d017f4909bdba43dae83b669fd0ccb1c27
Parents: 6e9ca80
Author: Peter Donald <pe...@realityforge.org>
Authored: Tue Nov 20 13:31:33 2018 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Nov 20 13:31:33 2018 +1100

----------------------------------------------------------------------
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/1caac4d0/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index e783749..73bec68 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,7 +30,7 @@ end
 
 # Load the Gem specification for the current platform (Ruby or JRuby).
 def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
-  @specs ||= ['ruby', 'java', 'x86-mswin32'].inject({}) { |hash, spec_platform|
+  @specs ||= %w(ruby java x86-mswin32).inject({}) { |hash, spec_platform|
     ENV['BUILDR_PLATFORM'] = spec_platform
     hash.update(spec_platform=> Gem::Specification.load('buildr.gemspec'))
     Gem::Specification._clear_load_cache


[2/2] buildr git commit: Attempt to force rspec to run in bundle controlled environment

Posted by do...@apache.org.
Attempt to force rspec to run in bundle controlled environment


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/01f08244
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/01f08244
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/01f08244

Branch: refs/heads/master
Commit: 01f0824446e8c552893a4039a30455a358da12aa
Parents: 1caac4d
Author: Peter Donald <pe...@realityforge.org>
Authored: Tue Nov 20 13:40:27 2018 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Nov 20 13:40:27 2018 +1100

----------------------------------------------------------------------
 rakelib/rspec.rake | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/01f08244/rakelib/rspec.rake
----------------------------------------------------------------------
diff --git a/rakelib/rspec.rake b/rakelib/rspec.rake
index 4a86a62..cc23457 100644
--- a/rakelib/rspec.rake
+++ b/rakelib/rspec.rake
@@ -36,6 +36,7 @@ RSpec::Core::RakeTask.new :spec => ['_reports', :compile] do |task|
   ENV['USE_FSC'] = 'no'
   files = FileList['spec/**/*_spec.rb']
   files = files.delete_if {|f| f =~ /^spec\/groovy\//} if RUBY_PLATFORM[/java/]
+  task.rspec_path = 'bundle exec rspec'
   task.rspec_files = files
   task.rspec_opts = %w{--order random:123 --format html --out _reports/specs.html --backtrace}
 end