aruba 1.0.0.pre.alpha.2 → 1.0.1

data/lib/aruba/platforms/unix_platform.rb

@@ -62,8 +62,8 @@ module Aruba
         DetermineFileSize.new.call(*args)
       end
 
-      def determine_disk_usage(*args)
-        DetermineDiskUsage.new.call(*args)
+      def determine_disk_usage(paths)
+        DetermineDiskUsage.new.call(paths)
       end
 
       def create_file(*args)
@@ -83,7 +83,7 @@ module Aruba
       end
 
       def detect_ruby(cmd)
-        if cmd =~ /^ruby\s/
+        if /^ruby\s/.match?(cmd)
           cmd.gsub(/^ruby\s/, "#{current_ruby} ")
         else
           cmd
@@ -98,14 +98,6 @@ module Aruba
         ::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
       end
 
-      # @deprecated
-      # Add newline at the end
-      def ensure_newline(str)
-        deprecated('The use of "#ensure_newline" is deprecated. It will be removed soon')
-
-        str.chomp << "\n"
-      end
-
       def require_matching_files(pattern, base)
         ::Dir.glob(::File.expand_path(pattern, base)).each { |f| require_relative f }
       end
@@ -121,7 +113,7 @@ module Aruba
       def rm(paths, options = {})
         paths = Array(paths).map { |p| ::File.expand_path(p) }
 
-        FileUtils.rm_r(paths, options)
+        FileUtils.rm_r(paths, **options)
       end
 
       # Get current working directory
@@ -140,22 +132,22 @@ module Aruba
 
       # Touch file, directory
       def touch(args, options)
-        FileUtils.touch(args, options)
+        FileUtils.touch(args, **options)
       end
 
       # Copy file/directory
-      def cp(args, options)
-        FileUtils.cp_r(args, options)
+      def cp(src, dest)
+        FileUtils.cp_r(src, dest)
       end
 
       # Move file/directory
-      def mv(args, options)
-        FileUtils.mv(args, options)
+      def mv(src, dest)
+        FileUtils.mv(src, dest)
       end
 
       # Change mode of file/directory
       def chmod(mode, args, options)
-        FileUtils.chmod_R(mode, args, options)
+        FileUtils.chmod_R(mode, args, **options)
       end
 
       # Exists and is file
@@ -195,7 +187,7 @@ module Aruba
 
       # Check if command is relative
       #
-      # @return [TrueClass, FalseClass]
+      # @return [Boolean]
       #   true
       #     * bin/command.sh
       #
@@ -203,13 +195,13 @@ module Aruba
       #     * /bin/command.sh
       #     * command.sh
       def relative_command?(path)
-        p = ArubaPath.new(path)
-        p.relative? && p.depth > 1
+        p = Pathname.new(path)
+        p.relative? && p.basename != p
       end
 
       # Check if command is relative
       #
-      # @return [TrueClass, FalseClass]
+      # @return [Boolean]
       #   true
       #     * command.sh
       #
@@ -226,23 +218,6 @@ module Aruba
         File.write(path, content)
       end
 
-      # Unescape string
-      #
-      # @param [String] string
-      #   The string which should be unescaped, e.g. the output of a command
-      #
-      # @return
-      #   The string stripped from escape sequences
-      def unescape(string, keep_ansi = true)
-        # rubocop:disable Metrics/LineLength
-        deprecated('The use of "Aruba.platform.unescape" is deprecated. Please use "#unescape_text" and "#sanitize_text" instead. But be aware it uses a different implementation')
-        # rubocop:enable Metrics/LineLength
-
-        string = string.gsub('\n', "\n").gsub('\"', '"').gsub('\e', "\e")
-        string = string.gsub(/\e\[\d+(?>(;\d+)*)m/, '') unless keep_ansi
-        string
-      end
-
       # Transform hash to a string table which can be output on stderr/stdout
       def simple_table(hash, opts = {})
         SimpleTable.new(hash, opts).to_s
@@ -261,6 +236,10 @@ module Aruba
       def which(program, path = ENV['PATH'])
         UnixWhich.new.call(program, path)
       end
+
+      def builtin_shell_commands
+        []
+      end
     end
   end
 end

data/lib/aruba/platforms/unix_which.rb

@@ -13,7 +13,7 @@ module Aruba
         end
 
         def call(program, path)
-          fail %(Invalid input program "#{program}" and/or path "#{path}".)
+          raise %(Invalid input program "#{program}" and/or path "#{path}".)
         end
       end
 
@@ -23,7 +23,7 @@ module Aruba
           Aruba.platform.absolute_path?(program) || Aruba.platform.relative_command?(program)
         end
 
-        def call(program, path)
+        def call(program, _path)
           return File.expand_path(program) if Aruba.platform.executable?(program)
 
           nil
@@ -72,6 +72,7 @@ module Aruba
       #   ENV['PATH']
       def call(program, path = ENV['PATH'])
         raise ArgumentError, "ENV['PATH'] cannot be empty" if path.nil? || path.empty?
+
         program = program.to_s
 
         whiches.find { |w| w.match? program }.new.call(program, path)

data/lib/aruba/platforms/windows_command_string.rb

@@ -1,5 +1,3 @@
-require 'delegate'
-
 # Aruba
 module Aruba
   # Platforms
@@ -9,15 +7,30 @@ module Aruba
     # This adds `cmd.exec` in front of commmand
     #
     # @private
-    class WindowsCommandString < SimpleDelegator
-      def initialize(cmd)
-        __setobj__ format('%s /c "%s"', Aruba.platform.which('cmd.exe'), cmd)
+    class WindowsCommandString
+      def initialize(command, *arguments)
+        @command = command
+        @arguments = arguments
       end
 
       # Convert to array
       def to_a
-        Shellwords.split( __getobj__.gsub('\\', 'ARUBA_TMP_PATHSEPARATOR') )
-                  .map { |w| w.gsub('ARUBA_TMP_PATHSEPARATOR', '\\') }
+        [cmd_path, '/c', [escaped_command, *escaped_arguments].join(' ')]
+      end
+
+      private
+
+      def escaped_arguments
+        @arguments.map { |arg| arg.gsub(/"/, '"""') }
+                  .map { |arg| / /.match?(arg) ? "\"#{arg}\"" : arg }
+      end
+
+      def escaped_command
+        @command.gsub(/ /, '""" """')
+      end
+
+      def cmd_path
+        Aruba.platform.which('cmd.exe')
       end
     end
   end

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -5,44 +5,42 @@ module Aruba
   # Platforms
   module Platforms
     # Windows is case-insensitive when it accesses its environment variables.
-    # That means that at the Windows command line:
     #
-    #  C:>set Path
-    #  C:>Path=.;.\bin;c:\rubys\ruby-2.1.6-p336\bin;
-    #  C:>set PATH
-    #  C:>Path=.;.\bin;c:\rubys\ruby-2.1.6-p336\bin;
+    # To work around this we turn all of the environment variable keys to
+    # upper-case so that aruba is ensured that accessing environment variables
+    # with upper-case keys will always work. See the following examples.
     #
-    # If you access environment variables through ENV, you can access values no
-    # matter the case of the key:
+    # @example Setting Windows environment variables using mixed case
+    #   C:>set Path
+    #   C:>Path=.;.\bin;c:\rubys\ruby-2.1.6-p336\bin;
+    #   C:>set PATH
+    #   C:>Path=.;.\bin;c:\rubys\ruby-2.1.6-p336\bin;
     #
-    #  irb: > ENV["Path"]
-    #  => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
-    #  irb: > ENV["Path"]
-    #  => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
+    # @example If you access environment variables through ENV, you can access
+    # values no matter the case of the key:
+    #     ENV["Path"] # => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
+    #     ENV["PATH"] # => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
     #
-    # But if you copy the ENV to a hash, Ruby treats the keys as case sensitive:
-    #
-    #  irb: > env_copy = ENV.to_hash
-    #  => {"ALLUSERSPROFILE"=>"C:\\ProgramData", "ANSICON"=>"119x1000 (119x58)", "ANSICON_DEF"=>"7",  APPDATA"=>"C:\\Users\\blorf\\AppData\\Roaming", ....}
-    #  irb: > env["Path"]
-    #  => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
-    #  irb: > env["PATH"]
-    #  => nil
-    #
-    # Thus we turn all of the environment variable keys to upper case so that
-    # aruba is ensured that accessing environment variables with upper case keys
-    # will always work.
+    # @example But if you copy the ENV to a hash, Ruby treats the keys as case sensitive:
+    #   env_copy = ENV.to_hash
+    #   # => {
+    #   "ALLUSERSPROFILE"=>
+    #     "C:\\ProgramData",
+    #     "ANSICON"=>"119x1000 (119x58)",
+    #     "ANSICON_DEF"=>"7",
+    #     APPDATA" => "C:\\Users\\blorf\\AppData\\Roaming", ....
+    #   }
+    #   env["Path"]
+    #   # => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
+    #   env["PATH"]
+    #   # => nil
     class WindowsEnvironmentVariables < UnixEnvironmentVariables
-      def initialize(env = ENV.to_hash)
-        @actions = []
-
-        @env = env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
+      def initialize(env = ENV)
+        super(upcase_env env)
       end
 
       def update(other_env, &block)
-        other_env = other_env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
-
-        super(other_env, &block)
+        super(upcase_env(other_env), &block)
       end
 
       def fetch(name, default = UnixEnvironmentVariables::UNDEFINED)
@@ -72,6 +70,20 @@ module Aruba
       def delete(name)
         super(name.upcase)
       end
+
+      def self.hash_from_env
+        upcase_env(ENV)
+      end
+
+      def self.upcase_env(env)
+        env.each_with_object({}) { |(k, v), a| a[k.to_s.upcase] = v }
+      end
+
+      private
+
+      def upcase_env(env)
+        self.class.upcase_env(env)
+      end
     end
   end
 end

data/lib/aruba/platforms/windows_platform.rb

@@ -37,6 +37,10 @@ module Aruba
       def which(program, path = ENV['PATH'])
         WindowsWhich.new.call(program, path)
       end
+
+      def builtin_shell_commands
+        %w(cd dir echo exit set type)
+      end
     end
   end
 end

data/lib/aruba/platforms/windows_which.rb

@@ -13,7 +13,7 @@ module Aruba
         end
 
         def call(program, path)
-          fail %(Invalid input program "#{program}" and/or path "#{path}".)
+          raise %(Invalid input program "#{program}" and/or path "#{path}".)
         end
       end
 
@@ -23,11 +23,12 @@ module Aruba
           Aruba.platform.absolute_path?(program) || Aruba.platform.relative_command?(program)
         end
 
-        def call(program, path)
+        def call(program, _path)
           # Expand `#path_exts`
           found = Dir[program].first
 
           return File.expand_path(found) if found && Aruba.platform.executable?(found)
+
           nil
         end
       end
@@ -48,7 +49,7 @@ module Aruba
             file = File.join(dir, program)
             # Dir[] doesn't handle backslashes properly, so convert them. Also, if
             # the program name doesn't have an extension, try them all.
-            file = file.tr("\\", "/")
+            file = file.tr('\\', '/')
 
             found = Dir[file].first
 
@@ -95,7 +96,11 @@ module Aruba
       private
 
       def windows_executable_extentions
-        ENV['PATHEXT'] ? format('.{%s}', ENV['PATHEXT'].tr(';', ',').tr('.','')).downcase : '.{exe,com,bat}'
+        if ENV['PATHEXT']
+          format('.{%s}', ENV['PATHEXT'].tr(';', ',').tr('.', '')).downcase
+        else
+          '.{exe,com,bat}'
+        end
       end
     end
   end

data/lib/aruba/processes/basic_process.rb

@@ -11,9 +11,12 @@ module Aruba
     #
     # @private
     class BasicProcess
-      attr_reader :exit_status, :environment, :working_directory, :main_class, :io_wait_timeout, :exit_timeout, :startup_wait_time
+      attr_reader :exit_status, :environment, :working_directory, :main_class,
+                  :io_wait_timeout, :exit_timeout, :startup_wait_time, :stop_signal
 
-      def initialize(cmd, exit_timeout, io_wait_timeout, working_directory, environment = ENV.to_hash.dup, main_class = nil, stop_signal = nil, startup_wait_time = 0)
+      def initialize(cmd, exit_timeout, io_wait_timeout, working_directory,
+                     environment = Aruba.platform.environment_variables.hash_from_env,
+                     main_class = nil, stop_signal = nil, startup_wait_time = 0)
         @cmd               = cmd
         @working_directory = working_directory
         @environment       = environment
@@ -36,7 +39,7 @@ module Aruba
 
       # Output pid of process
       def pid
-        'No implemented'
+        raise NotImplementedError
       end
 
       # Output stderr and stdout
@@ -45,39 +48,39 @@ module Aruba
       end
 
       def write(*)
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def stdin(*)
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def stdout(*)
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def stderr(*)
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def close_io(*)
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def send_signal(*)
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def filesystem_status
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def content
-        NotImplementedError
+        raise NotImplementedError
       end
 
       def wait
-        NotImplementedError
+        raise NotImplementedError
       end
 
       # Restart a command
@@ -101,14 +104,6 @@ module Aruba
         @timed_out == true
       end
 
-      # @deprecated
-      # @private
-      def run!
-        Aruba.platform.deprecated('The use of "command#run!" is deprecated. You can simply use "command#start" instead.')
-
-        start
-      end
-
       # Hook which is run before command is run
       def before_run; end
 
@@ -116,19 +111,15 @@ module Aruba
       def after_run; end
 
       def inspect
-        # rubocop:disable Style/UnneededInterpolation
-        out = truncate("#{stdout(:wait_for_io => 0).inspect}", 35)
-        err = truncate("#{stderr(:wait_for_io => 0).inspect}", 35)
-        # rubocop:enable Style/UnneededInterpolation
+        out = truncate(stdout(wait_for_io: 0).inspect, 35)
+        err = truncate(stderr(wait_for_io: 0).inspect, 35)
 
         fmt = '#<%s:%s commandline="%s": stdout=%s stderr=%s>'
-        format fmt, self.class, self.object_id, commandline, out, err
+        format fmt, self.class, object_id, commandline, out, err
       end
 
       alias to_s inspect
 
-      private
-
       def command
         Shellwords.split(commandline).first
       end
@@ -139,8 +130,11 @@ module Aruba
         []
       end
 
+      private
+
       def truncate(string, max_length)
         return string if string.length <= max_length
+
         string[0, max_length - 1] + ' ...'
       end
     end