aruba 0.14.14 → 1.0.0.pre.alpha.1

data/lib/aruba/generators/script_file.rb

@@ -16,7 +16,7 @@ module Aruba
 
     def call
       Aruba.platform.write_file(path, "#{header}#{content}")
-      Aruba.platform.chmod(0o755, path, {})
+      Aruba.platform.chmod(0755, path, {})
     end
 
     private

data/lib/aruba/in_process.rb

@@ -1,8 +1,6 @@
 require 'aruba/processes/in_process'
 require 'aruba/platform'
 
-Aruba.platform.deprecated('The use of "Aruba::InProcess" is deprecated. Use "Aruba::Processes::InProcess" instead.')
-
 # Aruba
 module Aruba
   # @deprecated

data/lib/aruba/initializer.rb

@@ -83,13 +83,8 @@ module Aruba
         send creator, file, <<-EOS
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-if RUBY_VERSION < '1.9.3'
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-else
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
-end
+::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
 EOS
       end
 
@@ -154,13 +149,8 @@ module Aruba
         send creator, file, <<-EOS
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-if RUBY_VERSION < '1.9.3'
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-else
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
-end
+::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
 EOS
       end
 

data/lib/aruba/matchers/base/object_formatter.rb

@@ -64,11 +64,6 @@ module Aruba
         def self.format_time(time)
           time.strftime("#{TIME_FORMAT}.#{format('%09d', time.nsec)} %z")
         end
-      else # for 1.8.7
-        # @private
-        def self.format_time(time)
-          time.strftime("#{TIME_FORMAT}.#{format('%06d', time.usec)} %z")
-        end
       end
 
       DATE_TIME_FORMAT = "%a, %d %b %Y %H:%M:%S.%N %z".freeze

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

@@ -2,7 +2,7 @@ require 'rspec/expectations/version'
 
 require 'fileutils'
 
-# @!method have_same_file_content_as(file_name)
+# @!method have_same_file_content_like(file_name)
 #   This matchers checks if <file1> has the same content like <file2>
 #
 #   @param [String] file_name
@@ -19,10 +19,10 @@ require 'fileutils'
 #   @example Use matcher
 #
 #     RSpec.describe do
-#       it { expect(file1).to have_same_file_content_as(file2) }
-#       it { expect(files).to include a_file_with_same_content_as(file2) }
+#       it { expect(file1).to have_same_file_content_like(file2) }
+#       it { expect(files).to include a_file_with_same_content_like(file2) }
 #     end
-RSpec::Matchers.define :have_same_file_content_as do |expected|
+RSpec::Matchers.define :have_same_file_content_like do |expected|
   match do |actual|
     stop_all_commands
 
@@ -44,5 +44,5 @@ RSpec::Matchers.define :have_same_file_content_as do |expected|
 end
 
 if RSpec::Expectations::Version::STRING >= '3.0'
-  RSpec::Matchers.alias_matcher :a_file_with_same_content_as, :have_same_file_content_as
+  RSpec::Matchers.alias_matcher :a_file_with_same_content_like, :have_same_file_content_like
 end

data/lib/aruba/matchers/string/output_string_eq.rb

@@ -15,7 +15,7 @@
 #
 #     RSpec.describe do
 #       it { expect(last_command_started).to have_output output_string_eq string) }
-#       it { expect(last_command_started).to have_output an_output_string_being_eq string) }
+#       it { expect(last_command_started).to have_output an_output_string_begin_eq string) }
 #     end
 RSpec::Matchers.define :output_string_eq do |expected|
   match do |actual|

data/lib/aruba/platforms/announcer.rb

@@ -1,7 +1,7 @@
 require 'shellwords'
 require 'aruba/colorizer'
 
-Aruba::Colorizer.coloring = false if !STDOUT.tty? && !ENV.key?("AUTOTEST")
+Aruba::AnsiColor.coloring = false if !STDOUT.tty? && !ENV.key?("AUTOTEST")
 
 # Aruba
 module Aruba
@@ -88,9 +88,9 @@ module Aruba
         output_format :stop_signal, proc { |p, s| format('Command will be stopped with `kill -%s %s`', s, p) }
         output_format :timeout, '# %s-timeout: %s seconds'
         output_format :wait_time, '# %s: %s seconds'
-        output_format :command_filesystem_status, proc { |status|
-          format("<<-COMMAND FILESYSTEM STATUS\n%s\nCOMMAND FILESYSTEM STATUS",
-                 Aruba.platform.simple_table(status.to_h, :sort => false)) }
+        # rubocop:disable Metrics/LineLength
+        output_format :command_filesystem_status, proc { |status| format("<<-COMMAND FILESYSTEM STATUS\n%s\nCOMMAND FILESYSTEM STATUS", Aruba.platform.simple_table(status.to_h, :sort => false)) }
+        # rubocop:enable Metrics/LineLength
 
         # rubocop:disable Metrics/LineLength
         if @options[:stdout]
@@ -184,18 +184,13 @@ module Aruba
 
         return unless activated?(channel)
 
-        begin
-          if block_given?
-            value = yield
-            args << value
-          end
-
-          message = the_output_format.call(*args)
-          message += "\n"
-          message = colorizer.cyan(message)
-        rescue NotImplementedError => e
-          message = "Error fetching announced value for #{channel}: #{e.message}"
-        end
+        message = if block_given?
+                    the_output_format.call(yield)
+                  else
+                    the_output_format.call(*args)
+                  end
+        message += "\n"
+        message = colorizer.cyan(message)
 
         announcer.announce(message)
 

data/lib/aruba/platforms/aruba_file_creator.rb

@@ -22,11 +22,7 @@ module Aruba
 
         Aruba.platform.mkdir(File.dirname(path))
 
-        if RUBY_VERSION < '1.9.3'
-          File.open(path, 'w') { |f| f << content }
-        else
-          File.write(path, content)
-        end
+        File.write(path, content)
 
         self
       end

data/lib/aruba/platforms/aruba_logger.rb

@@ -18,11 +18,7 @@ module Aruba
 
     [:fatal, :warn, :debug, :info, :error, :unknown].each do |m|
       define_method m do |msg|
-        if RUBY_VERSION < '1.9'
-          logger.send m, msg
-        else
-          logger.public_send m, msg
-        end
+        logger.public_send m, msg
       end
     end
 

data/lib/aruba/platforms/command_monitor.rb

@@ -34,6 +34,7 @@ module Aruba
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def initialize(opts = {})
       @registered_commands = []
       @announcer = opts.fetch(:announcer)
@@ -66,7 +67,7 @@ module Aruba
       @last_command_started = find(cmd)
     end
 
-    # Set last command stopped
+    # Set last command started
     #
     # @param [String] cmd
     #   The commandline of the command
@@ -101,7 +102,7 @@ module Aruba
     # @param [String] cmd
     #   The command
     def output_from(cmd)
-      cmd = Utils.detect_ruby(cmd)
+      cmd = Aruba.platform.detect_ruby(cmd)
       find(cmd).output
     end
 
@@ -111,7 +112,7 @@ module Aruba
     # @param [String] cmd
     #   The command
     def stdout_from(cmd)
-      cmd = Utils.detect_ruby(cmd)
+      cmd = Aruba.platform.detect_ruby(cmd)
       find(cmd).stdout
     end
 
@@ -121,10 +122,11 @@ module Aruba
     # @param [String] cmd
     #   The command
     def stderr_from(cmd)
-      cmd = Utils.detect_ruby(cmd)
+      cmd = Aruba.platform.detect_ruby(cmd)
       find(cmd).stderr
     end
 
+    # @deprecated
     # Get stdout of all commands
     #
     # @return [String]
@@ -132,13 +134,10 @@ module Aruba
     def all_stdout
       registered_commands.each(&:stop)
 
-      if RUBY_VERSION < '1.9.3'
-        registered_commands.inject("") { |a, e| a << e.stdout; a }
-      else
-        registered_commands.each_with_object("") { |e, a| a << e.stdout }
-      end
+      registered_commands.each_with_object("".dup) { |e, a| a << e.stdout }
     end
 
+    # @deprecated
     # Get stderr of all commands
     #
     # @return [String]
@@ -146,13 +145,10 @@ module Aruba
     def all_stderr
       registered_commands.each(&:stop)
 
-      if RUBY_VERSION < '1.9.3'
-        registered_commands.inject("") { |a, e| a << e.stderr; a }
-      else
-        registered_commands.each_with_object("") { |e, a| a << e.stderr }
-      end
+      registered_commands.each_with_object("".dup) { |e, a| a << e.stderr }
     end
 
+    # @deprecated
     # Get stderr and stdout of all commands
     #
     # @return [String]

data/lib/aruba/platforms/determine_disk_usage.rb

@@ -11,13 +11,18 @@ module Aruba
       def call(*args)
         args = args.flatten
 
-        physical_block_size = args.pop
+        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.blocks,
-            physical_block_size
+            (p.minimum_disk_space_used / deprecated_block_size),
+            deprecated_block_size
           )
         end.inject(0, &:+)
 

data/lib/aruba/platforms/filesystem_status.rb

@@ -22,11 +22,7 @@ module Aruba
 
       public
 
-      if RUBY_VERSION >= '1.9.3'
-        def_delegators :@status, *METHODS
-      else
-        def_delegators :@status, :executable?, :ctime, :atime, :mtime, :size
-      end
+      def_delegators :@status, *METHODS
 
       def initialize(path)
         @status = File::Stat.new(path)

data/lib/aruba/platforms/unix_command_string.rb

@@ -13,14 +13,7 @@ module Aruba
 
       # Convert to array
       def to_a
-        [__getobj__]
-      end
-
-      if RUBY_VERSION < '1.9'
-        def to_s
-          __getobj__.to_s
-        end
-        alias inspect to_s
+        Shellwords.split __getobj__
       end
     end
   end

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -11,13 +11,9 @@ module Aruba
         def initialize(other_env, &block)
           @other_env = other_env
 
-          @other_env = if RUBY_VERSION <= '1.9.3'
-                         # rubocop:disable Style/EachWithObject
-                         @other_env.to_hash.inject({}) { |a, (k, v)| a[k] = v.to_s; a }
-                         # rubocop:enable Style/EachWithObject
-                       else
-                         @other_env.to_h.each_with_object({}) { |(k, v), a| a[k] = v.to_s }
-                       end
+          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
@@ -207,8 +203,10 @@ module Aruba
       private
 
       def prepared_environment
-        if RUBY_VERSION <= '1.9.3'
+        if RUBY_VERSION == '1.9.3'
+          # rubocop:disable Style/EachWithObject
           actions.inject(ENV.to_hash.merge(env)) { |a, e| e.call(a) }
+          # rubocop:enable Style/EachWithObject
         else
           actions.each_with_object(ENV.to_hash.merge(env)) { |e, a| a = e.call(a) }
         end

data/lib/aruba/platforms/unix_platform.rb

@@ -107,11 +107,7 @@ module Aruba
       end
 
       def require_matching_files(pattern, base)
-        if RUBY_VERSION < '1.9.3'
-          ::Dir.glob(::File.expand_path(pattern, base)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-        else
-          ::Dir.glob(::File.expand_path(pattern, base)).each { |f| require_relative f }
-        end
+        ::Dir.glob(::File.expand_path(pattern, base)).each { |f| require_relative f }
       end
 
       # Create directory and subdirectories
@@ -125,8 +121,7 @@ module Aruba
       def rm(paths, options = {})
         paths = Array(paths).map { |p| ::File.expand_path(p) }
 
-        FileUtils.rm_r(paths, :force => options[:force], :noop => options[:noop],
-                       :verbose => options[:verbose], :secure => options[:secure])
+        FileUtils.rm_r(paths, options)
       end
 
       # Get current working directory
@@ -145,24 +140,22 @@ module Aruba
 
       # Touch file, directory
       def touch(args, options)
-        FileUtils.touch(args, :noop => options[:noop], :verbose => options[:verbose],
-                        :mtime => options[:mtime], :nocreate => options[:nocreate])
+        FileUtils.touch(args, options)
       end
 
       # Copy file/directory
-      def cp(src, dest)
-        FileUtils.cp_r(src, dest)
+      def cp(args, options)
+        FileUtils.cp_r(args, options)
       end
 
       # Move file/directory
-      def mv(src, dest)
-        FileUtils.mv(src, dest)
+      def mv(args, options)
+        FileUtils.mv(args, options)
       end
 
       # Change mode of file/directory
       def chmod(mode, args, options)
-        FileUtils.chmod_R(mode, args, :noop => options[:noop],
-                          :verbose => options[:verbose], :force => options[:force])
+        FileUtils.chmod_R(mode, args, options)
       end
 
       # Exists and is file
@@ -230,13 +223,7 @@ module Aruba
 
       # Write to file
       def write_file(path, content)
-        if RUBY_VERSION < '1.9.3'
-          File.open(path, 'wb') do |f|
-            f.print content
-          end
-        else
-          File.write(path, content)
-        end
+        File.write(path, content)
       end
 
       # Unescape string

data/lib/aruba/platforms/unix_which.rb

@@ -36,6 +36,8 @@ module Aruba
           Aruba.platform.command?(program)
         end
 
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/MethodLength
         def call(program, path)
           # Iterate over each path glob the dir + program.
           path.split(File::PATH_SEPARATOR).each do |dir|
@@ -48,6 +50,8 @@ module Aruba
 
           nil
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/MethodLength
       end
 
       private

data/lib/aruba/platforms/windows_command_string.rb

@@ -10,22 +10,14 @@ module Aruba
     #
     # @private
     class WindowsCommandString < SimpleDelegator
-      # Convert to array
-      def to_a
-        [cmd_path, '/c', __getobj__]
-      end
-
-      if RUBY_VERSION < '1.9'
-        def to_s
-          __getobj__.to_s
-        end
-        alias inspect to_s
+      def initialize(cmd)
+        __setobj__ format('%s /c "%s"', Aruba.platform.which('cmd.exe'), cmd)
       end
 
-      private
-
-      def cmd_path
-        Aruba.platform.which('cmd.exe')
+      # Convert to array
+      def to_a
+        Shellwords.split( __getobj__.gsub('\\', 'ARUBA_TMP_PATHSEPARATOR') ).
+          map { |w| w.gsub('ARUBA_TMP_PATHSEPARATOR', '\\') }
       end
     end
   end