jarl 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5f658f6a2817ddf675c13d89d831c744dd27fcf
-  data.tar.gz: 087abc1978c7461efc0e2b2154b321ad4c0c1285
+  metadata.gz: 970993e9185345d4b00ebacc7f220e3859530366
+  data.tar.gz: 65c05fe392e5b9b61860141927b71da5556258db
 SHA512:
-  metadata.gz: abfa4bd3f766e2d50352076b32ab0d1e56151fddd19ea8c3c769e44d971e11eecc0148c6187c6077a0fff02b77befaa1e7567507467a1f40cf1a2ed2e2513735
-  data.tar.gz: 1f397a352b7a36204e4ad6888235b7bf0b34d0d267b1084fbbd0d4bb6fc562bc22dd0078e92365d6308f9c2832216c655bd9431317694315317b06be772d5256
+  metadata.gz: 97aa717a7ae7d644ec8fce6a063c8bbf54b7cb4c2db911304236baa57e43162d3f839a903951cdfca4024bb84c9ad5f09cd66553d3dbe7cbabe9402c3767e4ad
+  data.tar.gz: 67c50f92173a2ca9e6a7c5187aaa0354fb9a4fad674937eaeed1e69d11b3f6ca4cd2b128e2175af1b1d5679755a6b01365d405187b8a4857e614409f03c334f1

data/bin/jarl

@@ -2,4 +2,9 @@
 
 require_relative '../lib/jarl'
 
-Jarl::CLI.start
+begin
+  Jarl::CLI.start
+rescue StandardError => e
+  puts esc_red "FATAL: #{e}"
+  puts e.backtrace.join("\n") if ARGV.include?('--debug')
+end

data/lib/jarl/application.rb

@@ -1,6 +1,7 @@
 module Jarl
   class Application
-    attr_reader :group, :name, :image, :volumes, :ports, :environment, :entrypoint, :command
+    attr_reader :group, :name, :hostname
+    attr_reader :image, :volumes, :ports, :environment, :entrypoint, :command
 
     # Create Application object from application definition:
     #
@@ -39,6 +40,8 @@ module Jarl
       if @command && !@command.is_a?(String)
         fail "Application '#{self}' has invalid 'command' definition, String is expected"
       end
+      @serial = self.class.next_serial
+      @hostname = @name
     end
 
     def full_name
@@ -61,6 +64,7 @@ module Jarl
       running_container.stop! if running?
       Docker.start(
         name: full_name,
+        hostname: hostname,
         image: image_name,
         volumes: volumes,
         ports: ports,
@@ -69,6 +73,23 @@ module Jarl
       )
     end
 
+    def execute(execute_command, args)
+      Docker.execute(
+        name: full_name,
+        hostname: hostname,
+        image: image_name,
+        volumes: volumes,
+        ports: ports,
+        environment: environment,
+        command: (execute_command || command || '') + ' ' + args.join(' ')
+      )
+    end
+
+    def ssh
+      fail 'Not a running application' unless running?
+      running_container.open_ssh_session!(Jarl.config.params)
+    end
+
     def build
       fail 'Not a file based image' unless image_is_a_path?
       Docker::Image.new(image_name, image_path).build!
@@ -83,11 +104,17 @@ module Jarl
     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 >>>'
-          puts "#{esc_yellow full_name}: #{str}" while str = p.gets
+          while str
+            str = p.gets
+            str.split("\n").each do |s|
+              puts "#{esc_color color_code, full_name}: #{s}"
+            end
+          end
         end
       rescue Interrupt
         #
@@ -97,5 +124,11 @@ module Jarl
     def to_s
       full_name
     end
+
+    def self.next_serial
+      @current_serial ||= 0
+      @current_serial += 1
+      @current_serial - 1
+    end
   end # class Application
 end # module Jarl

data/lib/jarl/base.rb

@@ -1,8 +1,12 @@
 module Jarl
+  DEFAULT_JARL_CONFIG_PATH = '~/.jarl'
+
   #
   # Load config and application definitions
   #
-  def self.load
+  def self.load(options)
+    load_config(options['config'] || DEFAULT_JARL_CONFIG_PATH)
+    # puts "Jarl::CLI.options: #{options}"
     abort 'Docker is not installed' unless Docker.installed?
     if Jarl.jarl_files.empty?
       abort 'No *.jarl files found'
@@ -12,6 +16,13 @@ module Jarl
     true
   end
 
+  #
+  # Returns current config
+  #
+  def self.config
+    @config
+  end
+
   #
   # Returns list of found *.jarl files
   #
@@ -24,7 +35,7 @@ module Jarl
   def self.applications
     @applications ||= jarl_files.map do |jf|
       begin
-        jf.applications.map { |app_name, params| Application.new(jf.name, app_name, params) }
+        jf.applications
       rescue StandardError => e
         abort "Failed to parse application definition in file '#{jf.path}': #{e}"
       end
@@ -39,6 +50,12 @@ module Jarl
 
   private
 
+  def self.load_config(filename)
+    @config = Config.new(filename)
+  rescue StandardError => e
+    raise "Failed to load config file '#{filename}': #{e}"
+  end
+
   def self.load_jarl_files
     Pathname.glob(Pathname.pwd + '**' + '*.jarl').map do |p|
       JarlFile.new(p)

data/lib/jarl/cli.rb

@@ -8,20 +8,39 @@ module Jarl
       aliases: '-c',
       type: :string,
       desc: 'Use specified config file (defaul: ~/.jarl)'
+    class_option :debug
 
     #
-    desc 'status [NAME]', 'Show applications statuses'
+    desc 'config', 'Show current configuration'
+    def config
+      Jarl.load(options)
+      puts esc_yellow('config:') + " #{Jarl.config.path}"
+      Jarl.config.params.each do |key, value|
+        puts "  #{key}: #{value.inspect}"
+      end
+      puts esc_yellow('jarl files:')
+      Jarl.jarl_files.each do |jarl_file|
+        puts "  #{jarl_file.path}"
+        jarl_file.applications.each do |app|
+          puts "    #{app.name}"
+        end
+      end
+      # show_jarl_applications_status(apps)
+    end
+
+    #
+    desc 'status [NAME]', '(default) Show applications statuses'
     def status(name = nil)
-      Jarl.load
+      Jarl.load(options)
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       show_jarl_applications_status(apps)
     end
     default_task :status
 
     #
-    desc 'up [NAME]', '(Re)start applications'
+    desc 'up [NAME]', 'Start or restart applications'
     def up(name = nil)
-      Jarl.load
+      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}'...")
@@ -33,7 +52,7 @@ module Jarl
     #
     desc 'down [NAME]', 'Stop applications'
     def down(name = nil)
-      Jarl.load
+      Jarl.load(options)
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       apps.each do |app|
         next unless app.running?
@@ -42,11 +61,29 @@ module Jarl
       end
     end
 
+    desc 'execute NAME [COMMAND ...]', 'Run a single command against application image'
+    def execute(name, command = nil, *args)
+      Jarl.load(options)
+      app = Jarl.find_applications_by(name).first
+      abort "Failed to find application by name: '#{name}'" unless app
+      app.execute(command, args)
+    end
+
+    #
+    desc 'ssh NAME', 'Open SSH session to a running application'
+    def ssh(name)
+      Jarl.load(options)
+      app = Jarl.find_applications_by(name).first
+      abort "Failed to find application by name: '#{name}'" unless app
+      abort "Application is not running: '#{app.full_name}'" unless app.running?
+      app.ssh
+    end
+
     #
     option :ip, type: :boolean, desc: 'Show only IPs'
     desc 'inspect [NAME]', 'Inspect applications'
     def inspect(name = nil)
-      Jarl.load
+      Jarl.load(options)
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       apps.each do |app|
         if options[:ip]
@@ -57,9 +94,9 @@ module Jarl
       end
     end
 
-    desc 'build [NAME]', '(Re)build docker images'
+    desc 'build [NAME]', 'Rebuild docker images for Dockerfile based applications'
     def build(name = nil)
-      Jarl.load
+      Jarl.load(options)
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       apps.select(&:image_is_a_path?).each do |app|
         puts esc_yellow "Building image for '#{app}'..."
@@ -69,7 +106,7 @@ module Jarl
 
     desc 'logs [NAME]', 'Show log output for applications'
     def logs(name = nil)
-      Jarl.load
+      Jarl.load(options)
       apps = name ? Jarl.find_applications_by(name) : Jarl.applications
       threads = []
       apps.select(&:running?).each do |app|
@@ -106,7 +143,6 @@ module Jarl
         ['UPTIME', 12],
         ['IP', 12],
         ['PORTS']
-        # ['IMAGE']
       )
       apps.each do |app|
         container = app.running_container
@@ -116,17 +152,8 @@ module Jarl
           (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(', ')] : [''])
-
-          # (app.image_is_a_path? ? ["path: #{app.image}"] : [app.image])
         )
       end
-      # puts "#{app.full_name} (#{app.image})"
-      # puts "  image: #{app.image}"
-      # puts "  volumes: #{app.volumes}"
-      # puts "  ports: #{app.ports}"
-      # puts "  environment: #{app.environment}"
-      # puts "  entrypoint: #{app.entrypoint}"
-      # puts "  command: #{app.command}"
     end
 
     def show_jarl_application_inspect(app)
@@ -143,8 +170,6 @@ module Jarl
       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']}"
-      # puts "       ps: #{esc_yellow container.ps}"
-      # puts "   params: #{esc_yellow container.params}"
     end
   end # class CLI
 end # module Jarl

data/lib/jarl/config.rb

@@ -0,0 +1,23 @@
+require 'yaml'
+require 'pathname'
+
+module Jarl
+  class Config
+    attr_reader :path, :params
+
+    def initialize(path)
+      @path = Pathname.new(path).expand_path
+      load
+    end
+
+    def [](key)
+      @params[key]
+    end
+
+    private
+
+    def load
+      @params = YAML.load File.read(path)
+    end
+  end # class Config
+end # module Jarl

data/lib/jarl/console.rb

@@ -25,34 +25,41 @@ module Console
   end # module Utils
 
   module Colors
+    SEQUENCE = %w(31 32 33 34 35 36 37 31;1 32;1 33;1 34;1 35;1 36;1 37;1)
     # Returns ANSI escaped string.
     #
     def esc_string(esc, text)
       esc + text.to_s + "\e[0m"
     end
 
+    # Returns ANSI escaped string for the colored text.
+    #
+    def esc_color(color_code, text)
+      esc_string "\e[#{color_code}m", text
+    end
+
     # Returns ANSI escaped string for the red colored text.
     #
     def esc_red(text)
-      esc_string "\e[31m", text
+      esc_color 31, text
     end
 
     # Returns ANSI escaped string for the green colored text.
     #
     def esc_green(text)
-      esc_string "\e[32m", text
+      esc_color 32, text
     end
 
     # Returns ANSI escaped string for the yellow colored text.
     #
     def esc_yellow(text)
-      esc_string "\e[33m", text
+      esc_color 33, text
     end
 
     # Returns ANSI escaped string for the blue colored text.
     #
     def esc_blue(text)
-      esc_string "\e[34m", text
+      esc_color 34, text
     end
 
     # Returns ANSI escaped string for the bold text.

data/lib/jarl/docker.rb

@@ -93,6 +93,8 @@ module Docker
   # Start container defined by params
   #
   def self.start(params)
+    container_name = params[:name]
+    Docker::Container.clean_containers(container_name)
     opts = []
     opts << params[:volumes].map do |v|
       "-v #{v}"
@@ -104,8 +106,30 @@ module Docker
       "-e #{k}=#{v}"
     end.join(' ')
     docker_cmd = "docker run -d #{opts.join(' ')} " \
-      " --hostname #{params[:name]} " \
-      " --name #{params[:name]} #{params[:image]} #{params[:command]}"
+      " --hostname #{params[:hostname]} " \
+      " --name #{container_name} #{params[:image]} #{params[:command]}"
+    # puts docker_cmd
+    sh docker_cmd
+  end
+
+  # Execute container in foreground, defined by params
+  #
+  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(' ')} " \
+      " --hostname #{params[:hostname]} " \
+      " --name #{container_name} #{params[:image]} #{params[:command]}"
     # puts docker_cmd
     sh docker_cmd
   end
@@ -195,9 +219,16 @@ module Docker
       end
     end
 
-    def open_ssh_session!
-      ssh_flags = "-oStrictHostKeyChecking=no -i #{INSECURE_KEY_PATH}"
-      sh "ssh #{ssh_flags} root@#{ip}"
+    def open_ssh_session!(params = {})
+      ssh_flags = ['-oStrictHostKeyChecking=no']
+      if params['ssh_identity']
+        ssh_flags << "-i #{params['ssh_identity']}" if params['ssh_identity'].is_a?(String)
+        if params['ssh_identity'].is_a?(Array)
+          ssh_flags << params['ssh_identity'].map { |i| "-i #{i}" }
+        end
+      end
+      ssh_user = params['ssh_user'] ? "#{params['ssh_user']}@" : ''
+      sh "ssh #{ssh_flags.join(' ')} #{ssh_user}#{ip}"
     end
 
     def stop!

data/lib/jarl/jarl_file.rb

@@ -3,18 +3,23 @@ require 'pathname'
 
 module Jarl
   class JarlFile
-    attr_reader :path, :name, :applications
+    attr_reader :path, :name
 
     def initialize(path)
-      @path = Pathname.new(path)
+      @path = Pathname.new(path).expand_path
       @name = @path.basename('.jarl')
-      load
+    end
+
+    def applications
+      @applications ||= load_applications
     end
 
     private
 
-    def load
-      @applications = YAML.load File.read(path)
+    def load_applications
+      YAML.load(File.read(path)).map do |app_name, params|
+        Application.new(name, app_name, params)
+      end
     end
 
   end # class JarlFile

data/lib/jarl/version.rb

@@ -1,3 +1,3 @@
 module Jarl
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/jarl.rb

@@ -5,6 +5,7 @@
 require 'jarl/base'
 require 'jarl/version'
 require 'jarl/cli'
+require 'jarl/config'
 require 'jarl/application'
 require 'jarl/jarl_file'
 require 'jarl/docker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,6 +85,7 @@ files:
 - lib/jarl/application.rb
 - lib/jarl/base.rb
 - lib/jarl/cli.rb
+- lib/jarl/config.rb
 - lib/jarl/console.rb
 - lib/jarl/docker.rb
 - lib/jarl/jarl_file.rb