master_manipulator 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc3OGRjYjUyYTQ1MDNjYmE3NzM3NTFmMzc0YTMwMDFiY2JlY2EyOA==
+    OGI5NWY1NDIzOTg4YmU4ZTg5ODNiZTM2YTAxOThiODZmYmM3ZGQ2ZA==
   data.tar.gz: !binary |-
-    Y2U4NTA0MWRiODk3ODk0N2I0ODdlZmUyMjg1YjhhZTBiM2U2MzhkMg==
+    Nzg2ZGRlMWQxMjQ1OTdmMDI5YzJiNjMzNmNmZjI1OGYzMDlkNTVhZg==
 SHA512:
   metadata.gz: !binary |-
-    NzdhNTBmNTVhZDRlZmI3MjZjNTg4ZWYwMGFjMDBkYWJkNDM4YzE1NTY2N2Jl
-    ODE4OTIyNjg4ZWExYTIwYTUyZTg2MGI2MTNjMmEwNmQ1ZGE3ZDlhY2VkYTNj
-    ODczZGM3YTA3NmFiNmViZmVkNTE2MDhjNDAyY2JhN2E4MjQyZDc=
+    NGYxZDYzZjRhMGU2MmIxZWRiODRhYzhjYTlkMWY0NTc3ZjljNGI3Yjc5YzE4
+    NDc5MWQzNzFlMTI1MTY5NzIzMTRlMWViOTk4ZmZhYmE5YjVlMjE3N2JhZjE0
+    MTk3N2U5ZTcyZmNjYWQxOTYyMGQxYzc4MDBkM2UzMDMwOGNjMWI=
   data.tar.gz: !binary |-
-    Y2M1Njg0NGE2MDM5ZDg2NjI1YTJmNGFiY2UzY2M0ZTNhZjUyOWRlOGMyZDll
-    MzU0M2RkMDI3M2ZmYmViNjBhODk4MjRkMWU2ZjEyZjEyNGI2ZjFhMTYyOTVk
-    ZjJlMDk5ZTRkZjJmYWFiNTVjMmI2ODVkNzliOGM3ODFiYzU0NTI=
+    NTA1YmMwNjVmMjVjZGQzYzc3NGUwMjAxZTU3NGFmZjY4ZjVmNmRhMWQ5ZGZm
+    Yzc4NzRlOGYyYzhlMDFmZWUwMDVkYzkyZWJjNzE1Y2FiNjJlN2EyYjdkZjA4
+    NjYwZjZlMDBkN2IxMWIwYWI5YWRiZGFkZTU2NmQ3YmRjOTc4NmU=

data/lib/master_manipulator/log.rb

@@ -2,6 +2,16 @@
 module MasterManipulator
   module Log
 
+    # Return the path to the puppetserver log file
+    # @param [Beaker::Host] master_host The puppet server host
+    # @return [String] path to puppetserver log file
+    # @example return the path to the puppet server log file
+    #   puppet_server_log_path(master)
+    def puppet_server_log_path(master_host)
+      log_dir = on(master_host, puppet("master --configprint logdir")).stdout.chomp
+      "#{log_dir}/puppetserver.log"
+    end
+
     #<fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
 
     # Rollover the puppetserver log file the same way logback would
@@ -11,9 +21,7 @@ module MasterManipulator
     #   rotate_puppet_server_log(master)
     def rotate_puppet_server_log(master_host)
 
-      log_dir = on(master_host, "puppet config print logdir").stdout.chomp
-      #this is ugly, rev 2 should parse the logback.xml, doesn't seem to be another way
-      log_file = log_dir + "server/puppetserver.log"
+      log_file = puppet_server_log_path(master_host)
 
       date_str = on(master_host, "date +%Y-%m-%d").stdout.chomp
       backup_log_file = log_file.sub(/\log$/,date_str)

data/lib/master_manipulator/version.rb

@@ -1,5 +1,5 @@
 module MasterManipulator
   module Version
-    STRING = '2.0.0'
+    STRING = '2.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: master_manipulator
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler