jarl 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61631bf03f69db561a1d8a9c69dbf83a9126ffb6
-  data.tar.gz: 4f1cc485a811a7ebc7c908c8d638894b76318077
+  metadata.gz: e8ca764b83d720d8c5b54eec8db4fc5177c6f2f3
+  data.tar.gz: a605b6f8e2f8447eabad0a23b4cad4b0a46b246f
 SHA512:
-  metadata.gz: 585653b90b50cd05586c2af13b51516c1391f214e9efb2dfe689f9382499bdd051f98355da1ab6306537242db54d247f44f3d45f1f13280562e0f2679e3e9c32
-  data.tar.gz: d49cbd4277bf2b99b6863c5b21ed7d666b5f5bd1b37460fdef4edbd3fbe7cbe2fa9c14756a6c962e9e01240831fc6e8a9fec56f2e3dcd5c96ceabb9c9f3dd338
+  metadata.gz: 12099f11b9fe1be9c35b467d5f5ab3590fee1df75e90bf20d411faaa7790d87c611a8a5fdc8c6dd294345399525fa629814a44b8ba8bd48889142305fedc9e9b
+  data.tar.gz: 9ddeebf7fe96b833fb7544fca4d7e3c35cddacf46bb91526716f9d1a86a94f5f7eae69f7ff0ed9fb580849a8a6d0730ce3c33dd07666001633c81b072dbf9cc0

data/lib/jarl/application.rb

@@ -1,7 +1,7 @@
 module Jarl
   class Application
     attr_reader :group, :name, :hostname, :base_path
-    attr_reader :image, :scale, :volumes, :ports, :environment, :entrypoint, :command
+    attr_reader :image, :scale, :volumes, :ports, :environment, :entrypoint, :command, :logging
     attr_reader :serial
 
     # Create Application object from application definition:
@@ -46,6 +46,17 @@ module Jarl
       if @command && !@command.is_a?(String)
         fail "Application '#{self}' has invalid 'command' definition, String is expected"
       end
+      @logging = (params['logging'] || {}).map { |k, v| [k.to_sym, v] }.to_h
+      unless @logging.is_a?(Hash)
+        fail "Application '#{self}' has invalid 'logging' definition, Hash is expected"
+      end
+      @logging = @logging.map { |k, v| [k.to_sym, v] }.to_h # .symbolize_keys
+      if @logging[:driver] && !@logging[:driver].is_a?(String)
+        fail "Application '#{self}' has invalid 'logging:driver' definition, String is expected"
+      end
+      if @logging[:options] && !@logging[:options].is_a?(Hash)
+        fail "Application '#{self}' has invalid 'logging:options' definition, Hash is expected"
+      end
       @serial = self.class.next_serial
       @hostname = @name
     end
@@ -115,7 +126,8 @@ module Jarl
         volumes: volumes,
         ports: ports,
         environment: environment,
-        command: (execute_command || command || '') + ' ' + args.join(' ')
+        command: (execute_command || command || '') + ' ' + args.join(' '),
+        logging: logging
       )
     end
 
@@ -197,7 +209,8 @@ module Jarl
           volumes: application.volumes,
           ports: application.ports,
           environment: application.environment,
-          command: application.command
+          command: application.command,
+          logging: application.logging
         )
       end
 

data/lib/jarl/docker.rb

@@ -98,11 +98,9 @@ module Docker
     raise unless e.to_s =~ /Command failed/
   end
 
-  # Start container defined by params
+  # Construct options string for running a container
   #
-  def self.start(params)
-    container_name = params[:name]
-    Docker::Container.clean_containers(container_name)
+  def self.run_options(params)
     opts = []
     opts << params[:volumes].map do |v|
       "-v #{v}"
@@ -113,7 +111,23 @@ module Docker
     opts << params[:environment].map do |k, v|
       "-e #{k}='#{v}'"
     end.join(' ')
-    docker_cmd = "docker run -d #{opts.join(' ')} " \
+    if params[:logging] && params[:logging][:driver]
+      opts << "--log-driver #{params[:logging][:driver]}"
+    end
+    if params[:logging] && params[:logging][:options]
+      opts << params[:logging][:options].map do |k, v|
+        "--log-opt #{k}='#{v}'"
+      end.join(' ')
+    end
+    opts.join(' ')
+  end
+
+  # Start container defined by params
+  #
+  def self.start(params)
+    container_name = params[:name]
+    Docker::Container.clean_containers(container_name)
+    docker_cmd = "docker run -d #{run_options(params)} " \
       " --hostname #{params[:hostname]} " \
       " --name #{container_name} #{params[:image]} #{params[:command]}"
     # puts docker_cmd
@@ -125,17 +139,7 @@ module Docker
   def self.execute(params)
     container_name = "#{params[:name]}.execute"
     Docker::Container.clean_containers(container_name)
-    opts = []
-    opts << params[:volumes].map do |v|
-      "-v #{v}"
-    end.join(' ')
-    opts << params[:ports].map do |p|
-      "-p #{p}"
-    end.join(' ')
-    opts << params[:environment].map do |k, v|
-      "-e #{k}='#{v}'"
-    end.join(' ')
-    docker_cmd = "docker run -t -i --rm #{opts.join(' ')} " \
+    docker_cmd = "docker run -t -i --rm #{run_options(params)} " \
       " --hostname #{params[:hostname]} " \
       " --name #{container_name} #{params[:image]} #{params[:command]}"
     # puts docker_cmd

data/lib/jarl/version.rb

@@ -1,3 +1,3 @@
 module Jarl
-  VERSION = '0.8.3'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarl
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Jarl, docker container management tool