hocho 0.3.2 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a70049bc394f2185d24039b5eb5f8bb47847891681e002bdc3a6bb7ef229c02
-  data.tar.gz: c3d6dfaca7333206d3fcd54d440facdb534cd2b178f0d83e72d9f881f73e445f
+  metadata.gz: 2f5398ffdb759cbfa7f06c5d388d5fa4b5455e81229f7546a302f9a97d9aeb8d
+  data.tar.gz: d07ddf5a3b23e81ba9b9d2eda67a909c3a4e84bd2a60a69bffcd682cad7db1e2
 SHA512:
-  metadata.gz: eac87e4cf5840f81d2880215a6c50609819518bd3fbe6bfb7aeee7097fefb19e24120e82e369af0b6482bfdbadf0f27fcaedef1a675fef7500f241204e993f0d
-  data.tar.gz: '06666955518c19926814e909db32e8d4d559c4b204d0de5ad4cb9788a7c20085bcfa6aa79d4be84faa1a45ec2054455a3a16d9404bc2846f6aba5d7584db0bce'
+  metadata.gz: 7e41c1eaa65f335385d5dead37cd1784500576f4ad3dfbb39e316771d28517b909097fafa687799e80067d2568a83ada90baa1db2e9030c3bcc6ddaca30020da
+  data.tar.gz: fdb35fd1103394c48602a766db80bcc90bec1777fb6d62dc562aebf0be2dfe6f73e3af6618679547d91ab92a07626a0e8c1616033e28f32e7017f5aa72deb31f

data/README.md

@@ -27,18 +27,30 @@ Or install it yourself as:
 
     $ gem install hocho
 
-## Setup
+## Usage
 
 ``` yaml
 # hocho.yml
 inventory_providers:
   file:
     path: './hosts'
+
 property_providers:
+  ## Provide default values to host properties (reverse_merge).
   - add_default:
       properties:
         blah: blahblah
         # preferred_driver: mitamae
+        attributes:
+          node_attributes_goes_here: hello
+
+  ## Run ruby script to mutate host properties
+  - ruby_script:
+      name: name-for-your-convenience # optional
+      script: 'host.properties[:hello] = Time.now.xmlschema'
+    ## or 
+    # file: path/to/script.rb
+
 # driver_options:
 #   mitamae:
 #     mitamae_prepare_script: 'wget -O /usr/local/bin/mitamae https://...'
@@ -52,6 +64,8 @@ test.example.org:
   properties:
     # preferred_driver: bundler
     # preferred_driver: mitamae
+    attributes:
+      node_attributes_goes_here: hello
     run_list:
       - roles/app/default.rb
 ```

data/hocho.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor"
   spec.add_dependency "itamae"
-  spec.add_dependency "net-ssh"
+  spec.add_dependency "net-ssh", ">= 4.1.0"
   spec.add_dependency "hashie"
 
   spec.add_development_dependency "bundler"

data/lib/hocho/drivers/ssh_base.rb

@@ -71,7 +71,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) : []
+        local_supports_pbkdf2 = system(*%w(openssl enc -pbkdf2), in: File::NULL, out: File::NULL, err: [:child, :out])
+        remote_supports_pbkdf2 = begin
+                                   exitstatus, * = ssh_run("openssl enc -pbkdf2", error: false, &:eof!)
+                                   exitstatus == 0
+                                 end
+        derive = local_supports_pbkdf2 && remote_supports_pbkdf2 ? %w(-pbkdf2) : []
 
         encrypted_password = IO.pipe do |r,w|
           w.write temporary_passphrase
@@ -104,30 +109,36 @@ module Hocho
       end
 
       def set_ssh_output_hook(c)
-        outbuf, errbuf = [], []
-        check = ->(prefix,data,buf) do
-          has_newline = data.include?("\n")
+        check = ->(prefix, data, buf) do
+          data = buf + data unless buf.empty?
+          return if data.empty?
+
           lines = data.lines
-          last = lines.pop
-          if last[-1] == "\n"
-            buf << last
-          end
-          if has_newline
-            (buf+lines).join.each_line do |line|
-              puts "#{prefix} #{line}"
-            end
-            buf.replace([])
+
+          # If data is not NL-terminated, its last line is carried over to next check.call
+          if lines.last.end_with?("\n")
+            buf.clear
+          else
+            buf.replace(lines.pop)
           end
-          if last[-1] != "\n"
-            buf << last
+
+          lines.each do |line|
+            puts "#{prefix}#{line}"
           end
         end
 
+        outbuf, errbuf = +"", +""
+        outpre, errpre = "[#{host.name}] ", "[#{host.name}/ERR] "
+
         c.on_data do |c, data|
-          check.call "[#{host.name}] ", data, outbuf
+          check.call outpre, data, outbuf
         end
         c.on_extended_data do |c, _, data|
-          check.call "[#{host.name}/ERR] ", data, errbuf
+          check.call errpre, data, errbuf
+        end
+        c.on_close do
+          puts "#{outpre}#{outbuf}" unless outbuf.empty?
+          puts "#{errpre}#{errbuf}" unless errbuf.empty?
         end
       end
 

data/lib/hocho/host.rb

@@ -1,6 +1,7 @@
 require 'hocho/utils/symbolize'
 require 'hashie'
 require 'net/ssh'
+require 'net/ssh/proxy/jump'
 require 'net/ssh/proxy/command'
 
 module Hocho
@@ -106,7 +107,7 @@ module Hocho
         when :encryption
          [["Ciphers", [*value].join(?,)]]
         when :compression
-         [["Compression", value]]
+         [["Compression", value ? 'yes' : 'no']]
         when :compression_level
          [["CompressionLevel", value]]
         when :timeout
@@ -150,6 +151,8 @@ module Hocho
          [["Port", value]]
         when :proxy
           case value
+          when Net::SSH::Proxy::Jump
+            [["ProxyJump", value.jump_proxies]]
           when Net::SSH::Proxy::Command
            [["ProxyCommand", value.command_line_template]]
           when false
@@ -163,8 +166,17 @@ module Hocho
          [["User", value]]
         when :user_known_hosts_file
          [["UserKnownHostsFile", value]]
-        when :proxy_jump
-         [["ProxyJump", value]]
+        when :verify_host_key
+          case value
+          when :never
+            [["StrictHostKeyChecking", "no"]]
+          when :accept_new_or_local_tunnel
+            [["StrictHostKeyChecking", "accept-new"]]
+          when :accept_new
+            [["StrictHostKeyChecking", "accept-new"]]
+          when :always
+            [["StrictHostKeyChecking", "yes"]]
+          end
         end
       end.compact.map do |keyval|
         keyval.join(separator)
@@ -198,7 +210,14 @@ module Hocho
     def make_ssh_connection
       alt = false
       begin
-        Net::SSH.start(name, nil, ssh_options)
+        # A workaround for a bug on net-ssh: https://github.com/net-ssh/net-ssh/issues/764
+        # :strict_host_key_checking is translated from ssh config. However, Net::SSH.start does not accept
+        # the option as valid one. Remove this part when net-ssh fixes the bug.
+          options = ssh_options
+        unless Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
+          options.delete(:strict_host_key_checking)
+        end
+        Net::SSH.start(name, nil, options)
       rescue Net::SSH::Exception, Errno::ECONNREFUSED, Net::SSH::Proxy::ConnectError => e
         raise if alt
         raise unless alternate_ssh_options_available?

data/lib/hocho/property_providers/ruby_script.rb

@@ -0,0 +1,27 @@
+module Hocho
+  module PropertyProviders
+    class RubyScript
+      def initialize(name: nil, script: nil, file: nil)
+        @template = case
+        when script
+          compile(script, "(#{name || 'ruby_script'})")
+        when file
+          compile(File.read(file), name ? "(#{name})" : file)
+        end
+      end
+
+      def determine(host)
+        @template.new(host).run
+        nil
+      end
+
+      private
+
+      Template = Struct.new(:host)
+
+      def compile(script, name)
+        binding.eval("Class.new(Template) { def run;\n#{script}\nend; }", name, 0)
+      end
+    end
+  end
+end

data/lib/hocho/version.rb

@@ -1,3 +1,3 @@
 module Hocho
-  VERSION = "0.3.2"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.7
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - her@sorah.jp
 executables:
@@ -142,6 +142,7 @@ files:
 - lib/hocho/property_providers.rb
 - lib/hocho/property_providers/add_default.rb
 - lib/hocho/property_providers/base.rb
+- lib/hocho/property_providers/ruby_script.rb
 - lib/hocho/runner.rb
 - lib/hocho/utils/finder.rb
 - lib/hocho/utils/symbolize.rb
@@ -152,7 +153,7 @@ homepage: https://github.com/sorah/hocho
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Server provisioning tool with itamae
 test_files: []