jarl 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1b82e05cd7a3e5e5e87a20e58f2975c7283bcd2
-  data.tar.gz: 9939dc2ec0e4b50c443f4e901687338d8183e603
+  metadata.gz: e076c0b533e66716c968624611648d1a04994765
+  data.tar.gz: efadec1a212ef32fc557c67573a5b3e36f43ee9d
 SHA512:
-  metadata.gz: abd454b5de4b9dbeb19d9775722d714f1e3d06bad19046602120027567e8918b02787307283324ecada358dd9fca32562ea2684c00bee0be880c49ca851b5f4e
-  data.tar.gz: 76e066025fb79123135cbddce7dd52b5c84900ed50d53b3381a49ea1dd4b13932a53e94e942800678a4faa2914f9e26bc8a406d7665c6e025fb38965c72d9ede
+  metadata.gz: d69a18c739d116b3cb92948a331d399363eb963d2ef2d0e75dd76681d186d5f8c8c9907b0036217c7277e09aaf19b898551405def83dbbe9d88b0b8071121925
+  data.tar.gz: 7ce1a86f9a063d968320b9586db3671b7b26835e02265169a3072c3f1afae3e1782e38967e6fda0be99df7fc30b474f4dd08a220d5968b071fccb3e464a77ad9

data/lib/jarl/application.rb

@@ -2,6 +2,7 @@ module Jarl
   class Application
     attr_reader :group, :name, :hostname
     attr_reader :image, :volumes, :ports, :environment, :entrypoint, :command
+    attr_reader :serial
 
     # Create Application object from application definition:
     #
@@ -53,24 +54,24 @@ module Jarl
     end
 
     def running?
-      running_container
+      instances.size > 0
     end
 
-    def running_container
-      Docker.containers_running.find { |c| c.name == full_name }
+    def instances
+      Docker.containers_running.select { |c| c.name =~ /^#{full_name}(\.\d+)?$/ }.map do |c|
+        Instance.new(self, c)
+      end
     end
 
-    def start
-      running_container.stop! if running?
-      Docker.start(
-        name: full_name,
-        hostname: hostname,
-        image: image_name,
-        volumes: volumes,
-        ports: ports,
-        environment: environment,
-        command: command
-      )
+    # Start +scale+ instances of the application
+    #
+    def start(scale = 1)
+      instances.map(&:stop!) if running?
+      if scale > 1
+        scale.times { |n| Instance.start(self, n + 1) }
+      else
+        Instance.start(self)
+      end
     end
 
     def execute(execute_command, args)
@@ -87,7 +88,7 @@ module Jarl
 
     def ssh
       fail 'Not a running application' unless running?
-      running_container.open_ssh_session!(Jarl.config.params)
+      instances.first.ssh
     end
 
     def build
@@ -103,24 +104,6 @@ module Jarl
       image_is_a_path? ? image : nil
     end
 
-    def show_log(*_args)
-      color_code = Console::Colors::SEQUENCE[@serial % Console::Colors::SEQUENCE.size]
-      return unless running?
-      begin
-        IO.popen "docker logs -f #{running_container.id}", 'r' do |p|
-          str = '<<< STARTED >>>'
-          while str
-            str = p.gets
-            str.split("\n").each do |s|
-              puts "#{esc_color color_code, full_name}: #{s}"
-            end
-          end
-        end
-      rescue Interrupt
-        #
-      end
-    end
-
     def to_s
       full_name
     end
@@ -130,5 +113,62 @@ module Jarl
       @current_serial += 1
       @current_serial - 1
     end
+
+    # Application::Instance represents a single running instance of the application
+    #
+    class Instance
+      attr_reader :application, :container
+      def initialize(application, container)
+        @application = application
+        @container = container
+      end
+
+      def stop!
+        @container.stop!
+      end
+
+      def name
+        @container.name
+      end
+
+      def n
+        suffix = @container.name.split('.').last
+        suffix =~ /^\d+$/ ? suffix : nil
+      end
+
+      def tail_log(*_args)
+        color_code = Console::Colors::SEQUENCE[application.serial % Console::Colors::SEQUENCE.size]
+        begin
+          instance_no = n ? ".#{n}" : ''
+          IO.popen "docker logs -f #{container.id}", 'r' do |p|
+            str = '<<< STARTED >>>'
+            while str
+              str = p.gets
+              str.split("\n").each do |s|
+                puts "#{esc_color color_code, application.full_name}#{instance_no}: #{s}"
+              end
+            end
+          end
+        rescue Interrupt
+          #
+        end
+      end
+
+      def ssh
+        container.open_ssh_session!(Jarl.config.params)
+      end
+
+      def self.start(application, n = nil)
+        Docker.start(
+          name: (n ? "#{application.full_name}.#{n}" : application.full_name),
+          hostname: (n ? "#{application.hostname}-#{n}" : application.hostname),
+          image: application.image_name,
+          volumes: application.volumes,
+          ports: application.ports,
+          environment: application.environment,
+          command: application.command
+        )
+      end
+    end # class Instance
   end # class Application
 end # module Jarl

data/lib/jarl/cli.rb

@@ -38,13 +38,17 @@ module Jarl
     default_task :status
 
     #
+    option :scale,
+      type: :numeric,
+      default: 1,
+      desc: 'Start several instances'
     desc 'up [NAME]', 'Start or restart applications'
     def up(name = nil)
       Jarl.load(options)
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       apps.each do |app|
         puts esc_green(app.running? ? "Restarting '#{app}'..." : "Starting '#{app}'...")
-        app.start
+        app.start(options[:scale])
       end
       # show_jarl_applications_status(apps)
     end
@@ -56,8 +60,10 @@ module Jarl
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       apps.each do |app|
         next unless app.running?
-        puts esc_yellow "Stopping '#{app}'..."
-        app.running_container.stop!
+        app.instances.each do |i|
+          puts esc_yellow "Stopping '#{i.name}'..."
+          i.stop!
+        end
       end
     end
 
@@ -87,7 +93,7 @@ module Jarl
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       apps.each do |app|
         if options[:ip]
-          puts app.running_container.ip if app.running?
+          puts app.instances.map(&:container).map(&:ip) if app.running?
         else
           show_jarl_application_inspect(app)
         end
@@ -109,11 +115,12 @@ module Jarl
       Jarl.load(options)
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       threads = []
-      apps.select(&:running?).each do |app|
-        threads << Thread.new { app.show_log }
+      apps.select(&:running?).map(&:instances).flatten.each do |instance|
+        threads << Thread.new { instance.tail_log }
       end
+
       begin
-        threads.each(&:join)
+        threads.flatten.each(&:join)
       rescue Interrupt
         #
       end
@@ -136,7 +143,10 @@ module Jarl
         puts esc_yellow 'No applications found'
         return
       end
-      max_full_name_len = [apps.map(&:full_name).map(&:size).max, 12].max
+      full_names = apps.map do |app|
+        app.running? ? app.instances.map { |i| i.container.name } : app.full_name
+      end.flatten
+      max_full_name_len = [full_names.map(&:size).max, 12].max
       puts esc_format(
         ['APPLICATION', max_full_name_len],
         ['RUNNING', 12],
@@ -145,14 +155,25 @@ module Jarl
         ['PORTS']
       )
       apps.each do |app|
-        container = app.running_container
-        puts esc_format(
-          [app.full_name, max_full_name_len, :yellow],
-          (app.running? ? [container.id, 12, :green] : ['no', 12]),
-          (app.running? ? [seconds_to_human(container.uptime), 12, :yellow] : ['', 12]),
-          (app.running? ? [container.ip, 12, :yellow] : ['', 12]),
-          (app.running? ? [container.ports.map { |p| "#{p[:from]}"}.join(', ')] : [''])
-        )
+        if app.running?
+          app.instances.each do |i|
+            puts esc_format(
+              [i.container.name, max_full_name_len, :yellow],
+              [i.container.id, 12, :green],
+              [seconds_to_human(i.container.uptime), 12, :yellow],
+              [i.container.ip, 12, :yellow],
+              [i.container.ports.map { |p| "#{p[:from]}" }.join(', ')]
+            )
+          end
+        else
+          puts esc_format(
+            [app.full_name, max_full_name_len, :yellow],
+            ['no', 12],
+            ['', 12],
+            ['', 12],
+            ['']
+          )
+        end
       end
     end
 
@@ -161,15 +182,16 @@ module Jarl
         puts esc_yellow("#{app.full_name}: ") + 'down'
         return
       end
-      container = app.running_container
-      puts esc_yellow "#{app.full_name}: " + esc_green(container.id)
-      puts "     name: #{esc_yellow container.name}"
-      puts "    image: #{esc_yellow container.image}"
-      puts "  full ID: #{esc_yellow container.long_id}"
-      puts "   uptime: #{esc_yellow seconds_to_human container.uptime}"
-      puts "       IP: #{esc_yellow container.ip}"
-      puts "    ports: #{esc_yellow container.ports.map { |p| "#{p[:from]}->#{p[:to]}"}.join(', ')}"
-      puts "  volumes: #{esc_yellow container.params['Volumes']}"
+      app.instances.map(&:container).each do |container|
+        puts esc_yellow "#{container.name}: " + esc_green(container.id)
+        puts "      app: #{esc_yellow app.full_name}"
+        puts "    image: #{esc_yellow container.image}"
+        puts "  full ID: #{esc_yellow container.long_id}"
+        puts "   uptime: #{esc_yellow seconds_to_human container.uptime}"
+        puts "       IP: #{esc_yellow container.ip}"
+        puts "    ports: #{esc_yellow container.ports.map { |p| "#{p[:from]}->#{p[:to]}"}.join(', ')}"
+        puts "  volumes: #{esc_yellow container.params['Volumes']}"
+      end
     end
   end # class CLI
 end # module Jarl

data/lib/jarl/version.rb

@@ -1,3 +1,3 @@
 module Jarl
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarl
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor