puppet-classroom-manager 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af0e7af7ee77ab29d61058fa57eba4af51f44d2c
-  data.tar.gz: fb770cff71763c9288217fde895d8f9cc70ed641
+  metadata.gz: 79fd3d3fa437580cfd5c850e7a1c3b2300ab952a
+  data.tar.gz: 0ff0471bd323d9b7f02b1a1ed91675b8cc0b7a4d
 SHA512:
-  metadata.gz: 544f54aca8ad9b49f131c15d4491411656048de94b33b1e072ff64883b0f314d5fcd571164d73f95e760fc87b69b07ef0b8c52e8df8b7db965d89b30653a6403
-  data.tar.gz: 624df6da7f0eaea5877211766fd02c2b76d89805146525b8e4334daf30653d8686f417867e1192256115ec75d80528b81969d3067a4af5fb74b129441956e068
+  metadata.gz: 7d239af624e0ab698c0df470deba2afb803d0b8ffef0657fe67c407fa4db763641b5ed0f48c5a015c2c02fa9bd821c20429a261832c5d819d3baeacd042f258c
+  data.tar.gz: af092cb9e071d9bb0d136b396214a6cb6930a63d85f12f10160c792a866e42e3a8525bfcc52913e452f88ff374da35c412f7031908075b87cfc90802e67d7200

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+## v0.0.4
+* Corrected page & submit behaviour
+* Allowed for paging even when the classroom isn't yet configured
+
+## v0.0.3
+* Use proper logger variable
+* Warn when the pagerduty key doesn't exist
+* Use curl instead of ping to validate forge connectivity
+* Allow end user to specify desired contact info when paging
+* Improve troubleshooting tasks
+
+## v0.0.2
+* Added page task
+* Reduced arbitrary verbosity
+* Corrected dependencies
+
+## v0.0.1
+* initial release

data/bin/classroom

@@ -35,7 +35,7 @@ optparse = OptionParser.new { |opts|
 
     opts.on("-v", "--version", "Print out the version") do
         require 'classroom/version'
-        puts Courseware::VERSION
+        puts Classroom::VERSION
         exit
     end
 

data/lib/classroom/page.rb

@@ -4,7 +4,7 @@ class Classroom
     require 'rest-client'
 
     begin
-      config = JSON.parse(File.read('/opt/pltraining/etc/classroom.json'))
+      config = showoff_config
       pd_key = File.read('/opt/pltraining/etc/pagerduty.key').strip
       raise 'Missing PagerDuty key' if pd_key.empty?
     rescue => e

data/lib/classroom/submit.rb

@@ -3,20 +3,20 @@ class Classroom
     require 'fileutils'
     require 'aws-sdk'
 
-    if puppetlabs_instructor?
+    config   = showoff_config
+    event_id = config['event_id']
+    course   = config['course']
+
+    print 'Enter your Puppet email address: '
+    email = STDIN.gets.strip
+
+    if email =~ /@puppet(labs)?.com$/
       puts "Please go to your learn dashboard and ensure that attendance is accurate"
       puts "and then close this class delivery to mark it as complete."
       puts " -- #{@config[:learndot]}"
       puts
     end
 
-    presentation = showoff_working_directory()
-
-    data = JSON.parse(File.read("#{presentation}/stats/metadata.json")) rescue {}
-    event_id = data['event_id'] || Time.now.to_i
-    course   = data['course']   || 'none'
-    email    = data['email']    || 'none'
-
     begin
       # depends on root's credentials as managed by bootstrap
       s3 = Aws::S3::Resource.new(region:'us-west-2')
@@ -25,16 +25,18 @@ class Classroom
       system("puppet module list > /var/log/puppetlabs/classroom-modules")
 
       filename = "classroom-perflogs-#{course}-#{email}-#{event_id}.tar.gz"
-      system("tar -cf /var/cache/#{filename} /var/log/puppetlabs/")
-      obj = s3.bucket(PERF_BUCKET).object(filename)
-      obj.upload_file("/var/cache/#{filename}")
-      FileUtils.rm(filename)
+      fullpath = "/var/cache/#{filename}"
+      system("tar -cf #{fullpath} /var/log/puppetlabs/")
+      obj = s3.bucket('classroom-performance').object(filename)
+      obj.upload_file(fullpath)
+      FileUtils.rm(fullpath)
 
       filename = "classroom-stats-#{course}-#{email}-#{event_id}.tar.gz"
-      system("tar -cf /var/cache/#{filename} #{presentation}/stats/")
-      obj = s3.bucket(STATS_BUCKET).object(filename)
-      obj.upload_file("/var/cache/#{filename}")
-      FileUtils.rm(filename)
+      fullpath = "/var/cache/#{filename}"
+      system("tar -cf #{fullpath} #{presentation}/stats/")
+      obj = s3.bucket('classroom-statistics').object(filename)
+      obj.upload_file(fullpath)
+      FileUtils.rm(fullpath)
 
     rescue LoadError, StandardError => e
       $logger.warn "S3 upload failed. No network?"
@@ -43,30 +45,12 @@ class Classroom
     end
 
     # clean up for next delivery
-    system("puppet resource service showoff-courseware ensure=stopped")
+    system("puppet resource service showoff-courseware ensure=stopped > /dev/null")
     FileUtils.rm_rf("#{presentation}/stats")
     FileUtils.rm_f("#{presentation}/courseware.yaml")
     FileUtils.rm_f("#{presentation}/_files/share/nearby_events.html")
-    system("puppet resource service showoff-courseware ensure=running")
-
-  end
-
-  def puppetlabs_instructor?
-    # TODO: how do?
-    false
-  end
+    system("puppet resource service showoff-courseware ensure=running > /dev/null")
 
-  def showoff_working_directory
-    # get the path of the currently configured showoff presentation
-    data = {}
-    path = '/usr/lib/systemd/system/showoff-courseware.service'
-    File.read(path).each_line do |line|
-      setting = line.split('=')
-      next unless setting.size == 2
-
-      data[setting.first] = setting.last
-    end
-    data['WorkingDirectory']
   end
 
 end

data/lib/classroom/version.rb

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

data/lib/classroom.rb

@@ -42,6 +42,34 @@ class Classroom
     end
   end
 
+  def showoff_config
+    presentation = showoff_working_directory()
+    data         = JSON.parse(File.read("#{presentation}/stats/metadata.json")) rescue {}
+
+    data['event_id'] ||= Time.now.to_i
+    data['course']   ||= File.basename(presentation.strip)
+    data
+  end
+
+  def showoff_working_directory
+    begin
+      # get the path of the currently configured showoff presentation
+      data = {}
+      path = '/usr/lib/systemd/system/showoff-courseware.service'
+      File.read(path).each_line do |line|
+        setting = line.split('=')
+        next unless setting.size == 2
+
+        data[setting.first] = setting.last
+      end
+      data['WorkingDirectory'].strip
+    rescue Errno::ENOENT => e
+      $logger.warn 'Cannot find classroom Showoff presentation'
+      $logger.debug e.message
+      'unconfigured'
+    end
+  end
+
   def help
     require 'classroom/help'
     puts Classroom::HELP

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-classroom-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Ford
@@ -107,6 +107,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - bin/classroom