aruba 1.0.0.pre.alpha.2 → 1.0.0.pre.alpha.3

data/lib/aruba/platforms/aruba_file_creator.rb

@@ -15,7 +15,7 @@ module Aruba
       # @param [Object] content
       #   The content of the file
       #
-      # @param [TrueClass, FalseClass] check_presence (false)
+      # @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)

data/lib/aruba/platforms/aruba_fixed_size_file_creator.rb

@@ -19,14 +19,14 @@ module Aruba
       # @param [Numeric] size
       #   The size of the file
       #
-      # @param [TrueClass, FalseClass] check_presence (false)
+      # @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)
 
         Aruba.platform.mkdir(File.dirname(path))
 
-        File.open(path, "wb"){ |f| f.seek(size - 1); f.write("\0") }
+        File.open(path, 'wb') { |f| f.seek(size - 1); f.write("\0") }
 
         self
       end

data/lib/aruba/platforms/aruba_logger.rb

@@ -10,12 +10,32 @@ module Aruba
 
     # Create logger
     #
-    # @param [Logger] logger (::Logger.new( $stderr ))
-    #   The logger with should be used to output data
+    # @param [Hash] opts
+    #   Options
+    #
+    # @option opts [Symbol] :default_mode Log level
     def initialize(opts = {})
       @mode = opts.fetch(:default_mode, :info)
     end
 
+    # @!method fatal(msg)
+    # Log a fatal level log message
+
+    # @!method warn(msg)
+    # Log a warn level log message
+
+    # @!method debug(msg)
+    # Log a debug level log message
+
+    # @!method info(msg)
+    # Log an info level log message
+
+    # @!method error(msg)
+    # Log an error level log message
+
+    # @!method unknown(msg)
+    # Log an unknown level log message
+
     [:fatal, :warn, :debug, :info, :error, :unknown].each do |m|
       define_method m do |msg|
         logger.public_send m, msg

data/lib/aruba/platforms/command_monitor.rb

@@ -40,23 +40,11 @@ module Aruba
 
       @last_command_stopped = DefaultLastCommandStopped.new
       @last_command_started = DefaultLastCommandStarted.new
-
     rescue KeyError => e
       raise ArgumentError, e.message
     end
 
-    if Aruba::VERSION < '1'
-      # Return the last command stopped
-      def last_command_stopped
-        return @last_command_stopped unless @last_command_stopped.nil?
-
-        registered_commands.each(&:stop)
-
-        @last_command_stopped
-      end
-    else
-      attr_reader :last_command_stopped
-    end
+    attr_reader :last_command_stopped
 
     # Set last command started
     #
@@ -66,7 +54,7 @@ module Aruba
       @last_command_started = find(cmd)
     end
 
-    # Set last command started
+    # Set last command stopped
     #
     # @param [String] cmd
     #   The commandline of the command
@@ -95,117 +83,6 @@ module Aruba
       self
     end
 
-    # @deprecated
-    # Fetch output (stdout, stderr) from command
-    #
-    # @param [String] cmd
-    #   The command
-    def output_from(cmd)
-      cmd = Aruba.platform.detect_ruby(cmd)
-      find(cmd).output
-    end
-
-    # @deprecated
-    # Fetch stdout from command
-    #
-    # @param [String] cmd
-    #   The command
-    def stdout_from(cmd)
-      cmd = Aruba.platform.detect_ruby(cmd)
-      find(cmd).stdout
-    end
-
-    # @deprecated
-    # Fetch stderr from command
-    #
-    # @param [String] cmd
-    #   The command
-    def stderr_from(cmd)
-      cmd = Aruba.platform.detect_ruby(cmd)
-      find(cmd).stderr
-    end
-
-    # @deprecated
-    # 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("".dup) { |e, a| a << e.stdout }
-    end
-
-    # @deprecated
-    # 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("".dup) { |e, a| a << e.stderr }
-    end
-
-    # @deprecated
-    # 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
-
-    # @deprecated
-    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
-      registered_commands.each(&:stop)
-      @last_exit_status
-    end
-
-    # @deprecated
-    def stop_process(process)
-      @last_command_stopped = process
-      @last_exit_status     = process.stop(announcer)
-    end
-
-    # @deprecated
-    def terminate_process!(process)
-      process.terminate
-    end
-
-    # @deprecated
-    def stop_processes!
-      Aruba.platform.deprecated('The use of "#stop_processes!" is deprecated.')
-
-      registered_commands.each(&:stop)
-    end
-
-    # @deprecated
-    # Terminate all running processes
-    def terminate_processes
-      Aruba.platform.deprecated('The use of "#terminate_processes" is deprecated.')
-
-      registered_commands.each(&:terminate)
-    end
-
-    # @deprecated
-    def only_processes
-      Aruba.platform.deprecated('The use of "#only_processes" is deprecated.')
-
-      registered_commands
-    end
-
-    # @deprecated
-    def get_process(wanted)
-      command = find(wanted)
-      raise ArgumentError.new("No process named '#{wanted}' has been started") unless command
-
-      command
-    end
-
     # Register command to monitor
     def register_command(cmd)
       registered_commands << cmd

data/lib/aruba/platforms/filesystem_status.rb

@@ -30,7 +30,7 @@ module Aruba
 
       # Return permissions
       def mode
-        format("%o", status.mode)[-4,4].gsub(/^0*/, '')
+        format('%o', status.mode)[-4, 4].gsub(/^0*/, '')
       end
 
       # Return owner
@@ -49,14 +49,14 @@ module Aruba
       #   A hash of values
       def to_h
         {
-          :owner      => owner,
-          :group      => group,
-          :mode       => mode,
-          :executable => executable?,
-          :ctime      => ctime,
-          :atime      => atime,
-          :mtime      => mtime,
-          :size       => size
+          owner: owner,
+          group: group,
+          mode: mode,
+          executable: executable?,
+          ctime: ctime,
+          atime: atime,
+          mtime: mtime,
+          size: size
         }
       end
     end

data/lib/aruba/platforms/local_environment.rb

@@ -13,8 +13,8 @@ module Aruba
       #
       # @yield
       #   The block of code which should with local ENV
-      def call(env, &block)
-        old_env = ENV.to_hash.dup
+      def call(env)
+        old_env = Aruba.platform.environment_variables.hash_from_env
 
         ENV.clear
         ENV.update env

data/lib/aruba/platforms/simple_table.rb

@@ -17,7 +17,7 @@ module Aruba
       def initialize(hash, opts)
         @hash = hash
         @opts = {
-          :sort => true
+          sort: true
         }.merge opts
       end
 
@@ -34,11 +34,11 @@ module Aruba
         if RUBY_VERSION < '2'
           rows = []
 
-          hash.each do |k,v|
+          hash.each do |k, v|
             rows << format("# %-#{name_size}s => %s", k, v)
           end
         else
-          rows = hash.each_with_object([]) do |(k,v), a|
+          rows = hash.each_with_object([]) do |(k, v), a|
             a << format("# %-#{name_size}s => %s", k, v)
           end
         end

data/lib/aruba/platforms/unix_command_string.rb

@@ -6,14 +6,17 @@ module Aruba
   # Platforms
   module Platforms
     # This is a command which should be run
-    class UnixCommandString < SimpleDelegator
-      def initialize(cmd)
-        __setobj__ cmd
+    #
+    # @private
+    class UnixCommandString
+      def initialize(command, *arguments)
+        @command = command
+        @arguments = arguments
       end
 
       # Convert to array
       def to_a
-        Shellwords.split __getobj__
+        [@command, *@arguments]
       end
     end
   end

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -73,7 +73,7 @@ module Aruba
       def update(other_env)
         actions << UpdateAction.new(other_env)
 
-        UnixEnvironmentVariables.new(to_h)
+        self
       end
 
       # Fetch variable from environment
@@ -133,7 +133,7 @@ module Aruba
         name  = name.to_s
         value = self[name].to_s + value.to_s
 
-        actions << UpdateAction.new(name => value )
+        actions << UpdateAction.new(name => value)
 
         value
       end
@@ -184,11 +184,7 @@ module Aruba
       # @return [Hash]
       #   A new hash from environment
       def to_h
-        if RUBY_VERSION < '2.0'
-          Marshal.load(Marshal.dump(prepared_environment.to_hash))
-        else
-          Marshal.load(Marshal.dump(prepared_environment.to_h))
-        end
+        actions.inject(hash_from_env.merge(env)) { |a, e| e.call(a) }
       end
 
       # Reset environment
@@ -200,14 +196,14 @@ module Aruba
         value
       end
 
+      def self.hash_from_env
+        ENV.to_hash
+      end
+
       private
 
-      def prepared_environment
-        if RUBY_VERSION == '1.9.3'
-          actions.inject(ENV.to_hash.merge(env)) { |a, e| e.call(a) }
-        else
-          actions.each_with_object(ENV.to_hash.merge(env)) { |e, a| a = e.call(a) }
-        end
+      def hash_from_env
+        self.class.hash_from_env
       end
     end
   end

data/lib/aruba/platforms/unix_platform.rb

@@ -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
@@ -195,7 +187,7 @@ module Aruba
 
       # Check if command is relative
       #
-      # @return [TrueClass, FalseClass]
+      # @return [Boolean]
       #   true
       #     * bin/command.sh
       #
@@ -209,7 +201,7 @@ module Aruba
 
       # 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

data/lib/aruba/platforms/unix_which.rb

@@ -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| arg =~ / / ? "\"#{arg}\"" : arg }
+      end
+
+      def escaped_command
+        @command.gsub(/ /, '""" """')
+      end
+
+      def cmd_path
+        Aruba.platform.which('cmd.exe')
       end
     end
   end