pero 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f292ef6092bf2aadcccca0a70fbf2257d273f0e2fded39752b8817d6920c334
-  data.tar.gz: 31d236c3533a6981aedf8d90d60b835561b64e50cfb5b643755f572e68003613
+  metadata.gz: 4a48e2786db38760a4c084182d6e8fa0d75ed4a8dc7a302bd019d66a58977e31
+  data.tar.gz: 85022aad2062db63dd56289a8b0a93998db0dc36a94cef79d46701e19f9e381e
 SHA512:
-  metadata.gz: eccbb2a3cdf32be14329cc7e2386151c6943519cd5123066e35d04b7032206d6c066623fa87af0a6cf350e7a7b9027df0bf6320a1fac674bd3107c40fa66a9b4
-  data.tar.gz: 8e179117e5ee50dc539a8f67d8308f9fe2928b6f1036eeddddd1f43e882e0784d8695c9aafa0d32c637953226dd9bb65091921bb7d0fe2a97c40a0d97b6b815d
+  metadata.gz: d4b82257f375edd65d5f336c5ea08289125c8fed6d0acad596a2e9ceedef6901c59c7c7d274dd41c8477f5a8bc44cb5f47d9a1df89d4ea44ff9ae2dea1f742f0
+  data.tar.gz: 4b541bd95a5c460f841ca63304e7141bc9390a3e20a93e6f7b1e463c522c40bf945c8512a0c6b755bdfbffe0099253d9dc28b406823695fb8a320a197b57efce

data/lib/pero/cli.rb

@@ -1,6 +1,6 @@
-require "pero"
-require "thor"
-require "parallel"
+require 'pero'
+require 'thor'
+require 'parallel'
 
 module Pero
   class CLI < Thor
@@ -17,41 +17,38 @@ module Pero
 
     def self.shared_options
       option :log_level, type: :string, aliases: ['-l'], default: 'info'
-      option :user, type: :string, aliases: ['-x'], desc: "ssh user"
-      option :key, type: :string, aliases: ['-i'], desc: "ssh private key"
-      option :port, type: :numeric, aliases: ['-p'], desc: "ssh port"
-      option "timeout", default: 10, type: :numeric, desc: "ssh connect timeout"
-      option :ssh_config, type: :string, desc: "ssh config path"
-      option :environment, type: :string, desc: "puppet environment"
-      option :ask_password, type: :boolean, default: false, desc: "ask ssh or sudo password"
-      option :vagrant, type: :boolean, default: false, desc: "use vagrarant"
-      option :sudo, type: :boolean, default: true, desc: "use sudo"
-      option "concurrent", aliases: '-C',default: 3, type: :numeric, desc: "running concurrent"
+      option :user, type: :string, aliases: ['-x'], desc: 'ssh user'
+      option :key, type: :string, aliases: ['-i'], desc: 'ssh private key'
+      option :port, type: :numeric, aliases: ['-p'], desc: 'ssh port'
+      option 'timeout', default: 10, type: :numeric, desc: 'ssh connect timeout'
+      option :ssh_config, type: :string, desc: 'ssh config path'
+      option :environment, type: :string, desc: 'puppet environment'
+      option :ask_password, type: :boolean, default: false, desc: 'ask ssh or sudo password'
+      option :vagrant, type: :boolean, default: false, desc: 'use vagrarant'
+      option :sudo, type: :boolean, default: true, desc: 'use sudo'
+      option 'concurrent', aliases: '-C', default: 3, type: :numeric, desc: 'running concurrent'
     end
 
-    desc "versions", "show support version"
+    desc 'versions', 'show support version'
     def versions
-      begin
-        Pero::Puppet::Redhat.show_versions
-      rescue => e
-        Pero.log.error e.inspect
-      end
+      Pero::Puppet::Redhat.show_versions
+    rescue StandardError => e
+      Pero.log.error e.inspect
     end
 
-    desc "apply", "puppet apply"
+    desc 'apply', 'puppet apply'
     shared_options
-    option "server-version", type: :string
-    option "image-name", type: :string
+    option 'server-version', type: :string
+    option 'image-name', type: :string
     option :noop, aliases: '-n', default: false, type: :boolean
     option :test, aliases: '-t', default: false, type: :boolean
     option :verbose, aliases: '-v', default: true, type: :boolean
     option :tags, default: nil, type: :array
     option :volumes, default: nil, type: :array
-    option "one-shot", default: false, type: :boolean, desc: "stop puppet server after run"
+    option 'one-shot', default: false, type: :boolean, desc: 'stop puppet server after run'
     def apply(name_regexp)
-
-      if !options["image-name"] && !options["server-version"]
-        Pero.log.error "image-name or server-version are required"
+      if !options['image-name'] && !options['server-version']
+        Pero.log.error 'image-name or server-version are required'
         return
       end
 
@@ -64,64 +61,60 @@ module Pero
       m = Mutex.new
 
       begin
-        Parallel.each(nodes, in_threads: options["concurrent"]) do |n|
+        Parallel.each(nodes, in_threads: options['concurrent']) do |n|
           opt = merge_options(n, options)
-          puppet = Pero::Puppet.new(opt["host"], opt, m)
+          puppet = Pero::Puppet.new(opt['host'], opt, m)
           puppet.apply
         end
-      rescue => e
+      rescue StandardError => e
         Pero.log.error e.backtrace.join("\n")
         Pero.log.error e.inspect
-
       ensure
-        if options["one-shot"]
-          Pero.log.info "stop puppet master container"
-          Parallel.each(nodes, in_threads: options["concurrent"]) do |n|
-            opt = merge_options(n, options)
-            Pero::Puppet.new(opt["host"], opt, m).stop_master
-          end
+        if options['one-shot']
+          Pero.log.info 'stop puppet master container'
+          opt = merge_options(nodes.first, options)
+          Pero::Puppet.new(opt['host'], opt, m).stop_master
         else
-          Pero.log.info "puppet master container keep running"
+          Pero.log.info 'puppet master container keep running'
         end
       end
     end
 
-    desc "bootstrap", "bootstrap pero"
+    desc 'bootstrap', 'bootstrap pero'
     shared_options
-    option "agent-version", type: :string
-    option "node-name", aliases: '-N', default: "", type: :string, desc: "json node name(default hostname)"
+    option 'agent-version', type: :string
+    option 'node-name', aliases: '-N', default: '', type: :string, desc: 'json node name(default hostname)'
     def bootstrap(*hosts)
-      begin
-        options["environment"] = "production" if options["environment"].nil? || options["environment"].empty?
-        m = Mutex.new
-        Parallel.each(hosts, in_threads: options["concurrent"]) do |host|
-          raise "unknown option #{host}" if host =~ /^-/
-          puppet = Pero::Puppet.new(host, options, m)
+      options['environment'] = 'production' if options['environment'].nil? || options['environment'].empty?
+      m = Mutex.new
+      Parallel.each(hosts, in_threads: options['concurrent']) do |host|
+        raise "unknown option #{host}" if host =~ /^-/
 
-          Pero.log.info "bootstrap pero #{host}"
-          puppet.install
-        end
-      rescue => e
-        Pero.log.error e.backtrace.join("\n")
-        Pero.log.error e.inspect
+        puppet = Pero::Puppet.new(host, options, m)
+
+        Pero.log.info "bootstrap pero #{host}"
+        puppet.install
       end
+    rescue StandardError => e
+      Pero.log.error e.backtrace.join("\n")
+      Pero.log.error e.inspect
     end
 
     no_commands do
       def merge_options(node, options)
-        opt = node["last_options"].merge(options)
-        opt["environment"] = "production" if opt["environment"].nil? || opt["environment"].empty?
-        if options["image-name"]
-          opt.delete("server-version")
+        opt = node['last_options'].merge(options)
+        opt['environment'] = 'production' if opt['environment'].nil? || opt['environment'].empty?
+        if options['image-name']
+          opt.delete('server-version')
         else
-          opt.delete("image-name")
+          opt.delete('image-name')
         end
         opt
       end
 
       def prepare
-        `bundle install` if File.exist?("Gemfile")
-        `bundle exec librarian-puppet install` if File.exist?("Puppetfile")
+        `bundle install` if File.exist?('Gemfile')
+        `bundle exec librarian-puppet install` if File.exist?('Puppetfile')
       end
     end
   end

data/lib/pero/puppet.rb

@@ -94,7 +94,7 @@ module Pero
       @mutex.lock
       run_container.kill if docker.alerady_run?
     ensure
-      @mutex.unlock if @mutex.owned?
+      @mutex.unlock
     end
 
     def serve_master
@@ -115,7 +115,7 @@ module Pero
       @mutex.lock
       docker.alerady_run? || docker.run
     ensure
-      @mutex.unlock if @mutex.owned?
+      @mutex.unlock
     end
 
     def apply

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - pyama86