grade_runner 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54341e166f0121e0e0c49b298ffab7fdb9c288b769e432a25103da828d0340a3
-  data.tar.gz: 743765e6cefe82977460154250c9abf8f5dbb4d00cb5a3a8c22eb3a888a5d16c
+  metadata.gz: 4d69d4bf6d04b43a1158cee76f3226460f25df5ed22c2ef51923d457edd6fba9
+  data.tar.gz: 5b3b6fe6ca5cefb53e9c03637564ec265d13fff47e0ace72416f87e5c46882e2
 SHA512:
-  metadata.gz: 91dbca294ec84fe7e1efd7dab82fbf827c61a86f7bb4bf54199ccd505efd1141a83246f326ca8a3aac9d5310a8d444da547cabc1a39b15eb6fe088a88bba703e
-  data.tar.gz: 6347b18ff8ca7b3c806511a5b054019729fe40327e4f02c2f9bdb3061686312c8278bd5ab94c0ab32f6445785fd5392a972b995c6cf7bcbf097d978b37b9a82b
+  metadata.gz: 46ff93a107026b708e82920099482856d8dc5c303694e24b4e18faf270e8a8ade4429920d69f2b786d1920b1d37629a5f8a8331d8ad19e251e6fc30407889433
+  data.tar.gz: e2e70bfb662d4afed2fdf254e49c42cc2ebc9e83154de2a01a6d1ff0ea16bce65e4b06ec4e3f55c982d1ee70019262fb60c5dd38867cabda831f8cd50a26df67

data/Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 gem "activesupport", ">= 2.3.5"
 gem "oj", "~> 3.13.12"
 gem "octokit", "~> 5.0"
+gem "zip"
 gem "faraday-retry", "~> 1.0.3"
 gem "rake", "~> 13"
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.2.0)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
@@ -19,6 +20,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
+    domain_name (0.6.20240107)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -42,6 +44,10 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
+    ffi (1.17.0)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
+      rake
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
@@ -53,6 +59,15 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.6.0)
     highline (2.1.0)
+    http (5.2.0)
+      addressable (~> 2.8)
+      base64 (~> 0.1)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.5.0)
+    http-cookie (1.0.6)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     interception (0.5)
@@ -67,6 +82,9 @@ GEM
       rdoc
       semver
     jwt (2.7.0)
+    llhttp-ffi (0.5.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     method_source (1.0.0)
     mini_portile2 (2.8.1)
     minitest (5.19.0)
@@ -145,6 +163,7 @@ GEM
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)
+    zip (2.0.2)
 
 PLATFORMS
   ruby
@@ -153,6 +172,7 @@ DEPENDENCIES
   activesupport (>= 2.3.5)
   bundler (~> 2.1.4)
   faraday-retry (~> 1.0.3)
+  http
   juwelier (~> 2.1.0)
   octokit (~> 5.0)
   oj (~> 3.13.12)
@@ -166,6 +186,7 @@ DEPENDENCIES
   rdoc (~> 6.1)
   rspec (~> 3.5.0)
   simplecov
+  zip
 
 BUNDLED WITH
    2.1.4

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.12

data/grade_runner.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: grade_runner 0.0.10 ruby lib
+# stub: grade_runner 0.0.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "grade_runner".freeze
-  s.version = "0.0.10"
+  s.version = "0.0.12".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Raghu Betina".freeze, "Jelani Woods".freeze]
-  s.date = "2024-07-09"
+  s.date = "2024-07-30"
   s.description = "This gem runs your RSpec test suite and posts the JSON output to grades.firstdraft.com.".freeze
   s.email = ["raghu@firstdraft.com".freeze, "jelani@firstdraft.com".freeze]
   s.extra_rdoc_files = [
@@ -37,47 +37,27 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/firstdraft/grade_runner".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.6".freeze
+  s.rubygems_version = "3.5.16".freeze
   s.summary = "A Ruby client for [firstdraft Grades](https://grades.firstdraft.com)".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-  end
+  s.specification_version = 4
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<activesupport>.freeze, [">= 2.3.5"])
-    s.add_runtime_dependency(%q<oj>.freeze, ["~> 3.13.12"])
-    s.add_runtime_dependency(%q<octokit>.freeze, ["~> 5.0"])
-    s.add_runtime_dependency(%q<faraday-retry>.freeze, ["~> 1.0.3"])
-    s.add_runtime_dependency(%q<rake>.freeze, ["~> 13"])
-    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.1.4"])
-    s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
-    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    s.add_development_dependency(%q<pry>.freeze, ["~> 0"])
-    s.add_development_dependency(%q<pry-byebug>.freeze, ["~> 3"])
-    s.add_development_dependency(%q<pry-doc>.freeze, ["~> 0"])
-    s.add_development_dependency(%q<pry-remote>.freeze, ["~> 0"])
-    s.add_development_dependency(%q<pry-rescue>.freeze, ["~> 1"])
-    s.add_development_dependency(%q<pry-stack_explorer>.freeze, ["~> 0"])
-  else
-    s.add_dependency(%q<activesupport>.freeze, [">= 2.3.5"])
-    s.add_dependency(%q<oj>.freeze, ["~> 3.13.12"])
-    s.add_dependency(%q<octokit>.freeze, ["~> 5.0"])
-    s.add_dependency(%q<faraday-retry>.freeze, ["~> 1.0.3"])
-    s.add_dependency(%q<rake>.freeze, ["~> 13"])
-    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 6.1"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 2.1.4"])
-    s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    s.add_dependency(%q<pry>.freeze, ["~> 0"])
-    s.add_dependency(%q<pry-byebug>.freeze, ["~> 3"])
-    s.add_dependency(%q<pry-doc>.freeze, ["~> 0"])
-    s.add_dependency(%q<pry-remote>.freeze, ["~> 0"])
-    s.add_dependency(%q<pry-rescue>.freeze, ["~> 1"])
-    s.add_dependency(%q<pry-stack_explorer>.freeze, ["~> 0"])
-  end
+  s.add_runtime_dependency(%q<activesupport>.freeze, [">= 2.3.5".freeze])
+  s.add_runtime_dependency(%q<oj>.freeze, ["~> 3.13.12".freeze])
+  s.add_runtime_dependency(%q<octokit>.freeze, ["~> 5.0".freeze])
+  s.add_runtime_dependency(%q<zip>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<faraday-retry>.freeze, ["~> 1.0.3".freeze])
+  s.add_runtime_dependency(%q<rake>.freeze, ["~> 13".freeze])
+  s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0".freeze])
+  s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1".freeze])
+  s.add_development_dependency(%q<bundler>.freeze, ["~> 2.1.4".freeze])
+  s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<pry>.freeze, ["~> 0".freeze])
+  s.add_development_dependency(%q<pry-byebug>.freeze, ["~> 3".freeze])
+  s.add_development_dependency(%q<pry-doc>.freeze, ["~> 0".freeze])
+  s.add_development_dependency(%q<pry-remote>.freeze, ["~> 0".freeze])
+  s.add_development_dependency(%q<pry-rescue>.freeze, ["~> 1".freeze])
+  s.add_development_dependency(%q<pry-stack_explorer>.freeze, ["~> 0".freeze])
 end
 

data/lib/tasks/grade.rake

@@ -2,6 +2,9 @@ require "active_support/core_ext/object/blank"
 require "grade_runner/runner"
 require "octokit"
 require "yaml"
+require "zip"
+require "fileutils"
+require "open-uri"
 
 desc "Alias for \"grade:next\"."
 task grade: "grade:all" do
@@ -14,10 +17,11 @@ namespace :grade do
     input_token = ARGV[1]
     file_token = nil
 
-    config_dir_name = find_or_create_config_dif
+    config_dir_name = find_or_create_directory(".vscode")
     config_file_name = "#{config_dir_name}/.ltici_apitoken.yml"
     student_config = {}
     student_config["submission_url"] = "https://grades.firstdraft.com"
+    student_config["github_username"] = retrieve_github_username
 
     if File.exist?(config_file_name)
       begin
@@ -47,7 +51,6 @@ namespace :grade do
       while new_personal_access_token == "" do
         print "> "
         new_personal_access_token = $stdin.gets.chomp.strip
-
         if new_personal_access_token!= "" && is_valid_token?(submission_url, new_personal_access_token) == false
           puts "Please enter valid token"
           new_personal_access_token = ""
@@ -67,17 +70,19 @@ namespace :grade do
         student_config["personal_access_token"] = nil
         update_config_file(config_file_name, student_config)
         puts "Your access token looked invalid, so we've reset it to be blank. Please re-run rails grade and, when asked, copy-paste your token carefully from the assignment page."
-      else
-        full_reponame = upstream_repo(submission_url, token)
+      else 
+        resource_info = upstream_repo(submission_url, token)
+        full_reponame = resource_info.fetch("repo_slug")
+        remote_spec_folder_sha = resource_info.fetch("spec_folder_sha")
+        source_code_url = resource_info.fetch("source_code_url")
         set_upstream_remote(full_reponame)
-        sync_specs_with_source(full_reponame)
+        sync_specs_with_source(full_reponame, remote_spec_folder_sha, source_code_url)
 
         path = File.join(project_root, "/tmp/output/#{Time.now.to_i}.json")
         `bin/rails db:migrate RAILS_ENV=test` if defined?(Rails)
-        `RAILS_ENV=test bundle exec rspec --order default --format JsonOutputFormatter --out #{path}`
+        `RAILS_ENV=test bundle exec rspec --format JsonOutputFormatter --out #{path}`
         rspec_output_json = Oj.load(File.read(path))
-        github_email = `git config user.email`.chomp
-        username = github_username(github_email)
+        username = retrieve_github_username
         reponame = project_root.to_s.split("/").last
         sha = `git rev-parse HEAD`.slice(0..7)
 
@@ -102,12 +107,13 @@ namespace :grade do
 
   desc "Reset access token saved in YAML file."
   task :reset_token do
-    config_dir_name = find_or_create_config_dif
+    config_dir_name = find_or_create_directory(".vscode")
     config_file_name = "#{config_dir_name}/.ltici_apitoken.yml"
     submission_url = "https://grades.firstdraft.com"
 
     student_config = {}
     student_config["submission_url"] = submission_url
+    student_config["github_username"] = retrieve_github_username
     puts "Enter your access token for this project"
     new_personal_access_token = ""
 
@@ -131,34 +137,62 @@ namespace :grade do
 
 end
 
-def sync_specs_with_source(full_reponame)
-  if Octokit.repository?(full_reponame)
-    repo_contents = Octokit.contents(full_reponame)
-    remote_spec_folder = repo_contents.find { |git_object| git_object[:name] == 'spec' }
-    if remote_spec_folder.blank?
-      abort("The project #{full_reponame} does not have specs.")
-    end
-    remote_sha = remote_spec_folder[:sha]
-    # Discard unstaged changes in spec folder
-    `git checkout spec -q`
-    `git clean spec -f -q`
-    local_sha = `git ls-tree HEAD #{project_root.join('spec')}`.chomp.split[2]
-
-    unless remote_sha == local_sha
-      `git fetch upstream -q`
-      # Remove local contents of spec folder
-      `rm -rf spec/*`
-      default_branch = `git remote show upstream | grep 'HEAD branch' | cut -d' ' -f5`.chomp
-      # Overwrite local contents of spec folder with contents from upstream branch
-      `git checkout upstream/#{default_branch} spec/ -q`
-      # Unstage new spec file contents
-      # - if wrong token is used, spec files can be removed properly when unstaged
-      # - spec file changes committed by learner are removed and updated
-      # - we are not committing spec file changes by default to avoid confusing the git history
-      `git restore --staged spec/*`
+def sync_specs_with_source(full_reponame, remote_sha, repo_url)
+  # Unstage staged changes in spec folder
+  `git restore --staged spec/* `
+  # Discard unstaged changes in spec folder
+  `git checkout spec -q`
+  `git clean spec -f -q`
+  local_sha = `git ls-tree HEAD #{project_root.join('spec')}`.chomp.split[2]
+
+  unless remote_sha == local_sha
+    find_or_create_directory("tmp")
+    find_or_create_directory("tmp/backup")
+    files_and_subfolders_inside_specs = Dir.glob("spec/*")
+    # Temporarily move specs
+    FileUtils.mv(files_and_subfolders_inside_specs, "tmp/backup")
+
+    download_file(repo_url, "tmp/spec.zip")
+    extracted_zip_folder = extract_zip("tmp/spec.zip", "tmp")
+    source_directory = extracted_zip_folder.join("spec")
+    overwrite_spec_folder(source_directory)
+
+    FileUtils.rm(project_root.join("tmp/spec.zip"))
+    FileUtils.rm_rf(extracted_zip_folder)
+    FileUtils.rm_rf("tmp/backup")
+    `git add spec/`
+    `git commit spec/ -m "Update spec/ folder to latest version" --author "First Draft <grades@firstdraft.com>"`
+  end
+end
+
+def download_file(url, destination)
+  download = URI.open(url)
+  IO.copy_stream(download, destination)
+end
+
+def extract_zip(folder, destination)
+  extracted_file_path = project_root.join(destination)
+  Zip::File.open(folder) do |zip_file|
+    zip_file.each_with_index do |file, index|
+      # Get name of root folder in zip file
+      if index == 0
+        extracted_file_path = extracted_file_path.join(file.name)
+      end
+      file_path = File.join(destination, file.name)
+      FileUtils.mkdir_p(File.dirname(file_path))
+      file.extract(file_path)
     end
-  else
-    abort("The project #{full_reponame} does not exist.")
+  end
+  extracted_file_path
+end
+
+def overwrite_spec_folder(source_directory)
+  destination_directory = "spec"
+  # Get all files in the source directory
+  files = Dir.glob("#{source_directory}/*")
+  # Move each file to the destination directory
+  files.each do |file|
+    FileUtils.mv(file, destination_directory)
   end
 end
 
@@ -175,10 +209,10 @@ def update_config_file(config_file_name, config)
   File.write(config_file_name, YAML.dump(config))
 end
 
-def find_or_create_config_dif
-  config_dir_name = File.join(project_root, ".vscode")
-  Dir.mkdir(config_dir_name) unless Dir.exist?(config_dir_name)
-  config_dir_name
+def find_or_create_directory(directory_name)
+  directory = File.join(project_root, directory_name)
+  Dir.mkdir(directory) unless Dir.exist?(directory)
+  directory
 end
 
 def is_valid_token?(root_url, token)
@@ -203,20 +237,29 @@ def upstream_repo(root_url, token)
   res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
     http.request(req)
   end
-  result = Oj.load(res.body)
-  result["repo_slug"]
+  Oj.load(res.body)
 rescue => e
   return false
 end
 
-def github_username(primary_email)
-  return "" if primary_email.blank?
-  username = `git config user.name`.chomp
-  search_results = Octokit.search_users("#{primary_email} in:email").fetch(:items)
-  if search_results.present?
-    username = search_results.first.fetch(:login, username)
+def retrieve_github_username
+  config_dir_name = find_or_create_directory(".vscode")
+  config_file_name = "#{config_dir_name}/.ltici_apitoken.yml"
+  if File.exist?(config_file_name)
+    config = YAML.load_file(config_file_name)
+    if config["github_username"].present?
+      return config["github_username"]
+    end
+  else
+    github_email = `git config user.email`.chomp
+    return "" if github_email.blank?
+    username = `git config user.name`.chomp
+    search_results = Octokit.search_users("#{github_email} in:email").fetch(:items)
+    if search_results.present?
+      username = search_results.first.fetch(:login, username)
+    end
+    return username
   end
-  username
 end
 
 def project_root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grade_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Raghu Betina
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday-retry
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: A Ruby client for [firstdraft Grades](https://grades.firstdraft.com)