grade_runner 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8287f06bead27eb7200e42fd3e95c5b59a3d6b20a2ec243ec0208a3833fa5b2
-  data.tar.gz: c37414bdcf6726a2c0cc4303d8a03de1b6d96f5d9fb6c8cc114f5d5dd1ddd8b6
+  metadata.gz: c031fd9ea407f2ec344b80fd85ddbbce5a298e27e136694c68ae0e3f63ced2c5
+  data.tar.gz: 3e144eee25f1ddc7d09bf65f190a58933369a4904eec18d3ea8c3056d4ff8601
 SHA512:
-  metadata.gz: 2249bf710cf8ee1dd932784084dd95f9468a0b5bc878a8bc097424c4ecfdfbda7857212941b7ffc4644b3abd889890bec073f3a73ed7e952a91f43043e417108
-  data.tar.gz: 6ab0d79a82276c71709f6903207d12cddf3130eedc96ea5816efbeeefda54f21a9c7440333a3c5494d84e66da00cde91b30d407e6c74615c007c17141c48e881
+  metadata.gz: 7b1063120735c91a8c128b63c4fdc0e6505575fd1130e32dc38b6b98e711f0168fbcbf94c840036e05b6db458219f73a748120181f0b247501815400c1bbe186
+  data.tar.gz: 384e3fe3cd6bee52cf009b5d7bac62d01dfeebb53b7f17f89aea33efeb089f8acd988472fbb5f2b34796e0c6b47c033ee50940055dfb68557991975917ff23fa

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

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.7 ruby lib
+# stub: grade_runner 0.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "grade_runner".freeze
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   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 = "2023-04-19"
+  s.date = "2023-05-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 = [

data/lib/tasks/grade.rake

@@ -14,8 +14,6 @@ namespace :grade do
     input_token = ARGV[1]
     file_token = nil
 
-    sync_specs_with_source
-
     config_dir_name = find_or_create_config_dif
     config_file_name = "#{config_dir_name}/.ltici_apitoken.yml"
     student_config = {}
@@ -70,6 +68,10 @@ namespace :grade do
         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)
+        set_upstream_remote(full_reponame)
+        sync_specs_with_source(full_reponame)
+
         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}`
@@ -129,10 +131,7 @@ namespace :grade do
 
 end
 
-def sync_specs_with_source
-  reponame = `basename -s .git \`git config --get remote.origin.url\``.chomp
-  full_reponame = "appdev-projects/#{reponame}"
-
+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' }
@@ -146,7 +145,7 @@ def sync_specs_with_source
     local_sha = `git ls-tree HEAD #{project_root.join('spec')}`.chomp.split[2]
 
     unless remote_sha == local_sha
-      `git fetch upstream`
+      `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
@@ -158,6 +157,15 @@ def sync_specs_with_source
   end
 end
 
+def set_upstream_remote(repo_slug)
+  upstream = `git remote -v | grep -w upstream`.chomp
+  if upstream.blank?
+    `git remote add upstream https://github.com/#{repo_slug}`
+  else
+    `git remote set-url upstream https://github.com/#{repo_slug}`
+  end
+end
+
 def update_config_file(config_file_name, config)
   File.write(config_file_name, YAML.dump(config))
 end
@@ -182,6 +190,20 @@ rescue => e
   return false
 end
 
+def upstream_repo(root_url, token)
+  return false unless token.is_a?(String) && token =~ /^[1-9A-Za-z][^OIl]{23}$/
+  url = "#{root_url}/submissions/resource?token=#{token}"
+  uri = URI.parse(url)
+  req = Net::HTTP::Get.new(uri, 'Content-Type' => 'application/json')
+  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"]
+rescue => e
+  return false
+end
+
 def github_username(primary_email)
   username = `git config user.name`.chomp
   search_results = Octokit.search_users("#{primary_email} in:email").fetch(:items)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grade_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Raghu Betina
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport