github-to-canvas 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c38080e6c0827bce0491f53aaada600e08d92ebf0b7a2d61c6d363a460e42ef
-  data.tar.gz: b1099325700aadcc9bb0e12115ac5a3c67992ce62ab62277a0aaebd638736319
+  metadata.gz: 6e37325db45799844237ba747240be9e85d677e9dc1289836c01205e51cd9f4f
+  data.tar.gz: cad741664204320b94a578ab4e617afd8c4b0e8e209c8ead9e8b91493d97b693
 SHA512:
-  metadata.gz: ec29a4070f46afe5a7dd580ab24688d9f19dba943d2f93e4850278516eccd583cf41e9793228b77e488aa8ef491d6015634116648339c6f2f0a6fb8f1cb1b8ec
-  data.tar.gz: 325b22cf79ef204466723ab79d638ce3c1790bdaf9a8e3485184200b6947d73b4d543fba55e8580591b794216483428faf997d3033a8b2ce128463bd495cd595
+  metadata.gz: 45753e9af5e7da01e1daccb8b89fe76d3edd6bda219cc47c6662d03e047e7ce323b0d2270fbc04120a2f7b57224f9eea31f3bade71a3a5d2fbddf4278f73dac2
+  data.tar.gz: 95c4ce9a722bd3ce2e8e4f9ec9ea933fbf92ad627f29719c02ce8fc7b547616baed012b26059d91b6e6d3df8d60b52b74f7b8587a7589237c80c740cda1f177f

data/README.md

@@ -1,4 +1,4 @@
-# GitHub to Canvas Gem Test
+# GitHub to Canvas Gem
 
 ## Introduction
 

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

@@ -1,8 +1,12 @@
 require 'yaml'
 class CanvasDotfile
 
+  def self.exists?
+    File.file?(".canvas")
+  end
+
   def self.update_or_create(filepath, response, course, type)
-    if File.file?(".canvas")
+    if self.exists?
       if type == "assignment" || type == "discussion"
         canvas_data = self.update_assignment_data(response, course, type)
       else
@@ -22,11 +26,6 @@ class CanvasDotfile
     File.write("#{filepath}/.canvas", canvas_data.to_yaml)
   end
 
-  def self.commit_canvas_dotfile(filepath)
-    GithubInterface.git_add(filepath, '.canvas')
-    GithubInterface.git_commit(filepath, 'AUTO: add .canvas file after migration')
-  end
-
   def self.read_canvas_data
     if File.file?(".canvas")
        YAML.load(File.read(".canvas"))

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

@@ -114,7 +114,7 @@ class CanvasInterface
       })
     rescue
       puts "Something went wrong while pushing lesson #{id} to course #{course_id}"
-      # abort
+      nil
     end
   end
 

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

@@ -18,15 +18,21 @@ class CreateCanvasLesson
       new_html = RepositoryConverter.add_fis_links(filepath, new_html)
     end
     response = CanvasInterface.submit_to_canvas(course, type, name, new_html)
+    
+    puts 'Creating .canvas file'
+    CanvasDotfile.update_or_create(filepath, response, course, type) 
+
+    puts "Canvas lesson created. Lesson available at #{response['html_url']}."
+
+    # If --save option is used, the .canvas file gets committed and pushed to the remote repo
     if save_to_github
-      puts 'Creating .canvas file'
-      CanvasDotfile.update_or_create(filepath, response, course, type)
+      puts 'Adding .canvas file'
+      GithubInterface.git_add(filepath, '.canvas')
       puts 'Commiting .canvas file'
-      CanvasDotfile.commit_canvas_dotfile(filepath)
+      GithubInterface.git_commit(filepath, 'AUTO: add .canvas file after migration')
       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/update_canvas_lesson.rb

@@ -12,25 +12,46 @@ class UpdateCanvasLesson
   end
 
   def update_canvas_lesson(course, markdown, filepath, branch, name, type, save_to_github, fis_links, remove_header_and_footer, only_update_content, id)
+    # Pulls any updates that exist on GitHub
     GithubInterface.get_updated_repo(filepath, branch)
+    
+    # Converts markdown to HTML
+    # Default is README.md. --file <FILENAME> can be used to override default.
     new_html = RepositoryConverter.convert(filepath, markdown, branch, remove_header_and_footer)
+    
+    # adds Flatiron School specific header and footer
     if fis_links
-      new_html = RepositoryConverter.add_fis_links(filepath, new_html) # adds Flatiron School specific header and footer
+      new_html = RepositoryConverter.add_fis_links(filepath, new_html) 
     end
+
+    # Read the local .canvas file if --id <ID> is not used. Otherwise, use provided ID (--course <COURSE> also required)
     if !id
-      # If no assignment or page ID is provided, tries to get info from a .canvas file
       canvas_data = CanvasDotfile.read_canvas_data
-      canvas_data[:lessons].each { |lesson|
+      canvas_data[:lessons] = canvas_data[:lessons].map { |lesson|
         response = CanvasInterface.update_existing_lesson(lesson[:course_id], lesson[:id], lesson[:type], name, new_html, only_update_content)
-        # puts "Canvas lesson created. Lesson available at #{response['html_url']}."
       }
     else
-      # If an ID is provided, uses the ID instead of the .canvas file
+      # If an ID (and course) are provided, they are used instead of the .canvas file
+      # Gets the current lesson's type (page or assignment)
       info = CanvasInterface.get_lesson_info(course, id)
-      CanvasInterface.update_existing_lesson(course, id, info[1], name, new_html, only_update_content)
+
+      # Implements update on Canvas
+      response = JSON.parse(CanvasInterface.update_existing_lesson(course, id, info[1], name, new_html, only_update_content))
+      
+      # Updates or creates a local .canvas file
+      CanvasDotfile.update_or_create(filepath, response, course, info[1])
     end
+    # If --save option is used, the .canvas file gets committed and pushed to the remote repo
+    if save_to_github
+      puts 'Adding .canvas file'
+      GithubInterface.git_add(filepath, '.canvas')
+      puts 'Commiting .canvas file'
+      GithubInterface.git_commit(filepath, 'AUTO: add .canvas file after migration')
+      puts 'Pushing .canvas file'
+      GithubInterface.git_push(filepath, branch)
+    end
+    
   end
-
   
 
 end

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

@@ -1,3 +1,3 @@
 class GithubToCanvas
-  VERSION = "0.0.42"
+  VERSION = "0.0.43"
 end

metadata

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