coursegen 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95d19a204722d46d2b449d337e27120f1a5695c7
-  data.tar.gz: e01e950e3f56726062f896af924837cdc8785636
+SHA256:
+  metadata.gz: f25c5692cc76fdaf8d3aebcc1c5d09b4a3adf99b9afb762839a6b9d58d94108d
+  data.tar.gz: 6c2546ac48c2285f7ccb03104a4adba4bd0416dbb7603f2ee856b6b5a462f2e2
 SHA512:
-  metadata.gz: '089b8cc554d0cf6ddb255d62611de872aba7a4d39958ac9b906c9892a2c619c1ed84595e634cb0e8f3fd88683f527eaadd1c09b6197204663793de485e1ef901'
-  data.tar.gz: 8d743322068f0fc4349627c009dbae91249266cf03c1274435bfaaaa26afb301ed1cb8805343c3c3bb049ef5489fa5eaa3fb02e646fe5132fabf19f5a563acd7
+  metadata.gz: 2485f4f287a7fc8336d9be1f0d21163cf8b10c88212b26fad4526656edd99e021f1da7583309ffa69bf5591f0bea6bc3381dc3a6e2600d0a4913ad37b3269860
+  data.tar.gz: a375c0c8805d09a25902b6219f05abc6d578a7404d3b3ae25abcd1f89e369b56de8a0bda6116f91a2527ffc7587481dca4cfabd73bd9086e9cbbf4e2e1642c97

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.4.2)
+    coursegen (0.6.2)
       activesupport
       adsf
       byebug
@@ -19,26 +19,32 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.3)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    adsf (1.2.1)
-      rack (>= 1.0.0)
-    byebug (9.0.6)
-    coderay (1.1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    adsf (1.4.0)
+      rack (>= 1.0.0, < 3.0.0)
+    byebug (10.0.2)
+    coderay (1.1.2)
     colored (1.2)
     concurrent-ruby (1.0.5)
-    cri (2.9.1)
+    cri (2.10.1)
       colored (~> 1.2)
+    ddmemoize (1.0.0a3)
+      ddtelemetry (= 1.0.0a2)
+      ref (~> 2.0)
     ddplugin (1.0.1)
-    ffi (1.9.18)
+    ddtelemetry (1.0.0a2)
+    ffi (1.9.25)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -50,49 +56,54 @@ GEM
       guard-compat (~> 1.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (0.8.6)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     icalendar (2.4.1)
-    json (1.8.6)
-    kramdown (1.14.0)
+    json (2.1.0)
+    kramdown (1.16.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.12)
-    method_source (0.8.2)
-    mini_portile2 (2.2.0)
-    minitest (5.10.3)
-    nanoc (4.8.2)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nanoc (4.8.19)
+      addressable (~> 2.5)
       cri (~> 2.8)
+      ddmemoize (= 1.0.0a3)
       ddplugin (~> 1.0)
+      ddtelemetry (= 1.0.0a2)
       hamster (~> 3.0)
       ref (~> 2.0)
+      slow_enumerator_tools (~> 1.0)
     nenv (0.3.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (2.0.3)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rack (2.0.5)
     rake (11.3.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     ref (2.0.0)
     ruby_dep (1.5.0)
-    rubytree (0.9.7)
-      json (~> 1.8)
-      structured_warnings (~> 0.2)
+    rubytree (1.0.0)
+      json (~> 2.1)
+      structured_warnings (~> 0.3)
     shellany (0.0.1)
-    slop (3.6.0)
+    slow_enumerator_tools (1.1.0)
     structured_warnings (0.3.0)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -104,4 +115,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/lib/coursegen/course/data/section.rb

@@ -37,7 +37,7 @@ class Section
 
   def previous_for(citem)
     index = @citems.find_index(citem)
-    byebug if index.nil? 
+    byebug if index.nil?
     raise ArgumentError, "invalid citem in previous_for" if index.nil?
     new_index = [index, 1].max
     @citems[new_index - 1]

data/lib/coursegen/course/helpers/bootstrap_markup.rb

@@ -3,8 +3,10 @@ class BootstrapMarkup
     @str = ""
   end
 
-  def table_begin(css_class="table-condensed")
-    @str << "<table class=\"table #{css_class}\">"
+  def table_begin(css_class = "table-condensed")
+    puts css_class.class
+    @str << "<table class=\"table x #{css_class}\">"
+    puts @str
   end
 
   def table_end

data/lib/coursegen/course/helpers/content_helpers.rb

@@ -107,11 +107,17 @@ HTMLSTRING
   end
 
   def important string = ":"
-    "**Important#{string}**{: style=\"color: red\"}"
+    <<-HTMLSTRING
+    <div class="cg-important">
+        #{string}
+    </div>
+    HTMLSTRING
   end
 
-  def nb string = ""
-    "*NB: #{string}*{: style=\"color: green\"}"
+  def nb string = ":"
+    <<-HTMLSTRING
+    <div class="label label-info">#{string}</div>
+    HTMLSTRING
   end
 
   def tbd string = ""
@@ -199,16 +205,35 @@ HTMLSTRING
     "~~~~~~\n {: .language-ruby}"
   end
 
+  def python_begin
+    "\n~~~~~~"
+  end
+
+  def python_end
+    "~~~~~~\n {: .language-python}"
+  end
+
   def ruby_string str
     ruby_begin + "\n" + str + "\n" + ruby_end
   end
 
+  def python_string str
+    python_begin + "\n" + str + "\n" + python_end
+  end
+
   def include_ruby name
     filename = Dir.pwd + "/content/content/topics/scripts/" + name.to_s + ".rb"
     filecontents = File.new(filename).read
     ruby_string filecontents
   end
 
+  def include_python name
+    filename = Dir.pwd + "/content/content/topics/robotcode/" + name.to_s + ".py"
+    filecontents = File.new(filename).read
+    ruby_string filecontents
+  end
+
+
   def code_begin
     "\n~~~~~~"
   end

data/lib/coursegen/course/helpers/formatting_helpers.rb

@@ -0,0 +1,21 @@
+# Helpers to be used to format content
+module FormattingHelpers
+
+  def list_begin
+    "<dl class=\"dl-horizontal\" style=\"font-size: 125%;\">"
+  end
+
+  def list_end
+    "</dd></dl>"
+  end
+
+  def le (name, first_entry=false)
+    str = ""
+    if !first_entry
+      str += "</dd><br/>"
+    end
+    str += "<dt>#{name}</dt><dd>"
+    str
+  end
+
+end

data/lib/coursegen/course/helpers/table_helpers.rb

@@ -1,11 +1,13 @@
 class TableHelper
-  def initialize(property)
+  def initialize(*property)
     @prop = property
     @bm = BootstrapMarkup.new
   end
 
   def headers(*labels)
-    css_style = @prop == :normal ? "table-condensed" : ""
+    css_style = ""
+    css_style += " table-condensed" if @prop.include? :normal
+    css_style += " table-bordered" if @prop.include? :bordered
     @bm.table_begin(css_style)
     @bm.headers_begin
     labels.each do |h|

data/lib/coursegen/course/lib/helpers_.rb

@@ -5,6 +5,7 @@ include LectureHelpers
 include SidebarHelpers
 include ListOfHelpers
 include ICalFeedHelpers
+include FormattingHelpers
 include Nanoc::Helpers::Rendering
 include Nanoc::Helpers::LinkTo
 include Nanoc::Helpers::Tagging

data/lib/coursegen/course/schedule/scheduler.rb

@@ -78,8 +78,8 @@ class Scheduler
     raise ArgumentError, "Scheduler: Start date is not on one of the weekdays" unless @weekdays.include? @start_date.cwday
     raise ArgumentError, "Scheduler: Skip date is not on a valid weekday" if !@skips.reduce(true) { |accum, skip| accum && @weekdays.include?(skip.cwday) }
 
-    @start_time = time_span_to_seconds(start_time)
-    @end_time = time_span_to_seconds(end_time)
+    @start_time = time_span_to_seconds(start_time) rescue raise(ArgumentError, "error converting start time. Use hh:mm: #{start_time} ")
+    @end_time = time_span_to_seconds(end_time) rescue raise(ArgumentError, "error converting end time. Use hh:mm: #{end_time}")
     @start_times = start_times.map { |x| time_span_to_seconds(x)}
     @end_times = end_times.map { |x| time_span_to_seconds(x)}
   end

data/lib/coursegen/version.rb

@@ -1,3 +1,3 @@
 module Coursegen
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

data/lib/coursegen.rb

@@ -6,6 +6,7 @@ require 'coursegen/course/helpers/lecture_helpers'
 require 'coursegen/course/helpers/content_helpers'
 require 'coursegen/course/helpers/logging_helpers'
 require 'coursegen/course/helpers/list_of_helpers'
+require 'coursegen/course/helpers/formatting_helpers'
 require 'coursegen/course/helpers/bootstrap_markup'
 require 'coursegen/course/helpers/table_helpers'
 require 'coursegen/course/helpers/navigation_helpers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coursegen
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Pito Salas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,6 +228,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -247,6 +248,7 @@ files:
 - lib/coursegen/course/data/toc.rb
 - lib/coursegen/course/helpers/bootstrap_markup.rb
 - lib/coursegen/course/helpers/content_helpers.rb
+- lib/coursegen/course/helpers/formatting_helpers.rb
 - lib/coursegen/course/helpers/ical_feed_helpers.rb
 - lib/coursegen/course/helpers/lecture_helpers.rb
 - lib/coursegen/course/helpers/list_of.rb
@@ -271,6 +273,7 @@ files:
 - spec/spec_helper.rb
 - spec/toc_spec.rb
 - tech_debt.md
+- templates/.DS_Store
 - templates/.gitignore
 - templates/Guardfile
 - templates/Rules
@@ -330,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Use Nanoc to build courses and deploy them to S3