aruba 1.0.0.pre.alpha.4 → 1.0.3

data/lib/aruba/platforms/aruba_file_creator.rb

@@ -18,7 +18,9 @@ module Aruba
       # @param [Boolean] check_presence (false)
       #   Check if file exist
       def call(path, content, check_presence = false)
-        fail "Expected #{path} to be present" if check_presence && !Aruba.platform.file?(path)
+        if check_presence && !Aruba.platform.file?(path)
+          raise "Expected #{path} to be present"
+        end
 
         Aruba.platform.mkdir(File.dirname(path))
 

data/lib/aruba/platforms/aruba_fixed_size_file_creator.rb

@@ -22,11 +22,16 @@ module Aruba
       # @param [Boolean] check_presence (false)
       #   Check if file exist
       def call(path, size, check_presence)
-        fail "Expected #{path} to be present" if check_presence && !Aruba.platform.file?(path)
+        if check_presence && !Aruba.platform.file?(path)
+          raise "Expected #{path} to be present"
+        end
 
         Aruba.platform.mkdir(File.dirname(path))
 
-        File.open(path, 'wb') { |f| f.seek(size - 1); f.write("\0") }
+        File.open(path, 'wb') do |f|
+          f.seek(size - 1)
+          f.write("\0")
+        end
 
         self
       end

data/lib/aruba/platforms/command_monitor.rb

@@ -12,7 +12,7 @@ module Aruba
 
     public
 
-    attr_reader :registered_commands, :last_command_started
+    attr_reader :registered_commands, :last_command_started, :last_command_stopped
 
     class DefaultLastCommandStopped
       def nil?
@@ -20,7 +20,11 @@ module Aruba
       end
 
       def method_missing(*)
-        fail NoCommandHasBeenStoppedError, 'No last command stopped available'
+        raise NoCommandHasBeenStoppedError, 'No last command stopped available'
+      end
+
+      def respond_to_missing?(*)
+        true
       end
     end
 
@@ -30,7 +34,11 @@ module Aruba
       end
 
       def method_missing(*)
-        fail NoCommandHasBeenStartedError, 'No last command started available'
+        raise NoCommandHasBeenStartedError, 'No last command started available'
+      end
+
+      def respond_to_missing?(*)
+        true
       end
     end
 
@@ -44,8 +52,6 @@ module Aruba
       raise ArgumentError, e.message
     end
 
-    attr_reader :last_command_stopped
-
     # Set last command started
     #
     # @param [String] cmd
@@ -70,7 +76,7 @@ module Aruba
       cmd = cmd.commandline if cmd.respond_to? :commandline
       command = registered_commands.reverse.find { |c| c.commandline == cmd }
 
-      fail CommandNotFoundError, "No command named '#{cmd}' has been started" if command.nil?
+      raise CommandNotFoundError, "No command named '#{cmd}' has been started" if command.nil?
 
       command
     end
@@ -83,6 +89,34 @@ module Aruba
       self
     end
 
+    # Get stdout of all commands
+    #
+    # @return [String]
+    #   The stdout of all command which have run before
+    def all_stdout
+      registered_commands.each(&:stop)
+
+      registered_commands.each_with_object('') { |e, a| a << e.stdout }
+    end
+
+    # Get stderr of all commands
+    #
+    # @return [String]
+    #   The stderr of all command which have run before
+    def all_stderr
+      registered_commands.each(&:stop)
+
+      registered_commands.each_with_object('') { |e, a| a << e.stderr }
+    end
+
+    # Get stderr and stdout of all commands
+    #
+    # @return [String]
+    #   The stderr and stdout of all command which have run before
+    def all_output
+      all_stdout << all_stderr
+    end
+
     # Register command to monitor
     def register_command(cmd)
       registered_commands << cmd

data/lib/aruba/platforms/determine_disk_usage.rb

@@ -1,33 +1,70 @@
-require 'aruba/platforms/disk_usage_calculator'
+require 'aruba/file_size'
 
-# Aruba
 module Aruba
-  # Platforms
   module Platforms
     # Determinate disk usage
     #
     # @private
     class DetermineDiskUsage
-      def call(*args)
-        args = args.flatten
-
-        deprecated_block_size = args.pop
-        paths = args
-
-        size = paths.flatten.map do |p|
-          # TODO: replace the `call` methods signature so that you can use just
-          # p.minimum_disk_space_used
-          #
-          # (Same result, since the values are multiplied, so
-          # deprecated_block_size is canceled out
-          DiskUsageCalculator.new.call(
-            (p.minimum_disk_space_used / deprecated_block_size),
-            deprecated_block_size
-          )
+      def call(paths)
+        size = paths.flatten.map do |path|
+          minimum_disk_space_used path
         end.inject(0, &:+)
 
         FileSize.new(size)
       end
+
+      private
+
+      # TODO: Aruba.config.physical_block_size could be allowed to be nil
+      # (So the unit size can be autodetected)
+
+      # Report minimum disk space used
+      #
+      # This estimates the minimum bytes allocated by the path.
+      #
+      # E.g. a 1-byte text file on a typical EXT-3 filesystem takes up 4096 bytes
+      # (could be more if it was truncated or less for sparse files).
+      #
+      # Both `File::Stat` and the `stat()` system call will report 8 `blocks`
+      # (each "usually" represents 512 bytes). So 8 * 512 is exactly 4096 bytes.
+      #
+      # (The "magic" 512 bye implied makes the value of "blocks" so confusing).
+      #
+      # Currently Aruba allows you to set what's called the `physical_block_size`,
+      # which is a bit misleading - it's the "512" value. So if you somehow have a
+      # "filesystem unit size" of 8192 (instead of a typical 4KB), set the
+      # `physical_block_size` to 1024 (yes, divide by 8: 8192/8 = 1024).
+      #
+      # Ideally, Aruba should provide e.g. `Aruba.config.fs_allocation_unit`
+      # (with 4096 as the default), so you wouldn't have to "divide by 8".
+      #
+      # (typical_fs_unit / typical_dev_bsize = 4096 / 512 = 8)
+      #
+      #
+      # @return [Integer]
+      #   Total bytes allocate
+      #
+      # TODO: this is recommended over the above "blocks"
+      def minimum_disk_space_used(path)
+        # TODO: replace Aruba.config.physical_block_size
+        # with something like Aruba.config.fs_allocation_unit
+        dev_bsize = Aruba.config.physical_block_size
+
+        stat = File::Stat.new(path.to_s)
+
+        blocks = stat.blocks
+        return (blocks * dev_bsize) if blocks
+
+        typical_fs_unit = 4096
+        typical_dev_bsize = 512 # google dev_bsize for more info
+
+        block_multiplier = typical_fs_unit / typical_dev_bsize
+        fs_unit_size = dev_bsize * block_multiplier
+        fs_units = (stat.size + fs_unit_size - 1) / fs_unit_size
+        fs_units = 1 if fs_units.zero?
+        fs_units * fs_unit_size
+      end
     end
   end
 end

data/lib/aruba/platforms/simple_table.rb

@@ -31,16 +31,8 @@ module Aruba
 
         name_size = longest_key.length
 
-        if RUBY_VERSION < '2'
-          rows = []
-
-          hash.each do |k, v|
-            rows << format("# %-#{name_size}s => %s", k, v)
-          end
-        else
-          rows = hash.each_with_object([]) do |(k, v), a|
-            a << format("# %-#{name_size}s => %s", k, v)
-          end
+        rows = hash.map do |k, v|
+          format("# %-#{name_size}s => %s", k, v)
         end
 
         if opts[:sort] == true

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -9,15 +9,9 @@ module Aruba
         attr_reader :other_env, :block
 
         def initialize(other_env, &block)
-          @other_env = other_env
+          @other_env = other_env.to_h.transform_values(&:to_s)
 
-          to_hash = RUBY_VERSION >= '2' ? :to_h : :to_hash
-
-          @other_env = @other_env.public_send(to_hash).each_with_object({}) { |(k, v), a| a[k] = v.to_s }
-
-          @block = if block_given?
-                     block
-                   end
+          @block = (block if block_given?)
         end
 
         def call(env)
@@ -56,11 +50,7 @@ module Aruba
       def initialize(env = ENV)
         @actions = []
 
-        @env = if RUBY_VERSION < '2.0'
-                 env.to_hash
-               else
-                 env.to_h
-               end
+        @env = env.to_h
       end
 
       # Update environment with other en
@@ -196,6 +186,13 @@ module Aruba
         value
       end
 
+      def nest
+        old_actions = @actions.dup
+        yield(self)
+      ensure
+        @actions = old_actions
+      end
+
       def self.hash_from_env
         ENV.to_hash
       end

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
@@ -113,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
@@ -132,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,8 +195,8 @@ 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
@@ -236,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
 

data/lib/aruba/platforms/windows_command_string.rb

@@ -21,8 +21,8 @@ module Aruba
       private
 
       def escaped_arguments
-        @arguments.map { |arg| arg.gsub(/"/, '"""') }.
-          map { |arg| arg =~ / / ? "\"#{arg}\"" : arg }
+        @arguments.map { |arg| arg.gsub(/"/, '"""') }
+                  .map { |arg| / /.match?(arg) ? "\"#{arg}\"" : arg }
       end
 
       def escaped_command

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -16,13 +16,20 @@ module Aruba
     #   C:>set PATH
     #   C:>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:
+    # @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;"
     #
     # @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", ....}
+    #   # => {
+    #   "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"]

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
 
@@ -96,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

@@ -12,7 +12,7 @@ module Aruba
     # @private
     class BasicProcess
       attr_reader :exit_status, :environment, :working_directory, :main_class,
-        :io_wait_timeout, :exit_timeout, :startup_wait_time, :stop_signal
+                  :io_wait_timeout, :exit_timeout, :startup_wait_time, :stop_signal
 
       def initialize(cmd, exit_timeout, io_wait_timeout, working_directory,
                      environment = Aruba.platform.environment_variables.hash_from_env,
@@ -39,7 +39,7 @@ module Aruba
 
       # Output pid of process
       def pid
-        'No implemented'
+        raise NotImplementedError
       end
 
       # Output stderr and stdout
@@ -48,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
@@ -111,10 +111,8 @@ 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, object_id, commandline, out, err
@@ -137,7 +135,7 @@ module Aruba
       def truncate(string, max_length)
         return string if string.length <= max_length
 
-        string[0, max_length - 1] + ' ...'
+        "#{string[0, max_length - 1]} ..."
       end
     end
   end