aruba 1.0.0.pre.alpha.5 → 1.0.0

data/lib/aruba/aruba_path.rb

@@ -1,30 +1,21 @@
 require 'pathname'
-require 'delegate'
-
-require 'aruba/file_size'
 
 # Aruba
 module Aruba
   # Pathname for aruba files and directories
   #
   # @private
-  class ArubaPath < Delegator
+  class ArubaPath
     def initialize(path)
-      obj = [path.to_s].flatten
-
-      super obj
-
-      @delegate_sd_obj = obj
+      @obj = [path.to_s].flatten
     end
 
-    # Get path
-    def __getobj__
-      ::Pathname.new(::File.join(*@delegate_sd_obj))
+    def to_str
+      to_pathname.to_s
     end
 
-    # Set path
-    def __setobj__(obj)
-      @delegate_sd_obj = [obj.to_s].flatten
+    def to_s
+      to_str
     end
 
     # Add directory/file to path
@@ -39,47 +30,19 @@ module Aruba
     #   puts path
     #   # => path/to/dir.d/subdir.d
     def push(p)
-      @delegate_sd_obj << p
+      @obj << p
     end
     alias << push
 
-    # Remove last component of path
+    # Remove last pushed component of path
     #
     # @example
-    #   path = ArubaPath.new 'path/to/dir.d'
+    #   path = ArubaPath.new 'path/to'
+    #   path.push 'dir'
     #   path.pop
     #   puts path # => path/to
     def pop
-      @delegate_sd_obj.pop
-    end
-
-    # How many parts has the file name
-    #
-    # @return [Integer]
-    #   The count of file name parts
-    #
-    # @example
-    #   path = ArubaPath.new('path/to/file.txt')
-    #   path.depth # => 3
-    #
-    def depth
-      __getobj__.each_filename.to_a.size
-    end
-
-    # Path ends with string
-    #
-    # @param [String] string
-    #   The string to check
-    def end_with?(string)
-      to_s.end_with? string
-    end
-
-    # Path starts with string
-    #
-    # @param [String] string
-    #   The string to check
-    def start_with?(string)
-      to_s.start_with? string
+      @obj.pop
     end
 
     # Return string at index
@@ -89,54 +52,20 @@ module Aruba
       to_s[index]
     end
 
-    # 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
-      # 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(to_s)
-
-      blocks = stat.blocks
-      return (blocks * dev_bsize) if blocks
+    private
 
-      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
+    # Get path
+    def to_pathname
+      current_path = @obj.inject do |path, element|
+        if element.start_with? '~'
+          element
+        elsif Aruba.platform.absolute_path? element
+          element
+        else
+          File.join(path, element)
+        end
+      end
+      ::Pathname.new(current_path)
     end
   end
 end

data/lib/aruba/config/jruby.rb

@@ -17,7 +17,7 @@ Aruba.configure do |config|
 
     env['JRUBY_OPTS'] = jruby_opts
 
-    if RbConfig::CONFIG['host_os'] =~ /solaris|sunos/i
+    if /solaris|sunos/i.match?(RbConfig::CONFIG['host_os'])
       java_opts = env['JAVA_OPTS'] || ''
 
       # force jRuby to use client JVM for faster startup times

data/lib/aruba/config_wrapper.rb

@@ -30,9 +30,7 @@ module Aruba
     # If one method ends with "=", e.g. ":option1=", then notify the event
     # queue, that the user changes the value of "option1"
     def method_missing(name, *args, &block)
-      if name.to_s.end_with? '='
-        event_bus.notify Events::ChangedConfiguration.new(changed: { name: name.to_s.gsub(/=$/, ''), value: args.first })
-      end
+      event_bus.notify Events::ChangedConfiguration.new(changed: { name: name.to_s.gsub(/=$/, ''), value: args.first }) if name.to_s.end_with? '='
 
       config.send(name, *args, &block)
     end

data/lib/aruba/configuration.rb

@@ -45,12 +45,14 @@ module Aruba
     option_accessor :main_class, contract: { Class => Maybe[Class] }, default: nil
 
     option_accessor :home_directory,
-                    contract: { Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] => Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] } do |config|
-                      File.join(config.root_directory.value, config.working_directory.value)
-                    end
+                    contract: { Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] =>
+                                Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] } do |config|
+      File.join(config.root_directory.value, config.working_directory.value)
+    end
 
     option_accessor :log_level,
-                    contract: { Aruba::Contracts::Enum[:fatal, :warn, :debug, :info, :error, :unknown, :silent] => Aruba::Contracts::Enum[:fatal, :warn, :debug, :info, :error, :unknown, :silent] },
+                    contract: { Aruba::Contracts::Enum[:fatal, :warn, :debug, :info, :error, :unknown, :silent] =>
+                                Aruba::Contracts::Enum[:fatal, :warn, :debug, :info, :error, :unknown, :silent] },
                     default: :info
 
     # TODO: deprecate this value and replace with "filesystem allocation unit"

data/lib/aruba/contracts/absolute_path.rb

@@ -1,4 +1,4 @@
-require 'aruba/aruba_path'
+require 'aruba/platform'
 
 # Aruba
 module Aruba
@@ -11,7 +11,7 @@ module Aruba
       # @param [Object] value
       #   The value to be checked
       def self.valid?(value)
-        ArubaPath.new(value).absolute?
+        Aruba.platform.absolute_path? value
       rescue
         false
       end

data/lib/aruba/contracts/relative_path.rb

@@ -1,4 +1,4 @@
-require 'aruba/aruba_path'
+require 'aruba/platform'
 
 # Aruba
 module Aruba
@@ -11,7 +11,7 @@ module Aruba
       # @param [String] value
       #   The path to be checked
       def self.valid?(value)
-        ArubaPath.new(value).relative?
+        Aruba.platform.relative_path? value
       rescue
         false
       end

data/lib/aruba/event_bus/name_resolver.rb

@@ -148,9 +148,9 @@ module Aruba
       def transform(event_id)
         resolvers.find { |r| r.match? event_id }.new.transform(default_namespace, event_id)
       rescue => e
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         raise EventNameResolveError, %(Transforming "#{event_id}" into an event class failed. Supported types are: #{@resolvers.map(&:supports).flatten.join(', ')}. #{e.message}.\n\n#{e.backtrace.join("\n")})
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
     end
   end

data/lib/aruba/initializer.rb

@@ -23,7 +23,11 @@ module Aruba
                   end
 
         content = if File.exist? file
-                    %(gem 'aruba', '~> #{Aruba::VERSION}')
+                    file_ends_with_carriage_return = File.open(file, 'r').readlines.last.match(/.*\n$/)
+
+                    prefix = file_ends_with_carriage_return ? '' : "\n"
+
+                    %(#{prefix}gem 'aruba', '~> #{Aruba::VERSION}')
                   else
                     %(source 'https://rubygems.org'\ngem 'aruba', '~> #{Aruba::VERSION}'\n)
                   end

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

@@ -10,7 +10,7 @@ module Aruba
         def indent_multiline_message(message)
           message = message.sub(/\n+\z/, '')
           message.lines.map do |line|
-            line =~ /\S/ ? '   ' + line : line
+            /\S/.match?(line) ? '   ' + line : line
           end.join
         end
       end

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

@@ -12,7 +12,6 @@ module Aruba
         prepare_for_inspection(object).inspect
       end
 
-      # rubocop:disable MethodLength
       # rubocop:disable Metrics/CyclomaticComplexity
 
       # @private
@@ -48,7 +47,6 @@ module Aruba
         InspectableItem.new(inspection)
       end
       # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable MethodLength
 
       # @private
       def self.prepare_hash(input)

data/lib/aruba/platforms/announcer.rb

@@ -92,9 +92,11 @@ 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)) }
+        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))
+                      }
       end
 
       def output_format(channel, string = '%s', &block)

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/unix_environment_variables.rb

@@ -188,6 +188,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
@@ -136,13 +136,13 @@ module Aruba
       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
@@ -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