mr-shipper 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8bafba34011cd5cae3f192c1295fe9000a7e7fef372e87dff5d5aa9ddc3e87
-  data.tar.gz: 037550c907e063a829f97b66a039a1fda746c500572c07728c6e2c8c7ebe156c
+  metadata.gz: 305478ea7dce83929bc1baf921e612486097332fd12509724e289ddcd97f01a7
+  data.tar.gz: 84f4b81e6e8d790287a2cdc82b2680a613a7eded1c0a83b1d71952548ea6dc84
 SHA512:
-  metadata.gz: 905efb0a06fb836bbee45683da2a0c7c5d13a3f21b48ff9b1036865201536548b10f95c5615f6091e95c552e8fb4f0b5aac3d0f456c27eb05210b1b593cee526
-  data.tar.gz: c84bbf53143af3e6272e1e10f4f047ce3c92e9c37d7d4cd00f91e9c471acf39551ca77f1fa194405ed0f5afaf7e34f95aa654a89631bbe6594d772566cff7b65
+  metadata.gz: bb5e3d17bd095b5afc081e8e55fa1b5378123cd3dcdeeb7b21491c75a9be86d14fa11e1614bf9d3134596c164500736920ee57aba7a1da4ac96b74e928403fa9
+  data.tar.gz: 1efc384e8a116d7f6c234003d8614ccaad696e9d719918843247549bf56e82ba559268576f359c3ce58ff19588a055ce51d1f5596b955202498792ae395c8a7e

data/lib/shipper/config.rb

@@ -6,11 +6,35 @@ require 'yaml'
 
 module Shipper
   class Config < ::OpenStruct
-    include Singleton
+    def initialize(config_path: nil, env: nil)
+      config_path ||= "#{Dir.pwd}/shipper.yml"
+      env ||= 'production'
 
-    def initialize
-      config = ::YAML::load_file("#{Dir.pwd}/shipper.yml")
+      config = load_env_config(config_path, env)
       super(config)
     end
+
+    private
+
+    def load_env_config(config_path, env)
+      full_config = ::YAML.load_file(config_path)
+      check_env_available!(full_config, env)
+
+      hosts = full_config.delete('hosts')
+      services = full_config.delete('services')
+
+      full_config['host'] = hosts[env]
+      full_config['services'] = services[env]
+      full_config
+    end
+
+    def check_env_available!(config, env)
+      services = !config.dig('services', env).nil?
+      hosts = !config.dig('hosts', env).nil?
+
+      puts "Error: No host available for env '#{env}'" unless hosts
+      puts "Error: No services available for env '#{env}'" unless services
+      exit(0) if !hosts || !services
+    end
   end
 end

data/lib/shipper/deploy.rb

@@ -32,7 +32,7 @@ module Shipper
 
     def load_services
       config.services
-            .select { |name, _| !service_ignored?(name) }
+            .reject { |name, _| service_ignored?(name) }
             .map { |name, config| ::Shipper::Service.new(name, config) }
     end
 

data/lib/shipper/executor.rb

@@ -25,7 +25,7 @@ module Shipper
     def exec_host(cmd)
       logger.bold("Exec host '#{cmd}'")
 
-      host_bash.exec!("cd #{path}; #{cmd}") do |channel, stream, data|
+      host_bash.exec!("cd #{path}; #{cmd}") do |_channel, _stream, data|
         logger.puts(data)
       end
     end
@@ -34,17 +34,24 @@ module Shipper
       logger.bold("Exec local '#{cmd}'")
 
       Dir.chdir(path) do
-        Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-          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_thr.value
+          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,11 +2,14 @@
 
 module Shipper
   class Run
-    attr_reader :config, :options
+    attr_reader :config, :options, :env
+
+    COMMANDS = %w[restart].freeze
 
     def initialize(options)
+      pop_env!(options)
+      @config = ::Shipper::Config.new(env: env)
       @options = options.empty? ? nil : options
-      @config = ::Shipper::Config.instance
     end
 
     def perform
@@ -22,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

@@ -13,7 +13,7 @@ module Shipper
 
     def ship!
       executor.cd(path)
-      before_build.each { |cmd| exec(cmd) } if before_build
+      before_build&.each { |cmd| exec(cmd) }
       exec "docker build . -t #{repo}"
       exec "docker push #{repo}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr-shipper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Rostyslav Safonov
@@ -11,33 +11,33 @@ cert_chain: []
 date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '5.1'
 description: The simple way to deploy docker-compose based apps
 email: elhowm@gmail.com
 executables:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Docker shipping