hocho 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb6d2cfd588c821f79b52d3db9bf0fa13966d9304f91484db673ae3bd73b38b
-  data.tar.gz: 253e0bb1b7cf9ce818807dd79bba5464e1f0ef83fb8efc2cd031135ae74f0630
+  metadata.gz: 2f61962a1136d9599c8cecf5befa6700f5ae547847a2b38e3a4a3aaeba849438
+  data.tar.gz: ed1d9cb144c79c3589ecfef262d45e367c35c109d7d4280233e64e2f844dbe6a
 SHA512:
-  metadata.gz: 3334806ae5b1bb5c44e292efab921fba893a72c587b4329d110766c116ff27f7febd9841aada054d77425886563c5fb2ca26a7c277e9d103673cc9c82d6a1615
-  data.tar.gz: bfe51cf6ccafdfef4c74d1e13abd008a5f909fe81bdc3b6b9868a0dfb7105674c2f9e2484c512e24282899abc5064e5bb6340b93b861748e049a80d258690738
+  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/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

data/lib/hocho/host.rb

@@ -166,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)
@@ -198,8 +209,15 @@ 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)
+        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.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -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