github-to-canvas 0.0.25 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ebf48161f0c0ac7ad012460961650eba100d006aa84a945a863278238a27a5
-  data.tar.gz: 1316e7036aa3032cbe4fa0d883b32f9c2bb142f585915d3045acbcb884e326b5
+  metadata.gz: 4848e1245f38fecc827a52b9148f89526d3b38045eb155d6b5eba412dcb96376
+  data.tar.gz: 1d414803e3fb134f82ecec3d2b21a80756b43000be3b69ea2df84fc7efedebb7
 SHA512:
-  metadata.gz: a7005054aae77a3c0212c6be57e9ecd1a6c6066d3882a25ef2fef6bafd96abf71b2ad2283bde23a80830379adfffb5dd56913d56709d8ed4ecd9b4c7aa5a745f
-  data.tar.gz: d3516690ddcbec8c8df013530c399a38f8d8ddb4f69513385dc1339eb1a04dac141446931000a6aa37daea1b74905fafa8793657107aea9075d41c1d6bf1d988
+  metadata.gz: 9e2d63fab8492b4486626a8bd09d0c748eed6f6dbd76c340c3277058a6d982f1d62388c6443acf2f490fb9b91a0b9aa6b7cd68e98168d3e24d56b22fea5915a3
+  data.tar.gz: f2ed3c42b44f75a629dce9d12bec144624102afb2c96148368e98cc9d6c2812fe26e2f6818fd41dc9d1a4c464b2ef8997c9801c467aa0829dffad191bab01172

data/bin/github-to-canvas

@@ -2,7 +2,6 @@
 
 require 'optparse'
 require 'github-to-canvas'
-
 options = {}
 OptionParser.new do |opts|
   opts.banner = <<-EOBANNER
@@ -13,13 +12,13 @@ OptionParser.new do |opts|
     https://github.com/learn-co-curriculum/github-to-canvas
 
     Commands:
-    github-to-canvas --create COURSE
-    github-to-canvas --create COURSE [--branch BRANCH]
-    github-to-canvas --create COURSE [--branch BRANCH] [--name NAME]
-    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-and-footer]
+    github-to-canvas --create-lesson COURSE
+    github-to-canvas --create-lesson COURSE [--save]
+    github-to-canvas --create-lesson COURSE [--branch BRANCH]
+    github-to-canvas --create-lesson COURSE [--branch BRANCH] [--name NAME]
+    github-to-canvas --create-lesson COURSE [--branch BRANCH] [--name NAME] [--type TYPE]
+    github-to-canvas --create-lesson COURSE [--fis-links]
+    github-to-canvas --create-lesson COURSE [--fis-links] [--remove-header-and-footer]
     github-to-canvas --align
     github-to-canvas --align [--branch BRANCH]
     github-to-canvas --align [--branch BRANCH] [--fis-links]
@@ -31,19 +30,19 @@ OptionParser.new do |opts|
 
     Example usage:
 
-    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, uses the repository's solution branch and derives the type from the local repo
+    github-to-canvas --create-lesson 154                                      -> Creates a lesson in course 154, derives the name and type from the local repo
+    github-to-canvas --create-lesson 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-lesson 154 --name "Fetch Lab" --type assignment -> Creates an assignment in course 154 with the provided name
+    github-to-canvas --create-lesson 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, adds addition Flatiron School specific HTML
     github-to-canvas --align --remove-header-and-footer                           -> Patches existing lessons in Canvas based on the .canvas file, removes top lesson header before converting to HTML
 
   EOBANNER
 
-  opts.on("-cCOURSE", "--create COURSE", 
+  opts.on("-cCOURSE", "--create-lesson COURSE", 
           "Creates a new canvas lesson, converting the local repository's README.md to HTML. Adds .canvas file to remote repository") do |course| 
-            options[:create] = true
+            options[:create_lesson] = true
             options[:course] = course
           end
   opts.on("-bBRANCH", "--branch BRANCH", 
@@ -63,6 +62,14 @@ OptionParser.new do |opts|
               options[:type] = "page"
             end
           end
+  opts.on("-fFILE", "--file FILE", 
+          "Looks for and uses a markdown file in the currentt folder as source for conversion. Default file is README.md. Skips writing .canvas to repository") do |file| 
+            options[:file_to_convert] = file
+          end
+  opts.on("-s", "--save-to-github",
+          "Creates a local .canvas file and attempts to commit and push it to the GitHub repository") do |s| 
+            options[:save_to_github] = true 
+          end
   opts.on("-a", "--align", 
           "Updates a canvas lesson based on the local repository's README.md") do |a|
             options[:align] = true 
@@ -71,11 +78,7 @@ OptionParser.new do |opts|
           "Displays current gem version") do |v|
             options[:version] = true
           end
-  opts.on("-d", "--dry-run",
-          "Runs through creation without pushing to Canvas or GitHub") do |d|
-            options[:dry] = true
-          end
-  opts.on("-f", "--fis-links",
+  opts.on("-l", "--fis-links",
           "Adds additional Flatiron School HTML after markdown conversion") do |f|
             options[:fis] = true
           end
@@ -90,6 +93,10 @@ if options[:version]
   GithubToCanvas.new(mode: 'version',  course: nil)
 end
 
+if !options[:file_to_convert]
+  options[:file_to_convert] = "README.md"
+end
+
 if !options[:type]
   if Dir.glob("**/*/").empty?
     options[:type] = "page"
@@ -106,14 +113,15 @@ if !options[:name]
   options[:name] = File.basename(Dir.getwd)
 end
 
-if options[:create]
+if options[:create_lesson]
   GithubToCanvas.new(mode: "create", 
                     course: options[:course], 
                     filepath: Dir.pwd, 
+                    file_to_convert: options[:file_to_convert],
                     branch: options[:branch], 
                     name: options[:name], 
                     type: options[:type], 
-                    dry: !!options[:dry], 
+                    save_to_github: !!options[:save_to_github], 
                     fis_links: !!options[:fis], 
                     remove_header_and_footer: !!options[:remove_header_and_footer])
 end
@@ -121,11 +129,12 @@ end
 if options[:align]
   GithubToCanvas.new(mode: "align", 
                     course: nil, 
-                    filepath: Dir.pwd, 
+                    filepath: Dir.pwd,
+                    file_to_convert: options[:file_to_convert], 
                     branch: options[:branch], 
                     name: options[:name], 
                     type: options[:type], 
-                    dry: !!options[:dry], 
+                    save_to_github: !!options[:save_to_github], 
                     fis_links: !!options[:fis], 
                     remove_header_and_footer: !!options[:remove_header_and_footer])
 end

data/lib/github-to-canvas.rb

@@ -12,10 +12,11 @@ class GithubToCanvas
   def initialize(mode:, 
                 course:, 
                 filepath:Dir.pwd, 
-                branch:'master', 
+                file_to_convert:'README.md',
+                branch:'master',
                 name:File.basename(Dir.getwd), 
                 type:"page", 
-                dry:false, 
+                save_to_github:false, 
                 fis_links:false,
                 remove_header_and_footer:false)
 
@@ -26,12 +27,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, remove_header_and_footer)
+      CreateCanvasLesson.new(course, filepath, file_to_convert, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
     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, remove_header_and_footer)
+      UpdateCanvasLesson.new(filepath, file_to_convert, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
     end
   end
 

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

@@ -1,16 +1,15 @@
 require 'yaml'
-
 class CanvasDotfile
 
   def self.update_or_create(filepath, response, course, type)
     if File.file?(".canvas")
-      if type == "assignment"
+      if type == "assignment" || type == "discussion"
         canvas_data = self.update_assignment_data(response, course, type)
       else
         canvas_data = self.update_page_data(response, course, type)
       end
     else
-      if type == "assignment"
+      if type == "assignment" || type == "discussion"
         canvas_data = self.create_assignment_data(response, course, type)
       else
         canvas_data = self.create_page_data(response, course, type)

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

@@ -1,19 +1,14 @@
 require 'json'
 require 'rest-client'
-
 class CanvasInterface
 
-  def self.submit_to_canvas(course_id, type, name, readme, dry_run = false)
-    if dry_run
-      puts 'DRY RUN: Skipping push to Canvas'
-    else
-      response = self.push_to_canvas(course_id, type, name, readme)
-      if ![200, 201].include? response.code
-        puts "Canvas push failed. #{response.code} status code returned "
-        abort
-      end
-      JSON.parse(response.body)
+  def self.submit_to_canvas(course_id, type, name, readme)
+    response = self.push_to_canvas(course_id, type, name, readme)
+    if ![200, 201].include? response.code
+      puts "Canvas push failed. #{response.code} status code returned "
+      abort
     end
+    JSON.parse(response.body)
   end
 
   def self.push_to_canvas(course_id, type, name, new_readme)
@@ -29,11 +24,16 @@ class CanvasInterface
       })
     rescue
       puts "Something went wrong while pushing lesson #{id} to course #{course_id}"
+      abort
     end
   end
 
   def self.update_existing_lesson(course_id, id, type, name, new_readme, dry_run)
-    url = "#{ENV['CANVAS_API_PATH']}/courses/#{course_id}/#{type}s/#{id}"
+    if type == "discussion"
+      url = "#{ENV['CANVAS_API_PATH']}/courses/#{course_id}/#{type}_topics/#{id}"
+    else
+      url = "#{ENV['CANVAS_API_PATH']}/courses/#{course_id}/#{type}s/#{id}"
+    end
     payload = self.build_payload(type, name, new_readme)
     begin
       RestClient.put(url, payload, headers={
@@ -41,6 +41,7 @@ class CanvasInterface
       })
     rescue
       puts "Something went wrong while pushing lesson #{id} to course #{course_id}"
+      # abort
     end
   end
 

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

@@ -1,29 +1,31 @@
 class CreateCanvasLesson
 
-  def initialize(course, filepath, branch, name, type, dry_run, fis_links, remove_header_and_footer)
+  def initialize(course, filepath, file_to_convert, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
     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...'
+    markdown = File.read("#{filepath}/#{file_to_convert}")
+    if !markdown
+      puts "#{file_to_convert} not found in current directory. Exiting..."
       abort
     end
-    create_canvas_lesson(original_readme, course, filepath, branch, name, type, dry_run, fis_links, remove_header_and_footer)
+    create_canvas_lesson(markdown, course, filepath, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
   end
 
-  def create_canvas_lesson(readme, course, filepath, branch, name, type, dry_run, fis_links, remove_header_and_footer)
+  def create_canvas_lesson(markdown, course, filepath, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
     GithubInterface.get_updated_repo(filepath, branch)
-    new_readme = RepositoryConverter.convert(filepath, readme, branch, remove_header_and_footer)
+    new_html = RepositoryConverter.convert(filepath, markdown, branch, remove_header_and_footer)
     if fis_links
-      new_readme = RepositoryConverter.add_fis_links(filepath, new_readme)
+      new_html = RepositoryConverter.add_fis_links(filepath, new_html)
     end
-    response = CanvasInterface.submit_to_canvas(course, type, name, new_readme, dry_run)
-    if dry_run
-      puts 'DRY RUN: Skipping dotfile creation and push to GitHub'
-    else
+    response = CanvasInterface.submit_to_canvas(course, type, name, new_html)
+    if save_to_github
+      puts 'Creating .canvas file'
       CanvasDotfile.update_or_create(filepath, response, course, type)
+      puts 'Commiting .canvas file'
       CanvasDotfile.commit_canvas_dotfile(filepath)
+      puts 'Pushing .canvas file'
       GithubInterface.git_push(filepath, branch)
     end
+    puts "Canvas lesson created. Lesson available at #{response['html_url']}."
   end
 
 end

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

@@ -1,4 +1,3 @@
-require 'byebug'
 class GithubInterface
 
   def self.cd_into_and(filepath, command)

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

@@ -11,7 +11,7 @@ class RepositoryConverter
   end
 
   def self.remove_header(readme)
-    readme.gsub(/^# .+\n\n/,"")
+    readme.gsub(/^# .+?\n\n/,"")
   end
 
   def self.remove_footer(readme)

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

@@ -1,24 +1,25 @@
 class UpdateCanvasLesson
 
-  def initialize(filepath, branch, name, type, dry_run, fis_links, remove_header_and_footer)
+  def initialize(filepath, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
     name = name.split(/[- _]/).map(&:capitalize).join(' ')
-    readme = File.read("#{filepath}/README.md")
-    if !readme
-      puts 'README.md not found in current directory. Exiting...'
+    markdown = File.read("#{filepath}/#{file_to_convert}")
+    if !markdown
+      puts "#{file_to_convert} not found in current directory. Exiting..."
       abort
     end
-    update_canvas_lesson(readme, filepath, branch, name, type, dry_run, fis_links, remove_header_and_footer)
+    update_canvas_lesson(markdown, filepath, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
   end
 
-  def update_canvas_lesson(readme, filepath, branch, name, type, dry_run, fis_links, remove_header_and_footer)
+  def update_canvas_lesson(markdown, filepath, branch, name, type, save_to_github, fis_links, remove_header_and_footer)
     GithubInterface.get_updated_repo(filepath, branch)
-    new_readme = RepositoryConverter.convert(filepath, readme, branch, remove_header_and_footer)
+    new_html = RepositoryConverter.convert(filepath, markdown, branch, remove_header_and_footer)
     if fis_links
-      new_readme = RepositoryConverter.add_fis_links(filepath, new_readme)
+      new_html = RepositoryConverter.add_fis_links(filepath, new_html) # adds Flatiron School specific header and footer
     end
     canvas_data = CanvasDotfile.read_canvas_data
     canvas_data[:lessons].each { |lesson|
-      CanvasInterface.update_existing_lesson(lesson[:course_id], lesson[:id], type, name, new_readme, dry_run)
+      response = CanvasInterface.update_existing_lesson(lesson[:course_id], lesson[:id], lesson[:type], name, new_html, save_to_github)
+      puts "Canvas lesson created. Lesson available at #{response['html_url']}."
     }
   end
 

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

@@ -1,3 +1,3 @@
 class GithubToCanvas
-  VERSION = "0.0.25"
+  VERSION = "0.0.29"
 end

metadata

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