github-to-canvas 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ee9448d74c258ca7d0a142e4b2fa4bfa708b227014fd3ef9cd5daf483b0da7
-  data.tar.gz: 84d2710f793fcf93beea70c5693554920b14890c0260e7d20bb28dbf1d3723c3
+  metadata.gz: a883cc9d8163795840e4d49334c15a3610d7bf95f03ea2791b03ef0311d235d7
+  data.tar.gz: deb4ee908fe26df4255626f10b6e1ae9dc5a1ffd993e24b8cac399f835eb87ac
 SHA512:
-  metadata.gz: 75c3662d1354d1c5ed0e83ec625eed59010dc254ec9fa5663a060d7f32e58cf937ead936dabf8debd1e3f3f2d07f26747c17945b3a99fc3054244fea9be518b2
-  data.tar.gz: cbc3df60cb990b5c7fffd58b04a0a575c1ec2e4b513f68f7d080b724ee6da94726e14e4d405b77a38389ad1fe470b7c7b2fb03b8f40f00835bdbfebefe52c795
+  metadata.gz: 1cea54b28ccb0d3e6ffaaf6d271fe5e4317ca92d86abe3958c97c8b1415571e25fed4cddb7317936727575f6696b0d32a3985294d893e7c48851f1ea33b3d210
+  data.tar.gz: 20af85bf1dc7f8c25a6ff3fb247717d611f6fb74d24716ee96966ec1573fc12516e6223fd4099d0022adbf565ca79b233679976319b4673fb3d4e0a31da59ffb

data/bin/github-to-canvas

@@ -19,6 +19,7 @@ OptionParser.new do |opts|
     github-to-canvas --create COURSE [--branch BRANCH] [--name NAME] [--type TYPE]
     github-to-canvas --create COURSE [--dry-run]
     github-to-canvas --create COURSE [--fis-links]
+    github-to-canvas --create COURSE [--fis-links] [--remove-header]
     github-to-canvas --align
     github-to-canvas --align [--branch BRANCH]
     github-to-canvas --align [--branch BRANCH] [--fis-links]
@@ -30,12 +31,13 @@ OptionParser.new do |opts|
 
     Example usage:
 
-    github-to-canvas --create 154                                      -> Creates a lesson in course 154, deriving the name and type from the local repo
-    github-to-canvas --create 154 --name "Fetch Lab"                   -> Creates a lesson in course 154 with the provided name, deriving the type from the local repo
+    github-to-canvas --create 154                                      -> Creates a lesson in course 154, derives the name and type from the local repo
+    github-to-canvas --create 154 --name "Fetch Lab"                   -> Creates a lesson in course 154 with the provided name, derives the type from the local repo
     github-to-canvas --create 154 --name "Fetch Lab" --type assignment -> Creates an assignment in course 154 with the provided name
-    github-to-canvas --create 154 --name "Fetch Lab" --branch solution -> Creates a lesson in course 154 with the provided name, using the repositorie's solution branch and deriving the type from the local repo
+    github-to-canvas --create 154 --name "Fetch Lab" --branch solution -> Creates a lesson in course 154 with the provided name, uses the repository's solution branch and derives the type from the local repo
     github-to-canvas --align                                           -> Patches existing lessons in Canvas based on the .canvas file  
-    github-to-canvas --align --fis-links                               -> Patches existing lessons in Canvas based on the .canvas file, adding addition Flatiron School specific HTML
+    github-to-canvas --align --fis-links                               -> Patches existing lessons in Canvas based on the .canvas file, adds addition Flatiron School specific HTML
+    github-to-canvas --align --remove-header                           -> Patches existing lessons in Canvas based on the .canvas file, removes top lesson header before converting to HTML
 
   EOBANNER
 
@@ -54,7 +56,7 @@ OptionParser.new do |opts|
           end
   opts.on("-tTYPE", "--type TYPE", 
           "Sets the type Canvas lesson to be created (page or assignment). If no type, type decided based on repository structure") do |type| 
-            if type == 'page' || type == 'assignment'
+            if type == 'page' || type == 'assignment' || type == 'discussion'
               options[:type] = type
             else
               puts "Invalid type. Defaulting to page"
@@ -70,13 +72,17 @@ OptionParser.new do |opts|
             options[:version] = true
           end
   opts.on("-d", "--dry-run",
-          "Runs through creation without pushing to Canvas or GitHub") do |v|
+          "Runs through creation without pushing to Canvas or GitHub") do |d|
             options[:dry] = true
           end
   opts.on("-f", "--fis-links",
-          "Adds additional Flatiron School HTML after markdown conversion") do |v|
+          "Adds additional Flatiron School HTML after markdown conversion") do |f|
             options[:fis] = true
           end
+  opts.on("-r", "--remove-header",
+          "Removes top lesson header before converting to HTML") do |r|
+            options[:remove_header] = true
+          end
   
 end.parse!
 
@@ -101,9 +107,25 @@ if !options[:name]
 end
 
 if options[:create]
-  GithubToCanvas.new(mode: "create", course: options[:course], filepath: Dir.pwd, branch: options[:branch], name: options[:name], type: options[:type], dry: !!options[:dry], fis_links: !!options[:fis])
+  GithubToCanvas.new(mode: "create", 
+                    course: options[:course], 
+                    filepath: Dir.pwd, 
+                    branch: options[:branch], 
+                    name: options[:name], 
+                    type: options[:type], 
+                    dry: !!options[:dry], 
+                    fis_links: !!options[:fis], 
+                    remove_header: !!options[:remove_header])
 end
 
 if options[:align]
-  GithubToCanvas.new(mode: "align", course: nil, filepath: Dir.pwd, branch: options[:branch], name: options[:name], type: options[:type], dry: !!options[:dry], fis_links: !!options[:fis])
+  GithubToCanvas.new(mode: "align", 
+                    course: nil, 
+                    filepath: Dir.pwd, 
+                    branch: options[:branch], 
+                    name: options[:name], 
+                    type: options[:type], 
+                    dry: !!options[:dry], 
+                    fis_links: !!options[:fis], 
+                    remove_header: !!options[:remove_header])
 end

data/lib/github-to-canvas.rb

@@ -9,7 +9,16 @@ require_relative './github-to-canvas/version'
 
 class GithubToCanvas
 
-  def initialize(mode:, course:, filepath:Dir.pwd, branch:'master', name:File.basename(Dir.getwd), type:"page", dry:false, fis_links:false)
+  def initialize(mode:, 
+                course:, 
+                filepath:Dir.pwd, 
+                branch:'master', 
+                name:File.basename(Dir.getwd), 
+                type:"page", 
+                dry:false, 
+                fis_links:false,
+                remove_header:false)
+
     if mode == 'version'
       puts VERSION
       return
@@ -17,12 +26,12 @@ class GithubToCanvas
 
     if mode == 'create'
       puts "github-to-canvas will now create a Canvas lesson based on the current repo"
-      CreateCanvasLesson.new(course, filepath, branch, name, type, dry, fis_links)
+      CreateCanvasLesson.new(course, filepath, branch, name, type, dry, fis_links, remove_header)
     end
 
     if mode == 'align'
       puts "github-to-canvas will now align any existing Canvas lessons based on the current repo. NOTE: .canvas file must be present"
-      UpdateCanvasLesson.new(filepath, branch, name, type, dry, fis_links)
+      UpdateCanvasLesson.new(filepath, branch, name, type, dry, fis_links, remove_header)
     end
   end
 

data/lib/github-to-canvas/canvas_interface.rb

@@ -17,7 +17,11 @@ class CanvasInterface
   end
 
   def self.push_to_canvas(course_id, type, name, new_readme)
-    url = "#{ENV['CANVAS_API_PATH']}/courses/#{course_id}/#{type}s"
+    if type == 'discussion'
+      url = "#{ENV['CANVAS_API_PATH']}/courses/#{course_id}/#{type}_topics"
+    else
+      url = "#{ENV['CANVAS_API_PATH']}/courses/#{course_id}/#{type}s"
+    end
     payload = self.build_payload(type, name, new_readme)
     begin
       RestClient.post(url, payload, headers={
@@ -46,6 +50,11 @@ class CanvasInterface
         'assignment[name]' => name,
         'assignment[description]' => new_readme
       }
+    elsif type == "discussion"
+      payload = {
+        'title' => name,
+        'message' => new_readme
+      }
     else
       payload = {
         'wiki_page[title]' => name,

data/lib/github-to-canvas/create_canvas_lesson.rb

@@ -1,18 +1,18 @@
 class CreateCanvasLesson
 
-  def initialize(course, filepath, branch, name, type, dry_run, fis_links)
+  def initialize(course, filepath, branch, name, type, dry_run, fis_links, remove_header)
     name = name.split(/[- _]/).map(&:capitalize).join(' ')
     original_readme = File.read("#{filepath}/README.md")
     if !original_readme
       puts 'README.md not found in current directory. Exiting...'
       abort
     end
-    create_canvas_lesson(original_readme, course, filepath, branch, name, type, dry_run, fis_links)
+    create_canvas_lesson(original_readme, course, filepath, branch, name, type, dry_run, fis_links, remove_header)
   end
 
-  def create_canvas_lesson(readme, course, filepath, branch, name, type, dry_run, fis_links)
+  def create_canvas_lesson(readme, course, filepath, branch, name, type, dry_run, fis_links, remove_header)
     GithubInterface.get_updated_repo(filepath, branch)
-    new_readme = RepositoryConverter.convert(filepath, readme, branch)
+    new_readme = RepositoryConverter.convert(filepath, readme, branch, remove_header)
     if fis_links
       new_readme = RepositoryConverter.add_fis_links(filepath, new_readme)
     end

data/lib/github-to-canvas/github_interface.rb

@@ -19,7 +19,7 @@ class GithubInterface
   def self.git_co_branch(filepath, branch)
     self.cd_into_and(filepath, "git checkout #{branch}")
     current_branch = self.get_current_branch(filepath)
-    
+    puts "Current branch #{current_branch.strip}"
     if !current_branch.match(branch)
       puts "#{branch} branch not found. Exiting..."
       abort

data/lib/github-to-canvas/repository_converter.rb

@@ -1,11 +1,19 @@
 require 'redcarpet'
+require 'byebug'
 class RepositoryConverter
 
-  def self.convert(filepath, readme, branch)
+  def self.convert(filepath, readme, branch, remove_header)
+    if remove_header
+      self.remove_header(readme)
+    end
     self.fix_local_images(filepath, readme, branch)
     self.convert_to_html(filepath, readme)
   end
 
+  def self.remove_header(readme)
+    readme.gsub!(/^#.+?\n\n/,"")
+  end
+
   def self.fix_local_images(filepath, readme, branch)
     raw_remote_url = self.set_raw_image_remote_url(filepath)
     self.adjust_local_markdown_images(readme, raw_remote_url, branch)

data/lib/github-to-canvas/update_canvas_lesson.rb

@@ -1,18 +1,18 @@
 class UpdateCanvasLesson
 
-  def initialize(filepath, branch, name, type, dry_run, fis_links)
+  def initialize(filepath, branch, name, type, dry_run, fis_links, remove_header)
     name = name.split(/[- _]/).map(&:capitalize).join(' ')
     readme = File.read("#{filepath}/README.md")
     if !readme
       puts 'README.md not found in current directory. Exiting...'
       abort
     end
-    update_canvas_lesson(readme, filepath, branch, name, type, dry_run, fis_links)
+    update_canvas_lesson(readme, filepath, branch, name, type, dry_run, fis_links, remove_header)
   end
 
-  def update_canvas_lesson(readme, filepath, branch, name, type, dry_run, fis_links)
+  def update_canvas_lesson(readme, filepath, branch, name, type, dry_run, fis_links, remove_header)
     GithubInterface.get_updated_repo(filepath, branch)
-    new_readme = RepositoryConverter.convert(filepath, readme, branch)
+    new_readme = RepositoryConverter.convert(filepath, readme, branch, remove_header)
     if fis_links
       new_readme = RepositoryConverter.add_fis_links(filepath, new_readme)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-to-canvas
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - maxwellbenton