Use RSpec annotations instead of included class to trigger RSpec hooks

lib/aruba/api/core.rb

@@ -177,6 +177,7 @@ def expand_path(file_name, dir_string = nil)
 
           path
         elsif prefix == '~'
+          # FIXME: Can we force use of config.home_directory
           path = with_environment do
             File.expand_path(file_name)
           end

lib/aruba/platforms/unix_platform.rb

@@ -101,6 +101,7 @@ def current_ruby
         ::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
       end
 
+      # FIXME: Why is this part of platform!? Just use Ruby or just list all files to require.
       def require_matching_files(pattern, base)
         ::Dir.glob(::File.expand_path(pattern, base)).each { |f| require_relative f }
       end

lib/aruba/rspec.rb

@@ -10,47 +10,35 @@
   config.include Aruba::Api, type: :aruba
 
   # Setup environment for aruba
-  config.around :each do |example|
-    if self.class.include? Aruba::Api
-      setup_aruba
+  config.around :each, type: :aruba do |example|
+    setup_aruba
 
-      # Modify PATH to include project/bin
-      prepend_environment_variable(
-        'PATH',
-        aruba.config.command_search_paths.join(File::PATH_SEPARATOR) + File::PATH_SEPARATOR
-      )
+    # Modify PATH to include project/bin
+    prepend_environment_variable(
+      'PATH',
+      aruba.config.command_search_paths.join(File::PATH_SEPARATOR) + File::PATH_SEPARATOR
+    )
 
-      # Use configured home directory as HOME
-      set_environment_variable 'HOME', aruba.config.home_directory
-    end
+    # Use configured home directory as HOME
+    set_environment_variable 'HOME', aruba.config.home_directory
 
     example.run
 
-    next unless self.class.include? Aruba::Api
-
     stop_all_commands
   end
 
-  config.around :each do |example|
-    if self.class.include? Aruba::Api
-      with_environment do
-        example.run
-      end
-    else
+  config.around :each, type: :aruba do |example|
+    with_environment do
       example.run
     end
   end
 
-  config.before :each do |example|
-    next unless self.class.include? Aruba::Api
-
+  config.before :each, type: :aruba do |example|
     example.metadata.each { |k, v| aruba.config.set_if_option(k, v) }
   end
 
   # Activate announcers based on rspec metadata
-  config.before :each do |example|
-    next unless self.class.include?(Aruba::Api)
-
+  config.before :each, type: :aruba do |example|
     if example.metadata[:announce_full_environment]
       aruba.announcer.activate(:full_environment)
     end

spec/support/configs/rspec.rb

@@ -11,6 +11,8 @@
 
   config.expect_with :rspec
 
+  # FIXME: Right, so we always include Aruba::Api, and all the special matchers
+  # only work when that's done (and also are not loaded unless that's done?)
   config.include Aruba::Api
   config.before { setup_aruba }
 end

spec/support/shared_contexts/aruba.rb

@@ -3,13 +3,15 @@
 require 'fileutils'
 require 'securerandom'
 
+# Provide Aruba API via an instance variable, instead of including it into the RSpec class.
 RSpec.shared_context 'uses aruba API' do
   def random_string(options = {})
     options[:prefix].to_s + SecureRandom.hex + options[:suffix].to_s
   end
 
   def create_test_files(files, data = 'a')
     Array(files).each do |s|
+      # TODO: Only allow absolute paths here
       next if s.to_s[0] == '%'
 
       local_path = @aruba.expand_path(s)
@@ -19,7 +21,7 @@ def create_test_files(files, data = 'a')
     end
   end
 
-  before do
+  around do |example|
     klass = Class.new do
       include Aruba::Api
 
@@ -29,14 +31,21 @@ def set_tag(tag_name, value)
     end
 
     @aruba = klass.new
+    @aruba.setup_aruba
 
     @file_name = 'test.txt'
     @file_size = 256
     @file_path = @aruba.expand_path(@file_name)
-    @aruba.setup_aruba
 
     if @aruba.aruba.current_directory[0] == '/'
       raise 'We must work with relative paths, everything else is dangerous'
     end
+
+    # Use configured home directory as HOME
+    @aruba.set_environment_variable "HOME", aruba.config.home_directory
+
+    @aruba.with_environment do
+      example.run
+    end
   end
 end