mr-shipper 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a89124cd13c7f9c9bb8172289206e0a07a415c049798327e1499cec74616c6
-  data.tar.gz: 96d6c8002ec688c7354722281d79073393429af6ca762566e7a5ccd4a94d24a5
+  metadata.gz: f2369a23d83d7ce62517f9218f552ee2f1eb486d577c5ae3d7789478c050bdd6
+  data.tar.gz: f955464874823fdaeae8b7bc91775edfab1652d62941dbe14e5c6adcca46d5bd
 SHA512:
-  metadata.gz: a921c5767e5a4c01d935db8d1a609894672f7b6afae51891a5eee5cda6144302ce868ca5fbc691e6ff716736d5b1daa9dc78cf0b4cc9d64543714ef24e22eafb
-  data.tar.gz: c6fbf4fad5b3cb7335e330d170f396c24c673cc5dc623c68e89f15a1d296fd35420db09d31eb05a5f4674e4167f56bab5421acc01cca5170e4af3f2cbb646825
+  metadata.gz: b359768c2a119a000ecff0b37328eb697fbcb35a84b8af93c840209cda61c94b397fc7108de9ec8a4e5d5fbae070dc895e223af76f603880db5f19b6975323d3
+  data.tar.gz: 3f26fd58671009f78249d3b16a6b3a5c7307b4f6f69259384da434c52f6f05ec83e1280122fda24a8a8bea966f85a97e5d840283f9727dffef6f841a8560682f

data/bin/ship

@@ -3,5 +3,4 @@
 
 require 'shipper'
 
-specified_services = ARGV.empty? ? nil : ARGV
-Shipper::Deploy.new(specified_services).perform
+Shipper::Run.new(ARGV).perform

data/lib/shipper.rb

@@ -7,4 +7,5 @@ require 'shipper/executor'
 require 'shipper/host'
 require 'shipper/service'
 require 'shipper/logger'
+require 'shipper/run'
 require 'shipper/deploy'

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

@@ -4,9 +4,9 @@ module Shipper
   class Deploy
     attr_reader :config, :specified_services
 
-    def initialize(specified_services = nil)
+    def initialize(config, specified_services = nil)
+      @config = config
       @specified_services = specified_services
-      @config = Shipper::Config.instance
     end
 
     def perform
@@ -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,22 +2,26 @@
 
 module Shipper
   class Host
-    attr_accessor :ssh_entry, :location, :executor
+    attr_accessor :user, :host, :port, :location, :executor
 
     def initialize(options)
-      @ssh_entry = options['ssh_entry']
+      @user, full_host = options['ssh_entry'].split('@')
+      @host, @port = full_host.split(':')
+      @post ||= 22
+
       @location = options['location']
       @executor = nil
     end
 
     def update!
-      user, host = ssh_entry.split('@')
+      restart!(pull_changes: true)
+    end
 
-      ::Net::SSH.start(host, user) do |ssh|
+    def restart!(pull_changes: false)
+      ::Net::SSH.start(host, user, port: port) do |ssh|
         load_executor(ssh)
-
         executor.cd location
-        exec 'docker-compose pull'
+        exec 'docker-compose pull' if pull_changes
         exec 'docker-compose down'
         exec 'docker-compose up -d'
       end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Shipper
+  class Run
+    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
+    end
+
+    def perform
+      if restart?
+        ::Shipper::Host.new(config.host).restart!
+      else
+        ::Shipper::Deploy.new(config, options).perform
+      end
+    end
+
+    private
+
+    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.3
+  version: 0.0.8
 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:
@@ -52,13 +52,14 @@ files:
 - lib/shipper/executor.rb
 - lib/shipper/host.rb
 - lib/shipper/logger.rb
+- lib/shipper/run.rb
 - lib/shipper/service.rb
 homepage: https://rubygemspecs.org/gems/mr-shipper
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/elhowm/shipper
-  documentation_uri: https://github.com/elhowm/shipper
+  source_code_uri: https://github.com/elhowm/mr-shipper
+  documentation_uri: https://github.com/elhowm/mr-shipper
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -74,8 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Docker shipping