puppet-courseware-manager 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e89b3401834bd6404bc3a44c321c8d9b596067f4
-  data.tar.gz: 0d5e36d0a72b3c3cd45eb3a2cab75b6161c25b85
+  metadata.gz: 3e5f648ab76b06e7ed35d6d4c39494a234373eeb
+  data.tar.gz: ef0ce0e41aba93367e57d0b459cd38c1f54ea38d
 SHA512:
-  metadata.gz: 37a4d133777c36e65bdeb126314ba819988e7a464d721ab8030dec3445850d23aebbbf8c8e54b7a8d218a9a2690aa2968a38f88ed48ce359f891488ede93cccd
-  data.tar.gz: ce484c755c3e65e14419d0853fe3100a8d781e4cabf2644eb90dc9f17f727439d795930c9574ec6b8aa8735fad09a5e5f9ff6d8d84f2cf26474c61a70c1f8635
+  metadata.gz: c2355ef7dd7a4d924e16fe62f70c053d18c88304d7d13a338274f07dd4b40f2b3abadae4d81c1d6c627645696835b2e1ab71d4fa93d9e35878eb8ce236fb1062
+  data.tar.gz: ea1525e76dd59d35fd130d54b3925c52958d80e3a7489e3962556b24846c3d88014f666f9a902e3f6e7673463ea3394cb4d1dac57736d9996da7a010276520c9

data/CHANGELOG.txt

@@ -1,6 +1,9 @@
 # Courseware Manager
 ## Release Notes
 
+### v0.5.4
+* When running non-interactively and a default is provided, don't prompt for input.
+
 ### v0.5.3
 * Use the in-preso watermark when cache is disabled.
 

data/lib/courseware/utils.rb

@@ -2,21 +2,37 @@ require 'word_wrap'
 require 'word_wrap/core_ext'
 
 class Courseware
-  def self.question(message, default=nil)
-    if default
-      print "#{message} [#{default}] "
-    else
-      print "#{message} "
+  def self.question(message, default=nil, required=false)
+    unless STDIN.tty?
+      raise "The question '#{message}' requires an answer and cannot be run non-interactively." if required
+      return default
     end
 
-    answer = STDIN.gets.strip
+    loop do
+      if default
+        print "#{message} [#{default}] "
+      else
+        print "#{message} "
+      end
+
+      answer = STDIN.gets.strip
+      next if required and answer.empty?
 
-    return answer.empty? ? default : answer
+      return answer.empty? ? default : answer
+    end
   end
 
-  def self.confirm(message)
-    print "#{message} [Y/n]: "
-    [ 'y', 'yes', '' ].include? STDIN.gets.strip.downcase
+  def self.confirm(message, default=true)
+    return default unless STDIN.tty?
+
+    if default
+      print "#{message} [Y/n]: "
+      answers = [ 'y', 'yes', '' ]
+    else
+      print "#{message} [N/y]: "
+      answers = [ 'y', 'yes' ]
+    end
+    answers.include? STDIN.gets.strip.downcase
   end
 
   def self.bailout?(message)

data/lib/courseware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-courseware-manager
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdl