hocho 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b86467c121e99a2b09b6a09ea852aaa61edcf3cd0ced7f068184284950d5bd8b
-  data.tar.gz: e9c851f4e6d6d7040c3455c21d91e5e674a7abe95fecd352a2b1319701e65da5
+  metadata.gz: 02bd4fdb528bce052b2fbbdf13094a22dd66eaf4cea358cfdf458ad744e16e7c
+  data.tar.gz: 133bea775d5dd49cceaca4f24abf0cb47b1bf67583d51879c37643bda8b9d8aa
 SHA512:
-  metadata.gz: 6b94585fa2224c38601e50173206fc35499f6e810817491ce0c556e9dfe55bbbc62b309d81139a4d40855c12c19be05cc51deb7cf265bd8970e20e466cae45a2
-  data.tar.gz: 7ce19d7a13bb657ab41b511eb290306980d1fba32b3b7c8e7011f8a12696bfcfca030ef0c3d2c17c8699a6495f38a61b7147f322b421f82bde98bb66bda762f5
+  metadata.gz: 8cc5f789571a9c32c8ef2633ea5ef78b128d85e8ce5c7900bb155138bd944deeb031e7fd2d3715059a1916f8c05837269a8bc9c4426f19218304308aaa41af53
+  data.tar.gz: b7985500b353068b4e0a7433db48b396c5f856b29d037bc3208c0420765d38dd8ec986d5a857556b56480fa210f796308d1d54b9c7e2ac8f0b5e1ea738fcc981

data/lib/hocho/command.rb

@@ -52,28 +52,40 @@ module Hocho
     desc "apply HOST", "run itamae"
     method_option :sudo,  type: :boolean, default: false
     method_option :dry_run, type: :boolean, default: false, aliases: %w(-n)
+    method_option :exclude, type: :string, default: '', aliases: %w(-e)
     method_option :driver, type: :string
     def apply(name)
-      host = inventory.filter(name: name).first
-      unless host
+      hosts = inventory.filter({name: name}, exclude_filters: {name: options[:exclude]})
+      if hosts.empty?
         raise "host name=#{name.inspect} not found"
       end
 
+      if hosts.size > 1
+        puts "Running sequencial on:"
+        hosts.each do |host|
+          puts " * #{host.name}"
+        end
+        puts
+      end
+
       if config[:ask_sudo_password] || options[:sudo]
         print "sudo password: "
-        host.sudo_password = $stdin.noecho { $stdin.gets.chomp }
+        sudo_password = $stdin.noecho { $stdin.gets.chomp }
         puts
       end
 
-      Runner.new(
-        host,
-        driver: options[:driver],
-        base_dir: config[:itamae_dir] || '.',
-        initializers: config[:initializers] || [],
-        driver_options: config[:driver_options] || {},
-      ).run(
-        dry_run: options[:dry_run],
-      )
+      hosts.each do |host|
+        host.sudo_password = sudo_password if sudo_password
+        Runner.new(
+          host,
+          driver: options[:driver],
+          base_dir: config[:itamae_dir] || '.',
+          initializers: config[:initializers] || [],
+          driver_options: config[:driver_options] || {},
+        ).run(
+          dry_run: options[:dry_run],
+        )
+      end
     end
 
     private

data/lib/hocho/drivers/bundler.rb

@@ -13,6 +13,7 @@ module Hocho
       end
 
       def run(dry_run: false)
+        ssh # Test connection
         deploy(**@deploy_options) do
           bundle_install
           run_itamae(dry_run: dry_run)

data/lib/hocho/drivers/mitamae.rb

@@ -13,8 +13,8 @@ module Hocho
         @deploy_options = deploy_options
       end
 
-
       def run(dry_run: false)
+        ssh # Test connection
         deploy(**@deploy_options) do
           prepare_mitamae
           run_mitamae(dry_run: dry_run)

data/lib/hocho/drivers/ssh_base.rb

@@ -70,10 +70,12 @@ module Hocho
 
         temporary_passphrase = SecureRandom.base64(129).chomp
 
+        derive = system(*%w(openssl enc -pbkdf2), in: File::NULL, out: File::NULL, err: [:child, :out]) ? %w(-pbkdf2) : []
+
         encrypted_password = IO.pipe do |r,w|
           w.write temporary_passphrase
           w.close
-          IO.popen([*%w(openssl enc -aes-128-cbc -pass fd:5 -a), 5 => r], "r+") do |io|
+          IO.popen([*%w(openssl enc -aes-128-cbc -pass fd:5 -a -md sha256), *derive, 5 => r], "r+") do |io|
             io.puts password
             io.close_write
             io.read.chomp
@@ -86,7 +88,7 @@ module Hocho
           raise unless temp_executable.start_with?('/')
 
           ssh_run("chmod 0700 #{temp_executable.shellescape}; cat > #{temp_executable.shellescape}; chmod +x #{temp_executable.shellescape}") do |ch|
-            ch.send_data("#!/bin/bash\nexec openssl enc -aes-128-cbc -d -a -pass env:#{passphrase_env_name} <<< #{encrypted_password.shellescape}\n")
+            ch.send_data("#!/bin/bash\nexec openssl enc -aes-128-cbc -d -a -md sha256 -pass env:#{passphrase_env_name} <<< #{encrypted_password.shellescape}\n")
             ch.eof!
           end
 

data/lib/hocho/host.rb

@@ -18,11 +18,13 @@ module Hocho
       @tmpdir = tmpdir
       @shmdir = shmdir
       @sudo_password = sudo_password
+
+      @use_alternate_ssh_options = false
     end
 
     attr_reader :name, :providers, :properties, :tmpdir, :shmdir
     attr_writer :sudo_password
-    attr_accessor :tags
+    attr_accessor :tags, :use_alternate_ssh_options
 
     def to_h
       {
@@ -42,10 +44,10 @@ module Hocho
     end
 
     def merge!(other)
-      @tags.merge!(other.tags)
+      @tags.merge!(other.tags) if other.tags
       @tmpdir = other.tmpdir if other.tmpdir
       @shmdir = other.shmdir if other.shmdir
-      @properties.merge(other.properties)
+      @properties.merge!(other.properties)
     end
 
     def apply_property_providers(providers)
@@ -79,9 +81,25 @@ module Hocho
     end
 
     def ssh_options
+      use_alternate_ssh_options? ? alternate_ssh_options : normal_ssh_options
+    end
+
+    def normal_ssh_options
       (Net::SSH::Config.for(ssh_name) || {}).merge(Hocho::Utils::Symbolize.keys_of(properties[:ssh_options] || {})).merge(@override_ssh_options || {})
     end
 
+    def alternate_ssh_options
+      normal_ssh_options.merge(Hocho::Utils::Symbolize.keys_of(properties.fetch(:alternate_ssh_options, {})))
+    end
+
+    def alternate_ssh_options_available?
+      !!properties[:alternate_ssh_options]
+    end
+
+    def use_alternate_ssh_options?
+      @use_alternate_ssh_options
+    end
+
     def openssh_config(separator='=')
       ssh_options.flat_map do |key, value|
         case key
@@ -131,8 +149,11 @@ module Hocho
         when :port
          [["Port", value]]
         when :proxy
-          if value.kind_of?(Net::SSH::Proxy::Command)
+          case value
+          when Net::SSH::Proxy::Command
            [["ProxyCommand", value.command_line_template]]
+          when false
+           [["ProxyCommand", 'none']]
           else
            [["ProxyCommand", value]]
           end
@@ -173,7 +194,17 @@ module Hocho
     end
 
     def make_ssh_connection
-      Net::SSH.start(name, nil, ssh_options)
+      alt = false
+      begin
+        Net::SSH.start(name, nil, ssh_options)
+      rescue Net::SSH::Exception => e
+        raise if alt
+        raise unless alternate_ssh_options_available?
+        puts "[#{name}] Trying alternate_ssh_options due to #{e.inspect}"
+        self.use_alternate_ssh_options = true
+        alt = true
+        retry
+      end
     end
   end
 end

data/lib/hocho/inventory.rb

@@ -20,19 +20,32 @@ module Hocho
       end.values
     end
 
-    def filter(filters)
-      filters = filters.map do |name, value|
-        [name.to_s, value.to_s.split(?,).map! { |_| /#{Regexp.escape(_).gsub(/\\*/,'.*')}/ }]
-      end.to_h
+    def filter(include_filters, exclude_filters: [])
+      include_filters, exclude_filters = [include_filters, exclude_filters].map do |f|
+        f.map do |name, value|
+          values = value.to_s.split(?,).map! do |_|
+            if _[0] == '/' && _[-1] == '/'
+              Regexp.new(_[1...-1])
+            else
+              /#{Regexp.escape(_).gsub(/\*/,'.*')}/
+            end
+          end
+          [name.to_s, values]
+        end.to_h
+      end
+
+      filters = include_filters.map do |name, conditions|
+        [name, [conditions, exclude_filters.fetch(name, [])]]
+      end
 
       hosts.select do |host|
-        filters.all? do |name, conditions|
+        filters.all? do |name, (conditions, exclude_conditions)|
           case name
           when 'name'
-            conditions.any? { |c| host.name.match(c) }
+            conditions.any? { |c| host.name.match(c) } && !exclude_conditions.any? { |c| host.name.match(c) }
           else
             v = (host.attributes[name] || host.attributes[name.to_sym] || host.tags[name] || host.tags[name.to_sym])
-            v && conditions.any? { |c| v.to_s.match(c) }
+            v && conditions.any? { |c| v.to_s.match(c) } && !exclude_conditions.any?{ |c| v.to_s.match(c) }
           end
         end
       end

data/lib/hocho/inventory_providers/file.rb

@@ -28,9 +28,9 @@ module Hocho
             Host.new(
               name.to_s,
               providers: self.class,
-              properties: value[:properties],
-              tags: value[:tags],
-              ssh_options: value[:ssh_options]
+              properties: value[:properties] || {},
+              tags: value[:tags] || {},
+              ssh_options: value[:ssh_options],
             )
           end
         end

data/lib/hocho/runner.rb

@@ -16,7 +16,7 @@ module Hocho
     attr_reader :host, :driver, :base_dir, :initializers
 
     def run(dry_run: false)
-      puts "Running using #{best_driver_name}"
+      puts "=> Running on #{host.name} using #{best_driver_name}"
       driver_options = @driver_options[best_driver_name] || {}
       driver = best_driver.new(host, base_dir: base_dir, initializers: initializers, **driver_options)
       driver.run(dry_run: dry_run)

data/lib/hocho/utils/finder.rb

@@ -1,6 +1,7 @@
 module Hocho
   module Utils
     module Finder
+      class NotFound < StandardError; end
       def self.find(const, prefix, name)
         retried = false
         constant_name = name.to_s.gsub(/\A.|_./) { |s| s[-1].upcase }
@@ -17,8 +18,7 @@ module Hocho
             retried = true
             retry
           end
-
-          nil
+          raise NotFound, "Couldn't find #{prefix}/#{name}"
         end
       end
     end

data/lib/hocho/version.rb

@@ -1,3 +1,3 @@
 module Hocho
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-10 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -167,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Server provisioning tool with itamae