aruba 0.14.9 → 0.14.10

data/features/{matchers/timeouts.feature → 05_use_rspec_matchers/command/check_timeouts.feature}

@@ -6,7 +6,7 @@ Feature: Check if a timeout occured during command execution
     Given I use a fixture named "cli-app"
 
   Scenario: Check if command runs to long
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     sleep 1
@@ -18,7 +18,7 @@ Feature: Check if a timeout occured during command execution
     RSpec.describe 'Long running command', :type => :aruba do
       before(:each) { aruba.config.exit_timeout = 0 }
 
-      before(:each) { run_command('cli') }
+      before(:each) { run_command('aruba-test-cli') }
 
       it { expect(last_command_started).to run_too_long }
     end
@@ -27,7 +27,7 @@ Feature: Check if a timeout occured during command execution
     Then the specs should all pass
 
   Scenario: Check if command finishes in time
-    Given an executable named "bin/cli" with:
+    Given an executable named "bin/aruba-test-cli" with:
     """
     #!/bin/bash
     exit 0
@@ -39,7 +39,7 @@ Feature: Check if a timeout occured during command execution
     RSpec.describe 'Short running command', :type => :aruba do
       before(:each) { aruba.config.exit_timeout = 5 }
 
-      before(:each) { run_command('cli') }
+      before(:each) { run_command('aruba-test-cli') }
 
       it { expect(last_command_started).to have_finished_in_time }
     end

data/features/{matchers → 05_use_rspec_matchers}/path/have_permissions.feature

@@ -31,7 +31,7 @@ Feature: Check if path has permissions in filesystem
 
     RSpec.describe 'Check if path has permissions', :type => :aruba do
       let(:file) { 'file.txt' }
-      let(:permissions) { 0700 }
+      let(:permissions) { 0600 }
 
       before(:each) { touch(file) }
       before(:each) { chmod(permissions, file) }
@@ -67,7 +67,7 @@ Feature: Check if path has permissions in filesystem
 
     RSpec.describe 'Check if path has permissions', :type => :aruba do
       let(:files) { %w(file1.txt file2.txt) }
-      let(:permissions) { 0700 }
+      let(:permissions) { 0600 }
 
       before :each do
         files.each do |f|
@@ -89,7 +89,7 @@ Feature: Check if path has permissions in filesystem
 
     RSpec.describe 'Check if path has permissions', :type => :aruba do
       let(:files) { %w(file1.txt file2.txt) }
-      let(:permissions) { 0700 }
+      let(:permissions) { 0600 }
 
       before :each do
         touch(files.first)
@@ -109,7 +109,7 @@ Feature: Check if path has permissions in filesystem
 
     RSpec.describe 'Check if path has permissions', :type => :aruba do
       let(:path) { 'file.txt' }
-      let(:permissions) { 0777 }
+      let(:permissions) { 0700 }
 
       it { expect(path).to have_permissions permissions }
     end

data/features/08_other/improve_performance_if_using_jruby.feature

@@ -0,0 +1,37 @@
+Feature: Support for JRuby
+
+  Improve startup time by disabling JIT and forcing client JVM mode.  This can
+  be accomplished by adding
+
+  ```ruby
+  require 'aruba/config/jruby'
+  ```
+
+  *Note* - no conflict resolution on the JAVA/JRuby environment options is
+  done; only merging. For more complex settings please manually set the
+  environment variables in the hook or externally.
+
+  Refer to http://blog.headius.com/2010/03/jruby-startup-time-tips.html for other tips on startup time.
+
+  Background:
+    Given I use a fixture named "cli-app"
+
+  @requires-ruby-platform-java
+  Scenario:
+    Given a file named "spec/jruby_env_spec.rb" with:
+      """
+      require 'spec_helper'
+      require 'aruba/config/jruby'
+
+      RSpec.describe 'running commands with before :command hook', :type => :aruba do
+        it 'sets up for efficient JRuby startup' do
+          with_environment 'JRUBY_OPTS' => '-d' do
+            run_command_and_stop('env')
+
+            expect(last_command_started.output).to include 'JRUBY_OPTS=--dev -X-C -d'
+          end
+        end
+      end
+      """
+    When I run `rspec`
+    Then the specs should all pass

data/features/step_definitions/hooks.rb

@@ -10,16 +10,6 @@ Before '@requires-python' do |scenario|
   end
 end
 
-Before '@requires-zsh' do |scenario|
-  next unless Aruba.platform.which('zsh').nil?
-
-  if Cucumber::VERSION < '2'
-    scenario.skip_invoke!
-  else
-    skip_this_scenario
-  end
-end
-
 Before '@requires-java' do |scenario|
   next unless Aruba.platform.which('javac').nil?
 

data/features/support/env.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
 
 # Has to be the first file required so that all other files show coverage information
-require 'simplecov'
+require 'simplecov' unless RUBY_PLATFORM.include?('java')
 
 # Standard Library
 require 'fileutils'

data/features/support/simplecov_setup.rb

@@ -1,8 +1,11 @@
-# @note this file is loaded in env.rb to setup simplecov using RUBYOPTs for child processes and @in-process
-require 'simplecov'
+# @note this file is loaded in env.rb to setup simplecov using RUBYOPTs for
+# child processes and @in-process
+unless RUBY_PLATFORM.include?('java')
+  require 'simplecov'
 
-root = File.expand_path('../../../', __FILE__)
+  root = File.expand_path('../../../', __FILE__)
 
-SimpleCov.command_name(ENV['SIMPLECOV_COMMAND_NAME'])
-SimpleCov.root(root)
-load File.join(root, '.simplecov')
+  SimpleCov.command_name(ENV['SIMPLECOV_COMMAND_NAME'])
+  SimpleCov.root(root)
+  load File.join(root, '.simplecov')
+end

data/fixtures/cli-app/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'cli/app'
+require 'support/aruba'
 
 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')) }

data/fixtures/empty-app/lib/cli/app.rb

@@ -1,11 +1,5 @@
 require 'cli/app/version'
 
-if RUBY_VERSION < '1.9.3'
-  ::Dir.glob(::File.expand_path('../**/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-else
-  ::Dir.glob(File.expand_path('../**/*.rb', __FILE__)).each { |f| require_relative f }
-end
-
 module Cli
   module App
     # Your code goes here...

data/lib/aruba/api/commands.rb

@@ -103,6 +103,30 @@ module Aruba
         self
       end
 
+      # Get stdout of all processes
+      #
+      # @return [String]
+      #   The stdout of all processes which have run before
+      def all_stdout
+        aruba.command_monitor.all_stdout
+      end
+
+      # Get stderr of all processes
+      #
+      # @return [String]
+      #   The stderr of all processes which have run before
+      def all_stderr
+        aruba.command_monitor.all_stderr
+      end
+
+      # Get stderr and stdout of all processes
+      #
+      # @return [String]
+      #   The stderr and stdout of all processes which have run before
+      def all_output
+        aruba.command_monitor.all_output
+      end
+
       # Find a started command
       #
       # @param [String, Command] commandline

data/lib/aruba/api/core.rb

@@ -3,8 +3,6 @@ require 'aruba/runtime'
 require 'aruba/errors'
 require 'aruba/setup'
 
-require 'aruba/config/jruby'
-
 # Aruba
 module Aruba
   # Api
@@ -31,6 +29,15 @@ module Aruba
         self
       end
 
+      # Execute block in Aruba's current directory
+      #
+      # @yield
+      #   The block which should be run in current directory
+      def in_current_directory(&block)
+        create_directory '.' unless directory?('.')
+        cd('.', &block)
+      end
+
       # Switch to directory
       #
       # @param [String] dir

data/lib/aruba/api/deprecated.rb

@@ -51,22 +51,6 @@ module Aruba
         setup_aruba
       end
 
-      # @deprecated
-      # Execute block in current directory
-      #
-      # @yield
-      #   The block which should be run in current directory
-      def in_current_directory(&block)
-        Aruba.platform.deprecated(
-          'The use of "in_current_directory" is deprecated.' \
-          ' Use "#cd(\'.\') { # your code }" instead. But be aware,' \
-          ' "cd" requires a previously created directory'
-        )
-
-        create_directory '.' unless directory?('.')
-        cd('.', &block)
-      end
-
       # @deprecated
       def detect_ruby(cmd)
         Aruba.platform.deprecated('The use of "#detect_ruby" is deprecated')
@@ -525,11 +509,10 @@ module Aruba
       def in_current_dir(&block)
         Aruba.platform.deprecated(
           'The use of "in_current_dir" is deprecated.' \
-          ' Use "#cd(\'.\') { }" instead'
+          ' Use "#in_current_directory { }" instead'
         )
 
-        create_directory '.' unless directory?('.')
-        cd('.', &block)
+        in_current_directory(&block)
       end
 
       # @deprecated
@@ -1017,60 +1000,6 @@ module Aruba
         process_monitor.stderr_from(cmd)
       end
 
-      # @deprecated
-      #
-      # Get stdout of all processes
-      #
-      # @return [String]
-      #   The stdout of all process which have run before
-      def all_stdout
-        Aruba.platform.deprecated(
-          'The use of "#all_stdout" is deprecated.' \
-          ' Use `all_commands.map { |c| c.stdout }.join("\n") instead.' \
-          ' If you need to check for some output, use' \
-          ' "expect(all_commands).to included_an_object have_output_on_stdout(/output/)"' \
-          ' instead'
-        )
-
-        process_monitor.all_stdout
-      end
-
-      # @deprecated
-      #
-      # Get stderr of all processes
-      #
-      # @return [String]
-      #   The stderr of all process which have run before
-      def all_stderr
-        Aruba.platform.deprecated(
-          'The use of "#all_stderr" is deprecated.' \
-          ' Use `all_commands.map { |c| c.stderr }.join("\n") instead.' \
-          ' If you need to check for some output use' \
-          ' "expect(all_commands).to included_an_object have_output_on_stderr /output/"' \
-          ' instead'
-        )
-
-        process_monitor.all_stderr
-      end
-
-      # @deprecated
-      #
-      # Get stderr and stdout of all processes
-      #
-      # @return [String]
-      #   The stderr and stdout of all process which have run before
-      def all_output
-        Aruba.platform.deprecated(
-          'The use of "#all_output" is deprecated.' \
-          ' Use `all_commands.map { |c| c.output }.join("\n") instead.' \
-          ' If you need to check for some output use' \
-          ' "expect(all_commands).to included_an_object have_output /output/"' \
-          ' instead'
-        )
-
-        process_monitor.all_output
-      end
-
       # @deprecated
       #
       # Default exit timeout for running commands with aruba

data/lib/aruba/api/filesystem.rb

@@ -383,7 +383,7 @@ module Aruba
       # @return [Numeric]
       #   The size of the file
       def file_size(name)
-        expect(name).to be_an_existing_file
+        raise ArgumentError, "#{name} does not exist" unless exist? name
 
         Aruba.platform.determine_file_size expand_path(name)
       end

data/lib/aruba/colorizer.rb

@@ -1,108 +1,19 @@
+# Aruba
 module Aruba
-  # The ANSIColor module can be used for namespacing and mixed into your own
-  # classes.
-  module AnsiColor
-    # :stopdoc:
-    ATTRIBUTES = [
-      [ :clear        ,   0 ],
-      [ :reset        ,   0 ],     # synonym for :clear
-      [ :bold         ,   1 ],
-      [ :dark         ,   2 ],
-      [ :italic       ,   3 ],     # not widely implemented
-      [ :underline    ,   4 ],
-      [ :underscore   ,   4 ],     # synonym for :underline
-      [ :blink        ,   5 ],
-      [ :rapid_blink  ,   6 ],     # not widely implemented
-      [ :negative     ,   7 ],     # no reverse because of String#reverse
-      [ :concealed    ,   8 ],
-      [ :strikethrough,   9 ],     # not widely implemented
-      [ :black        ,  30 ],
-      [ :red          ,  31 ],
-      [ :green        ,  32 ],
-      [ :yellow       ,  33 ],
-      [ :blue         ,  34 ],
-      [ :magenta      ,  35 ],
-      [ :cyan         ,  36 ],
-      [ :white        ,  37 ],
-      [ :on_black     ,  40 ],
-      [ :on_red       ,  41 ],
-      [ :on_green     ,  42 ],
-      [ :on_yellow    ,  43 ],
-      [ :on_blue      ,  44 ],
-      [ :on_magenta   ,  45 ],
-      [ :on_cyan      ,  46 ],
-      [ :on_white     ,  47 ]
-    ].freeze
-
-    ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
-    # :startdoc:
-
-    # Returns true, if the coloring function of this module
-    # is switched on, false otherwise.
-    def self.coloring?
-      @coloring
-    end
-
-    # Turns the coloring on or off globally, so you can easily do
-    # this for example:
-    #  Cucumber::Term::ANSIColor::coloring = STDOUT.isatty
-    def self.coloring=(val)
-      @coloring = val
-    end
-    self.coloring = true
-
-    ATTRIBUTES.each do |c, v|
-      define_method(c) do |string|
-        result = ''
-        result << "\e[#{v}m" if Aruba::AnsiColor.coloring?
-        if block_given?
-          result << yield
-        elsif string
-          result << string
-        elsif respond_to?(:to_str)
-          result << to_str
-        else
-          return result #only switch on
-        end
-        result << "\e[0m" if Aruba::AnsiColor.coloring?
-        result
-      end
-    end
-
-    # Regular expression that is used to scan for ANSI-sequences while
-    # uncoloring strings.
-    COLORED_REGEXP = /\e\[(?:[34][0-7]|[0-9])?m/
+  # Simple colorizer class. Only supports the color cyan
+  class Colorizer
+    class << self
+      attr_accessor :coloring
 
-    def self.included(klass)
-      if klass == String
-        ATTRIBUTES.delete(:clear)
-        ATTRIBUTE_NAMES.delete(:clear)
-      end
+      alias coloring? coloring
     end
 
-    # Returns an uncolored version of the string, that is all
-    # ANSI-sequences are stripped from the string.
-    def uncolored(string = nil) # :yields:
-      if block_given?
-        yield.gsub(COLORED_REGEXP, '')
-      elsif string
-        string.gsub(COLORED_REGEXP, '')
-      elsif respond_to?(:to_str)
-        to_str.gsub(COLORED_REGEXP, '')
+    def cyan(string)
+      if self.class.coloring?
+        "\e[36m#{string}\e[0m"
       else
-        ''
+        string
       end
     end
-
-    # Returns an array of all Aruba::Platforms::AnsiColor attributes as symbols.
-    def attributes
-      ATTRIBUTE_NAMES
-    end
-  end
-end
-
-module Aruba
-  class Colorizer
-    include Aruba::AnsiColor
   end
 end