commit-live-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cbd2ff0437f481596381b8f1efa9df84394297a
-  data.tar.gz: d2c618d94b7e0aa18e3d24f5c9b33b364bbbd1aa
+  metadata.gz: 062a20f271b98d140dba254c60bfcd31661469a5
+  data.tar.gz: 975affbb4b2779f4cf405e3f182947ce5325e91a
 SHA512:
-  metadata.gz: addb83172bcf9a6f712672a6f4246e28b3ee2e7e5a7ce467ecc9a7114662a8880a6482fddf1ae294fb836fd5af43b7a1c4f3be10fbf13b2f0f22a28fd3667f84
-  data.tar.gz: ae51babe59560362c9015ddf7c689c45eddcab55d307912941dd00734361b192e5287e5e1e034f9963a88e781a90cfcd18dd60f028383418a149549909faa1dd
+  metadata.gz: e43c648b09acfd98057d1e2bd17f296757148b2eb4fb88f0b883d118e2c944b6dcc4a8f660ab7e09fdae376dec8a41402a1f8af80d16083e1993826d586ac6a6
+  data.tar.gz: 155c6817abb6418707ef2862cf3cba0ef6730675f2329a236392b0e651d771df5759f48770c38c244b0bd5281076f2a734a79986b2d93c074b0d0ec05dbd1c58

data/lib/commit-live/lesson/git-helper.rb

@@ -7,9 +7,10 @@ require "commit-live/sentry"
 module CommitLive
 	class Submit
 		class GitHelper
-			attr_reader   :git, :currentLesson, :netrc, :status, :lessonName, :sentry, :track_slug
+			attr_reader   :git, :currentLesson, :netrc, :status, :lessonName, :sentry, :track_slug, :rootDir
 			attr_accessor :remote_name
 
+			HOME_DIR = File.expand_path("~")
 			REPO_BELONGS_TO_US = [
 				'commit-live-students'
 			]
@@ -22,6 +23,9 @@ module CommitLive
 				@status = CommitLive::Status.new
 				@lessonName = repo_name(remote: 'origin')
 				@sentry = CommitLive::Sentry.new()
+				if File.exists?("#{HOME_DIR}/.ga-config")
+					@rootDir = YAML.load(File.read("#{HOME_DIR}/.ga-config"))[:workspace]
+				end
 			end
 
 			def commitAndPush
@@ -51,11 +55,26 @@ module CommitLive
 
 			private
 
+			def dir_path
+				filePath = "#{title_slug}/"
+				filePath += "#{test_slug}/" if is_project_assignment
+				return filePath
+			end
+
 			def is_test_case_passed
 				isTestCasesPassed = currentLesson.getValue('testCasesPassed')
 				!isTestCasesPassed.nil? && isTestCasesPassed == 1
 			end
 
+			def test_slug
+				currentLesson.getValue('testCase')
+			end
+
+			def is_project_assignment
+				isProjectAssignment = currentLesson.getValue('isProjectAssignment')
+				!isProjectAssignment.nil? && isProjectAssignment == 1
+			end
+
 			def is_submitted_pr
 				isSubmittedPr = currentLesson.getValue('submittedPr')
 				!isSubmittedPr.nil? && isSubmittedPr == 1
@@ -204,7 +223,8 @@ module CommitLive
 			end
 
 			def update_lesson_status
-				status.update('submittedPr', track_slug)
+				file_path = "#{rootDir}/#{dir_path}/build.py"
+				status.update('submittedPr', track_slug, true, {}, file_path)
 			end
 		end
 	end

data/lib/commit-live/lesson/status.rb

@@ -2,6 +2,7 @@ require "commit-live/api"
 require "commit-live/netrc-interactor"
 require "commit-live/sentry"
 require "uri"
+require "oj"
 
 module CommitLive
 	class Status
@@ -18,7 +19,7 @@ module CommitLive
 			netrc.password
 		end
 
-		def update(type, trackName)
+		def update(type, trackName, shouldAnalyze = false, dump_data = {}, file_path = "")
 			enc_url = URI.escape("/v2/user/track/#{trackName}")
 			begin
 				Timeout::timeout(60) do
@@ -29,7 +30,10 @@ module CommitLive
 							'Content-Type' => 'application/json'
 						},
 						body: {
-							'action' => type
+							'action' => type,
+							'analysis' => shouldAnalyze ? 1 : 0,
+							'data' => Oj.dump(dump_data, mode: :compat),
+							'filePath' => file_path
 						}
 					)
 					if response.status != 201

data/lib/commit-live/tests/runner.rb

@@ -71,21 +71,19 @@ module CommitLive
 			if strategy.results
 				strategy.print_results
 			end
-			if updateStatus
+			file_path = "#{rootDir}/#{dir_path}/build.py"
+			if updateStatus && strategy.results
 				if results
 					# test case passed
 					puts 'Great! You have passed all the test cases.'
 					puts 'Use `clive submit` to push your changes.'
-					CommitLive::Status.new().update('testCasesPassed', track_slug)
+					CommitLive::Status.new().update('testCasesPassed', track_slug, true, strategy.results, file_path)
 				else
 					# test case failed
 					puts 'Oops! You still have to pass all the test cases.'
-					CommitLive::Status.new().update('testCasesFailed', track_slug)
+					CommitLive::Status.new().update('testCasesFailed', track_slug, true, strategy.results, file_path)
 				end
 			end
-			if strategy.results
-				dump_results
-			end
 			strategy.cleanup
 			return results
 		end
@@ -98,6 +96,12 @@ module CommitLive
 			system("git checkout HEAD -- #{test_case_dir_path}")
 		end
 
+		def dir_path
+			filePath = "#{title_slug}/"
+			filePath += "#{test_slug}/" if is_project_assignment
+			return filePath
+		end
+
 		def test_case_dir_path
 			filePath = ""
 			filePath += "#{test_slug}/" if is_project_assignment
@@ -154,43 +158,6 @@ module CommitLive
 			end
 		end
 
-		def dump_results
-			begin
-				Timeout::timeout(15) do
-					api = CommitLive::API.new
-					netrc = CommitLive::NetrcInteractor.new()
-					netrc.read
-					token = netrc.password
-					url = URI.escape("/v2/dumps")
-					response = api.post(
-						url,
-						headers: {
-							'Authorization' => "#{token}",
-							'Content-Type' => 'application/json',
-						},
-						body: {
-							'data' => Oj.dump(strategy.results, mode: :compat),
-							'titleSlugTestCase' => track_slug
-						}
-					)
-					if response.status != 200
-						sentry.log_message("Test Results Dump Failed",
-							{
-								'url' => url,
-								'track-slug' => track_slug,
-								'results' => strategy.results,
-								'response-body' => response.body,
-								'response-status' => response.status
-							}
-						)
-					end
-				end
-			rescue Timeout::Error
-				puts "Error while dumping test results."
-				exit
-			end
-		end
-
 		def strategies
 			[
 				CommitLive::Strategies::PythonUnittest

data/lib/commit-live/version.rb

@@ -1,5 +1,5 @@
 module CommitLive
 	module Cli
-		VERSION = "0.1.6"
+		VERSION = "0.1.7"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit-live-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - greyatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler