pero 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2cd510f50571a49f36a9d83b33b6ec102c2ec31dce18ee08223b96d9767a867
-  data.tar.gz: a576229ec962f9359956f787591b3c14b7d6a779fae2224d06181f4508adb573
+  metadata.gz: 17794a1ffa026b662d06b36840a883a434823c791db1839ef1efba8306238a63
+  data.tar.gz: af2d15aa1377be5af99b1769c6690adeddba106b51e62eaf20e778566df6a96b
 SHA512:
-  metadata.gz: de370da8d84760e9c441630e123ecce5af27fb52af670b9edc16ba62b14b4bdc4b156b343c0ba8f764dc3203cfa3eb5b6ffc9a0d6b17efaa5982e31f68e42e22
-  data.tar.gz: 743fc365959f454d404d11faf1dda6d4c89242e2e4b054d137c5887befc7fb027c5c56345f6bfc164db4c19e8081d27563e8b19bdcd117d6e1a0ea070940da88
+  metadata.gz: 372e94f0f02059e076ebbbf7976ecc188b9f22a983c6fe0cd788e899f3536c0c99a1728d33df080458b7e21bd7207f5df9d547a373837d19da25da6544d43388
+  data.tar.gz: 7a4baefe02de81bc4551777fcc785ad1332bf2ee7ede50fd5c1d682dfcb1f5479a32221ccec31c9bae6085964da96d93dafac11c5fce716cd509b4115f4641e1

data/.gitignore

@@ -6,3 +6,4 @@ run
 yaml
 log
 pkg
+Gemfile.lock

data/lib/pero/cli.rb

@@ -22,7 +22,7 @@ module Pero
       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", default: "production"
+      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"
@@ -61,6 +61,7 @@ module Pero
         return unless nodes
         Parallel.each(nodes, in_process: options["concurrent"]) do |n|
           opt = n["last_options"].merge(options)
+          opt["environment"] = "production" if opt["environment"].empty?
           if options["image-name"]
             opt.delete("server-version")
           else
@@ -80,6 +81,7 @@ module Pero
     option "node-name", aliases: '-N', default: "", type: :string, desc: "json node name(default hostname)"
     def bootstrap(*hosts)
       begin
+        options["environment"] = "production" if options["environment"].empty?
         Parallel.each(hosts, in_process: options["concurrent"]) do |host|
           raise "unknown option #{host}" if host =~ /^-/
           puppet = Pero::Puppet.new(host, options)
@@ -94,7 +96,7 @@ module Pero
 
     no_commands do
       def prepare
-        `bundle insatll` if File.exists?("Gemfile")
+        `bundle install` if File.exists?("Gemfile")
         `bundle exec librarian-puppet install` if File.exists?("Puppetfile")
       end
     end

data/lib/pero/docker.rb

@@ -41,7 +41,7 @@ module Pero
 
     def alerady_run?
       c = find
-      c && c.info["State"] != "exited" && c
+      c && c.info["State"] == "running" && c
     end
 
     def run
@@ -49,23 +49,26 @@ module Pero
         c.delete(:force => true) if c.info["Names"].first == "/#{container_name}"
       end
 
+      vols = volumes || []
+      vols << "#{Dir.pwd}:/etc/puppetlabs/code/environments/#{@environment}"
+      vols << "#{Dir.pwd}/keys:/etc/puppetlabs/puppet/eyaml/"
+
       container = ::Docker::Container.create({
         'name' => container_name,
         'Hostname' => 'puppet',
         'Image' => build.id,
         'ExposedPorts' => { '8140/tcp' => {} },
+        'HostConfig' => {
+          'Binds' => vols,
+          'PortBindings' => {
+            '8140/tcp' => [{ 'HostPort' => "0" }],
+          },
+        },
+        'Cmd' => ["bash", "-c", "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"]
       })
 
       Pero.log.info "start puppet master container"
-      vols = volumes || []
-      vols << "#{Dir.pwd}:/etc/puppetlabs/code/environments/#{@environment}"
-      vols << "#{Dir.pwd}/keys:/etc/puppetlabs/puppet/eyaml/"
-      container.start(
-        'Binds' => vols,
-        'PortBindings' => {
-          '8140/tcp' => [{ 'HostPort' => "0" }],
-        },
-      )
+      container.start
 
       container = find
       raise "can't start container" unless container
@@ -111,15 +114,28 @@ EOS
 
 
     end
+
+    def conf_dir
+      if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
+        "/etc/puppet"
+      elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version) && Gem::Version.new("4.0.0") <= Gem::Version.new(server_version)
+        "/etc/puppetlabs/puppet/"
+      elsif Gem::Version.new("6.0.0") > Gem::Version.new(server_version)&& Gem::Version.new("5.0.0") <= Gem::Version.new(server_version)
+        "/etc/puppetlabs/puppet/"
+      else
+        "/etc/puppetlabs/puppet/"
+      end
+    end
+
     def docker_file
-      release_package,package_name, conf_dir  = if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
-        ["puppetlabs-release-el-#{el}.noarch.rpm", "puppet-server", "/etc/puppet"]
+      release_package,package_name = if Gem::Version.new("4.0.0") > Gem::Version.new(server_version)
+        ["puppetlabs-release-el-#{el}.noarch.rpm", "puppet-server"]
       elsif Gem::Version.new("5.0.0") > Gem::Version.new(server_version) && Gem::Version.new("4.0.0") <= Gem::Version.new(server_version)
-        ["puppetlabs-release-pc1-el-#{el}.noarch.rpm", "puppetserver", "/etc/puppetlabs/puppet/"]
+        ["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", "/etc/puppetlabs/puppet/"]
+        ["puppet5-release-el-#{el}.noarch.rpm", "puppetserver"]
       else
-        ["puppet6-release-el-#{el}.noarch.rpm", "puppetserver", "/etc/puppetlabs/puppet/"]
+        ["puppet6-release-el-#{el}.noarch.rpm", "puppetserver"]
       end
 
       <<-EOS
@@ -129,7 +145,6 @@ rpm -ivh #{release_package}
 RUN yum install -y #{package_name}-#{server_version}
 ENV PATH $PATH:/opt/puppetlabs/bin
 RUN echo -e "#{puppet_config.split(/\n/).join("\\n")}" > #{conf_dir}/puppet.conf
-CMD bash -c "rm -rf #{conf_dir}/ssl/* && #{create_ca} && #{run_cmd}"
       EOS
     end
 

data/lib/pero/version.rb

@@ -1,3 +1,3 @@
 module Pero
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/pero.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'retryable'
   spec.add_dependency 'specinfra'
   spec.add_dependency 'parallel'
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pero
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - pyama86
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -112,30 +112,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        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
@@ -160,7 +160,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -200,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: tool for puppet apply from our desktop.

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pero (0.1.9)
-      docker-api
-      logger
-      net-ssh
-      parallel
-      retryable
-      specinfra
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.4.4)
-    docker-api (1.34.2)
-      excon (>= 0.47.0)
-      multi_json
-    excon (0.76.0)
-    logger (1.4.2)
-    multi_json (1.15.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
-    net-telnet (0.1.1)
-    parallel (1.19.2)
-    rake (10.5.0)
-    retryable (3.0.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    sfl (2.3)
-    specinfra (2.82.19)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
-    thor (1.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  pero!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.17.3