mr-shipper 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a86d4c088e0331f1ee1a54b56bec7ad625064c32da630c0c2e1d18089df45d
-  data.tar.gz: bc8d182606080ab3be29c8761d6d38b7416ff5b349cc5213a07b4ff3f14261ec
+  metadata.gz: edf594bb44ed2b293851240ce12773bfe0caa22abba7306d2f212b259694b658
+  data.tar.gz: 6eef6adcdf7459dfcfe6849f6282440bff9711cfa1bbfd6eb7593d26bfee0526
 SHA512:
-  metadata.gz: 2f110e2d4973736e313503c6d5a032cd33ddda218eaa43f662accabd970cdf33ca36cd0c9baa5a14f40381524eab9410e781b633cd4385ae0efa6e4fe4bb2118
-  data.tar.gz: c8dbaeea4aa1deeaec1b7c4ad9a10a6e9c60dee949d5914f93177bb8747f845f05e09fe8d7615c11db35259189f31371ae198abb9c4ade9e2d09a0b6e839f2a1
+  metadata.gz: fd439c93e42cb10c935b2a055dbe50e9b9703eab6fca04e2c57c3002f0acc69fee53dc8e3527a5b006e879cf61a751cbb40b83d135e06dbc27c04b227f21e7f4
+  data.tar.gz: f426c088e38cb2f53651f7db847b23d44fee4185dc3c022215c8fef7ac03642be4af9bfb6519f24e16e30276818a3315c01bac1048e2b4dcf70e2f3e9caf973e

data/lib/shipper/executor.rb

@@ -34,17 +34,24 @@ module Shipper
       logger.bold("Exec local '#{cmd}'")
 
       Dir.chdir(path) do
-        Open3.popen3(cmd) do |_stdin, stdout, stderr, wait_thread|
-          logger.puts(stdout.gets)
-          logger.puts(stderr.gets)
+        status = Open3.popen2e(cmd) do |_stdin, stdout, wait_thread|
+          stdout.each_line { |line| logger.puts(line) }
 
           wait_thread.value
         end
+        fall_down!(cmd) unless status.exitstatus.zero?
       end
     end
 
     def logger
       ::Shipper::Logger.instance
     end
+
+    def fall_down!(failed_cmd)
+      logger.error 'Command finished with non-zero code:'
+      logger.puts "'#{failed_cmd}'"
+      logger.puts 'halt.'
+      exit
+    end
   end
 end

data/lib/shipper/host.rb

@@ -2,10 +2,13 @@
 
 module Shipper
   class Host
-    attr_accessor :user, :host, :location, :executor
+    attr_accessor :user, :host, :port, :location, :executor
 
     def initialize(options)
-      @user, @host = options['ssh_entry'].split('@')
+      @user, full_host = options['ssh_entry'].split('@')
+      @host, @port = full_host.split(':')
+      @port = @port || 22
+
       @location = options['location']
       @executor = nil
     end
@@ -15,9 +18,8 @@ module Shipper
     end
 
     def restart!(pull_changes: false)
-      ::Net::SSH.start(host, user) do |ssh|
+      ::Net::SSH.start(host, user, port: port) do |ssh|
         load_executor(ssh)
-
         executor.cd location
         exec 'docker-compose pull' if pull_changes
         exec 'docker-compose down'

data/lib/shipper/logger.rb

@@ -20,6 +20,10 @@ module Shipper
       puts "# #{phrase}".bold.yellow
     end
 
+    def error(phrase)
+      puts "# #{phrase}".bold.red
+    end
+
     def puts(phrase)
       super(phrase)
     end

data/lib/shipper/run.rb

@@ -2,12 +2,14 @@
 
 module Shipper
   class Run
-    attr_reader :config, :options
+    attr_reader :config, :options, :env
+
+    COMMANDS = %w[restart].freeze
 
     def initialize(options)
-      @config = ::Shipper::Config.new(env: options[0] || 'production')
+      pop_env!(options)
+      @config = ::Shipper::Config.new(env: env)
       @options = options.empty? ? nil : options
-      @options&.delete(0) # remove env
     end
 
     def perform
@@ -23,5 +25,13 @@ module Shipper
     def restart?
       options&.size == 1 && options[0] == 'restart'
     end
+
+    def pop_env!(options)
+      if options.empty? || COMMANDS.include?(options[0])
+        @env = 'production'
+      else
+        @env = options.delete_at(0)
+      end
+    end
   end
 end

data/lib/shipper/service.rb

@@ -2,24 +2,30 @@
 
 module Shipper
   class Service
-    attr_reader :name, :path, :before_build, :repo
+    attr_reader :name, :options, :path
 
     def initialize(name, options)
       @name = name
+      @options = options
       @path = "#{Dir.pwd}/#{options['path']}"
-      @before_build = options['before_build']
-      @repo = options['repo']
     end
 
     def ship!
       executor.cd(path)
-      before_build&.each { |cmd| exec(cmd) }
-      exec "docker build . -t #{repo}"
-      exec "docker push #{repo}"
+      options['before_build']&.each { |cmd| exec(cmd) }
+      exec "docker build . -t #{options.fetch('repo')} #{build_args}".strip
+      exec "docker push #{options.fetch('repo')}"
     end
 
     private
 
+    def build_args
+      return nil if options['args'].nil?
+
+      options['args'].map { |key, value| "--build-arg #{key}=#{value}" }
+                     .join(' ')
+    end
+
     def exec(cmd)
       executor.exec(cmd)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr-shipper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Rostyslav Safonov
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Docker shipping