puppet-courseware-manager 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eb2df1ef67e6ef21fd53cb49d0fbba4cca60715
-  data.tar.gz: 97851ebba09d5ae7db6543c0b6fca90fdd3585f8
+  metadata.gz: e89b3401834bd6404bc3a44c321c8d9b596067f4
+  data.tar.gz: 0d5e36d0a72b3c3cd45eb3a2cab75b6161c25b85
 SHA512:
-  metadata.gz: edb197aa9f1dd9a6aba1461c5effccf5aaa786bcc2f6ec078cc6c6ccef68d698c1ae83507dc41c709c1e82b69ef5f40e17fc94ac213a0f15f33cca09defaa3cb
-  data.tar.gz: e4dc9bd3d1a5d9d95be834f71c1335ae7f7d940552290957e0bf8b492c5c1e063c5d2551cf4b5344d2d3a4ceadea171f8030ef5558d6376dd7b6fc8774fa2c20
+  metadata.gz: 37a4d133777c36e65bdeb126314ba819988e7a464d721ab8030dec3445850d23aebbbf8c8e54b7a8d218a9a2690aa2968a38f88ed48ce359f891488ede93cccd
+  data.tar.gz: ce484c755c3e65e14419d0853fe3100a8d781e4cabf2644eb90dc9f17f727439d795930c9574ec6b8aa8735fad09a5e5f9ff6d8d84f2cf26474c61a70c1f8635

data/CHANGELOG.txt

@@ -1,6 +1,9 @@
 # Courseware Manager
 ## Release Notes
 
+### v0.5.3
+* Use the in-preso watermark when cache is disabled.
+
 ### v0.5.2
 * Add support for Showoff named sections, making it possible to validate new courses.
 * Add support for packaging more showoff formats.

data/lib/courseware/printer.rb

@@ -15,12 +15,18 @@ class Courseware::Printer
     @pdfopts << " --disallow-modify" if @config[:pdf][:protected]
 
     if @config[:pdf][:watermark]
-      showoff          = Courseware.parse_showoff(@config[:presfile])
+      showoff   = Courseware.parse_showoff(@config[:presfile])
 
-      @event_id        = showoff['event_id'] || Courseware.question('Enter the Event ID:')
-      @password        = showoff['key']      || Courseware.question('Enter desired password:', (@event_id[/-?(\w*)$/, 1] rescue nil))
-      @watermark_style = File.join(@config[:cachedir], 'templates', 'watermark.css')
-      @watermark_pdf   = File.join(@config[:cachedir], 'templates', 'watermark.pdf')
+      @event_id = showoff['event_id'] || Courseware.question('Enter the Event ID:')
+      @password = showoff['key']      || Courseware.question('Enter desired password:', (@event_id[/-?(\w*)$/, 1] rescue nil))
+
+      if @config[:nocache]
+        @watermark_style = File.join('_support', 'watermark.css')
+        @watermark_pdf   = File.join('_support', 'watermark.pdf')
+      else
+        @watermark_style = File.join(@config[:cachedir], 'templates', 'watermark.css')
+        @watermark_pdf   = File.join(@config[:cachedir], 'templates', 'watermark.pdf')
+      end
     end
 
     FileUtils.mkdir(config[:output]) unless File.directory?(config[:output])

data/lib/courseware/version.rb

@@ -1,4 +1,4 @@
 class Courseware
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-courseware-manager
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdl
@@ -65,21 +65,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.txt
-- LICENSE
 - README.txt
+- LICENSE
 - bin/courseware
-- lib/courseware.rb
 - lib/courseware/cache.rb
 - lib/courseware/composer.rb
 - lib/courseware/dummy.rb
 - lib/courseware/generator.rb
 - lib/courseware/help.rb
-- lib/courseware/manager.rb
 - lib/courseware/manager/validators.rb
+- lib/courseware/manager.rb
 - lib/courseware/printer.rb
 - lib/courseware/repository.rb
 - lib/courseware/utils.rb
 - lib/courseware/version.rb
+- lib/courseware.rb
 homepage: http://github.com/puppetlabs/courseware-manager
 licenses:
 - Apache-2.0
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Manage the development lifecycle of Puppet courseware. Not for general consumption.