hocho 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02bd4fdb528bce052b2fbbdf13094a22dd66eaf4cea358cfdf458ad744e16e7c
-  data.tar.gz: 133bea775d5dd49cceaca4f24abf0cb47b1bf67583d51879c37643bda8b9d8aa
+  metadata.gz: 2f61962a1136d9599c8cecf5befa6700f5ae547847a2b38e3a4a3aaeba849438
+  data.tar.gz: ed1d9cb144c79c3589ecfef262d45e367c35c109d7d4280233e64e2f844dbe6a
 SHA512:
-  metadata.gz: 8cc5f789571a9c32c8ef2633ea5ef78b128d85e8ce5c7900bb155138bd944deeb031e7fd2d3715059a1916f8c05837269a8bc9c4426f19218304308aaa41af53
-  data.tar.gz: b7985500b353068b4e0a7433db48b396c5f856b29d037bc3208c0420765d38dd8ec986d5a857556b56480fa210f796308d1d54b9c7e2ac8f0b5e1ea738fcc981
+  metadata.gz: c057b7c3a289dfbc0a9dac7bf294cec8807af1d26744ff098f76b963df4626763eabeec0a7482c0186c09c99656b5bbfdbbfea92ec7c2c4cdfa93f42149c4c25
+  data.tar.gz: 7423407b1f272b38ba82c31041e3010206a71f05c1d2b07a3dea40c9a49cf58ecc2b16473d3d07aa0fe648d2aadc6fdad59c299038c22840cefed169d8d9cdca

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,10 +20,10 @@ 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", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/hocho/drivers/mitamae.rb

@@ -25,7 +25,7 @@ module Hocho
         exitstatus, _ = if @mitamae_path.start_with?('/')
           ssh_run("test -x #{@mitamae_path.shellescape}", error: false)
         else
-          ssh_run("which #{@mitamae_path.shellescape} 2>/dev/null >/dev/null", error: false)
+          ssh_run("#{@mitamae_path.shellescape} version 2>/dev/null >/dev/null", error: false)
         end
         exitstatus == 0
       end

data/lib/hocho/drivers/ssh_base.rb

@@ -21,14 +21,15 @@ module Hocho
 
         ssh_cmd = ['ssh', *host.openssh_config.flat_map { |l| ['-o', "\"#{l}\""] }].join(' ')
         shm_exclude = shm_prefix.map{ |_| "--exclude=#{_}" }
-        rsync_cmd = [*%w(rsync -az --copy-links --copy-unsafe-links --delete --exclude=.git), *shm_exclude, '--rsh', ssh_cmd, '.', "#{host.hostname}:#{host_basedir}"]
+        compress = host.compress? ? ['-z'] : []
+        rsync_cmd = [*%w(rsync -a --copy-links --copy-unsafe-links --delete --exclude=.git), *compress, *shm_exclude, '--rsh', ssh_cmd, '.', "#{host.hostname}:#{host_basedir}"]
 
         puts "=> $ #{rsync_cmd.shelljoin}"
         system(*rsync_cmd, chdir: base_dir) or raise 'failed to rsync'
 
         unless shm_prefix.empty?
           shm_include = shm_prefix.map{ |_| "--include=#{_.sub(%r{/\z},'')}/***" }
-          rsync_cmd = [*%w(rsync -az --copy-links --copy-unsafe-links --delete), *shm_include, '--exclude=*', '--rsh', ssh_cmd, '.', "#{host.hostname}:#{host_shm_basedir}"]
+          rsync_cmd = [*%w(rsync -a --copy-links --copy-unsafe-links --delete), *compress, *shm_include, '--exclude=*', '--rsh', ssh_cmd, '.', "#{host.hostname}:#{host_shm_basedir}"]
           puts "=> $ #{rsync_cmd.shelljoin}"
           system(*rsync_cmd, chdir: base_dir) or raise 'failed to rsync'
           shm_prefix.each do |x|
@@ -70,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
@@ -88,7 +94,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 -md sha256 -pass env:#{passphrase_env_name} <<< #{encrypted_password.shellescape}\n")
+            ch.send_data("#!/bin/bash\nexec openssl enc -aes-128-cbc -d -a -md sha256 #{derive.shelljoin} -pass env:#{passphrase_env_name} <<< #{encrypted_password.shellescape}\n")
             ch.eof!
           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
@@ -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,6 +166,17 @@ module Hocho
          [["User", value]]
         when :user_known_hosts_file
          [["UserKnownHostsFile", 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)
@@ -195,9 +209,16 @@ module Hocho
 
     def make_ssh_connection
       alt = false
+      # 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
       begin
-        Net::SSH.start(name, nil, ssh_options)
-      rescue Net::SSH::Exception => e
+        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?
         puts "[#{name}] Trying alternate_ssh_options due to #{e.inspect}"
@@ -206,5 +227,9 @@ module Hocho
         retry
       end
     end
+
+    def compress?
+      properties.fetch(:compress, true)
+    end
   end
 end

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.0"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2020-06-13 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
@@ -70,30 +70,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Server provisioning tool with itamae