coursegen 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43b0f80990f635e97e2296a59c46a5e9f0c2249ad0fef72e7bd528707ba0136
-  data.tar.gz: db0bcc6dcd65415aaed98d45f2946598740e353759ded2ef1d0d0c91122bcd5d
+  metadata.gz: 543b0fef5c5c04eb2f10cbb9f8a9ba89f740e50822ee15e88f0f6989928503b8
+  data.tar.gz: 345f95242fdf23f71c87fc5351369ee1711f46d460ede6572815c7de43bbe34d
 SHA512:
-  metadata.gz: ac65332cfd6c2761b3369afadc9f8f30f4d8a0a20b8d7b6dd58eb7c7fe7517089d20a2059143e02c65a8f53eb35deac930a025cfead8d2c0bad06d0920d63ea4
-  data.tar.gz: b6b55c082e8390e209532a21a6907fba1b7e39aa348a8c43bd067d5a56ad2fd646019292628b73c13fb3f1970521874906ef639e5153934879e44660602f3dce
+  metadata.gz: 388aa33947d9be4fde1f0f7024edd51ad78019fcb8d909a8c64fecdc4642f8f0fa255114316ab6090cc2731a24e265acee8db3b16c6c7bf7965eaeb5ac709957
+  data.tar.gz: 94ee16cbe750e7b24e54a5648ccf0a3fb158512db59fe3e6cbf560971b1098f1433efcceb20a3c244982273574feb731f7befe030f67cc27f1c0b34c657b1621

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coursegen (0.7.4)
+    coursegen (0.7.5)
       activesupport
       adsf
       byebug
@@ -19,27 +19,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     adsf (1.4.1)
       rack (>= 1.0.0, < 3.0.0)
-    byebug (10.0.2)
+    byebug (11.0.1)
     coderay (1.1.2)
     colored (1.2)
-    concurrent-ruby (1.1.4)
-    cri (2.15.2)
+    concurrent-ruby (1.1.5)
+    cri (2.15.3)
       colored (~> 1.2)
     ddmemoize (1.0.0)
       ddmetrics (~> 1.0)
       ref (~> 2.0)
     ddmetrics (1.0.1)
     ddplugin (1.0.2)
-    ffi (1.9.25)
+    ffi (1.10.0)
     formatador (0.2.5)
     guard (2.15.0)
       formatador (>= 0.2.4)
@@ -56,14 +56,14 @@ GEM
       guard-compat (~> 1.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    icalendar (2.5.2)
+    icalendar (2.5.3)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
-    json (2.1.0)
-    json_schema (0.19.1)
-    kramdown (1.17.0)
+    json (2.2.0)
+    json_schema (0.20.4)
+    kramdown (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -85,24 +85,24 @@ GEM
       slow_enumerator_tools (~> 1.0)
       tomlrb (~> 1.2)
     nenv (0.3.0)
-    nokogiri (1.9.1)
+    nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.1)
+    parallel (1.17.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    rack (2.0.6)
+    rack (2.0.7)
     rake (11.3.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     ref (2.0.0)
     ruby_dep (1.5.0)
-    rubytree (1.0.0)
+    rubytree (1.0.1)
       json (~> 2.1)
       structured_warnings (~> 0.3)
     shellany (0.0.1)

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

@@ -1,4 +1,5 @@
 # Helpers to be used to annotate content
+require 'byebug'
 module ContentHelpers
   def include_topic(item_symbol)
     incorporated_topic = lookup_nitem("topics", item_symbol.to_s)
@@ -271,4 +272,34 @@ HTMLSTRING
     filecontents = File.new(filename).read
     code_string filecontents
   end
+
+  def postit_begin title
+    "<div class=\"postit\">" + "<h5>" + title + "</h5>"
+  end
+
+  def postit_end
+    "</div>"
+  end
+
+  def ul_begin
+    "<ul>"
+  end
+
+  def ul_end
+    "</ul>"
+  end
+
+  def ul body
+    "<ul>#{body}</ul>"
+  end
+
+  def list_items *items
+    items.reduce("") do |s, i|
+      if i.start_with?("<ul>")
+        s + i
+      else
+        s + "<li>" + i + "</li>"
+      end
+    end
+  end
 end

data/lib/coursegen/templates.rb

@@ -8,7 +8,6 @@ module CourseGen
       copy_template_dir("layouts", "layouts")
       copy_template_dir("content/bootstrap", "content/bootstrap")
       copy_template_dir("content/content", "content/content")
-      copy_template_dir("content/chalkmark", "content/chalkmark")
       delete_target_file("lib/default.rb")
       copy_template_dir("lib", "lib")
       delete_target_file("Rules")
@@ -21,8 +20,6 @@ module CourseGen
       delete_target_file("content/index.html")
       delete_target_file("layouts/default.html")
       create_empty_dir("content/images")
-      copy_template_dir("content/tipuesearch", "content/tipuesearch")
-      copy_template_dir("content/tipuesearch_logic", "content/tipuesearch_logic")
     end
 
     def valid_cg_directory?

data/lib/coursegen/version.rb

@@ -1,3 +1,3 @@
 module Coursegen
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/templates/Guardfile

@@ -2,8 +2,8 @@
 #   watch(%r{file/path}) { `command(s)` }
 #
 guard :shell do
-   clearing :on
-   directories %w(. /mydev/cg-topics)
+  directories %w(. /mydev/cg-topics)
   watch(/.erb/) { |m| `cg compile` }
-  watch(/(cg_config.rb|Rules)/) { |m| `cg reset; cg compile`}
+  watch(/.rb/) { |m| `cg compile` }
+  watch(/Rules/) { |m| `cg compile` }
 end

data/templates/Rules

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require './cg_config.rb'
 
 preprocess do
@@ -10,47 +8,39 @@ compile '/bootstrap/**/*' do
   nil
 end
 
-compile '/content/scripts/**/*' do
+compile '/extras/**/*' do
   nil
 end
 
-compile '/chalkmark/**/*' do
+compile '/content/topics/robotcode/**/*' do
   nil
 end
 
-compile '/tipuesearch/**/*' do
+compile '/content/scripts/**/*' do
   nil
 end
 
-compile "/tipuesearch_logic/tipuesearch_content.*" do
+compile "/content/tipuesearch/tipuesearch_content.js.erb" do
   filter :erb
 end
 
-compile "/content/**/*.ical.erb" do
+compile '/**/*.ical.erb' do
   filter :erb
 end
 
+compile '/**/*.{md,ical}.erb' do
+  if item[:status] != "hidden"
+    filter :erb
+    filter :kramdown, coderay_line_numbers: nil
+    layout '/course.*'
+  else
+    nil
+  end
+end
+
 compile '/**/*' do
   if item.binary? || item[:status] == "hidden"
     nil
-  elsif item[:status] == "hidden"
-    nil
-  elsif item[:type] == "subsection"
-    nil
-  elsif item[:extension] == "haml"
-    filter :haml;
-    layout '/course.*'
-  else
-    item[:extension].split('.').reverse.each do
-      |f|
-      case f
-      when 'md', 'markdown'
-        filter :kramdown, coderay_tab_width: 3
-      when 'erb'
-        filter :erb
-      end
-    end
-    layout '/course.*'
   end
 end
 
@@ -62,27 +52,17 @@ route '/tipuesearch/**/*' do
   @item.identifier.to_s
 end
 
-route "/tipuesearch_logic/tipuesearch_content.*" do
+route "/content/tipuesearch/tipuesearch_content.*" do
   '/tipuesearch/tipuesearch_content.js'
 end
 
-
-route '/chalkmark/**/*' do
-  @item.identifier.to_s
-end
-
 # Output the search page
-route '/tipuesearch_logic/search.md.erb' do
-  '/tipuesearch_logic/search/index.html'
-end
-
-route '/**/*.ical.erb' do
-  @item.identifier.without_ext
+route '/tipuesearch/search.md.erb' do
+  '/tipuesearch/search/index.html'
 end
 
-
 # Select which .md.erb becomes the home page of the site
-route '/content/index.md.erb' do
+route HOME_PAGE do
   '/index.html'
 end
 
@@ -91,15 +71,14 @@ route '/**/*' do
     raise RuntimeError, "Missing required extension: \".#{item.identifier}\""
   elsif item.binary?
     item.identifier.to_s
-  elsif item.identifier == "/search_logic/tipuesearch_content/"
-      item.identifier.chop + '.' + item[:extension] rescue fail "in route * in Rules"
+  elsif item.identifier == "/searchtipuesearch_content/"
+    item.identifier.chop + '.' + item[:extension] rescue fail "in route * in Rules"
   elsif item[:status] == "hidden"
     nil
   elsif item[:type] == "subsection"
     nil
   elsif item[:extension] != "css"
     item.identifier.without_ext + '/index.html'
-
   end
 end
 

data/templates/cg_config.rb

@@ -1,7 +1,7 @@
 require 'coursegen'
 
 # Copyright string
-COPYRIGHT_STRING = "Copyright (2013-2014) R. Pito Salas, pitosalas@gmail.com"
+COPYRIGHT_STRING = "Copyright (2013-2019) R. Pito Salas, pitosalas@gmail.com"
 
 # Course short name
 COURSE_SHORT_NAME = "Sample Course"
@@ -27,3 +27,4 @@ SECTION_CONFIG = [
 # Options are:
 # bullet_style: css style for each bullet
 STYLING_CONFIG = {bullet_style: "\"font-size: 60%; width: 10px; color: grey\""}
+HELPFUL_BOX = false

data/templates/cg_config.rb_sample

@@ -1,44 +1,38 @@
 require 'coursegen'
 
-# bucket for AWS Deployment of the course
-AWS_BUCKET = "cosi236b.courses.salas.com"
-
-# Local directory path for directory of content
-CONTENT_PATH = "/mydev/cosi236b"
-
 # Copyright string
-COPYRIGHT_STRING = "Copyright (2013-2014) R. Pito Salas, pitosalas@gmail.com"
+COPYRIGHT_STRING = "Copyright (2014-2019) R. Pito Salas, pitosalas@brandeis.edu".freeze
+
+# bucket for AWS Deployment of the course
+AWS_BUCKET = "cosi105b".freeze
 
 # Course short name
-COURSE_SHORT_NAME = "COSI 236B"
-COURSE_LONG_NAME = "Software Engineering"
+COURSE_SHORT_NAME = "Cosi 105b".freeze
+COURSE_LONG_NAME = "Software Engineering for Scalability ".freeze
+COURSE_ABBREV = "cs105".freeze
 
 # Schedule information. Note that Monday is day 0
 LECTURES_SCHEDULE_CONFIG = ScheduleDef.new(
-		first_day: "jan-14-2014",
-		weekdays: [:tuesday, :friday],
-		number: 26,
-		skips: ["feb-18-2014", "feb-21-2014", "apr-15-2014", "apr-18-2014", "apr-22-2014"])
-
-LABS_SCHEDULE_CONFIG = ScheduleDef.new(
-		first_day: "jan-16-2014",
-		weekdays: [:thursday],
-		number: 13,
-		skips: ["feb-20-2014", "apr-17-2014"])
+  first_day: "jan-15-2019",
+  weekdays: [:tuesday, :thursday],
+  number: 30,
+  start_times: ["15:30", "15:30"],
+  end_times: ["16:50", "16:50"],
+  start_time: "15:30",
+  end_time: "16:50",
+  skips: ["jan-22-2019", "feb-19-2019", "feb-21-2019", "apr-23-2019", "apr-25-2019", "may-2-2019"])
 
 # Sections in the right hand margin of the page
 SECTION_CONFIG = [
-		SectionDef.new("Lectures", "lectures", type: :lecture, schedule: LECTURES_SCHEDULE_CONFIG),
-		SectionDef.new("Labs", "lab", type: :lecture, schedule: LABS_SCHEDULE_CONFIG),
-		SectionDef.new("Incubator", "incubator", type: :section),
-		SectionDef.new("PA", "pa", type: :section),
-		SectionDef.new("Crib Sheets", "cribsheets", type: :section),
-		SectionDef.new("Background", "background", type: :section),
-		SectionDef.new("Root", "root", hidden: true, type: :section),
-		SectionDef.new("Topics", "topics", hidden: true, type: :section),
-		SectionDef.new("Hidden", "hidden", hidden: true, type: :section)
-]
+  SectionDef.new("Intro", "intro", type: :section, bullet: :star),
+  SectionDef.new("Lectures", "lectures", type: :lecture, schedule: LECTURES_SCHEDULE_CONFIG,
+                  bullet: :dash),
+  SectionDef.new("Topics", "topics", hidden: true, type: :section),
+  SectionDef.new("Extras", "extras", hidden: true, type: :section)
+].freeze
 
 # Options are:
 # bullet_style: css style for each bullet
-STYLING_CONFIG = {bullet_style: "\"font-size: 60%; width: 10px; color: grey\""}
+STYLING_CONFIG = {bullet_style: %("font-size: 60%; width: 10px; color: grey")}.freeze
+HOME_PAGE = "/content/intro/05_syllabus.md.erb".freeze
+HELPFUL_BOX = false

data/templates/content/bootstrap/css/custom.css

@@ -1,16 +1,56 @@
+@import url("prettyquote.css");
+@import url("full-width-pics.css");
 @import url(//fonts.googleapis.com/css?family=Telex);
 
 .themefg {
-  color: rgb(47, 86, 111);
+  color: rgb(64,56,207);
 }
 
 .themebg {
-  background-color: rgb(47, 86, 111);
+  background-color: rgb(64,56,207);
+}
+.nav-menus {
+  height: 0px;
+}
+
+.navbar-inverse .navbar-nav > li > a {
+  padding-top: 4px;
+  padding-bottom: 0px;
+  color: white;
+}
+
+.navbar-inverse .navbar-nav > li > a:hover {
+  font-weight: bold;
+}
+
+a {
+ color: rgb(64,56,207);
 }
 
 .navbar a.navbar-title {
-	color: white;
-	padding-top: 7px;
+  font-family: telex;
+  float: left;
+  margin-top: 20px;
+  padding-left: 10px;
+  padding-right: 10px;
+  font-size: 28px;
+  color: white;
+  white-space: nowrap;
+  background-color: rgba(18, 0, 0, 0.3);
+}
+
+.nav-menus a.navbar-brand {
+  padding: 4px 10px;
+  color: white;
+}
+
+.nav-menus a.navbar-brand:hover {
+  font-weight: bold;
+}
+
+.nav-btn.btn-mini {
+  font-size: 16px;
+  color: white;
 }
 
 .navbar {
@@ -18,50 +58,52 @@
 	margin-bottom: 1px;
 }
 
-
 .navbar a:hover {
 	color: white;
+  text-decoration: none;
 }
 
-.navbar a {
-	padding: 6px;
-	color: light-blue;
+.navbar .input-group-sm input{
+	height: 22px;
+	width: 150px;
+	margin-top: 4px;
 }
 
-.navbar-title {
-  float: left;
-  height: 30px;
-  font-size: 18px;
-  line-height: 20px
+.header-main {
+  padding-left: 45px;
 }
 
-.navbar .input-group-sm input{
-	height: 22px;
-	width: 150px;
-	margin-top: 6px;
+.body-main {
+  padding-left: 45px;
 }
 
 h1, h2, h3, h4, h5{
 	font-family: telex;
-	color: rgb(21, 123, 207);
+	color: rgb(64,56,207);
 }
 
 h3 {
-	margin-bottom: 15px;
+  padding-top: 20px;
+  /* padding-bottom: 10px; */
 }
 
-h3.body-header {
-  margin-bottom: -5px;
-}
+/* h3.body-header {
+  margin-left: -15px;
+  margin-top: -10px;
+  margin-right: -15px;
+  margin-bottom: -22px;
+} */
 
 h4 {
 	margin-top: 20px;
-	border-top: gainsboro solid 1px;
+  border-top: rgb(64,56,207) solid 3px;
 	padding-top: 5px;
 }
 
 h5 {
 	margin-top: 15px;
+  font-weight: bold;
+  font-variant: small-caps;
 }
 
 body {