lib/aruba/api/core.rb in aruba-1.0.4 vs lib/aruba/api/core.rb in aruba-1.1.0

- old
+ new

@@ -1,9 +1,9 @@ -require 'rspec/expectations' -require 'aruba/runtime' -require 'aruba/errors' -require 'aruba/setup' +require "rspec/expectations" +require "aruba/runtime" +require "aruba/errors" +require "aruba/setup" # Aruba module Aruba # Api module Api @@ -36,12 +36,12 @@ # Execute block in Aruba's current directory # # @yield # The block which should be run in current directory def in_current_directory(&block) - create_directory '.' unless directory?('.') - cd('.', &block) + create_directory "." unless directory?(".") + cd(".", &block) end # Switch to directory # # @param [String] dir @@ -62,13 +62,13 @@ unless Aruba.platform.directory?(expand_path(dir)) raise ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." end - old_directory = expand_path('.') + old_directory = expand_path(".") aruba.current_directory << dir - new_directory = expand_path('.') + new_directory = expand_path(".") aruba.event_bus.notify Events::ChangedWorkingDirectory.new(old: old_directory, new: new_directory) old_dir = Aruba.platform.getwd @@ -76,12 +76,12 @@ real_new_directory = File.expand_path(aruba.current_directory, aruba.root_directory) Aruba.platform.chdir real_new_directory result = with_environment( - 'OLDPWD' => old_dir, - 'PWD' => real_new_directory, + "OLDPWD" => old_dir, + "PWD" => real_new_directory, &block ) ensure aruba.current_directory.pop Aruba.platform.chdir old_dir @@ -92,13 +92,13 @@ unless Aruba.platform.directory?(expand_path(dir)) raise ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." end - old_directory = expand_path('.') + old_directory = expand_path(".") aruba.current_directory << dir - new_directory = expand_path('.') + new_directory = expand_path(".") aruba.event_bus.notify Events::ChangedWorkingDirectory.new(old: old_directory, new: new_directory) self @@ -141,45 +141,45 @@ # expand_path('/foo/bar') # def expand_path(file_name, dir_string = nil) unless file_name.is_a?(String) && !file_name.empty? message = "Filename #{file_name} needs to be a string." \ - ' It cannot be nil or empty either. '\ + " It cannot be nil or empty either. "\ "Please use `expand_path('.')` if you want the current directory to be expanded." raise ArgumentError, message end unless Aruba.platform.directory? File.join(aruba.config.root_directory, aruba.config.working_directory) raise "Aruba's working directory does not exist." \ - ' Maybe you forgot to run `setup_aruba` before using its API.' + " Maybe you forgot to run `setup_aruba` before using its API." end prefix = file_name[0] if aruba.config.fixtures_path_prefix == prefix rest = file_name[2..-1] path = File.join(*[aruba.fixtures_directory, rest].compact) unless Aruba.platform.exist? path aruba_fixture_candidates = aruba.config.fixtures_directories - .map { |p| format('"%s"', p) }.join(', ') + .map { |p| format('"%s"', p) }.join(", ") raise ArgumentError, "Fixture \"#{rest}\" does not exist" \ " in fixtures directory \"#{aruba.fixtures_directory}\"." \ - ' This was the one we found first on your system from all possible' \ + " This was the one we found first on your system from all possible" \ " candidates: #{aruba_fixture_candidates}." end path - elsif prefix == '~' + elsif prefix == "~" path = with_environment do File.expand_path(file_name) end - raise ArgumentError, 'Expanding "~/" to "/" is not allowed' if path == '/' + raise ArgumentError, 'Expanding "~/" to "/" is not allowed' if path == "/" unless Aruba.platform.absolute_path? path raise ArgumentError, "Expanding \"~\" to a relative path \"#{path}\" is not allowed" end @@ -190,11 +190,11 @@ caller_location = caller_locations(1, 1).first caller_file_line = "#{caller_location.path}:#{caller_location.lineno}" aruba.logger.warn \ "Aruba's `expand_path` method was called with an absolute path" \ " at #{caller_file_line}, which is not recommended." \ - ' Change the call to pass a relative path or set '\ - '`config.allow_absolute_paths = true` to silence this warning' + " Change the call to pass a relative path or set "\ + "`config.allow_absolute_paths = true` to silence this warning" end file_name else with_environment do directory = File.expand_path(aruba.current_directory, aruba.root_directory)