aruba 0.14.14 → 1.0.0.pre.alpha.1

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -36,23 +36,11 @@ module Aruba
       def initialize(env = ENV.to_hash)
         @actions = []
 
-        @env = if RUBY_VERSION <= '1.9.3'
-                 # rubocop:disable Style/EachWithObject
-                 env.inject({}) { |a, (k,v)| a[k.to_s.upcase] = v; a }
-               # rubocop:enable Style/EachWithObject
-               else
-                 env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
-               end
+        @env = env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
       end
 
       def update(other_env, &block)
-        other_env = if RUBY_VERSION <= '1.9.3'
-                      # rubocop:disable Style/EachWithObject
-                      other_env.inject({}) { |a, (k,v)| a[k.to_s.upcase] = v; a }
-                    # rubocop:enable Style/EachWithObject
-                    else
-                      other_env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
-                    end
+        other_env = other_env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
 
         super(other_env, &block)
       end
@@ -81,8 +69,8 @@ module Aruba
         super(name.upcase, value)
       end
 
-      def delete(name, value)
-        super(name.upcase, value)
+      def delete(name)
+        super(name.upcase)
       end
     end
   end

data/lib/aruba/platforms/windows_which.rb

@@ -38,6 +38,8 @@ module Aruba
           Aruba.platform.command?(program)
         end
 
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/MethodLength
         def call(program, path)
           # Iterate over each path glob the dir + program.
           path.split(File::PATH_SEPARATOR).each do |dir|
@@ -61,6 +63,8 @@ module Aruba
 
           nil
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/MethodLength
       end
 
       private

data/lib/aruba/processes/basic_process.rb

@@ -36,7 +36,7 @@ module Aruba
 
       # Output pid of process
       def pid
-        raise NotImplementedError
+        'No implemented'
       end
 
       # Output stderr and stdout
@@ -45,39 +45,39 @@ module Aruba
       end
 
       def write(*)
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def stdin(*)
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def stdout(*)
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def stderr(*)
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def close_io(*)
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def send_signal(*)
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def filesystem_status
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def content
-        raise NotImplementedError
+        NotImplementedError
       end
 
       def wait
-        raise NotImplementedError
+        NotImplementedError
       end
 
       # Restart a command
@@ -116,16 +116,15 @@ module Aruba
       def after_run; end
 
       def inspect
-        out = stdout(:wait_for_io => 0) + stderr(:wait_for_io => 0)
+        # rubocop:disable Style/UnneededInterpolation
+        out = truncate("#{stdout(:wait_for_io => 0).inspect}", 35)
+        err = truncate("#{stderr(:wait_for_io => 0).inspect}", 35)
+        # rubocop:enable Style/UnneededInterpolation
 
-        out = if out.length > 76
-                out[0, 75] + ' ...'
-              else
-                out
-              end
-
-        format '#<%s:%s commandline="%s": output="%s">', self.class, self.object_id, commandline, out
+        fmt = '#<%s:%s commandline="%s": stdout=%s stderr=%s>'
+        format fmt, self.class, self.object_id, commandline, out, err
       end
+
       alias to_s inspect
 
       private
@@ -139,6 +138,11 @@ module Aruba
 
         []
       end
+
+      def truncate(string, max_length)
+        return string if string.length <= max_length
+        string[0, max_length - 1] + ' ...'
+      end
     end
   end
 end

data/lib/aruba/processes/spawn_process.rb

@@ -25,29 +25,17 @@ module Aruba
 
       # Create process
       #
-      # @param [String] cmd
+      # @params [String] cmd
       #   Command string
       #
-      # @param [Numeric] exit_timeout
+      # @params [Integer] exit_timeout
       #   The timeout until we expect the command to be finished
       #
-      # @param [Numeric] io_wait_timeout
+      # @params [Integer] io_wait_timeout
       #   The timeout until we expect the io to be finished
       #
-      # @param [String] working_directory
+      # @params [String] working_directory
       #   The directory where the command will be executed
-      #
-      # @param [Hash] environment
-      #   Environment variables
-      #
-      # @param [Class] main_class
-      #   E.g. Cli::App::Runner
-      #
-      # @param [String] stop_signal
-      #   Name of signal to send to stop process. E.g. 'HUP'.
-      #
-      # @param [Numeric] startup_wait_time
-      #   The amount of seconds to wait after Aruba has started a command.
       def initialize(cmd, exit_timeout, io_wait_timeout, working_directory, environment = ENV.to_hash.dup, main_class = nil, stop_signal = nil, startup_wait_time = 0)
         super
 
@@ -76,11 +64,6 @@ module Aruba
         @stdout_file.sync = true
         @stderr_file.sync = true
 
-        if RUBY_VERSION >= '1.9'
-          @stdout_file.set_encoding('ASCII-8BIT')
-          @stderr_file.set_encoding('ASCII-8BIT')
-        end
-
         @exit_status = nil
         @duplex      = true
 
@@ -100,16 +83,16 @@ module Aruba
             sleep startup_wait_time
           end
         rescue ChildProcess::LaunchError => e
-          raise LaunchError, "It tried to start #{cmd}. " + e.message
+          raise LaunchError, "It tried to start #{commandline}. " + e.message
         end
 
         after_run
 
         yield self if block_given?
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
 
-      # Access to stdin of process
+      # Access to stdout of process
       def stdin
         return if @process.exited?
 
@@ -175,11 +158,7 @@ module Aruba
       def close_io(name)
         return if stopped?
 
-        if RUBY_VERSION < '1.9'
-          @process.io.send(name.to_sym).close
-        else
-          @process.io.public_send(name.to_sym).close
-        end
+        @process.io.public_send(name.to_sym).close
       end
 
       # Stop command
@@ -270,13 +249,15 @@ module Aruba
         # gather fully qualified path
         cmd = Aruba.platform.which(command, environment['PATH'])
 
+        # rubocop:disable  Metrics/LineLength
         fail LaunchError, %(Command "#{command}" not found in PATH-variable "#{environment['PATH']}".) if cmd.nil?
+        # rubocop:enable  Metrics/LineLength
 
         Aruba.platform.command_string.new(cmd)
       end
 
       def wait_for_io(time_to_wait, &block)
-        sleep time_to_wait
+        sleep time_to_wait.to_i
         yield
       end
 
@@ -286,11 +267,7 @@ module Aruba
         data = file.read
         file.close
 
-        if RUBY_VERSION >= '1.9'
-          data.force_encoding('UTF-8')
-        else
-          data
-        end
+        data
       end
     end
   end

data/lib/aruba/rspec.rb

@@ -16,6 +16,7 @@ RSpec.configure do |config|
   # Setup environment for aruba
   config.around :each do |example|
     if self.class.include? Aruba::Api
+      restore_env
       setup_aruba
     end
 

data/lib/aruba/runtime.rb

@@ -81,12 +81,11 @@ module Aruba
     # @return [ArubaPath]
     #   The directory to where your fixtures are stored
     def fixtures_directory
-      @fixtures_directory ||= begin
+      unless @fixtures_directory
         candidates = config.fixtures_directories.map { |dir| File.join(root_directory, dir) }
-        directory = candidates.find { |d| Aruba.platform.directory? d }
+        @fixtures_directory = candidates.find { |d| Aruba.platform.directory? d }
 
-        fail "No existing fixtures directory found in #{candidates.map { |d| format('"%s"', d) }.join(', ')}." unless directory
-        directory
+        fail "No existing fixtures directory found in #{candidates.map { |d| format('"%s"', d) }.join(', ')}. " unless @fixtures_directory
       end
 
       fail %(Fixtures directory "#{@fixtures_directory}" is not a directory) unless Aruba.platform.directory?(@fixtures_directory)

data/lib/aruba/setup.rb

@@ -10,10 +10,10 @@ module Aruba
       @runtime = runtime
     end
 
-    def call(clobber = true)
+    def call
       return if runtime.setup_already_done?
 
-      working_directory(clobber)
+      working_directory
       events
 
       runtime.setup_done
@@ -23,10 +23,8 @@ module Aruba
 
     private
 
-    def working_directory(clobber = true)
-      if clobber
-        Aruba.platform.rm File.join(runtime.config.root_directory, runtime.config.working_directory), :force => true
-      end
+    def working_directory
+      Aruba.platform.rm File.join(runtime.config.root_directory, runtime.config.working_directory), :force => true
       Aruba.platform.mkdir File.join(runtime.config.root_directory, runtime.config.working_directory)
       Aruba.platform.chdir runtime.config.root_directory
     end
@@ -36,11 +34,11 @@ module Aruba
       runtime.event_bus.register(
         :command_started,
         proc do |event|
-          runtime.announcer.announce(:command) { event.entity.commandline }
-          runtime.announcer.announce(:timeout, 'exit') { event.entity.exit_timeout }
-          runtime.announcer.announce(:timeout, 'io wait') { event.entity.io_wait_timeout }
-          runtime.announcer.announce(:wait_time, 'startup wait time') { event.entity.startup_wait_time }
-          runtime.announcer.announce(:full_environment) { event.entity.environment }
+          runtime.announcer.announce :command, event.entity.commandline
+          runtime.announcer.announce :timeout, 'exit', event.entity.exit_timeout
+          runtime.announcer.announce :timeout, 'io wait', event.entity.io_wait_timeout
+          runtime.announcer.announce :wait_time, 'startup wait time', event.entity.startup_wait_time
+          runtime.announcer.announce :full_environment, event.entity.environment
         end
       )
 

data/lib/aruba/spawn_process.rb

@@ -1,12 +1,9 @@
 require 'aruba/processes/spawn_process'
-require 'aruba/platform'
-
-Aruba.platform.deprecated('The use of "Aruba::SpawnProcess" is deprecated. Use "Aruba::Processes::SpawnProcess" instead.')
 
 module Aruba
   class SpawnProcess < Aruba::Processes::SpawnProcess
     def initialize(*args)
-      Aruba.platform.deprecated('The use of "Aruba::SpawnProcess" is deprecated. Use "Aruba::Processes::SpawnProcess" instead.')
+      warn('The use of "Aruba::SpawnProcess" is deprecated. Use "Aruba::Processes::SpawnProcess" instead.')
 
       super
     end

data/lib/aruba/tasks/docker_helpers.rb

@@ -0,0 +1,158 @@
+require 'psych'
+
+module Aruba
+  class DockerRunInstance
+    protected
+
+    attr_reader :file, :instance
+
+    public
+
+    def initialize(file, instance)
+      @file     = file
+      @instance = instance
+    end
+
+    def method_missing(m, *args, &block)
+      @file.public_send m, instance
+    end
+
+    def respond_to_missing?(m)
+      @file.respond_to? m
+    end
+  end
+
+  class DockerBuildCommandLineBuilder
+    protected
+
+    attr_reader :run_instance, :opts
+
+    public
+
+    def initialize(run_instance, opts = {})
+      @run_instance = run_instance
+      @opts = opts
+    end
+
+    def to_cli
+      cache               = opts[:cache]
+      application_version = opts[:version]
+      docker_file         = run_instance.docker_file
+      docker_image        = run_instance.image
+
+      cmdline = []
+      cmdline << 'docker'
+      cmdline << 'build'
+      cmdline << '--no-cache=true' if cache == 'false'
+
+      %w(http_proxy https_proxy HTTP_PROXY HTTPS_PROXY).each do |var|
+        next unless ENV.key? var
+
+        proxy_uri = URI(ENV[var])
+        proxy_uri.host = '172.17.0.1'
+        cmdline << "--build-arg #{var}=#{proxy_uri}"
+      end
+
+      cmdline << "-t #{docker_image}:#{application_version}"
+      cmdline << "-f #{docker_file}"
+      cmdline << File.dirname(docker_file)
+
+      cmdline.join(' ')
+    end
+  end
+
+  class DockerRunCommandLineBuilder
+    protected
+
+    attr_reader :run_instance, :opts
+
+    public
+
+    def initialize(run_instance, opts = {})
+      @run_instance = run_instance
+      @opts         = opts
+    end
+
+    def to_cli
+      volumes = run_instance.volumes
+      image   = run_instance.image
+      command = opts[:command]
+
+      cmdline = []
+      cmdline << 'docker'
+      cmdline << 'run'
+      cmdline << '-it'
+      cmdline << '--rm'
+      cmdline << "--name #{run_instance.container_name}"
+
+      volumes.each do |v|
+        cmdline << "-v #{expand_volume_paths(v)}"
+      end
+
+      cmdline << image
+      cmdline << command if command
+
+      cmdline.join(' ')
+    end
+
+    private
+
+    def expand_volume_paths(volume_paths)
+      volume_paths.split(':').map { |path| File.expand_path(path) }.join(':')
+    end
+  end
+
+  class DockerComposeFile
+    protected
+
+    attr_reader :data
+
+    public
+
+    def initialize(path)
+      @data = Psych.load_file(path)['services']
+    end
+
+    def volumes(instance)
+      fetch(instance)['volumes']
+    end
+
+    def build_context(instance)
+      fetch(instance).fetch('build', {})['context']
+    end
+
+    def build_arguments(instance)
+      fetch(instance).fetch('build', {})['args']
+    end
+
+    def docker_file(instance)
+      fetch(instance).fetch('build', {})['dockerfile']
+    end
+
+    def image(instance)
+      fetch(instance)['image']
+    end
+
+    def container_name(instance)
+      fetch(instance)['container_name']
+    end
+
+    def command(instance)
+      fetch(instance)['command']
+    end
+
+    def working_directory(instance)
+      fetch(instance)['working_dir']
+    end
+
+    def command(instance)
+      fetch(instance)['command']
+    end
+
+    private
+
+    def fetch(instance)
+      Hash(data).fetch(instance.to_s)
+    end
+  end
+end