github-to-canvas 0.0.41 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a0c55312a2f98cfab18af28e44eff85e7e278178c92c2f87b0ea06e274dc7b
-  data.tar.gz: e6692af5eb0439d14239a3945d522a55986943a95f2987ba14c651e579459c34
+  metadata.gz: ddda58c3ed202c82e6c0f71a80178a7fbc72e593b9357b5449ee2116d35f68cf
+  data.tar.gz: ea08df0af727814a06508291e9e2d0159f5e268ed7b54858002a74cb6529a26d
 SHA512:
-  metadata.gz: a1396b11ac39793429af8dc9ae34272d3ebc988475e68294acea92f0df1fd59d190eb5dce02671a1389267c62fed234b207dd67dcf894116b66ea4e914493adf
-  data.tar.gz: d9ce9f1eb8ef7c8ce1f3675b16f5d8b57e1cdecd1e39f0988a2dad6c14439903e1bad9dce3ff39a7f132d0a1afcd265142d8bf5a2f607fa7ac29cd1510c46dcd
+  metadata.gz: a62890799c51f119081bca8a26455ff46d55e9f796a3a3f783f2b39a47c16439b2ca1528eee528b54c2c8453fc865ec62e7b5526cdf925199b24a243fddc7e33
+  data.tar.gz: 980f0d8f8265f2cffa75e8f5659bbb4e7d34efaf76c4d8ff1748e9ee2357fbca3c10903ff63a5bcf9f0fc7c60c8a38a2374174c18235dfb4a70843f4350baf23

data/bin/github-to-canvas

@@ -129,9 +129,23 @@ end
 
 if !options[:name]
   if options[:file_to_convert]
-    options[:name] = options[:file_to_convert]
+    markdown = File.read("#{Dir.pwd}/#{options[:file_to_convert]}")
+    if markdown.match?(/^# .+?\n\n/)
+      options[:name] = markdown.match(/^# .+?\n\n/)[0].strip.gsub("# ","").gsub("#","")
+    elsif markdown.match?(/^# .+?\n/)
+      options[:name] = markdown.match(/^# .+?\n/)[0].strip.gsub("# ","").gsub("#","")
+    else
+      options[:name] = options[:file_to_convert]
+    end
   else
-    options[:name] = File.basename(Dir.getwd)
+    markdown = File.read("#{Dir.pwd}/README.md")
+    if markdown.match?(/^# .+?\n\n/)
+      options[:name] = markdown.match(/^# .+?\n\n/)[0].strip.gsub("# ","").gsub("#","")
+    elsif markdown.match?(/^# .+?\n/)
+      options[:name] = markdown.match(/^# .+?\n/)[0].strip.gsub("# ","").gsub("#","")
+    else
+      options[:name] = File.basename(Dir.getwd)
+    end    
     options[:file_to_convert] = "README.md"
   end
 end

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

@@ -58,7 +58,8 @@ class CanvasInterface
             index = nil
           end 
         end
-
+        puts ""
+        puts ""
         puts "Info for Course #{course} from #{ENV['CANVAS_API_PATH']}"
         puts ""
         puts "## Pages ##"
@@ -114,7 +115,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

@@ -1,7 +1,7 @@
 class CreateCanvasLesson
 
   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(' ')
+    # name = name.split(/[- _]/).map(&:capitalize).join(' ')
     begin
       markdown = File.read("#{filepath}/#{file_to_convert}")
     rescue
@@ -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/repository_converter.rb

@@ -11,7 +11,8 @@ class RepositoryConverter
   end
 
   def self.remove_header(readme)
-    readme.gsub(/^# .+?\n\n/,"")
+    readme.gsub!(/^# .+?\n\n/,"")
+    readme.gsub(/^# .+?\n/,"")
   end
 
   def self.remove_footer(readme)
@@ -40,27 +41,27 @@ class RepositoryConverter
   end
 
   def self.adjust_local_markdown_images(readme, raw_remote_url, branch)
-    readme.gsub!(/\!\[.+\]\(.+\)/) {|image|
-      if !image.match('amazonaws.com') && !image.match('https://') && !image.match('youtube')
-        image.gsub!(/\(.+\)/) { |path|
+    readme.gsub!(/\!\[.+\]\(.+\)/) {|image_markdown|
+      if !image_markdown.match?('amazonaws.com') && !image_markdown.match?('https://') && !image_markdown.match?('http://') && !image_markdown.match?('youtube')
+        image_markdown.gsub!(/\(.+\)/) { |path|
           path.delete_prefix!("(")
           path.delete_suffix!(")")
           "(" + raw_remote_url + "/#{branch}/" + path + ")"
         }
       end
-      image
+      image_markdown
     }
   end
 
   def self.adjust_local_html_images(readme, raw_remote_url)
-    readme.gsub!(/src=\"[\s\S]*?" /) { |img|
-      if !img.match('amazonaws.com') && !img.match('https://') && !img.match('youtube')
-        img.gsub!(/\"/, "")
-        img.gsub!(/src=/, '')
-        img.strip!
-        'src="' + raw_remote_url + '/master/' + img + '"'
+    readme.gsub!(/src=(\'|\")[\s\S]*?(\'|\")/) { |image_source|
+      if !image_source.match?('amazonaws.com') && !image_source.match?('https://') && !image_source.match?('http://') && !image_source.match?('youtube')
+        image_source.gsub!(/(\'|\")/, "")
+        image_source.gsub!(/src=/, '')
+        image_source.strip!
+        'src="' + raw_remote_url + '/master/' + image_source + '"'
       else
-        img
+        image_source
       end
     }
   end

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

@@ -1,7 +1,7 @@
 class UpdateCanvasLesson
 
   def initialize(course, filepath, file_to_convert, branch, name, type, save_to_github, fis_links, remove_header_and_footer, only_update_content, id)
-    name = name.split(/[- _]/).map(&:capitalize).join(' ')
+    # name = name.split(/[- _]/).map(&:capitalize).join(' ')
     begin
       markdown = File.read("#{filepath}/#{file_to_convert}")
     rescue
@@ -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.41"
+  VERSION = "0.0.46"
 end

metadata

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