puppet-classroom-manager 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d40f055cbde79805220831826bc1128772f84965
-  data.tar.gz: 72d28900ce567fb1817a47a7a3457f901537e565
+  metadata.gz: af0e7af7ee77ab29d61058fa57eba4af51f44d2c
+  data.tar.gz: fb770cff71763c9288217fde895d8f9cc70ed641
 SHA512:
-  metadata.gz: 605d3a23d1a59ca411f51edaa7891de4d261387381d2023581bde06e9cc5bde2a949d92c2cf521688fcd9c6cc32e48697468e76afd958cadfcdd081bc16b2073
-  data.tar.gz: c50b0ffa83ba2a2033b7fdfce4b49f982eee19d624bcc4f9a47d8e2f24fcbfd1daa9ef2426b2fedd507d2597090829728f125aadbd876804ecd89b28c5b5d1c9
+  metadata.gz: 544f54aca8ad9b49f131c15d4491411656048de94b33b1e072ff64883b0f314d5fcd571164d73f95e760fc87b69b07ef0b8c52e8df8b7db965d89b30653a6403
+  data.tar.gz: 624df6da7f0eaea5877211766fd02c2b76d89805146525b8e4334daf30653d8686f417867e1192256115ec75d80528b81969d3067a4af5fb74b129441956e068

data/bin/classroom

@@ -19,7 +19,7 @@ optparse = OptionParser.new { |opts|
         the delivery and facilities for resetting the VM for use across
         multiple deliveries. This is pre-installed on the classroom VM.
 
-        Type courseware help for full usage instructions.
+        Type classroom help for full usage instructions.
 
 "
 
@@ -34,7 +34,7 @@ optparse = OptionParser.new { |opts|
     opts.separator('')
 
     opts.on("-v", "--version", "Print out the version") do
-        require 'courseware/version'
+        require 'classroom/version'
         puts Courseware::VERSION
         exit
     end

data/lib/classroom.rb

@@ -1,4 +1,5 @@
 class Classroom
+  require 'classroom/page'
   require 'classroom/performance'
   require 'classroom/reset'
   require 'classroom/restart'

data/lib/classroom/page.rb

@@ -5,7 +5,8 @@ class Classroom
 
     begin
       config = JSON.parse(File.read('/opt/pltraining/etc/classroom.json'))
-      pd_key = File.read('/opt/pltraining/etc/pagerduty.key')
+      pd_key = File.read('/opt/pltraining/etc/pagerduty.key').strip
+      raise 'Missing PagerDuty key' if pd_key.empty?
     rescue => e
       puts "Cannot load configuration"
       puts e.message
@@ -18,24 +19,30 @@ class Classroom
     puts "https://github.com/puppetlabs/courseware/blob/master/TroubleshootingGuide.md"
     puts
     if confirm?("Have you done everything in the troubleshooting guide?") then
-      puts "Sending page. Make sure you've posted about the issue in HipChat."
-      config = load_metadata
-      page_message = "Instructor: #{config['name']}\n" +
-                     "Email: #{config['email']}\n" +
-                     "Course: #{config['course']}\n" +
+      print 'Describe the problem in a short sentence: '
+      description  = STDIN.gets.strip
+
+      print 'Enter the email or phone number where you can be reached: '
+      contact      = STDIN.gets.strip
+
+      page_message = "#{description}\n" +
+                     "Contact: #{contact}\n" +
+                     "Course: #{config['course']} #{config['version']}\n" +
                      "ID: #{config['event_id']}"
       page_data = {
         "service_key" => pd_key,
         "event_type"  => "trigger",
         "description" => page_message
       }
-      response = RestClient.post(
+
+      puts "Sending page. Make sure you've posted about the issue in HipChat."
+      response = JSON.parse(RestClient.post(
         "https://events.pagerduty.com/generic/2010-04-15/create_event.json",
         page_data.to_json,
         :content_type => :json,
         :accept => :json
-      )
-      puts response
+      ))
+      puts response unless response['status'] == 'success'
     end
   end
 end

data/lib/classroom/sanitize.rb

@@ -10,7 +10,7 @@ class Classroom
     master       = `puppet agent --configprint server`.strip
     classifier   = "http://#{master}:4433/classifier-api"
     known_groups = [ 'All Nodes', 'Agent-specified environment', 'Production environment', /PE / ]
-    known_users  = [ 'admin"=', 'api_user', 'deployer' ]
+    known_users  = [ 'admin', 'api_user', 'deployer' ]
     auth_info    = {
       'ca_certificate_path' => `puppet master --configprint localcacert`.strip,
       'certificate_path'    => `puppet master --configprint hostcert`.strip,

data/lib/classroom/submit.rb

@@ -37,9 +37,9 @@ class Classroom
       FileUtils.rm(filename)
 
     rescue LoadError, StandardError => e
-      LOGGER.warn "S3 upload failed. No network?"
-      LOGGER.warn e.message
-      LOGGER.debug e.backtrace
+      $logger.warn "S3 upload failed. No network?"
+      $logger.warn e.message
+      $logger.debug e.backtrace
     end
 
     # clean up for next delivery

data/lib/classroom/troubleshoot.rb

@@ -17,18 +17,18 @@ class Classroom
 
     print "Cleaning any stray .git directories in: #{codedir}..."
     sleep 1
-    system("find #{codedir} -name .git -type d -print -exec rm -rf {} \\;")
+    system("find #{codedir} -name .git -type d -print -exec rm -rf {} +")
     check_success
 
     print "Validating permissions on: #{codedir}..."
     sleep 1
-    system("find #{codedir} '!' -user pe-puppet -print -exec chown pe-puppet:pe-puppet {} \\;")
+    system("find #{codedir} '!' -user pe-puppet -print -exec chown pe-puppet:pe-puppet {} +")
     check_success
 
     if codedir != staging
       puts "Validating permissions on: #{staging}..."
       sleep 1
-      system("find #{staging} '!' -user pe-puppet -print -exec chown pe-puppet:pe-puppet {} \\;")
+      system("find #{staging} '!' -user pe-puppet -print -exec chown pe-puppet:pe-puppet {} +")
       check_success
     end
 
@@ -47,7 +47,7 @@ class Classroom
     end
 
     print "Checking Forge connection..."
-    if system("ping -c1 -W2 forge.puppet.com >/dev/null 2>&1")
+    if system("curl -s https://forge.puppet.com >/dev/null 2>&1")
       if legacy
         puts "Ensuring the latest version of pltraining/classroom in #{staging}..."
         system("puppet module upgrade pltraining/classroom --modulepath #{staging}")

data/lib/classroom/version.rb

@@ -1,3 +1,3 @@
 class Classroom
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-classroom-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -107,9 +107,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
+- README.md
 - bin/classroom
+- lib/classroom.rb
 - lib/classroom/help.rb
 - lib/classroom/page.rb
 - lib/classroom/performance.rb
@@ -120,7 +121,6 @@ files:
 - lib/classroom/troubleshoot.rb
 - lib/classroom/validate.rb
 - lib/classroom/version.rb
-- lib/classroom.rb
 homepage: http://github.com/puppetlabs/puppet-classroom-manager
 licenses:
 - Apache-2.0
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Manage Puppet classroom VMs and updating courseware.