pero 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecfeedf1f5589503f81308e4df7f4e8ce6735d17ea53aa146b9a6ff4749b65c6
-  data.tar.gz: 6ae0544b2f34d3d8f26ef8c1d10338528091215cf4ae3e7620c0d86829a6ed2d
+  metadata.gz: 987ee0dddd45d8f05e4a1ca60cfe2df83a31542e2793931ddfda01446f3bbe1b
+  data.tar.gz: 791d656dc30d9530316a10fa5b7dc08c69e7089d24a5b040f884435a44f4f038
 SHA512:
-  metadata.gz: fc3aad015bc517fbedcb5aa30ea824cbc08819c63054e09491d389ff2383119ab3449b895a5d8caf17450271dc7398d474159050006c590bfb6a71130f8c5d43
-  data.tar.gz: 06ea7ee5a816e62bb257636c53c863709e3217e7d6fe218bec9efdb51ccee4821d4ff3013c79528ce2813f693c081e090d295393c8b68fc35d504083e6d2b461
+  metadata.gz: 1745f07c1634fc170bd6b34c5f2332627a86d2352645045919cdd26e5cf57a3b6bb32e69606b2be4f7dbc6272153905f36095699062a89d047c2e1e54dacd330
+  data.tar.gz: e866274608d76736a53f74f0d9e2b0503c55e200548b1df204059743daca66c7cb208ff387cd9ffcd9bbe170fbd6cc7beb433822ffd55b4c4809104982b537a4

data/lib/pero/puppet.rb

@@ -9,9 +9,9 @@ module Specinfra
       return @sudo_password if defined?(@sudo_password)
 
       # TODO: Fix this dirty hack
-      return nil unless caller.any? {|call| call.include?('channel_data') }
+      return nil unless caller.any? { |call| call.include?('channel_data') }
 
-      print "sudo password: "
+      print 'sudo password: '
       @sudo_password = STDIN.noecho(&:gets).strip
       print "\n"
       @sudo_password
@@ -23,6 +23,7 @@ module Pero
   class Puppet
     extend Pero::SshExecutable
     attr_reader :specinfra
+
     def initialize(host, options, mutex)
       @options = options.dup
       @mutex = mutex
@@ -30,15 +31,13 @@ module Pero
       @options[:host] = host
       so = ssh_options
 
-      if !Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
-        so.delete(:strict_host_key_checking)
-      end
+      so.delete(:strict_host_key_checking) unless Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
 
       @specinfra = Specinfra::Backend::Ssh.new(
         request_pty: true,
         host: so[:host_name],
         ssh_options: so,
-        disable_sudo: false,
+        disable_sudo: false
       )
     end
 
@@ -48,15 +47,15 @@ module Pero
       opts[:host_name] = @options[:host]
 
       # from ssh-config
-      ssh_config_files = @options["ssh_config"] ? [@options["ssh_config"]] : Net::SSH::Config.default_files
-      opts.merge!(Net::SSH::Config.for(@options["host"], ssh_config_files))
-      opts[:user] = @options["user"] || opts[:user] || Etc.getlogin
-      opts[:password] = @options["password"] if @options["password"]
-      opts[:keys] = [@options["key"]] if @options["key"]
-      opts[:port] = @options["port"] if @options["port"]
-      opts[:timeout] = @options["timeout"] if @options["timeout"]
-
-      if @options["vagrant"]
+      ssh_config_files = @options['ssh_config'] ? [@options['ssh_config']] : Net::SSH::Config.default_files
+      opts.merge!(Net::SSH::Config.for(@options['host'], ssh_config_files))
+      opts[:user] = @options['user'] || opts[:user] || Etc.getlogin
+      opts[:password] = @options['password'] if @options['password']
+      opts[:keys] = [@options['key']] if @options['key']
+      opts[:port] = @options['port'] if @options['port']
+      opts[:timeout] = @options['timeout'] if @options['timeout']
+
+      if @options['vagrant']
         config = Tempfile.new('', Dir.tmpdir)
         hostname = opts[:host_name] || 'default'
         vagrant_cmd = "vagrant ssh-config #{hostname} > #{config.path}"
@@ -70,8 +69,8 @@ module Pero
         opts.merge!(Net::SSH::Config.for(hostname, [config.path]))
       end
 
-      if @options["ask_password"]
-        print "password: "
+      if @options['ask_password']
+        print 'password: '
         password = STDIN.noecho(&:gets).strip
         print "\n"
         opts.merge!(password: password)
@@ -82,47 +81,55 @@ module Pero
     def install
       osi = specinfra.os_info
       os = case osi[:family]
-      when "redhat"
-        Redhat.new(specinfra, osi)
-      else
-          raise "sorry unsupport os, please pull request!!!"
-      end
-      os.install(@options["agent-version"]) if @options["agent-version"]
+           when 'redhat'
+             Redhat.new(specinfra, osi)
+           else
+             raise 'sorry unsupport os, please pull request!!!'
+           end
+      os.install(@options['agent-version']) if @options['agent-version']
       Pero::History::Attribute.new(specinfra, @options).save
     end
 
     def stop_master
+      @mutex.lock
       run_container.kill if docker.alerady_run?
+    ensure
+      @mutex.unlock
     end
 
     def serve_master
-        container = run_container
-        begin
-          yield container
-        rescue => e
-          Pero.log.error e.inspect
-          raise e
-        end
+      container = run_container
+      begin
+        yield container
+      rescue StandardError => e
+        Pero.log.error e.inspect
+        raise e
+      end
     end
 
     def docker
-      Pero::Docker.new(@options["server-version"], @options["image-name"], @options["environment"], @options["volumes"])
+      Pero::Docker.new(@options['server-version'], @options['image-name'], @options['environment'], @options['volumes'])
     end
 
     def run_container
-      begin
-        @mutex.lock
-        docker.alerady_run? || docker.run
-      ensure
-        @mutex.unlock
-      end
+      @mutex.lock
+      docker.alerady_run? || docker.run
+    ensure
+      @mutex.unlock
     end
 
     def apply
       serve_master do |container|
-        port = container.info["Ports"].first["PublicPort"]
+        port = container.info['Ports'].first['PublicPort']
+        https = Net::HTTP.new('localhost', port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.start do
+          https.delete('/puppet-admin-api/v1/environment-cache')
+        end
+
         begin
-          tmpdir=container.info["id"][0..5]
+          tmpdir = container.info['id'][0..5]
           in_ssh_forwarding(port) do |host, ssh|
             Pero.log.info "#{host}:puppet cmd[#{puppet_cmd}]"
             cmd = "mkdir -p /tmp/puppet/#{tmpdir} && unshare -m -- /bin/bash -c 'export PATH=$PATH:/opt/puppetlabs/bin/ && \
@@ -131,14 +138,14 @@ module Pero
             Pero.log.debug "run cmd:#{cmd}"
             ssh_exec(ssh, host, cmd)
 
-            if @options["one-shot"]
+            if @options['one-shot']
               cmd = "/bin/rm -rf /tmp/puppet/#{tmpdir}"
               ssh_exec(ssh, host, cmd)
             end
 
-            ssh.loop {true} if ENV['PERO_DEBUG']
+            ssh.loop { true } if ENV['PERO_DEBUG']
           end
-        rescue => e
+        rescue StandardError => e
           Pero.log.error "puppet apply error:#{e.inspect}"
         end
       end
@@ -149,15 +156,15 @@ module Pero
     def ssh_exec(ssh, host, cmd)
       ssh.open_channel do |ch|
         ch.request_pty
-        ch.on_data do |ch,data|
+        ch.on_data do |_ch, data|
           Pero.log.info "#{host}:#{data.chomp}"
         end
 
-        ch.on_extended_data do |c,type,data|
+        ch.on_extended_data do |_c, _type, data|
           Pero.log.error "#{host}:#{data.chomp}"
         end
 
-        ch.exec specinfra.build_command(cmd) do |ch, success|
+        ch.exec specinfra.build_command(cmd) do |_ch, success|
           raise "could not execute #{cmd}" unless success
         end
       end
@@ -165,29 +172,27 @@ module Pero
     end
 
     def puppet_cmd
-        if Gem::Version.new("5.0.0") > Gem::Version.new(@options["agent-version"])
-            "puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_port 8140 --ca_server localhost --masterport 8140 --server localhost"
-        else
-            "/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_server localhost --masterport 8140 --server localhost"
-        end
+      if Gem::Version.new('5.0.0') > Gem::Version.new(@options['agent-version'])
+        "puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_port 8140 --ca_server localhost --masterport 8140 --server localhost"
+      else
+        "/opt/puppetlabs/bin/puppet agent --no-daemonize --onetime #{parse_puppet_option(@options)} --ca_server localhost --masterport 8140 --server localhost"
+      end
     end
 
     def parse_puppet_option(options)
-      ret = ""
-      %w(noop verbose test).each do |n|
+      ret = ''
+      %w[noop verbose test].each do |n|
         ret << " --#{n}" if options[n]
       end
-      ret << " --tags #{options["tags"].join(",")}" if options["tags"]
-      ret << " --environment #{options["environment"]}" if options["environment"]
+      ret << " --tags #{options['tags'].join(',')}" if options['tags']
+      ret << " --environment #{options['environment']}" if options['environment']
       ret
     end
 
     def in_ssh_forwarding(port)
       options = specinfra.get_config(:ssh_options)
 
-      if !Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
-        options.delete(:strict_host_key_checking)
-      end
+      options.delete(:strict_host_key_checking) unless Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
 
       Pero.log.info "start forwarding #{specinfra.get_config(:host)}:8140 => localhost:#{port}"
       Net::SSH.start(

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: tool for puppet apply from our desktop.