specinfra 2.17.1 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95957f49bb4305b2517ce5b6850b7f6e099cc3ce
-  data.tar.gz: 49b26004b03a66d83d4dcf0bdb6c3e471ea63b50
+  metadata.gz: 986714dbef8eb87fe3feeec2a68f47b3d54c93e7
+  data.tar.gz: 462409f9a83ca31793a5878c39aebab6cd4d1843
 SHA512:
-  metadata.gz: 76bfa75a89269273dba700ec9d0bbc824f4e7e2b5846d2109b7e896be97c29f8a184af0d484824e88454a4786b43639703f031f6e78722aea8260fb7af6b8f40
-  data.tar.gz: f269df1a92d3305f0ec60697f491eef385cb9975e3acbad5d2ec500b3ced054170c001defac00fbef14515630fdd929ac1f536759244e6ec90973c46d056c09d
+  metadata.gz: 247447e1066bfbb554f3da2d3b038e35f0f1b760158d3f21b374447095e4240d1656523706bb753a58ba5ea1887220c4ddd3f21fd73cc762ebf6602367425359
+  data.tar.gz: 57c398cabc517e9df36f0775655c9555bda4ee0a21a0634102229f8bb2e0a027b6da570be93168e0116f468d698efbe84c1593d78c11746cb6053a2bf7a78cda

data/lib/specinfra/backend/docker.rb

@@ -13,8 +13,7 @@ module Specinfra::Backend
         @images = []
         @base_image = ::Docker::Image.get(image)
 
-        env = Specinfra.configuration.env || {}
-        create_and_start_container(env)
+        create_and_start_container
         ObjectSpace.define_finalizer(self, proc { cleanup_container })
       elsif container = Specinfra.configuration.docker_container
         @container = ::Docker::Container.get(container)
@@ -49,7 +48,7 @@ module Specinfra::Backend
 
     private
 
-    def create_and_start_container(env)
+    def create_and_start_container
       opts = { 'Image' => current_image.id }
 
       if current_image.json["Config"]["Cmd"].nil?
@@ -60,10 +59,13 @@ module Specinfra::Backend
         (opts['Env'] ||= []) << "PATH=#{path}"
       end
 
-      if env
-        opts['Env'] = (opts['Env'] || []) + env.map { |k,v| [k,v].join('=') }
+      if Specinfra.configuration.env.any?
+        env = Specinfra.configuration.env.to_a.map { |v| v.join('=') }
+        opts['Env'] = opts['Env'].to_a.concat(env)
       end
 
+      opts.merge!(Specinfra.configuration.docker_container_create_options || {})
+
       @container = ::Docker::Container.create(opts)
       @container.start
     end
@@ -78,13 +80,17 @@ module Specinfra::Backend
     end
 
     def docker_run!(cmd, opts={})
-      begin
-        stdout, stderr, status = @container.exec(['/bin/sh', '-c', cmd])
-        return CommandResult.new :stdout => stdout.join, :stderr => stderr.join,
-        :exit_status => status
-      rescue
-        @container.kill
-      end
+      stdout, stderr, status = @container.exec(['/bin/sh', '-c', cmd])
+
+      CommandResult.new :stdout => stdout.join, :stderr => stderr.join,
+      :exit_status => status
+    rescue ::Docker::Error::DockerError => e
+      raise
+    rescue => e
+      @container.kill
+      err = stderr.nil? ? ([e.message] + e.backtrace) : stderr
+      CommandResult.new :stdout => [stdout].join, :stderr => err.join,
+      :exit_status => (status || 1)
     end
   end
 end

data/lib/specinfra/command/alpine/base/package.rb

@@ -0,0 +1,19 @@
+class Specinfra::Command::Alpine::Base::Package < Specinfra::Command::Linux::Base::Package
+  class << self
+    def check_is_installed(package, version = nil)
+      pkg = [escape(package), version].compact.join('=')
+      "apk info -qe #{pkg}"
+    end
+
+    alias_method :check_is_installed_by_apk, :check_is_installed
+
+    def install(package, version = nil, _option = '')
+      pkg = [escape(package), version].compact.join('=')
+      "apk add -U #{pkg}"
+    end
+
+    def get_version(package, _opts = nil)
+      "apk version #{package} | tail -n1 | awk '{ print $1; }' | cut -d- -f2-"
+    end
+  end
+end

data/lib/specinfra/command/alpine/base/process.rb

@@ -0,0 +1,20 @@
+class Specinfra::Command::Alpine::Base::Process < Specinfra::Command::Base
+  class << self
+    def get(process, opts)
+      col = opts[:format].chomp('=')
+      if col == 'args'
+        "ps -o #{col} | grep #{escape(process)} | head -1"
+      else
+        "ps -o #{col},args | grep -E '\\s+#{process}' | awk '{ print $1 }' | head -1"
+      end
+    end
+
+    def check_is_running(process)
+      "ps -ocomm | grep -w -- #{escape(process)} | grep -qv grep"
+    end
+
+    def check_count(process, count)
+      "test $(ps -ocomm | grep -w -- #{escape(process)} | grep -v grep | wc -l) -eq #{escape(count)}"
+    end
+  end
+end

data/lib/specinfra/command/alpine/base.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Alpine::Base < Specinfra::Command::Linux::Base
+end

data/lib/specinfra/command/alpine.rb

@@ -0,0 +1 @@
+class Specinfra::Command::Alpine; end

data/lib/specinfra/command.rb

@@ -98,6 +98,12 @@ require 'specinfra/command/aix/base/port'
 require 'specinfra/command/aix/base/service'
 require 'specinfra/command/aix/base/user'
 
+# Alpine (inherit Linux)
+require 'specinfra/command/alpine'
+require 'specinfra/command/alpine/base'
+require 'specinfra/command/alpine/base/package'
+require 'specinfra/command/alpine/base/process'
+
 # Arch (inherit Linux)
 require 'specinfra/command/arch'
 require 'specinfra/command/arch/base'

data/lib/specinfra/configuration.rb

@@ -13,6 +13,7 @@ module Specinfra
         :sudo_path,
         :disable_sudo,
         :sudo_options,
+        :docker_container_create_options,
         :docker_image,
         :docker_url,
         :lxc,

data/lib/specinfra/helper/detect_os/alpine.rb

@@ -0,0 +1,8 @@
+class Specinfra::Helper::DetectOs::Alpine < Specinfra::Helper::DetectOs
+  def self.detect
+    if run_command('ls /etc/alpine-release').success?
+      release = run_command('cat /etc/alpine-release').stdout
+      { :family => 'alpine', :release => release }
+    end
+  end
+end

data/lib/specinfra/helper/detect_os.rb

@@ -7,6 +7,7 @@ module Specinfra::Helper
 end
 
 require 'specinfra/helper/detect_os/aix'
+require 'specinfra/helper/detect_os/alpine'
 require 'specinfra/helper/detect_os/arch'
 require 'specinfra/helper/detect_os/darwin'
 require 'specinfra/helper/detect_os/debian'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.17.1"
+  VERSION = "2.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.18.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -145,6 +145,10 @@ files:
 - lib/specinfra/command/aix/base/port.rb
 - lib/specinfra/command/aix/base/service.rb
 - lib/specinfra/command/aix/base/user.rb
+- lib/specinfra/command/alpine.rb
+- lib/specinfra/command/alpine/base.rb
+- lib/specinfra/command/alpine/base/package.rb
+- lib/specinfra/command/alpine/base/process.rb
 - lib/specinfra/command/arch.rb
 - lib/specinfra/command/arch/base.rb
 - lib/specinfra/command/arch/base/file.rb
@@ -325,6 +329,7 @@ files:
 - lib/specinfra/helper/configuration.rb
 - lib/specinfra/helper/detect_os.rb
 - lib/specinfra/helper/detect_os/aix.rb
+- lib/specinfra/helper/detect_os/alpine.rb
 - lib/specinfra/helper/detect_os/arch.rb
 - lib/specinfra/helper/detect_os/darwin.rb
 - lib/specinfra/helper/detect_os/debian.rb