aruba 0.9.0.pre → 0.9.0.pre2

data/lib/aruba/matchers/command/have_output_size.rb

@@ -0,0 +1,28 @@
+# @!method have_output_size(output)
+#   This matchers checks if output has size.
+#
+#   @param [String] output
+#     The content which should be checked
+#
+#   @return [TrueClass, FalseClass] The result
+#
+#     false:
+#     * if output does not have size
+#     true:
+#     * if output has size
+#
+#   @example Use matcher
+#
+#     RSpec.describe do
+#       it { expect(file1).to have_output_size(256) }
+#     end
+RSpec::Matchers.define :have_output_size do |expected|
+  match do |actual|
+    next false unless actual.respond_to? :size
+
+    @actual = actual.size
+    values_match? expected, @actual
+  end
+
+  description { "output has size #{description_of expected}" }
+end

data/lib/aruba/matchers/directory/be_an_existing_directory.rb

@@ -17,7 +17,7 @@ require 'rspec/expectations/version'
 #     end
 RSpec::Matchers.define :be_an_existing_directory do |_|
   match do |actual|
-    stop_processes!
+    stop_all_commands
 
     next false unless actual.is_a? String
 

data/lib/aruba/matchers/file/be_an_existing_file.rb

@@ -17,7 +17,7 @@ require 'rspec/expectations/version'
 #     end
 RSpec::Matchers.define :be_an_existing_file do |_|
   match do |actual|
-    stop_processes!
+    stop_all_commands
 
     next false unless actual.is_a? String
 

data/lib/aruba/matchers/file/have_file_content.rb

@@ -40,7 +40,7 @@ require 'rspec/expectations/version'
 #     end
 RSpec::Matchers.define :have_file_content do |expected|
   match do |actual|
-    stop_processes!
+    stop_all_commands
 
     next false unless file? actual
 

data/lib/aruba/matchers/file/have_file_size.rb

@@ -22,12 +22,12 @@ require 'rspec/expectations/version'
 #     end
 RSpec::Matchers.define :have_file_size do |expected|
   match do |actual|
-    stop_processes!
+    stop_all_commands
 
     next false unless file?(actual)
 
     @old_actual = actual
-    @actual = File.size(expand_path(actual))
+    @actual = file_size(actual)
     @expected = expected.to_i
 
     values_match?(@expected, @actual)

data/lib/aruba/matchers/file/have_same_file_content.rb

@@ -24,7 +24,7 @@ require 'fileutils'
 #     end
 RSpec::Matchers.define :have_same_file_content_like do |expected|
   match do |actual|
-    stop_processes!
+    stop_all_commands
 
     next false unless file?(actual) && file?(expected)
 

data/lib/aruba/matchers/path/have_permissions.rb

@@ -34,7 +34,7 @@ RSpec::Matchers.define :have_permissions do |expected|
   end
 
   match do |actual|
-    stop_processes!
+    stop_all_commands
 
     @old_actual = actual
     @actual = permissions(expand_path(@old_actual))

data/lib/aruba/platforms/aruba_file_creator.rb

@@ -1,6 +1,5 @@
 module Aruba
-  # Create things to make aruba work
-  module Creators
+  module Platforms
     # Normal File Creator
     # This class is not meant to be used directly by users.
     class ArubaFileCreator
@@ -14,7 +13,7 @@ module Aruba
       #
       # @param [TrueClass, FalseClass] check_presence (false)
       #   Check if file exist
-      def write(path, content, check_presence = false)
+      def call(path, content, check_presence = false)
         fail "Expected #{path} to be present" if check_presence && !Aruba.platform.file?(path)
 
         Aruba.platform.mkdir(File.dirname(path))

data/lib/aruba/platforms/aruba_fixed_size_file_creator.rb

@@ -1,6 +1,5 @@
 module Aruba
-  # Create things to make aruba work
-  module Creators
+  module Platforms
     # Create files with fixed size
     #
     # This class is not meant to be used directly by users.
@@ -18,7 +17,7 @@ module Aruba
       #
       # @param [TrueClass, FalseClass] check_presence (false)
       #   Check if file exist
-      def write(path, size, check_presence)
+      def call(path, size, check_presence)
         fail "Expected #{path} to be present" if check_presence && !Aruba.platform.file?(path)
 
         Aruba.platform.mkdir(File.dirname(path))

data/lib/aruba/platforms/determine_disk_usage.rb

@@ -0,0 +1,23 @@
+require 'aruba/platforms/disk_usage_calculator'
+
+module Aruba
+  module Platforms
+    class DetermineDiskUsage
+      def call(*args)
+        args = args.flatten
+
+        physical_block_size = args.pop
+        paths = args
+
+        size = paths.flatten.map do |p|
+          DiskUsageCalculator.new.call(
+            p.blocks,
+            physical_block_size
+          )
+        end.inject(0, &:+)
+
+        FileSize.new(size)
+      end
+    end
+  end
+end

data/lib/aruba/platforms/determine_file_size.rb

@@ -0,0 +1,13 @@
+module Aruba
+  module Platforms
+    class DetermineFileSize
+      def call(path)
+        return -1 unless File.file? path
+
+        FileSize.new(
+          File.size(path)
+        )
+      end
+    end
+  end
+end

data/lib/aruba/platforms/disk_usage_calculator.rb

@@ -0,0 +1,11 @@
+require 'aruba/file_size'
+
+module Aruba
+  module Platforms
+    class DiskUsageCalculator
+      def call(blocks, block_size)
+        Aruba::FileSize.new(blocks * block_size)
+      end
+    end
+  end
+end

data/lib/aruba/platforms/local_environment.rb

@@ -0,0 +1,15 @@
+module Aruba
+  module Platforms
+    class LocalEnvironment
+      def call(env, &block)
+        old_env = ENV.to_hash.dup
+        ENV.update env
+
+        block.call if block_given?
+      ensure
+        ENV.clear
+        ENV.update old_env
+      end
+    end
+  end
+end

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -2,7 +2,7 @@ module Aruba
   module Platforms
     class UnixEnvironmentVariables
       # We need to use this, because `nil` is a valid value as default
-      UNDEFINED = Object.new
+      UNDEFINED = Object.new.freeze
 
       private
 

data/lib/aruba/platforms/unix_platform.rb

@@ -1,9 +1,16 @@
 require 'rbconfig'
 require 'pathname'
 
+require 'aruba/aruba_path'
+
 require 'aruba/platforms/simple_table'
 require 'aruba/platforms/unix_command_string'
 require 'aruba/platforms/unix_which'
+require 'aruba/platforms/determine_file_size'
+require 'aruba/platforms/determine_disk_usage'
+require 'aruba/platforms/aruba_file_creator'
+require 'aruba/platforms/aruba_fixed_size_file_creator'
+require 'aruba/platforms/local_environment'
 
 module Aruba
   # This abstracts OS-specific things
@@ -28,6 +35,26 @@ module Aruba
         UnixCommandString
       end
 
+      def determine_file_size(*args)
+        DetermineFileSize.new.call(*args)
+      end
+
+      def determine_disk_usage(*args)
+        DetermineDiskUsage.new.call(*args)
+      end
+
+      def create_file(*args)
+        ArubaFileCreator.new.call(*args)
+      end
+
+      def create_fixed_size_file(*args)
+        ArubaFixedSizeFileCreator.new.call(*args)
+      end
+
+      def with_environment(env = {}, &block)
+        LocalEnvironment.new.call(env, &block)
+      end
+
       def detect_ruby(cmd)
         if cmd =~ /^ruby\s/
           cmd.gsub(/^ruby\s/, "#{current_ruby} ")
@@ -83,19 +110,8 @@ module Aruba
       def chdir(dir_name, &block)
         dir_name = ::File.expand_path(dir_name.to_s)
 
-        begin
-          if RUBY_VERSION <= '1.9.3'
-            old_env = ENV.to_hash.dup
-          else
-            old_env = ENV.to_h.dup
-          end
-
-          ENV['OLDPWD'] = getwd
-          ENV['PWD'] = dir_name
+        with_environment 'OLDPWD' => getwd, 'PWD' => dir_name do
           ::Dir.chdir(dir_name, &block)
-        ensure
-          ENV.clear
-          ENV.update old_env
         end
       end
 
@@ -109,6 +125,11 @@ module Aruba
         FileUtils.cp_r(args, options)
       end
 
+      # Move file/directory
+      def mv(args, options)
+        FileUtils.mv(args, options)
+      end
+
       # Change mode of file/directory
       def chmod(mode, args, options)
         FileUtils.chmod_R(mode, args, options)
@@ -159,8 +180,8 @@ module Aruba
       #     * /bin/command.sh
       #     * command.sh
       def relative_command?(path)
-        p = Pathname.new(path)
-        p.relative? && p.basename != p
+        p = ArubaPath.new(path)
+        p.relative? && p.depth > 1
       end
 
       # Check if command is relative

data/lib/aruba/process_monitor.rb

@@ -12,13 +12,28 @@ module Aruba
     end
 
     def last_exit_status
+      Aruba.platform.deprecated('The use of "#last_exit_status" is deprecated. Use "last_command_(started|stopped).exit_status" instead')
+
       return @last_exit_status if @last_exit_status
-      stop_processes!
+      all_commands.each { |c| stop_process(c) }
       @last_exit_status
     end
 
+    def last_command_stopped
+      return @last_command_stopped if @last_command_stopped
+
+      all_commands.each { |c| stop_process(c) }
+
+      @last_command_stopped
+    end
+
+    def last_command_started
+      processes.last[1]
+    end
+
     def stop_process(process)
-      @last_exit_status = process.stop(announcer)
+      @last_command_stopped = process
+      @last_exit_status     = process.stop(announcer)
     end
 
     def terminate_process!(process)
@@ -26,13 +41,19 @@ module Aruba
     end
 
     def stop_processes!
-      processes.each do |_, process|
-        @last_exit_status = stop_process(process)
-      end
+      Aruba.platform.deprecated('The use of "#stop_processes!" is deprecated. Use "#stop_all_commands" instead')
+
+      stop_all_commands
+    end
+
+    def stop_all_commands
+      all_commands.each { |c| c.stop(announcer) }
     end
 
     # Terminate all running processes
     def terminate_processes
+      Aruba.platform.deprecated('The use of "#terminate_processes" is deprecated. Use "#all_commands.each(&:terminate)" instead')
+
       processes.each do |_, process|
         terminate_process(process)
         stop_process(process)
@@ -52,6 +73,8 @@ module Aruba
     end
 
     def only_processes
+      Aruba.platform.deprecated('The use of "#only_processes" is deprecated. Use "#all_commands" instead')
+
       processes.collect{ |_, process| process }
     end
 
@@ -87,7 +110,11 @@ module Aruba
     # @return [String]
     #   The stdout of all process which have run before
     def all_stdout
-      stop_processes!
+      # rubocop:disable Metrics/LineLength
+      Aruba.platform.deprecated('The use of "#all_stdout" is deprecated. Use `all_commands.map { |c| c.stdout }.join("\n") instead. If you need to check for some output use "expect(all_commands).to have_output_on_stdout /output/" instead')
+      # rubocop:enable Metrics/LineLength
+
+      stop_all_commands
 
       if RUBY_VERSION < '1.9'
         out = ''
@@ -104,7 +131,11 @@ module Aruba
     # @return [String]
     #   The stderr of all process which have run before
     def all_stderr
-      stop_processes!
+      # rubocop:disable Metrics/LineLength
+      Aruba.platform.deprecated('The use of "#all_stderr" is deprecated. Use `all_commands.map { |c| c.stderr }.join("\n") instead. If you need to check for some output use "expect(all_commands).to have_output_on_stderr /output/" instead')
+      # rubocop:enable Metrics/LineLength
+
+      stop_all_commands
 
       if RUBY_VERSION < '1.9'
         out = ''
@@ -121,11 +152,26 @@ module Aruba
     # @return [String]
     #   The stderr and stdout of all process which have run before
     def all_output
+      # rubocop:disable Metrics/LineLength
+      Aruba.platform.deprecated('The use of "#all_output" is deprecated. Use `all_commands.map { |c| c.output }.join("\n") instead. If you need to check for some output use "expect(all_commands).to have_output /output/" instead')
+      # rubocop:enable Metrics/LineLength
+
       all_stdout << all_stderr
     end
 
+    # Return all commands
+    #
+    # @return [Array]
+    #   A list of all commands
+    def all_commands
+      processes.collect { |_, process| process }
+    end
+
+    # Clear list of processes
     def clear
       processes.clear
+
+      self
     end
   end
 end

data/lib/aruba/processes/basic_process.rb

@@ -12,6 +12,9 @@ module Aruba
         @environment       = environment
         @main_class        = main_class
         @exit_status       = nil
+
+        @exit_timeout = exit_timeout
+        @io_wait      = io_wait
       end
 
       # Return command line
@@ -20,8 +23,8 @@ module Aruba
       end
 
       # Output stderr and stdout
-      def output
-        stdout + stderr
+      def output(opts = {})
+        stdout(opts) + stderr(opts)
       end
 
       def write(*)
@@ -54,17 +57,34 @@ 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
 
       # Hook which is run after command is run
       def after_run; end
 
-      private
+      def inspect
+        out = stdout(:wait_for_io => 0) + stderr(:wait_for_io => 0)
+
+        out = if out.length > 76
+                out[0, 75] + ' ...'
+              else
+                out
+              end
 
-      def which(program)
-        Aruba.platform.which(program, environment['PATH'])
+        format '#<%s:%s commandline="%s": output="%s">', self.class, self.object_id, commandline, out
       end
+      alias_method :to_s, :inspect
+
+      private
 
       def command
         Shellwords.split(commandline).first