aruba 1.0.0.pre.alpha.5 → 1.0.4

data/lib/aruba/api/text.rb

@@ -14,7 +14,14 @@ module Aruba
       # @param [#to_s] text
       #   Input
       def unescape_text(text)
-        text.gsub('\n', "\n").gsub('\"', '"').gsub('\e', "\e").gsub('\033', "\e").gsub('\016', "\016").gsub('\017', "\017").gsub('\t', "\t")
+        text
+          .gsub('\n', "\n")
+          .gsub('\"', '"')
+          .gsub('\e', "\e")
+          .gsub('\033', "\e")
+          .gsub('\016', "\016")
+          .gsub('\017', "\017")
+          .gsub('\t', "\t")
       end
 
       # Remove ansi characters from text
@@ -22,7 +29,10 @@ module Aruba
       # @param [#to_s] text
       #   Input
       def extract_text(text)
-        text.gsub(/(?:\e|\033)\[\d+(?>(;\d+)*)m/, '').gsub(/\\\[|\\\]/, '').gsub(/\007|\016|\017/, '')
+        text
+          .gsub(/(?:\e|\033)\[\d+(?>(;\d+)*)m/, '')
+          .gsub(/\\\[|\\\]/, '')
+          .gsub(/\007|\016|\017/, '')
       end
 
       # Unescape special characters and remove ANSI characters
@@ -41,7 +51,9 @@ module Aruba
       # @param [#to_s] text
       #   The text to parse
       def replace_variables(text)
-        text = text.gsub(/<pid-last-command-started>/, last_command_started.pid.to_s) if text.include? '<pid-last-command-started>'
+        if text.include? '<pid-last-command-started>'
+          text = text.gsub(/<pid-last-command-started>/, last_command_started.pid.to_s)
+        end
 
         text
       end

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,19 @@ 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?('~') ||
+           Aruba.platform.absolute_path?(element)
+          element
+        else
+          File.join(path, element)
+        end
+      end
+      ::Pathname.new(current_path)
     end
   end
 end

data/lib/aruba/basic_configuration.rb

@@ -20,27 +20,18 @@ module Aruba
       # @param [Symbol] name
       #   The name of the reader
       #
-      # @param [Hash] opts
-      #   Options
-      #
-      # @option [Class, Module] contract
-      #   The contract for the option
+      # @option [Class, Module] type
+      #   The type contract for the option
       #
       # @option [Object] default
       #   The default value
-      def option_reader(name, opts = {})
-        contract = opts[:contract]
-        default  = opts[:default]
-
-        fail ArgumentError, 'Either use block or default value' if block_given? && default
-        fail ArgumentError, 'contract-options is required' if contract.nil?
+      def option_reader(name, type:, default: nil)
+        raise ArgumentError, 'Either use block or default value' if block_given? && default
 
-        Contract contract
         add_option(name, block_given? ? yield(InConfigWrapper.new(known_options)) : default)
 
+        Contract None => type
         define_method(name) { find_option(name).value }
-
-        self
       end
 
       # Define an option reader and writer
@@ -48,31 +39,23 @@ module Aruba
       # @param [Symbol] name
       #   The name of the reader
       #
-      # @param [Hash] opts
-      #   Options
-      #
-      # @option [Class, Module] contract
-      #   The contract for the option
+      # @option [Class, Module] type
+      #   The type contract for the option
       #
       # @option [Object] default
       #   The default value
       #
-      def option_accessor(name, opts = {})
-        contract = opts[:contract]
-        default  = opts[:default]
-
-        fail ArgumentError, 'Either use block or default value' if block_given? && default
-        # fail ArgumentError, 'Either use block or default value' if !block_given? && default.nil? && default.to_s.empty?
-        fail ArgumentError, 'contract-options is required' if contract.nil?
+      def option_accessor(name, type:, default: nil)
+        raise ArgumentError, 'Either use block or default value' if block_given? && default
 
         # Add writer
         add_option(name, block_given? ? yield(InConfigWrapper.new(known_options)) : default)
 
-        Contract contract
+        Contract type => type
         define_method("#{name}=") { |v| find_option(name).value = v }
 
         # Add reader
-        option_reader name, contract: { None => contract.values.first }
+        option_reader name, type: type
       end
 
       private
@@ -91,8 +74,6 @@ module Aruba
     attr_accessor :local_options
     attr_writer :hooks
 
-    # attr_reader :hooks
-
     public
 
     # Create configuration
@@ -121,68 +102,68 @@ module Aruba
       obj
     end
 
-    # Define or run before-hook
+    # Define before-hook
     #
     # @param [Symbol, String] name
     #   The name of the hook
     #
-    # @param [Proc] context
-    #   The context a hook should run in. This is a runtime only option.
-    #
-    # @param [Array] args
-    #   Arguments for the run of hook. This is a runtime only option.
-    #
     # @yield
     #   The code block which should be run. This is a configure time only option
-    def before(name, context = proc {}, *args, &block)
+    def before(name, &block)
       name = format('%s_%s', 'before_', name.to_s).to_sym
+      raise ArgumentError, 'A block is required' unless block
 
-      if block_given?
-        @hooks.append(name, block)
+      @hooks.append(name, block)
 
-        self
-      else
-        @hooks.execute(name, context, *args)
-      end
+      self
     end
 
-    # Define or run after-hook
+    # Run before-hook
     #
     # @param [Symbol, String] name
     #   The name of the hook
     #
     # @param [Proc] context
-    #   The context a hook should run in. This is a runtime only option.
+    #   The context a hook should run in
     #
     # @param [Array] args
-    #   Arguments for the run of hook. This is a runtime only option.
+    #   Arguments for the run of hook
+    def run_before_hook(name, context, *args)
+      name = format('%s_%s', 'before_', name.to_s).to_sym
+
+      @hooks.execute(name, context, *args)
+    end
+
+    # Define after-hook
+    #
+    # @param [Symbol, String] name
+    #   The name of the hook
     #
     # @yield
     #   The code block which should be run. This is a configure time only option
-    def after(name, context = proc {}, *args, &block)
+    def after(name, &block)
       name = format('%s_%s', 'after_', name.to_s).to_sym
+      raise ArgumentError, 'A block is required' unless block
 
-      if block_given?
-        @hooks.append(name, block)
-
-        self
-      else
-        @hooks.execute(name, context, *args)
-      end
-    end
-
-    # Check if before-hook <name> is defined
-    def before?(name)
-      name = format('%s_%s', 'before_', name.to_s).to_sym
+      @hooks.append(name, block)
 
-      @hooks.exist? name
+      self
     end
 
-    # Check if after-hook <name> is defined
-    def after?(name)
+    # Run after-hook
+    #
+    # @param [Symbol, String] name
+    #   The name of the hook
+    #
+    # @param [Proc] context
+    #   The context a hook should run in
+    #
+    # @param [Array] args
+    #   Arguments for the run of hook
+    def run_after_hook(name, context, *args)
       name = format('%s_%s', 'after_', name.to_s).to_sym
 
-      @hooks.exist? name
+      @hooks.execute(name, context, *args)
     end
 
     # Check if <name> is option
@@ -210,7 +191,7 @@ module Aruba
     end
 
     def find_option(name)
-      fail NotImplementedError, %(Unknown option "#{name}") unless option? name
+      raise NotImplementedError, %(Unknown option "#{name}") unless option? name
 
       local_options[name]
     end

data/lib/aruba/basic_configuration/option.rb

@@ -15,8 +15,8 @@ module Aruba
         name = opts[:name]
         value = opts[:value]
 
-        fail ArgumentError, '"name" is required' unless opts.key? :name
-        fail ArgumentError, '"value" is required' unless opts.key? :value
+        raise ArgumentError, '"name" is required' unless opts.key? :name
+        raise ArgumentError, '"value" is required' unless opts.key? :value
 
         @name          = name
         @value         = value

data/lib/aruba/cli.rb

@@ -18,7 +18,10 @@ module Aruba
     end
 
     desc 'init', 'Initialize aruba'
-    option :test_framework, default: 'cucumber', enum: %w(cucumber rspec minitest), desc: 'Choose which test framework to use'
+    option :test_framework,
+           default: 'cucumber',
+           enum: %w(cucumber rspec minitest),
+           desc: 'Choose which test framework to use'
     def init
       Aruba::Initializer.new.call(options[:test_framework])
     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,11 +30,11 @@ 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
+      notify(name, args) if name.to_s.end_with?('=')
 
-      config.send(name, *args, &block)
+      return config.send(name, *args, &block) if config.respond_to? name
+
+      super
     end
 
     # Pass on respond_to?-calls
@@ -56,5 +56,18 @@ module Aruba
     def respond_to?(m)
       config.respond_to? m
     end
+
+    private
+
+    def notify(name, args)
+      event_bus.notify(
+        Events::ChangedConfiguration.new(
+          changed: {
+            name: name.to_s.gsub(/=$/, ''),
+            value: args.first
+          }
+        )
+      )
+    end
   end
 end