aruba 0.6.1 → 0.6.2

data/lib/aruba/config.rb

@@ -1,17 +1,17 @@
 module Aruba
   class Config
     attr_reader :hooks
-    
+
     def initialize
       @hooks = Hooks.new
     end
-    
+
     # Register a hook to be called before Aruba runs a command
     def before_cmd(&block)
       @hooks.append(:before_cmd, block)
     end
   end
-  
+
   #nodoc
   class Hooks
     def initialize
@@ -19,26 +19,26 @@ module Aruba
         hash[key] = []
       end
     end
-    
+
     def append(label, block)
       @store[label] << block
     end
-    
+
     def execute(label, context, *args)
       @store[label].each do |block|
         context.instance_exec(*args, &block)
       end
     end
   end
-  
+
   class << self
     attr_accessor :config
 
     def configure
       yield config
     end
-    
+
   end
-  
+
   self.config = Config.new
 end

data/lib/aruba/cucumber.rb

@@ -129,7 +129,7 @@ When /^I pipe in the file "([^"]*)"$/ do |file|
 end
 
 When /^I wait for (?:output|stdout) to contain "([^"]*)"$/ do |expected|
-  Timeout::timeout(exit_timeout) do
+  Timeout.timeout(exit_timeout) do
     loop do
       break if assert_partial_output_interactive(expected)
       sleep 0.1
@@ -332,36 +332,28 @@ Then /^the following directories should not exist:$/ do |directories|
   check_directory_presence(directories.raw.map{|directory_row| directory_row[0]}, false)
 end
 
-Then /^a directory named "([^"]*)" should exist$/ do |directory|
-  check_directory_presence([directory], true)
+Then /^a directory named "([^"]*)" should (not )?exist$/ do |directory, expect_match|
+  check_directory_presence([directory], !expect_match)
 end
 
-Then /^a directory named "([^"]*)" should not exist$/ do |directory|
-  check_directory_presence([directory], false)
+Then /^the file "([^"]*)" should (not )?contain "([^"]*)"$/ do |file, expect_match, partial_content|
+  check_file_content(file, Regexp.compile(Regexp.escape(partial_content)), !expect_match)
 end
 
-Then /^the file "([^"]*)" should contain "([^"]*)"$/ do |file, partial_content|
-  check_file_content(file, partial_content, true)
+Then /^the file "([^"]*)" should (not )?contain:$/ do |file, expect_match, partial_content|
+  check_file_content(file, Regexp.compile(Regexp.escape(partial_content)), !expect_match)
 end
 
-Then /^the file "([^"]*)" should not contain "([^"]*)"$/ do |file, partial_content|
-  check_file_content(file, partial_content, false)
+Then /^the file "([^"]*)" should (not )?contain exactly:$/ do |file, expect_match, exact_content|
+  check_file_content(file, exact_content, !expect_match)
 end
 
-Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|
-  check_file_content(file, partial_content, true)
+Then /^the file "([^"]*)" should (not )?match \/([^\/]*)\/$/ do |file, expect_match, partial_content|
+  check_file_content(file, /#{partial_content}/, !expect_match)
 end
 
-Then /^the file "([^"]*)" should contain exactly:$/ do |file, exact_content|
-  check_exact_file_content(file, exact_content)
-end
-
-Then /^the file "([^"]*)" should match \/([^\/]*)\/$/ do |file, partial_content|
-  check_file_content(file, /#{partial_content}/, true)
-end
-
-Then /^the file "([^"]*)" should not match \/([^\/]*)\/$/ do |file, partial_content|
-  check_file_content(file, /#{partial_content}/, false)
+Then /^the file "([^"]*)" should (not )?be equal to file "([^"]*)"/ do |file, expect_match, reference_file|
+  check_binary_file_content(file, reference_file, !expect_match)
 end
 
 Then /^the mode of filesystem object "([^"]*)" should match "([^"]*)"$/ do |file, mode|

data/lib/aruba/in_process.rb

@@ -48,4 +48,4 @@ module Aruba
       @stderr.string
     end
   end
-end
+end

data/lib/aruba/jruby.rb

@@ -2,7 +2,7 @@
 Aruba.configure do |config|
   config.before_cmd do
     # disable JIT since these processes are so short lived
-    set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") 
+    set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}")
     # force jRuby to use client JVM for faster startup times
     set_env('JAVA_OPTS', "-d32 #{ENV['JAVA_OPTS']}") if RbConfig::CONFIG['host_os'] =~ /solaris|sunos/i
   end

data/lib/aruba/reporting.rb

@@ -1,6 +1,6 @@
 if(ENV['ARUBA_REPORT_DIR'])
   ENV['ARUBA_REPORT_TEMPLATES'] ||= File.dirname(__FILE__) + '/../../templates'
-  
+
   require 'fileutils'
   require 'erb'
   require 'cgi'
@@ -17,7 +17,7 @@ if(ENV['ARUBA_REPORT_DIR'])
           end
         end
       end
-      
+
       def pygmentize(file)
         pygmentize = SpawnProcess.new(%{pygmentize -f html -O encoding=utf-8 "#{file}"}, 3, 0.5)
         pygmentize.run! do |p|
@@ -28,7 +28,7 @@ if(ENV['ARUBA_REPORT_DIR'])
             IO.read(file)
           else
             STDERR.puts "\e[31m#{p.stderr} - is pygments installed?\e[0m"
-            exit $?.exitstatus
+            exit $CHILD_STATUS.exitstatus
           end
         end
       end
@@ -61,15 +61,15 @@ if(ENV['ARUBA_REPORT_DIR'])
         erb = ERB.new(template('main.erb'), nil, '-')
         erb.result(binding)
       end
-      
+
       def files
         erb = ERB.new(template('files.erb'), nil, '-')
         file = current_dir
         erb.result(binding)
       end
-      
-      def again(erb, _erbout, file)
-        _erbout.concat(erb.result(binding))
+
+      def again(erb, erbout, file)
+        erbout.concat(erb.result(binding))
       end
 
       def children(dir)
@@ -119,4 +119,3 @@ if(ENV['ARUBA_REPORT_DIR'])
     end
   end
 end
-

data/spec/aruba/api_spec.rb

@@ -12,7 +12,7 @@ describe Aruba::Api  do
       include Aruba::Api
 
       def set_tag(tag_name, value)
-        self.instance_variable_set "@#{tag_name.to_s}", value
+        self.instance_variable_set "@#{tag_name}", value
       end
 
       def announce_or_puts(*args)
@@ -25,7 +25,7 @@ describe Aruba::Api  do
     @file_size = 256
     @file_path = File.join(@aruba.current_dir, @file_name)
 
-    (@aruba.dirs.length-1).times do |depth| #Ensure all parent dirs exists
+    (@aruba.dirs.length - 1).times do |depth| #Ensure all parent dirs exists
       dir = File.join(*@aruba.dirs[0..depth])
       Dir.mkdir(dir) unless File.exist?(dir)
     end
@@ -40,26 +40,36 @@ describe Aruba::Api  do
     end
 
     it "can be cleared" do
-      write_file( 'test', 'test test test' )
+      write_file('test', 'test test test')
 
       in_current_dir do
-        expect( File.exist? 'test' ).to be_truthy
+        expect(File.exist?('test')).to be_truthy
       end
 
       clean_current_dir
 
       in_current_dir do
-        expect( File.exist? 'test' ).to be_falsey
+        expect(File.exist?('test')).to be_falsey
       end
 
     end
   end
 
   describe 'directories' do
+    before(:each) do
+      @directory_name = 'test_dir'
+      @directory_path = File.join(@aruba.current_dir, @directory_name)
+    end
+
+    context '#create_dir' do
+      it 'creates a directory' do
+        @aruba.create_dir @directory_name
+        expect(File.exist?(File.expand_path(@directory_path))).to be_truthy
+      end
+    end
+
     context '#remove_dir' do
-      before(:each) do
-        @directory_name = 'test_dir'
-        @directory_path = File.join(@aruba.current_dir, @directory_name)
+      before :each do
         Dir.mkdir(@directory_path)
       end
 
@@ -82,6 +92,57 @@ describe Aruba::Api  do
   end
 
   describe 'files' do
+    context '#touch_file' do
+      it 'creates an empty file' do
+        @aruba.touch_file(@file_name)
+        expect(File.exist?(@file_path)).to eq true
+        expect(File.size(@file_path)).to eq 0
+      end
+
+      it 'supports an unexisting directory in path' do
+        path = 'directory/test'
+        full_path = File.join(@aruba.current_dir, path)
+        @aruba.touch_file(path)
+
+        expect(File.exist?(full_path)).to eq true
+      end
+
+      it "works with ~ in path name" do
+        file_path = File.join('~', random_string)
+
+        with_env 'HOME' => File.expand_path(current_dir) do
+          @aruba.touch_file(file_path)
+          expect(File.exist?(File.expand_path(file_path))).to eq true
+        end
+      end
+    end
+
+    context '#absolute_path' do
+      it 'expands and returns path' do
+        expect(@aruba.absolute_path(@file_name)).to eq File.expand_path(@file_path)
+      end
+
+      it 'removes "."' do
+        expect(@aruba.absolute_path('.')).to eq File.expand_path(current_dir)
+      end
+
+      it 'removes ".."' do
+        expect(@aruba.absolute_path('..')).to eq File.expand_path(File.join(current_dir, '..'))
+      end
+
+      it 'joins multiple arguments' do
+        expect(@aruba.absolute_path('path', @file_name)).to eq File.expand_path(File.join(current_dir, 'path', @file_name))
+      end
+    end
+
+    context '#write_file' do
+      it 'writes file' do
+        @aruba.write_file(@file_name, '')
+
+        expect(File.exist?(@file_path)).to eq true
+      end
+    end
+
     context '#write_fixed_size_file' do
       it "should write a fixed sized file" do
         @aruba.write_fixed_size_file(@file_name, @file_size)
@@ -100,6 +161,7 @@ describe Aruba::Api  do
         end
       end
     end
+
     context '#check_file_size' do
       it "should check an existing file size" do
         @aruba.write_fixed_size_file(@file_name, @file_size)
@@ -125,6 +187,7 @@ describe Aruba::Api  do
         expect { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.to raise_error
       end
     end
+
     context '#filesystem_permissions' do
       before(:each) { File.open(@file_path, 'w') { |f| f << "" } }
 
@@ -211,8 +274,10 @@ describe Aruba::Api  do
         FileUtils.mkdir_p File.dirname( file_path )
         File.open(file_path, 'w') { |f| f << "" }
 
-        @aruba.check_file_presence( [ file_name ], true )
-        @aruba.check_file_presence( [ 'asdf' ] , false )
+        @aruba.check_file_presence(file_name)
+        @aruba.check_file_presence([file_name])
+        @aruba.check_file_presence([file_name], true)
+        @aruba.check_file_presence(['asdf'], false)
       end
 
       it "should check existence using regex" do
@@ -251,25 +316,70 @@ describe Aruba::Api  do
       end
     end
 
-    context "#check_file_content" do
-      before :each do
+    context "check file content" do
+      before :example do
         @aruba.write_file(@file_name, "foo bar baz")
       end
 
-      it "succeeds if file content matches" do
-        @aruba.check_file_content(@file_name, "foo bar baz", true)
-      end
+      context "#check_binary_file_content" do
+        it "succeeds if file content matches" do
+          @aruba.write_file("fixture", "foo bar baz")
+          @aruba.check_binary_file_content(@file_name, "fixture")
+          @aruba.check_binary_file_content(@file_name, "fixture", true)
+        end
+
+        it "succeeds if file content does not match" do
+          @aruba.write_file("wrong_fixture", "bar")
+          @aruba.check_binary_file_content(@file_name, "wrong_fixture", false)
+        end
 
-      it "succeeds if file content does not match" do
-        @aruba.check_file_content(@file_name, "hello world", false)
+        it "raises if file does not exist" do
+          expect{@aruba.check_binary_file_content(@file_name, "non_existing", false)}.to raise_error
+        end
       end
 
-      it "works with ~ in path name" do
-        file_path = File.join('~', random_string)
+      context "#check_file_content" do
+        context "with regexp" do
+          let(:matching_content){/bar/}
+          let(:non_matching_content){/nothing/}
+          it "succeeds if file content matches" do
+            @aruba.check_file_content(@file_name, matching_content)
+            @aruba.check_file_content(@file_name, matching_content, true)
+          end
 
-        with_env 'HOME' => File.expand_path(current_dir) do
-          @aruba.write_file(file_path, "foo bar baz")
-          @aruba.check_file_content(file_path, "hello world", false)
+          it "succeeds if file content does not match" do
+            @aruba.check_file_content(@file_name, non_matching_content, false)
+          end
+
+          it "works with ~ in path name" do
+            file_path = File.join('~', random_string)
+
+            with_env 'HOME' => File.expand_path(current_dir) do
+              @aruba.write_file(file_path, "foo bar baz")
+              @aruba.check_file_content(file_path, non_matching_content, false)
+            end
+          end
+        end
+        context "with string" do
+          let(:matching_content){"foo bar baz"}
+          let(:non_matching_content){"bar"}
+          it "succeeds if file content matches" do
+            @aruba.check_file_content(@file_name, matching_content)
+            @aruba.check_file_content(@file_name, matching_content, true)
+          end
+
+          it "succeeds if file content does not match" do
+            @aruba.check_file_content(@file_name, non_matching_content, false)
+          end
+
+          it "works with ~ in path name" do
+            file_path = File.join('~', random_string)
+
+            with_env 'HOME' => File.expand_path(current_dir) do
+              @aruba.write_file(file_path, "foo bar baz")
+              @aruba.check_file_content(file_path, non_matching_content, false)
+            end
+          end
         end
       end
     end
@@ -301,8 +411,8 @@ describe Aruba::Api  do
         it "is successful when the inner expectations match" do
           expect do
             @aruba.with_file_content @file_name do |full_content|
-              expect(full_content).to     match /foo/
-              expect(full_content).not_to match /zoo/
+              expect(full_content).to     match(/foo/)
+              expect(full_content).not_to match(/zoo/)
             end
           end . not_to raise_error
         end
@@ -310,8 +420,8 @@ describe Aruba::Api  do
         it "raises RSpec::Expectations::ExpectationNotMetError when the inner expectations don't match"  do
           expect do
             @aruba.with_file_content @file_name do |full_content|
-              expect(full_content).to     match /zoo/
-              expect(full_content).not_to match /foo/
+              expect(full_content).to     match(/zoo/)
+              expect(full_content).not_to match(/foo/)
             end
           end . to raise_error RSpec::Expectations::ExpectationNotMetError
         end
@@ -444,5 +554,4 @@ describe Aruba::Api  do
       expect(@aruba.all_output).not_to include("LONG_LONG_ENV_VARIABLE")
     end
   end
-
 end # Aruba::Api

data/spec/aruba/jruby_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'aruba/config'
 require 'aruba/api'
-include Aruba::Api
 
 describe "Aruba JRuby Startup Helper"  do
   before(:all) do
@@ -9,29 +8,32 @@ describe "Aruba JRuby Startup Helper"  do
   end
   before(:each) do
     Aruba.config = Aruba::Config.new
+
     @fake_env['JRUBY_OPTS'] = "--1.9"
     @fake_env['JAVA_OPTS'] = "-Xdebug"
+
+    stub_const('ENV', @fake_env)
   end
 
   it 'configuration does not load when RUBY_PLATFORM is not java' do
-    with_constants :ENV => @fake_env, :RUBY_PLATFORM => 'x86_64-chocolate' do
-      load 'aruba/jruby.rb'
-      Aruba.config.hooks.execute :before_cmd, self
-      expect(ENV['JRUBY_OPTS']).to eq "--1.9"
-      expect(ENV['JAVA_OPTS']).to eq "-Xdebug"
-    end
+    stub_const('RUBY_PLATFORM', 'x86_64-chocolate')
+
+    load 'aruba/jruby.rb'
+    Aruba.config.hooks.execute :before_cmd, self
+    expect(ENV['JRUBY_OPTS']).to eq "--1.9"
+    expect(ENV['JAVA_OPTS']).to eq "-Xdebug"
   end
 
   it 'configuration loads for java and merges existing environment variables' do
-    with_constants :ENV => @fake_env, :RUBY_PLATFORM => 'java'  do
-      rb_config = double('rb_config')
-      allow(rb_config).to receive(:[]).and_return('solaris')
-      stub_const 'RbConfig::CONFIG', rb_config
-
-      load 'aruba/jruby.rb'
-      Aruba.config.hooks.execute :before_cmd, self
-      expect(ENV['JRUBY_OPTS']).to eq "-X-C --1.9"
-      expect(ENV['JAVA_OPTS']).to eq "-d32 -Xdebug"
-    end
+    stub_const('RUBY_PLATFORM', 'java')
+
+    rb_config = double('rb_config')
+    allow(rb_config).to receive(:[]).and_return('solaris')
+    stub_const 'RbConfig::CONFIG', rb_config
+
+    load 'aruba/jruby.rb'
+    Aruba.config.hooks.execute :before_cmd, self
+    expect(ENV['JRUBY_OPTS']).to eq "-X-C --1.9"
+    expect(ENV['JAVA_OPTS']).to eq "-d32 -Xdebug"
   end
 end