@@ -8,7 +8,7 @@ include FileUtils ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) ## ORDER IS IMPORTANT # gems may depend on other member gems of dm-more Rakefile @@ -2,8 +2,8 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ -WINDOWS = Gem.win_platform? -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/ferret_adapter/version' adapters/dm-ferret-adapter/Rakefile @@ -2,8 +2,8 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ -WINDOWS = Gem.win_platform? -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/rest_adapter/version' adapters/dm-rest-adapter/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-adjust/version' dm-adjust/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-aggregates/version' dm-aggregates/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-ar-finders/version' dm-ar-finders/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-cli/version' dm-cli/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-constraints/version' dm-constraints/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-example/is/version' dm-is-example/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-list/is/version' dm-is-list/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-nested_set/is/version' dm-is-nested_set/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-remixable/is/version' dm-is-remixable/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-searchable/is/version' dm-is-searchable/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-state_machine/is/version' dm-is-state_machine/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-tree/is/version' dm-is-tree/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-is-versioned/is/version' dm-is-versioned/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-migrations/version' dm-migrations/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-observer/version' dm-observer/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-serializer/version' dm-serializer/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-sweatshop/version' dm-sweatshop/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-tags/version' dm-tags/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-timestamps/version' dm-timestamps/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-types/version' dm-types/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/dm-validations/version' dm-validations/Rakefile @@ -3,7 +3,7 @@ require 'pathname' ROOT = Pathname(__FILE__).dirname.expand_path JRUBY = RUBY_PLATFORM =~ /java/ WINDOWS = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i) -SUDO = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS']) +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) require ROOT + 'lib/rails_datamapper/version' rails_datamapper/Rakefile 05d5c1c9b6c92c70f418bffa1ea1596010d7fbfb Alex Coles alex@alexcolesportfolio.com http://github.com/datamapper/dm-more/commit/03da8da95d370a01c1262bc06a8174df52ff68e8 03da8da95d370a01c1262bc06a8174df52ff68e8 2009-11-03T23:20:21-08:00 2009-10-31T14:39:12-07:00 [all] rake install task should use sudo on JRuby * *NIX platforms only. * SUDOLESS env may be set to prevent this behavior, but this brings it closer inline to how rake install works for MRI. Signed-off-by: Alex Coles <alex@alexcolesportfolio.com> 7f671ae860c3401807a02310425187a4ce254671 Dan Kubb dan.kubb@gmail.com