pero 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c887b6e9b5f504590d3a89b77630d76fa1bc39823e25b74e0bece76ff74a94b7
-  data.tar.gz: 1147b48bbaf1cdc375ce946c312f14010fc75ba89c4fd610d3c1f6c4a001cfcb
+  metadata.gz: 5c70b7eacb6c850afd1cdd014f357204cf34face7354aeb5056cf3869172794e
+  data.tar.gz: 83d9dd8fedd249340337914d5635725b9f2cd189fac0d8bc189c7e9a3a74874f
 SHA512:
-  metadata.gz: 0acb6080d4ecfb1499f12628667ad952346bf4a16d97d777b9492bfcf798a86d03ba7d95788a8c84be47c811cf4880de4d03e6d7dedcec298b494fb83a53ed20
-  data.tar.gz: 25ffa99fc93c113cff3e29daa77c369daee6972c4ed1752bd6fa55ea14cf723beca64cbaea9a7b032da5100c7b2aa9d7a04536fbbf45e6ef4031d86efe05a168
+  metadata.gz: bb72ebfec2140ef2bde35127614ed05240e73b41ebd7442d9cf8ab8bcc9b2bbed3c98198c6caef0932481066477246661332741b7a44d3fcfeb7667509709741
+  data.tar.gz: 4a9288d537cc01061b725552f9dd01ce71f48112cf9f49a5b180bba9cb5274521d95b7d673e3f9121d518158ae3596cba1e100e4a1f6c62d8acdcf2509fd1862

data/lib/pero/cli.rb

@@ -57,7 +57,10 @@ module Pero
 
       prepare
       nodes = Pero::History.search(name_regexp)
-      return unless nodes
+      if nodes.empty?
+        Pero.log.info 'No matching node found.'
+        return
+      end
       m = Mutex.new
 
       begin
@@ -117,8 +120,8 @@ module Pero
       end
 
       def prepare
-        `bundle install` if File.exists?("Gemfile")
-        `bundle exec librarian-puppet install` if File.exists?("Puppetfile")
+        `bundle install` if File.exist?("Gemfile")
+        `bundle exec librarian-puppet install` if File.exist?("Puppetfile")
       end
     end
   end

data/lib/pero/docker.rb

@@ -135,8 +135,10 @@ EOS
         ["puppetlabs-release-pc1-el-#{el}.noarch.rpm", "puppetserver"]
       elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("5.0.0") <= Gem::Version.new(server_version)
         ["puppet5-release-el-#{el}.noarch.rpm", "puppetserver"]
-      else
+      elsif Gem::Version.new("7.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("6.0.0") <= Gem::Version.new(server_version)
         ["puppet6-release-el-#{el}.noarch.rpm", "puppetserver"]
+      else
+        ["puppet7-release-el-#{el}.noarch.rpm", "puppetserver"]
       end
 
       vault_repo = if el == 6
@@ -149,9 +151,16 @@ RUN sed -i "s|#baseurl=|baseurl=|g" /etc/yum.repos.d/CentOS-Base.repo \
         ''
       end
 
+      legacy_signing = if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
+        "RUN echo 'LegacySigningMDs md5' >> /etc/pki/tls/legacy-settings"
+      else
+        ''
+      end
+
       <<-EOS
 FROM #{from_image}
 #{vault_repo}
+#{legacy_signing}
 RUN curl -L -k -O https://yum.puppetlabs.com/#{release_package}  && \
 rpm -ivh #{release_package}
 RUN yum install -y #{package_name}-#{server_version}
@@ -161,7 +170,7 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
     end
 
     def create_ca
-      release_package,package_name, conf_dir  = if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
+      if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
         'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'
       elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
         'puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1'
@@ -171,7 +180,12 @@ RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
     end
 
     def run_cmd
-      release_package,package_name, conf_dir  = if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
+      if Gem::Version.new("3.0.0") > Gem::Version.new(server_version)
+        # /var/puppet/run is created for the first time by running `puppet master`,
+        # but `puppet master` will fail because the permissions are wrong.
+        # So, let the `puppet master` fail once, fix the permission of /var/puppet/run, and execute `puppet master` again.
+        'puppet master --no-daemonize --verbose || (chown puppet: /var/puppet/run && puppet master --no-daemonize --verbose)'
+      elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
         'puppet master --no-daemonize --verbose'
       elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)
         'puppetserver foreground'

data/lib/pero/puppet/redhat.rb

@@ -44,8 +44,10 @@ module Pero
           ["puppetlabs-release-pc1-el-#{main_release}.noarch.rpm", "puppet"]
         elsif Gem::Version.new("6.0.0") > Gem::Version.new(version) && Gem::Version.new("5.0.0") <= Gem::Version.new(version)
           ["puppet5-release-el-#{main_release}.noarch.rpm", "puppet-agent"]
-        else
+        elsif Gem::Version.new("7.0.0") > Gem::Version.new(version) && Gem::Version.new("6.0.0") <= Gem::Version.new(version)
           ["puppet6-release-el-#{main_release}.noarch.rpm", "puppet-agent"]
+        else
+          ["puppet7-release-el-#{main_release}.noarch.rpm", "puppet-agent"]
         end
 
         unless run_specinfra(:check_package_is_installed, package_name, version)

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.5.2"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2023-03-31 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.1.4
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: tool for puppet apply from our desktop.