hocho 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a842112a88e2159de9edb1544967ece4d054f30f7af102da56f101264732dded
-  data.tar.gz: 255602f3163282c8e97eacf3ed96193bdf6c4d1d6a8ce65033fa561e5dc27756
+  metadata.gz: fc1d89aba4bdb301b19444dc5d87cbe529b75cd7fd2a5862af8a0e0eee0f06c9
+  data.tar.gz: a1e4308126d79cb3b4365c0dda2737ff2c57ca1f9a71ff74ba86948a0d4e4ab7
 SHA512:
-  metadata.gz: 6a11eac90ef61888470d47b4e0ed5cbfec05626106367f94851272ab54c11cf62d1d86486953b0d2cf9804e518cf0a414370802e3c17c6d1e900c90132db2d03
-  data.tar.gz: afab13846cfabd15f62cbf9f8d335bde577f1bc841871c858c7f14876b099ffe16be4d1e57245e21706e2f89eb955ed1a477db7a15f628f1d88b9cf8b77f8a9c
+  metadata.gz: e9a5930caf9ce31ba052af069126bb6230b275ab007c00a0edbaf08a8d30fc0b4135aeae57899ebc8428a068a0f7221dd4249f1fa6af240830fb98b045aaeef5
+  data.tar.gz: 89d2ac75f09f14d2e569a7a229cfa61a625dbda5e1da6d035d54ac240d9cb78fd6272a85cc686166004404994a98384b1e6466d86ee349ab4d28270ad33c5e45

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

@@ -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

@@ -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)
@@ -196,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.1"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - sorah (Shota Fukumori)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-06-25 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.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Server provisioning tool with itamae