github-to-canvas 0.0.56 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b2320509da12ac07b0a2905c4302b8a2d3d492f2fc04bcd5dc606b8fb36cb3
-  data.tar.gz: 7964bd362c1315ddf7203f6f9599e8a69469d59579457fb6dd632c80c0127be5
+  metadata.gz: f5628681c8cda313989c521770b0b7f2a20e9b7a0aa0f661446d25d1040eca8d
+  data.tar.gz: da78038dd5492dbb897c9fb6d65e05c76f02e7e57df952630c859d9b446d6c79
 SHA512:
-  metadata.gz: c55a64f4a56fcb795af943a9db7e9799164cd19c5119738c0899ce3b73e1b8998a5c16ce676d5553828bf6d0f54b55d804c2066c2702e113ace009649e0ece3d
-  data.tar.gz: 37e1f2a57675d8ec0cb9dc6e36716b35b7ca8ab38b243e4cb6186a17fe0894c4b1ef8fde65dc0fbdaf3bb242d0bafcd08dd243abbb83acf03139de75597f95a4
+  metadata.gz: abc12344a24c0c7d67980dc4911462e7c7eb3aba0c31e18b42e5f95fda97fef7b60a994c4ce59fc6da3d6fb7db044fc47ae443979e06455a82906e4ae863f4cd
+  data.tar.gz: 467e1d799b929fccf52cb155d27411050232c30b704fde8d216516c1bc7891d69c6617252cfdd8782ceb35a10fd05b2d5efdf5dd6754bfb097f22ee740876f36

data/README.md

@@ -4,19 +4,15 @@
 
 The `github-to-canvas` gem is designed to aid in integrating GitHub and the
 Canvas LMS. This gem takes a GitHub repository's `README.md` file, converts it
-to HTML, and pushes it to Canvas using the Canvas API. The gem also has the ability
-to updates a repository to include a `.canvas` file containing Canvas specific
-information.
-
-With  the `.canvas` file in place, this gem can be used to continuously align
-content between GitHub and Canvas using the GitHub repository as the single
-source of truth.
+to HTML, and pushes it to Canvas using the Canvas API. This gem can also update
+existing Canvas lessons, allowing continuous alignment of content between GitHub
+and Canvas.
 
 This gem is built for use internally at [Flatiron School][], so some features may be
 specific to Flatiron School branding and needs. Access to the
 [Canvas LMS API][] and the ability to add pages and assignments to a Canvas
 course are required. Write access to the GitHub repository being converted is
-also required for committing `.canvas` files.
+also required for some features.
 
 ## Installation
 
@@ -47,7 +43,7 @@ echo "$(export 'CANVAS_API_KEY=your-new-API-key-here' | cat - ~/.bash_profile)"
 
 ### Add Canvas API Base Path
 
-The exact Canvas API path is specific to where you Canvas LMS is located. For example,
+The exact Canvas API path is specific to where your Canvas LMS is located. For example,
 Flatiron School's base path is `https://learning.flatironschool.com/api/v1`. Add this path
 as an `ENV` variable like the API key. **Do not add a `/` at the end after `/api/v1`.**
 
@@ -65,67 +61,350 @@ After both the API key and path are added to `~/.zshrc`, run `source ~/.zshrc` (
 to make them available in your current terminal. You can verify these variables
 are present by running `ENV` and finding them in the output list.
 
-## Usage
+## Common Uses
+
+The GitHub to Canvas gem can be used for the following:
+
+- [Create a Canvas Lesson from a Local Repository](#create)
+- [Create a Canvas Lesson from a Remote Repository](#createremote)
+- [Read a Remote Repository as HTML](#read)
+- [Update a Canvas Lesson from a Local Repository](#update)
+- [Update a Canvas Lesson from a Remote Repository](#updateremote)
+- [Retrieve Canvas Course Information as YAML Markdown](#query)
+- [Map GitHub Repositories to a Canvas Course YAML file](#map)
+- [Create New Canvas Course from a YAML file](#buildcourse)
+- [Update Lessons in an Existing Course from a YAML file](#updatecourse)
+
+### Creating and Updating Canvas Lessons
+
+#### Create a Canvas Lesson from a Local Repository <a name="create"></a>
+
+Navigate into a repository folder cloned down to your local machine and run:
+
+```sh
+github-to-canvas -c <CANVAS_COURSE_ID> -lr --forkable
+```
+
+The command above will create a Canvas lesson in the course provided. It will
+also remove the repositories top-level header and remove any old Flatiron
+branded footers. It will also add an HTML header for Canvas that includes links
+back to the repository.
+
+If the lesson type is an assignment, a Fork button will also be added to the
+HTML header. Because the command didn't specify, the type of lesson is determined
+based on the local repo structure - if it has sub-folders, the lesson will become
+an assignment; if there are no sub-folders, the lesson will become a page. If the
+lesson type is a page, the `--forkable` option will be ignored.
+
+Creating a lesson this way will also produce a `.canvas` file. This file
+contains info about the Canvas lesson that was created.
+
+#### Create a Canvas Lesson from a Remote Repository <a name="createremote"></a>
+
+To create from a remote repo, run the following command:
+
+```sh
+github-to-canvas --create-from-github <URL> --course <CANVAS_COURSE_ID> --type <TYPE> -lr --forkable
+```
+
+This command will read a GitHub markdown based on the provided URL and create a
+Canvas lesson based on it. We need to provide the Course ID and the type of
+lesson (`page` or `assignment`) as type can't be determined automatically. We'll
+also continue to use `-lr --forkable` like the previous command to set up the
+lesson the same way as before.
+
+The repository must be public in order to read the markdown file.
+
+#### Read a Remote Repository as HTML <a name="read"></a>
+
+To read the contents of a remote repo:
+
+```sh
+github-to-canvas --read-from-github <URL>
+```
+
+This will produce an HTML conversion of the repository's markdwon. This HTML can
+be directly pasted into Canvas' HTML editor if a manual process is needed.
+
+#### Update a Canvas Lesson from a Local Repository <a name="update"></a>
+
+If you previously created a Canvas lesson from a local repository, you should
+have a `.canvas` file present in the repo. If that file is present, you can run
+the following command to update the listed Canvas lesson automatically:
+
+```sh
+github-to-canvas -a -lr --forkable
+```
+
+If you don't have or want to use the `.canvas` file, you can also specify the
+course ID and lesson ID:
+
+```sh
+github-to-canvas -a --course <CANVAS_COURSE_ID> --id <CANVAS_LESSON_ID> -lr --forkable
+```
+
+Canvas course and lesson IDs can be found in the URL.
+
+#### Update a Canvas Lesson from a Remote Repository <a name="updateremote"></a>
+
+You can update an existing Canvas course using a remote GitHub repository like so:
+
+```sh
+github-to-canvas --align-from-github <URL> --course <COURSE_ID> --id <LESSON_ID> --type <TYPE> -lr --forkable
+```
+
+This will read remote markdown using the provided URL and update a Canvas course
+using the info provided. Type must match the existing lesson type.
+
+### Course Creation
+
+This gem can create Canvas courses from scratch. These features
+are still in development and may not work for all course designs. Quiz and
+Discussion Topic lesson creation is still under development and will not work.
+
+By providing a YAML file of the desired course structure, this gem can create a
+course, add in modules, and populate those modules with pages and assignments.
+The required YAML file must follow a specific structure. Using the steps below,
+this gem can create the necessary YAML markup from existing Canvas courses.
+
+#### Retrieve Canvas Course Information as YAML Markdown <a name="query"></a>
+
+To create YAML markup of an existing Canvas course, use the following:
+
+```sh
+github-to-canvas --query <CANVAS_COURSE_ID>
+```
+
+This command will use the Canvas API to read a course's information, including
+its module and lesson structure and lesson URLs. YAML markup will be produced as a result. This
+output can be directly saved to a file, which will make the next step a little
+easier:
+
+```sh
+github-to-canvas --query <CANVAS_COURSE_ID> > query_results.yml
+```
+
+The output will look similar to this:
+
+```yml
+---
+:name: The Course's Title
+:id: 111
+:modules:
+- :id: 2020
+  :name: First Module's Name
+  :lessons:
+  - id: slugified-page-name
+    title: This is the Title Of The First Lesson, a Page
+    indent: 0
+    type: Page
+    html_url: https://learning.flatironschool.com/courses/111/modules/items/27001
+    page_url: slugified-page-name
+    url: https://learning.flatironschool.com/api/v1/courses/111/pages/slugified-page-name
+    published: false
+    repository: ''
+  - id: 333
+    title: This is the Title Of The Second Lesson, an Assignment
+    indent: 1
+    type: Assignment
+    html_url: https://learning.flatironschool.com/courses/111/modules/items/27002
+    page_url: ''
+    url: https://learning.flatironschool.com/api/v1/courses/111/assignments/333
+    published: false
+    repository: ''
+- :id: 2021
+  :name: Second Module's Name
+  :lessons:
+```
+
+The output YAML will not include associated GitHub repository information.
+
+#### Map GitHub Repositories to a Canvas Course YAML file <a name="map"></a>
+
+To associate repositories to an existing course YAML, the following command can be used:
+
+```sh
+github-to-canvas --map <YAML_FILE>
+```
+
+For this feature to work, all Canvas lessons must have the GitHub HTML header
+that is added using `-l`. This header contains the necessary repo information.
+
+Save the output YAML to another file if you want to use it for later course
+creation. For example:
+
+```sh
+github-to-canvas --map query_results.yml > course_structure.yml
+```
+
+The resulting YAML file will contain course information, the module and lesson
+structure, and each lesson's associated GitHub repository.
+
+#### Create New Canvas Course from a YAML file <a name="buildcourse"></a>
+
+To create a Canvas course with this gem, you will need a correctly structured
+YAML file with the course info, modules, lessons and associated lesson
+repositories. In addition, all lessons must have a type (`Page` or
+`Assignment`), a repository, and a title. Other lesson options are currently
+ignored. 
+
+With the necessary data configured, use the `--build-course` option and pass in
+the course's YAML file:
 
-### Create a Canvas Lesson
+```sh
+github-to-canvas --build-course course_structure.yml -lr --forkable
+```
+
+This command will cause the following to happen:
 
-To create a Canvas lesson from a GitHub `README.md` file, at minimum, you will
-need to know the Canvas course id you are going to add to. This id can be found
-in the URL of the course.
+- Create a Canvas course using the top level `:name:` in the YAML data
+- Create the first module
+- Create the first lesson using the repository, title and type, as well as additional command options
+- Add the newly created lesson to the current module
+- Create the second lesson and add it to the module...
+- Repeate process until all modules and lessons are created
 
-Once you have the course id, you will need to do the following:
+#### Update Lessons in an Existing Course from a YAML file <a name="updatecourse"></a>
 
-1. Clone down the repository you'd like to push to Canvas.
-2. Change directory into the new local repository
-3. Run `github-to-canvas --create <your-course-id>` from inside the local repo
+The GitHub to Canvas gem can be used to update all lessons in a course
+with a single command. To do this, you will need an up-to-date course YAML file with repositories
+mapped to each lesson.
 
-If everything is set up properly, `github-to-canvas` will create a Canvas lesson
-using `master` branch `README.md` and the name of the current folder. By
-default, if the repository contains folders, an **assignment** will be created.
-Otherwise, a **page** will be created.
+```sh
+github-to-canvas --query <COURSE_ID> > query_results.yml
+github-to-canvas --map query_results.yml > your_new_course.yml
+```
 
-### Saving `.canvas` to GitHub
+Use the resulting file (in this example, `your_new_course.yml`) to update all lessons in
+a course based on their GitHub repo:
 
-Using `--save-to-github` will create a `.canvas` YAML file in the local repo and attempt to commit
-and push it to the remote repository. This file contains the course id, the newly
-created page id, and the Canvas URL to the lesson for future reference. 
+```sh
+github-to-canvas --update-course YAML_FILE -lr --forkable
+```
 
-If you create multiple Canvas lessons from the same repository, each lesson's
-Canvas data will be stored in the `.canvas` file.
+The gem will iterate over the data and update every lesson according to the
+associated repository.
 
-### Update an Existing Canvas Lesson
+## Known Issues
 
-To update an existing Canvas lesson using a local repository, **a `.canvas` file
-must be present in the repo**, as it contains the lesson information for the
-Canvas API.
+### HTML Code Snippets Do Not Render
 
-1. Clone down and/or change directory into the repository you'd like to update
-2. Run `github-to-canvas --align` from inside the local repo
+The Canvas API renders all HTML it receives. If your repository's markdown
+includes HTML that is not meant to be rendered, the content will be rendered as
+part of the page's HTML, resulting in unusual display errors in Canvas. Examples of
+this would be lessons on HTML or JavaScript that include HTML code snippets.
 
-`github-to-canvas` will get the course id and page/assignment id from the
-`.canvas` file and update the associated Canvas lesson. If there are multiple
-Canvas lessons included in the `.canvas` file, each lesson will be updated (i.e.
-you have the same lesson in two courses created from one repository).
+To fix any rendering issues in Canvas, go to the Canvas WYSIWYG editor for the
+afflicted lesson. Click the HTML editor option (`</>` button in the lower right) to
+switch to HTML.
 
-### Options
+Read the GitHub repo as HTML:
 
-This gem provides to the following options:
+```sh
+github-to-canvas --read-from-github URL
+```
 
-* `-c, --create-lesson COURSE` - Creates a new Canvas lesson, converting the local repository's README.md to HTML. Adds .canvas file to remote repository
-* `-a, --align` - Updates a canvas lesson based on the local repository's README.md
-* `-n, --name NAME` - Sets the name of the new Canvas lesson to be created. If no name is given, repository folder name is used
-* `-t, --type TYPE` - Sets the type of Canvas lesson to be created (page, assignment or discussion). If no type, type decided based on repository structure
-* `-f, --file FILE` - Looks for and uses a markdown file in the currentt folder as source for conversion. Default file is README.md
-* `-b, --branch BRANCH` - Sets the repository branch used for lesson creation
-* `-s, --save-to-github` - Creates a local .canvas file and attempts to commit and push it to the GitHub repository
-* `-l, --fis-links` - Adds additional Flatiron School HTML after markdown conversion           
-* `-r, --remove-header-and-footer` - Removes top lesson header and any Learn.co specific footer links before converting to HTML             
-* `-o, --only-content` - For align functionality only - updates the HTML content of a lesson without changing the name
-* `-h, --help` - Outputs examples commands and all options
-                   
+Copy the output HTML and paste it in to the Canvas editor. This should clear up
+some larger page rendering issues, but may not fix all code snippets issues. To
+fix these, switch back to the regular Canvas WYSIWYG editor, then open a second
+tab to the GitHub repo you're converting from. Copy any HTML code snippets from
+GitHub and paste them into the Canvas editor where they should be displayed.
+
+The Canvas editor will treat the pasted HTML content as code and will
+automatically replace some characters, escaping the code from the
+normal rendering process.
+
+Note that realigning after fixing this content with the gem will break the
+rendering for these lessons again. A fix is planned for this issue, but has not
+been implemented.
+
+### Multi-Line Code Snippets Render as a Single Line
+
+The Github to Canvas gem uses an existing gem, Redcarpet, to handle the Markdown to HTML
+conversion. This gem does not currently support multi-line codeblocks. This
+functionality has been added in the Github to Canvas gem through monkeypatching.
+This error should be resolved, but if you encounter code snippet rendering
+issues, please open a new issue with a markdown example to replicate the error.
+
+### Markdown Formatting Issues Cause Errors in Canvas
+
+An empty line should separate individual markdown headers, paragraphs and code snippets
+in the markdown. Without these empty lines, the contents will be interpretted as one
+continuous paragraph and ignore formatting.
+
+### New Repos That Use a `main` Branch
+
+If you are using a new GitHub repository that uses a `main` branch, you may not be able to
+create or update from a remote repository. You can still create and update from a local
+repository by using the `--branch` (`-b`) option and specifying `main` as the branch.
+
+A fix is planned for this issue, but not implemented.
+
+## Overview of GitHub to Canvas workflows
+
+Using this gem, you can maintain Canvas courses in multiple ways - either by
+creating and updating individual Canvas lessons or through the YAML file process.
+
+At Flatiron School, we use the Canvas blueprint course feature. We use the
+github-to-canvas gem to update the blueprint copy of lessons. These updates will appear
+in future copies of the course or when synced down associated courses in Canvas.
+
+![github-to-canvas workflow chart](./images/github-to-canvas_workflow.png)
+
+This can either be done with individual lessons or using a YAML files to keep
+entire courses updated.
+
+If you are using github-to-canvas in this way, changes should always be made on
+the repository, not on Canvas. Any changes made only on Canvas will get
+overwritten if the lesson is updated using the gem.
+
+## Common Options
+
+- `--create-lesson`, `-c`: Requires a Canvas course ID. Creates a new Canvas
+  lesson, converting the local repository's README.md to HTML. Adds `.canvas`
+  file to remote repository
+- `--align`, `-a`: Updates a canvas lesson based on the local repository's
+  README.md. If no other options are used, `--align` will look for a `.canvas`
+  file to know what to lesson to update
+- `--course`: Provide a specific course ID. When used with `--id`, this can
+  override the default behavior for `--align`, allowing you to update any
+  existing lesson and ignore the `.canvas` file if present.
+- `--id`: Provide a specific lesson ID. This can be found in the URL of the
+  specific lesson. For Pages, used the slugified lesson title.
+- `--type`: Sets the type of Canvas lesson to be created (page, assignment or
+  discussion). If no type, type decided based on repository structure.
+- `--name`: Can be used to override default naming behavior. By default, Canvas
+  lesson names are determined by the first top-level (`#`) header in the
+  repository's markdown file.
+- `--fis-links`, `-l`: Adds additional Flatiron School HTML header after
+  markdown conversion, including links back to the GitHub repo and it's issue
+  form.
+- `--forkable`: Adds a **Fork** button to the Flatiron School HTML header. For
+  use with custom Canvas JS to enable Canvas assignment forking workflow for
+  Flatiron School students.
+- `--remove-header-and-footer`, `-r`: Removes top lesson header and any Flatiron
+  School specific footer links before converting to HTML. Removing top lesson
+  header prevents duplicate titles while viewing in Canvas.
+- `--create-from-github`: Requires a GitHub repository URL. Also requires
+  `--course` and `--type`. Creates a Canvas lesson, reading from the remote repo
+  instead of a local repository. Repository must be public.
+- `--align-from-github`: Requires a GitHub repo URL, `--course`, `--id`, and
+  `--type`. Updates a Canvas lesson from a remote repository.
+- `--read-from-github`: Requires a GitHub repo URL. Reads a remote repository
+  and converts its contents to HTML, but does not push to Canvas.
+- `--branch`, `-b`: Can be used when creating or aligning with a local repo to
+  specify which branch to use. Use this if you have a new repository that uses a
+  `main` branch instead of `master`.
+- `--save-to-github`, `-s`: If you are are creating or aligning content locally,
+  the `.canvas` file is not automatically committed to the repo. This option will
+  attempt to commit and push the `.canvas` file to the remote repository.
+
+Run `github-to-canvas --help` for additional options not listed in this Readme.
 
 ## Examples of Valid Images This Gem Can Convert
 
+This gem can convert both standard inline markdown and HTML images. 
+
 Inline Markdown:
 
 ![example in-line image](https://curriculum-content.s3.amazonaws.com/fewpjs/fewpjs-fetch-lab/Image_25_AsynchronousJavaScript.png)

data/bin/github-to-canvas

@@ -1,6 +1,8 @@
+require 'byebug'
 #!/usr/bin/env ruby
 require 'optparse'
 require 'github-to-canvas'
+
 options = {}
 OptionParser.new do |opts|
   opts.banner = <<-EOBANNER
@@ -29,23 +31,40 @@ OptionParser.new do |opts|
     Run these commands from inside a local GitHub repository. This gem is built for Flatiron School's internal use.
     Some default behaviors assume this, like the default Canvas API path.
 
-    Example usage:
+    Create and Update Canvas Lessons From Inside a Local GitHub Repo Folder:
+
+    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 additional Flatiron School specific HTML and meta-data
+    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    
+
+    Get Info on a Canvas Course, Lesson or GitHub Repo:
+    
+    github-to-canvas --query COURSE                                                                -> Displays a course's modules and their lessons in course order as YAML
+    github-to-canvas --map YAML                                                                    -> Uses a YAML file created with --query to retrieve repositories that were associated with Canvas lessons using --fis-links. Returns an updated YAML.
+    github-to-canvas --read-from-canvas CANVAS_LESSON_URL                                          -> Retrieves a lesson's contents and information from Canvas
+    github-to-canvas --read-from-github GITHUB_URL                                                 -> Retrieves the provided GitHub markdown file, converted into HTML
+
+    Create and Update Canvas Lessons Using Remote GitHub Repositories:
+
+    github-to-canvas --create-from-github GITHUB_URL --course COURSE_ID --type TYPE                -> Creates a lesson in the provided course using the remote GitHub URL. Source must be from a public repo.
+    github-to-canvas --align-from-github GITHUB_URL --course COURSE_ID --id LESSON_ID --type TYPE  -> Updates a lesson in the provided course using the remote GitHub URL. Source must be from a public 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 additional Flatiron School specific HTML and meta-data
-    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
-    github-to-canvas --info COURSE                                            -> Displays a course's lesson and assignment names    
+    Create and Update Canvas Courses From YAML:
+
+    github-to-canvas --build-course YAML_FILE                                                     -> Uses the provided YAML file to create a course, add modules and populate them with lessons using remote GitHub repositories
+    github-to-canvas --add-to-course YAML_FILE --course                                           -> Uses a YAML file to a modules and lessons to an existing course.
+    github-to-canvas --update-course YAML_FILE                                                    -> Uses a YAML file to update lessons using their associated GitHub repositories (ignores module/course structure in YAML file)
 
   EOBANNER
 
   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_lesson] = true
-            options[:course] = course
+            options[:course_id] = course
           end
   opts.on("-bBRANCH", "--branch BRANCH", 
           "Sets the repository branch used for lesson creation") do |branch| 
@@ -57,12 +76,16 @@ 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' || type == 'discussion'
-              options[:type] = type
-            else
-              puts "Invalid type. Defaulting to page"
-              options[:type] = "page"
-            end
+            # byebug
+            puts type.downcase
+            options[:type] = type.downcase
+            abort if type == 'quiz' || type == 'discussion'
+            # if type == 'page' || type == 'assignment' || type == 'discussion' || type == 'quiz' || type == 'Page' || type == 'Assignment' || type == 'Discussion' || type == 'Quiz'
+              
+            # else
+            #   puts "Invalid type. Defaulting to page"
+            #   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| 
@@ -93,8 +116,8 @@ OptionParser.new do |opts|
             options[:remove_header_and_footer] = true
           end
   opts.on("--course COURSE",
-          "For align functionality only - updates the HTML content of a lesson using the provided course ID. Use with --id.") do |course|
-            options[:course] = course
+          "For align functionality only - updates the HTML content of a lesson using the provided course ID. Use with --id.") do |course_id|
+            options[:course_id] = course_id
           end
   opts.on("--id ID",
           "For align functionality only - updates the HTML content of a lesson using the provided assignment or page ID. Use with --course.") do |id|
@@ -108,28 +131,151 @@ OptionParser.new do |opts|
           "Displays a course's lessons and assignments") do |course|
             options[:query] = course
           end
-  opts.on("--remote",
-          "Retrieves a Canvas lesson. Requires --course and --id") do |remote|
-            options[:remote] = true
+  opts.on("--map YAML_FILE", 
+          "REQUIRES -f or --file Associates canvas lessons with repositories. Use query to create required YAML file") do |file|
+            options[:map] = file
+          end
+  opts.on("--csv COURSE", 
+          "Returns a course's lesson struction as CSV") do |course|
+            options[:csv] = course
+          end
+  opts.on("--read-from-canvas CANVAS_URL",
+          "Retrieves an existing Canvas lesson using the provided URL") do |url|
+            options[:read_from_canvas] = url
+          end
+  opts.on("--read-from-github GITHUB_URL",
+          "Converts an existing GitHub Readme to HTML using the provided URL. URL must be for a GitHub markdown file") do |url|
+            options[:read_from_github] = url
+          end
+  opts.on("--create-from-github GITHUB_URL",
+          "Creates a new Canvas lesson from a remote GitHub Readme. --course and --type options required") do |url|
+            options[:create_from_github] = url
+          end
+  # opts.on("--create-quiz-from-github GITHUB_URL",
+  #         "Creates a new Canvas quiz from a remote GitHub YAML file. --course option required") do |url|
+  #           options[:quiz_from_github] = url
+  #         end
+  opts.on("--align-from-github GITHUB_URL",
+          "Aligns an existing Canvas lesson using a remote GitHub Readme. --course, --id, and --type options required") do |url|
+            options[:align_from_github] = url
+          end
+  opts.on("--build-course YAML_FILE", 
+          "Creates Canvas course using provided YAML file") do |file|
+            options[:build_course] = file
+          end
+  opts.on("--add-to-course YAML_FILE", 
+          "Creates Canvas course using provided YAML file") do |file|
+            options[:add_to_course] = file
+          end
+  opts.on("--update-course-lessons YAML_FILE", 
+          "Updates all lessons in a course using remote repos in provided YAML file") do |file|
+            options[:update_course_lessons] = file
+          end
+  opts.on("--clone-from-yaml YAML_FILE", 
+          "Iterates over provided course YAML file and clones repos locally") do |file|
+            options[:clone_from_yaml] = file
           end
-  
   
 end.parse!
 
 if options[:version]
-  GithubToCanvas.new(mode: 'version',  course: nil)
+  GithubToCanvas.new(mode: 'version',  course_id: nil)
+  abort
+end
+
+if options[:read_from_canvas]
+  GithubToCanvas.new(mode: 'canvas_read', filepath: options[:read_from_canvas])
+  abort
+end
+
+if options[:read_from_github]
+  GithubToCanvas.new(mode: 'github_read', filepath: options[:read_from_github])
+  abort
+end
+
+if options[:create_from_github]
+  if options[:course_id] && options[:type]
+    GithubToCanvas.new(mode: 'github_create', 
+                      filepath: options[:create_from_github], 
+                      course_id: options[:course_id], 
+                      type: options[:type],
+                      remove_header_and_footer: !!options[:remove_header_and_footer],
+                      forkable: !!options[:forkable],
+                      fis_links: !!options[:fis])
+  else
+    puts 'Canvas course ID and lesson type required. Example: github-to-canvas --create-from-github URL --course ID --type TYPE'
+  end
+  abort
+end
+
+if options[:align_from_github]
+  if options[:course_id] && options[:type] && options[:id]
+    GithubToCanvas.new(mode: 'github_align', 
+                      filepath: options[:align_from_github], 
+                      course_id: options[:course_id], 
+                      type: options[:type], 
+                      id: options[:id],
+                      name: options[:name],
+                      remove_header_and_footer: !!options[:remove_header_and_footer],
+                      forkable: !!options[:forkable],
+                      fis_links: !!options[:fis])
+  else
+    puts 'Canvas course ID, lesson ID, and type required. Example: github-to-canvas --create-from-github URL --course COURSE_ID --id LESSON_ID --type TYPE'
+  end
+  abort
 end
 
 if options[:query]
-  GithubToCanvas.new(mode: 'query',  course: options[:query], id: options[:id])
+  GithubToCanvas.new(mode: 'query',  course_id: options[:query], id: options[:id])
+  abort
 end
 
-if options[:remote]
-  if !options[:course] || !options[:id]
-    puts "Both --course and --id required when using --remote"
-    abort
+if options[:map]
+  GithubToCanvas.new(mode: 'map', file_to_convert: options[:map])
+  abort
+end
+
+if options[:csv]
+  GithubToCanvas.new(mode: 'csv', file_to_convert: options[:csv])
+  abort
+end
+
+if options[:build_course]
+  GithubToCanvas.new(mode: 'build_course', 
+                    file_to_convert: options[:build_course],
+                    fis_links: !!options[:fis], 
+                    remove_header_and_footer: !!options[:remove_header_and_footer],
+                    forkable: !!options[:forkable])
+  abort
+end
+
+if options[:add_to_course]
+  if options[:course_id]
+    GithubToCanvas.new(mode: 'add_to_course', 
+                      course_id: options[:course_id], 
+                      file_to_convert: options[:add_to_course],
+                      fis_links: !!options[:fis], 
+                      remove_header_and_footer: !!options[:remove_header_and_footer],
+                      forkable: !!options[:forkable])
+  else
+    puts '--course required'
   end
-  GithubToCanvas.new(mode: 'remote', course: options[:course], id: options[:id])
+  abort
+end
+
+if options[:update_course_lessons]
+  GithubToCanvas.new(mode: 'update_course_lessons', 
+                    file_to_convert: options[:update_course_lessons],
+                    fis_links: !!options[:fis], 
+                    remove_header_and_footer: !!options[:remove_header_and_footer],
+                    forkable: !!options[:forkable])
+  abort
+end
+
+if options[:clone_from_yaml]
+  GithubToCanvas.new(mode: 'clone_course', 
+                    file_to_convert: options[:clone_from_yaml])
+  abort
 end
 
 if !options[:type]
@@ -174,7 +320,7 @@ end
 
 if options[:create_lesson]
   GithubToCanvas.new(mode: "create", 
-                    course: options[:course], 
+                    course_id: options[:course_id], 
                     filepath: Dir.pwd, 
                     file_to_convert: options[:file_to_convert],
                     branch: options[:branch], 
@@ -189,7 +335,7 @@ end
 
 if options[:align]
   GithubToCanvas.new(mode: "align", 
-                    course: options[:course], 
+                    course_id: options[:course_id], 
                     id: options[:id],
                     filepath: Dir.pwd,
                     file_to_convert: options[:file_to_convert],