pero 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f970d0b7869fb40c3e86c2946655bd523971901322cf0e290647c2dbe0115a1b
-  data.tar.gz: f2a7c166a9feff206398f8e7dad567c24860cd7613f06a1f2a81f3ff6c9f55ac
+  metadata.gz: 05cbbff3dcd2e37bc56f0b6b84c67c7f920aa7f648fdf523ec6b6ebc062c5f06
+  data.tar.gz: 9254adde17ef21f614ab32e84edd3e4a71d40ae534372224bffd4c6587ae8b49
 SHA512:
-  metadata.gz: 28ca76f64521f7529d63cb1c7bfd0ab2747ade30d3f0cbe247f6793a45e6c147e677086e896d925bd1fc2401d74bb1265bdd63c88dcd5c801d2c03496834fba0
-  data.tar.gz: fc59ba398210e11a801cafa509eb81c8db0dcb6e3837b78562a021f0face8741935ecff2b2d5cac021bd5940612524a3ff5a6d18197022bfb2e181a27aba098f
+  metadata.gz: 4e264fefbe67c4d6240125f327f8013bc2a6450770e2eef42e9d2eb62386aadca5782b0bd3f23b79f88cc8ba4348ad131e6b995ad9b6bb2779b7d64e42d74f78
+  data.tar.gz: b496423a88e94f2625ad18dc1abdaabbd60b9e54ef3a4949043301dabaf531589a3df85511e2cbdeb95a14a96c150708cc5feb48482dccdc9f5c4d34cb7321e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pero (0.1.5)
+    pero (0.1.6)
       docker-api
       logger
       net-ssh

data/lib/pero/cli.rb

@@ -30,7 +30,11 @@ module Pero
 
     desc "versions", "show support version"
     def versions
-      Pero::Puppet::Redhat.show_versions
+      begin
+        Pero::Puppet::Redhat.show_versions
+      rescue => e
+        Pero.log.error e.inspect
+      end
     end
 
     desc "apply", "puppet apply"
@@ -41,12 +45,17 @@ module Pero
     option :tags, default: nil, type: :array
     option "one-shot", default: false, type: :boolean, desc: "stop puppet server after run"
     def apply(name_regexp)
-      nodes = Pero::History.search(name_regexp)
-      return unless nodes
-      Parallel.each(nodes, in_process: options["concurrent"]) do |n|
-        opt = n["last_options"].merge(options)
-        puppet = Pero::Puppet.new(opt["host"], opt)
-        puppet.apply
+      begin
+        prepare
+        nodes = Pero::History.search(name_regexp)
+        return unless nodes
+        Parallel.each(nodes, in_process: options["concurrent"]) do |n|
+          opt = n["last_options"].merge(options)
+          puppet = Pero::Puppet.new(opt["host"], opt)
+          puppet.apply
+        end
+      rescue => e
+        Pero.log.error e.inspect
       end
     end
 
@@ -55,10 +64,21 @@ module Pero
     option "agent-version", type: :string
     option "node-name", aliases: '-N', default: "", type: :string, desc: "json node name(default hostname)"
     def bootstrap(*hosts)
-      Parallel.each(hosts, in_process: options["concurrent"]) do |host|
-        next if host =~ /^-/
-        puppet = Pero::Puppet.new(host, options)
-        puppet.install
+      begin
+        Parallel.each(hosts, in_process: options["concurrent"]) do |host|
+          next if host =~ /^-/
+          puppet = Pero::Puppet.new(host, options)
+          puppet.install
+        end
+      rescue => e
+        Pero.log.error e.inspect
+      end
+    end
+
+    no_commands do
+      def prepare
+        `bundle insatll` if File.exists?("Gemfile")
+        `bundle exec librarian-puppet install` if File.exists?("Puppetfile")
       end
     end
   end

data/lib/pero/docker.rb

@@ -27,12 +27,17 @@ module Pero
       "pero-#{server_version}-#{Digest::MD5.hexdigest(Dir.pwd)[0..5]}-#{@environment}"
     end
 
-    def alerady_run?
+    def find
       ::Docker::Container.all(:all => true).find do |c|
-        c.info["Names"].first == "/#{container_name}" && c.info["State"] != "exited"
+        c.info["Names"].first == "/#{container_name}"
       end
     end
 
+    def alerady_run?
+      c = find
+      c && c.info["State"] != "exited" && c
+    end
+
     def run
       ::Docker::Container.all(:all => true).each do |c|
         c.delete(:force => true) if c.info["Names"].first == "/#{container_name}"
@@ -57,12 +62,8 @@ module Pero
         "AutoRemove" => true,
       )
 
-      container = ::Docker::Container.all(:all => true).find do |c|
-        c.info["Names"].first == "/#{container_name}"
-      end
-
+      container = find
       raise "can't start container" unless container
-
       begin
         Retryable.retryable(tries: 20, sleep: 5) do
           https = Net::HTTP.new('localhost', container.info["Ports"].first["PublicPort"])
@@ -78,10 +79,11 @@ module Pero
           raise e
         end
       rescue
-        container.kill
+        Pero.log.error "can't start container.please check [ docker logs #{container.info["id"]} ]"
+        container = find
+        container.kill if container && container.info["State"] != "exited"
         raise "can't start puppet server"
       end
-
       container
     end
 
@@ -126,7 +128,6 @@ CMD bash -c "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"
 
     def create_ca
       release_package,package_name, conf_dir  = if Gem::Version.new("5.0.0") > Gem::Version.new(server_version)
-        #'(puppet cert generate `hostname` --dns_alt_names localhost,127.0.0.1 || puppet cert --allow-dns-alt-names sign `hostname`)'
         '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'

data/lib/pero/puppet.rb

@@ -101,6 +101,8 @@ module Pero
           if @options["one-shot"]
             Pero.log.info "stop puppet master container"
             container.kill
+          else
+            Pero.log.info "puppet master container keep running"
           end
         end
     end

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor