master_manipulator 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 82c90ccb9f7a1f77f034cb73f4c8d758d961cf34
-  data.tar.gz: 8547f78eb24085267afec5fd669d6be03acb3a38
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjI2Mzg2MzgxYTFkZDU4NWNiNTJlZWY4MDFlYmZkYWM0NjY3Mjc0NA==
+  data.tar.gz: !binary |-
+    M2E0ZGQyYjY1YzFmZDlmODg3MmY0YzU2ZTkzYTU1M2NlZjhhMGRkNw==
 SHA512:
-  metadata.gz: 2ed736250d0ed64c218ede0274677eaa01b08079167f10f661a762aff0724f6285181e65326a3f777189bf7991bc4580abe47560c3409957f17c0595f83c364e
-  data.tar.gz: fa9927b9a7bd56d6a98ad6c1741c6eedd5415abb73544f0e756111d2691c7b1501a7e13ccf99163ea68dd2d5e31576792456d8b688f6223fd1df1330a743adf1
+  metadata.gz: !binary |-
+    YTI4M2Y5ZmNiZjMxZWE1NDczNTAxYjk4MzQ0YzI4OWM4ODczODcyYjI5OWMy
+    ODc4OGQ0NGVlNWQ0NDZiNWI0OWE5M2Q0YjM4YTFmMmZjYmY1YjE1ZDAzZWNk
+    MzUyOGViMmIxYTRlODQ1MTY0ODNiYjc0ZDEzZDg4OTBmMjBjZDk=
+  data.tar.gz: !binary |-
+    Y2JjYTM0Y2ZlNjVlMzkyMTE1ZTI0ZTZlYTYzYjRlZGMyMTliODIyMzA0YmEy
+    MGU5YmRhOWNiODNlM2UxNTExNGY5NGNlMjE2ODY0MDdiZDRmMjA2NTlmNDJl
+    MjQyZjE3MTY3YzIxMWUwZWZjNDk0MzkwZTU0NTdiM2I5YTYyNzg=

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    master_manipulator (1.1.2)
+    master_manipulator (1.2.0)
       beaker (~> 2.7, >= 2.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.1)
-    activesupport (4.2.3)
+    CFPropertyList (2.3.2)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -19,16 +19,19 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (1.64.0)
-      aws-sdk-v1 (= 1.64.0)
-    aws-sdk-v1 (1.64.0)
+    aws-sdk (1.66.0)
+      aws-sdk-v1 (= 1.66.0)
+    aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (2.18.0)
+    beaker (2.27.0)
       aws-sdk (~> 1.57)
+      beaker-answers (~> 0.0)
+      beaker-hiera (~> 0.0)
       docker-api
       fission (~> 0.4)
       fog (~> 1.25)
+      fog-google (~> 0.0.9)
       google-api-client (~> 0.8)
       hocon (~> 0.1)
       inifile (~> 2.0)
@@ -39,26 +42,33 @@ GEM
       open_uri_redirections (~> 0.2.1)
       rbvmomi (~> 1.8)
       rsync (~> 1.0.9)
+      stringify-hash (~> 0.0)
       unf (~> 0.1)
+    beaker-answers (0.3.0)
+      require_all (~> 1.3.2)
+      stringify-hash (~> 0.0.0)
+    beaker-hiera (0.1.1)
+      stringify-hash (~> 0.0.0)
     builder (3.2.2)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.21.4)
+    docker-api (1.22.4)
       excon (>= 0.38.0)
       json
     excon (0.45.4)
     extlib (0.9.16)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.32.0)
+    fog (1.34.0)
       fog-atmos
       fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
       fog-core (~> 1.32)
-      fog-ecloud (= 0.1.1)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
       fog-google (>= 0.0.2)
       fog-json
       fog-local
@@ -79,26 +89,30 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.7.3)
+    fog-aws (0.7.6)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.7.2)
+    fog-brightbox (0.9.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.32.0)
+    fog-core (1.32.1)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-    fog-ecloud (0.1.1)
+    fog-dynect (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
       fog-core
       fog-xml
-    fog-google (0.0.7)
+    fog-google (0.0.9)
       fog-core
       fog-json
       fog-xml
@@ -111,7 +125,7 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.3)
+    fog-profitbricks (0.0.5)
       fog-core
       fog-xml
       nokogiri
@@ -123,13 +137,13 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.0.1)
+    fog-sakuracloud (1.3.3)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (0.4.7)
+    fog-softlayer (1.0.1)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -159,24 +173,24 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.4.1)
+    googleauth (0.4.2)
       faraday (~> 0.9)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
-      multi_json (= 1.11)
+      multi_json (~> 1.11)
       signet (~> 0.6)
-    hocon (0.9.2)
+    hocon (0.9.3)
     i18n (0.7.0)
     inflecto (0.0.2)
     inifile (2.0.2)
     ipaddress (0.8.0)
     json (1.8.3)
-    jwt (1.5.1)
-    kramdown (1.8.0)
+    jwt (1.5.2)
+    kramdown (1.9.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    little-plugger (1.1.3)
+    little-plugger (1.1.4)
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
@@ -187,10 +201,10 @@ GEM
       textutils (>= 0.2.0)
     memoist (0.12.0)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.7.0)
-    multi_json (1.11.0)
+    minitest (5.8.2)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -208,17 +222,18 @@ GEM
       builder
       nokogiri (>= 1.4.1)
       trollop
+    require_all (1.3.3)
     retriable (1.4.1)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
@@ -236,6 +251,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
+    stringify-hash (0.0.2)
     textutils (1.3.1)
       activesupport
       logutils (>= 0.6.1)
@@ -262,6 +278,3 @@ DEPENDENCIES
   rspec (>= 3.0.0)
   simplecov
   yard (~> 0)
-
-BUNDLED WITH
-   1.10.5

data/HISTORY.md

@@ -1,12 +1,75 @@
 # default - History
 ## Tags
-* [LATEST - 1 Jul, 2015 (14ceb0e8)](#LATEST)
+* [LATEST - 29 Oct, 2015 (4be0bec7)](#LATEST)
+* [1.1.2 - 14 Jul, 2015 (13e5bb62)](#1.1.2)
+* [1.1.1 - 1 Jul, 2015 (42e15400)](#1.1.1)
 * [1.1.0 - 30 Jun, 2015 (c33bac06)](#1.1.0)
 * [1.0.1 - 17 Jun, 2015 (33c2182d)](#1.0.1)
 * [1.0.0 - 6 May, 2015 (8ae50d90)](#1.0.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 1 Jul, 2015 (14ceb0e8)
+### <a name = "LATEST">LATEST - 29 Oct, 2015 (4be0bec7)
+
+* (GEM) update master_manipulator version to 1.2.0 (4be0bec7)
+
+* Merge pull request #13 from zreichert/improvement/master/QA-2115-use_status_enpoint (8ef7e82b)
+
+
+```
+Merge pull request #13 from zreichert/improvement/master/QA-2115-use_status_enpoint
+
+(QA-2115) use services endpoint for puppetserver
+```
+* (QA-2115) use services endpoint for puppetserver (ef2ebfc7)
+
+### <a name = "1.1.2">1.1.2 - 14 Jul, 2015 (13e5bb62)
+
+* Merge pull request #12 from mckern/master (13e5bb62)
+
+
+```
+Merge pull request #12 from mckern/master
+
+(MAINT) Bump version to 1.1.2 for first public release
+```
+* (MAINT) Bump version to 1.1.2 for first public release (8bd83fe9)
+
+* Merge pull request #11 from mckern/master (be4bf542)
+
+
+```
+Merge pull request #11 from mckern/master
+
+(MAINT) Prepare Gemspec for initial public release
+```
+* (MAINT) Prepare Gemspec for initial public release (0016defd)
+
+
+```
+(MAINT) Prepare Gemspec for initial public release
+
+Updated Gemspec to newer general Ruby and Rubygem standards
+(http://guides.rubygems.org/specification-reference/), which includes:
+
+Use single-quoted strings instead of double-string when interpolation
+isn't needed.
+
+Provide a slightly better description.
+
+Update the Gem author with the same 'author' as our other public gems.
+
+Correct OSI license name
+  (http://opensource.org/licenses/alphabetical).
+
+Use Ruby to generate the files to package, instead of shelling out to
+git on the command line.
+
+Removing attributes that are unused, like spec.executables and
+spec.require_paths (since it defaults to 'lib/').
+```
+### <a name = "1.1.1">1.1.1 - 1 Jul, 2015 (42e15400)
+
+* (HISTORY) update master_manipulator history for gem release 1.1.1 (42e15400)
 
 * (GEM) update master_manipulator version to 1.1.1 (14ceb0e8)
 

data/lib/master_manipulator/service.rb

@@ -1,3 +1,5 @@
+require 'JSON'
+
 module MasterManipulator
   module Service
 
@@ -5,44 +7,52 @@ module MasterManipulator
     # ==== Attributes
     # *+host+ - the host that this should operate on
     # *+opts+ - an options hash - not required
-    #   *+:timeout+ - the amount of time in seconds to wait for success
-    #   *+:frequency+ - The time to wait between retries
+    #   *+:wait_cycle+ - the number of cycles to attempt retry
     #   *+:is_pe?+ - Boolean : if the SUT is PE, defaults to true
     #
     # Raises a standard error if the wait is unsuccessful
     #
     # ==== Example
     # restart_puppet_server(master)
-    # restart_puppet_server(master, {:time_out => 200, :frequency => 10})
+    # restart_puppet_server(master, {:wait_cycles => 20})
     def restart_puppet_server(host, opts = {})
 
+      start_time = Time.now
+
       opts[:is_pe?] ||= true
       opts[:is_pe?] ? service_name = 'pe-puppetserver' : service_name = 'puppetserver'
 
       on(host, puppet("resource service #{service_name} ensure=stopped"))
       on(host, puppet("resource service #{service_name} ensure=running"))
-      masterHostName = on(host, 'hostname').stdout.chomp
-      opts[:time_out] ||= 60
-      opts[:frequency] ||= 5
-      i = 0
+      hostname = on(host, 'hostname').stdout.chomp
+      opts[:wait_cycles] ||= 10
 
       # -k to ignore HTTPS error that isn't relevant to us
-      curl_call = "-I -k https://#{masterHostName}:8140"
+      curl_call = "-k -X GET -H 'Content-Type: application/json' https://#{hostname}:8140/status/v1/services?level=debug"
 
-      while i < opts[:time_out] do
-        i += 1
-        exit_code = curl_on(host, curl_call, :acceptable_exit_codes => [0,1,7]).exit_code
-        case exit_code.to_s
+      (1..opts[:wait_cycles]).each do |i|
+        @result = curl_on(host, curl_call, :acceptable_exit_codes => [0,1,7])
+        @body = JSON.parse(@result.stdout)
+        case @result.exit_code.to_s
           when '0'
             sleep 20
-            return
-          when '1' || '7'
+            return if @body.all?{ |k, v| v['state'] == 'running' }
+          when '1', '7'
             # Exit code 7 is "connection refused"
-            sleep opts[:frequency]
+            sleep (i**(1.2))
         end
       end
 
-      message = "Attempted to restart #{i} times, waited #{opts[:frequency]} seconds between attempts."
+      total_time = Time.now - start_time
+
+      message = "Attempted to restart #{opts[:wait_cycles]} times, waited #{total_time} seconds total."
+
+      message << "\nHere is the status reported by the puppetserver'"
+
+      @body.each do |k,v|
+        message << "\n'#{k}' state: #{v['state']} "
+      end
+
       raise message
 
     end

data/lib/master_manipulator/version.rb

@@ -1,5 +1,5 @@
 module MasterManipulator
   module Version
-    STRING = '1.1.2'
+    STRING = '1.2.0'
   end
 end

metadata

@@ -1,131 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: master_manipulator
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
 description: This Gem extends the Beaker DSL for the purpose of changing things on
@@ -158,17 +158,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Puppet Labs testing library for controlling a Puppet Master