grade_runner 0.0.3 → 0.0.4.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bca6a9499dd2c470ddca0987086391fec5f6b279949dfbbd8467375ddbe83024
-  data.tar.gz: f22699e5ba8d8245b4668d8d9e618b0502da9e7f06b87d852b22c17659ceb8b3
+  metadata.gz: a0d5594572bec1135a4b450337a2e19bb4ebac70391fb5a07f44b144a391598c
+  data.tar.gz: 6cce5686313ee19768a9a4d47b629570b34d24a3c1e6387ec4a3de1b628045db
 SHA512:
-  metadata.gz: deeb0a73556460275d08bb98418e3d9d466515aa4f617cad9e70d4eddd8d497cf8f6f4400f8443e50c019bb399f3650ec7340404891096513410344b76a635ce
-  data.tar.gz: c5ffbb984fb6202b03e7122a5d48fbc1cc22a3d3ab7e794ef352f9f40ec5b560c1ebb78c8412c61bf85eef3200e7055506425dafc91888983afc9f5f37e74e75
+  metadata.gz: 63137c0908311fa1e8be305dc58c22a78052f9e0eed81559707ff54d77ab6e33273fe11fab42fbcc678e38f43fab2b5307de8a640600a1c9bcf4da943f954fa5
+  data.tar.gz: b84198012f42fc3beb0c997b6d0713a9a42e32229c3a58e188975d261922f825320366ae86e78f7d91fe68e1d3254e3c9bf4e5a6686f69b19bda39bcac767598

data/Gemfile.lock

@@ -12,7 +12,7 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     git (1.5.0)
@@ -36,12 +36,12 @@ GEM
       rake
       rdoc
       semver
-    jwt (2.1.0)
+    jwt (2.2.1)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     oauth2 (1.4.1)
@@ -68,7 +68,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     rack (2.0.7)
     rake (12.3.2)
     rdoc (3.12.2)

data/Rakefile

@@ -40,7 +40,7 @@ task :default => :spec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.file?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "grade_runner #{version}"

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4.pre.1

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.3 ruby lib
+# stub: grade_runner 0.0.3.pre.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "grade_runner".freeze
-  s.version = "0.0.3"
+  s.version = "0.0.3.pre.3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Raghu Betina".freeze]
-  s.date = "2019-06-19"
+  s.date = "2019-06-26"
   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
   s.extra_rdoc_files = [

data/lib/grade_runner/railtie.rb

@@ -1,11 +1,11 @@
-require 'rails'
+# require 'rails'
 
 module GradeRunner
-  class Railtie < ::Rails::Railtie
+  # class Railtie < ::Rails::Railtie
 
-     rake_tasks do
-      load "tasks/grade_runner.rake"
-      load "tasks/grade.rake"
-     end
-  end
+  #    rake_tasks do
+  #     load "tasks/grade_runner.rake"
+  #     load "tasks/grade.rake"
+  #    end
+  # end
 end

data/lib/tasks/grade.rake

@@ -1,23 +1,28 @@
+require 'yaml'
+require 'net/http'
+require "json"
+require_relative "../grade_runner/runner"
+
 desc "Alias for \"grade:next\"."
 task grade: "grade:all" do
 end
 
 namespace :grade do
   desc "Run all tests and submit a build report."
-  task all: :environment do
+  task :all do
     ARGV.each { |a| task a.to_sym do ; end }
     input_token = ARGV[1]
     file_token = nil
 
-    config_file_name = Rails.root.join("grades.yml")
+    config_file_name = File.join(project_root, "grades.yml")
     student_config = {}
     student_config["submission_url"] = "https://grades.firstdraft.com"
 
-    if File.exist?(config_file_name)
+    if File.file?(config_file_name)
       begin
         config = YAML.load_file(config_file_name)
       rescue
-        abort "It looks like there's something wrong with your token in `/grades.yml`. Please delete that file and try `rails grade:all` again, and be sure to provide the access token for THIS project.".red
+        abort "It looks like there's something wrong with your token in `/grades.yml`. Please delete that file and try `rake grade:all` again, and be sure to provide the access token for THIS project.".red
       end
       submission_url = config["submission_url"]
       file_token = config["personal_access_token"]
@@ -26,11 +31,13 @@ namespace :grade do
       submission_url = "https://grades.firstdraft.com"
     end
 
-    if input_token.present?
+    if input_token != false && input_token != "" && input_token !=  " " && !input_token.nil? && input_token != [] && input_token != {}
+
       token = input_token
       student_config["personal_access_token"] = input_token
       update_config_file(config_file_name, student_config)
-    elsif input_token.nil? && file_token.present?
+    elsif input_token.nil? && file_token != false && file_token != "" && file_token !=  " " && !file_token.nil? &&  file_token != [] &&  file_token != {}
+
       token = file_token
     elsif input_token.nil? && file_token.nil?
       puts "Enter your access token for this project"
@@ -53,15 +60,19 @@ namespace :grade do
       end
     end
     
-    if token.present? 
+    if token != false && token != "" && token !=  " " && !token.nil? && token != [] && token != {}
       if is_valid_token?(submission_url, token) == false
         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."
+        puts "Your access token looked invalid, so we've reset it to be blank. Please re-run rake grade and, when asked, copy-paste your token carefully from the assignment page."
       else
-        path = Rails.root.join("/tmp/output/#{Time.now.to_i}.json")
-        `bin/rails db:migrate RAILS_ENV=test`
-        `RAILS_ENV=test bundle exec rspec --order default --format JsonOutputFormatter --out #{path}`
+        path = File.join(project_root, "/tmp/output/#{Time.now.to_i}.json")
+        # `bin/rails db:migrate RAILS_ENV=test`
+        if Dir.exist?("bin")
+          `bin/rake db:migrate`
+        end
+        # `RAILS_ENV=test bundle exec rspec --order default --format JsonOutputFormatter --out #{path}`
+        `bundle exec rspec -I spec/support -f JsonOutputFormatter --out #{path}`
         rspec_output_json = JSON.parse(File.read(path))
         username = ""
         reponame = ""
@@ -70,19 +81,21 @@ namespace :grade do
         GradeRunner::Runner.new(submission_url, token, rspec_output_json, username, reponame, sha, "manual").process
       end
     else
-      puts "We couldn't find your access token, so we couldn't record your grade. Please click on the assignment link again and run the rails grade ...  command shown there."
+      puts "We couldn't find your access token, so we couldn't record your grade. Please click on the assignment link again and run the rake grade ...  command shown there."
     end
   end
 
   desc "Run only the next failing test."
-  task next: :environment do
-    path = Rails.root.join("examples.txt")
-    if File.exist?(path)
-      `bin/rails db:migrate RAILS_ENV=test`
-      puts `RAILS_ENV=test bundle exec rspec --next-failure --format HintFormatter`
+  task :next do
+    path = File.join(__dir__, "examples.txt")
+    if File.file?(path)
+      # `bin/rails db:migrate RAILS_ENV=test`
+      # puts `RAILS_ENV=test bundle exec rspec --next-failure --format HintFormatter`
+      puts `bundle exec rspec --next-failure --format HintFormatter`
     else
-      puts `RAILS_ENV=test bundle exec rspec`
-      puts "Please rerun rails grade:next to run the first failing spec"
+      # puts `RAILS_ENV=test bundle exec rspec`
+      puts `bundle exec rspec`
+      puts "Please rerun rake grade:next to run the first failing spec"
     end
   end
 
@@ -93,15 +106,31 @@ def update_config_file(config_file_name, config)
 end
 
 def is_valid_token?(root_url, token)
-  return false unless token.is_a?(String) && token =~ /^[1-9A-Za-z][^OIl]{23}$/
+  return false unless token.is_a?(String) && !(token =~ /^[1-9A-Za-z][^OIl]{23}$/).nil?
+
   url = "#{root_url}/submissions/validate_token?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 = JSON.parse(res.body)
   result["success"]
 rescue => e
   return false
 end
+
+def project_root
+  if defined?(Rails)
+    return Rails.root
+  end
+
+  if defined?(Bundler)
+    return Bundler.root
+  end
+
+  Dir.pwd
+end

data/lib/tasks/grade_runner.rake

@@ -1,14 +1,16 @@
+require 'yaml'
+
 namespace :grade_runner do
   desc "Grade project"
-  task runner: :environment do
+  task :runner do
     default_submission_url = "https://grades.firstdraft.com"
     config = {}
-    path = Rails.root.join("grades.yml")
-    if File.exist?(path)
+    path = File.join(__dir__,"grades.yml")
+    if File.file?(path)
       begin
         config = YAML.load_file(path)
       rescue
-        abort "It looks like there's something wrong with your token in `/grades.yml`. Please delete that file and try `rails grade:all` again, and be sure to provide the access token for THIS project.".red
+        abort "It looks like there's something wrong with your token in `/grades.yml`. Please delete that file and try `rake grade:all` again, and be sure to provide the access token for THIS project.".red
       end
     end
     rspec_output_json = JSON.parse(File.read("#{ENV['CIRCLE_ARTIFACTS']}/output/rspec_output.json"))
@@ -16,10 +18,15 @@ namespace :grade_runner do
     reponame = ENV["CIRCLE_PROJECT_REPONAME"]
     sha = ENV["CIRCLE_SHA1"]
     token = ENV['GRADES_PERSONAL_ACCESS_TOKEN']
-    if token.present?
+    if token != false &&
+      token != "" &&
+      token !=  " " && 
+      !token.nil? && 
+      token != [] && 
+      token != {}
       GradeRunner::Runner.new('', config['submission_url'] || default_submission_url, token, rspec_output_json, username, reponame, sha, 'circle_ci').process
     else
-      puts "We couldn't find your access token, so we couldn't record your grade. Please click on the assignment link again and run the rails grade ...  command shown there."
+      puts "We couldn't find your access token, so we couldn't record your grade. Please click on the assignment link again and run the rake grade ...  command shown there."
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grade_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.pre.1
 platform: ruby
 authors:
 - Raghu Betina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -202,9 +202,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.8