commit-live-cli 0.0.23 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d45ad410bfe948285bf25b5652e497b54043593
-  data.tar.gz: '00318d6b80ee020a995562d10b209f02b74b6679'
+  metadata.gz: b709e76c453c1368baffb3c69ee21b4271b7beaa
+  data.tar.gz: cbb74a0bdcd090e0fbe4b8b88d0f7b30c95bce03
 SHA512:
-  metadata.gz: 0d05711060ff9dac8b57c7eeeecf821a16d1058f0b736f39d1d23a1376706a3812e1a9ffcd00145ecc1628b5de47b1df4069b70cf16befab9180fcc8e2e0ae41
-  data.tar.gz: 4ed5f0d36065629528141bb97e3d8e9a4907f61112d798be9520a9c430ba94b0c871f40716730f5d73b979d55360e37bc73592f31da99c7cab6a5c5f8085a2fd
+  metadata.gz: 8327dbdb9b8b634018aef8903d3a429d5fab4069e39990e735d7d59b42af72f4bd983c079d2a60c2b7aaf42fc3f4d7e823a13aae0cbfdd63dec9065fe664608f
+  data.tar.gz: eb5f274543d192232d48f9d3b83dc1516a3045515f59cf5107e77899645efdc6d2e1f9a80d790e3e29b82bef001cc2fefe8cdfa583a6f32e3a870788f2d131c3

data/lib/commit-live/cli.rb

@@ -13,12 +13,18 @@ module CommitLive
 			puts "Hello World!"
 		end
 
-		desc "setup", "This will ask for token"
+		desc "setup", "This will ask for your User-ID & Access Token"
 		def setup(retries: 5)
 			# Check if token already present
 			login, password = CommitLive::NetrcInteractor.new().read
 			if login.nil? || password.nil?
-				print 'Enter your github token here and press [ENTER]: '
+				print 'Enter User-ID here and press [ENTER]: '
+				login = STDIN.gets.chomp
+				if login.empty?
+					puts "No User-ID provided."
+					exit
+				end
+				print 'Enter Access token here and press [ENTER]: '
 				password = STDIN.gets.chomp
 				if password.empty?
 					puts "No token provided."
@@ -27,7 +33,7 @@ module CommitLive
 			end
 			# Check if token is valid
 			user = CommitLive::User.new()
-			user.validate(password)
+			user.validate(login, password)
 			user.setDefaultWorkspace
 		end
 
@@ -36,21 +42,19 @@ module CommitLive
 			CommitLive::User.new().confirmAndReset
 		end
 
-		desc "open", "This will fork new work"
-		def open(*puzzle_name)
-			# Fork and Clone User's current lesson
-			lab_name = CommitLive::Puzzle::Parser.new(puzzle_name.join(' ')).parse!
-			CommitLive::Open.new().openALesson(lab_name)
+		desc "open <track-slug>", "This will fork given assignment. (for eg. clive open <track-slug>)"
+		def open(track_slug)
+			CommitLive::Open.new().openALesson(track_slug)
 		end
 
-		desc "submit", "This will submit your work"
-		def submit()
-			CommitLive::Submit.new().run
+		desc "submitn <track-slug>", "This will submit your work"
+		def submit(track_slug)
+			CommitLive::Submit.new().run(track_slug)
 		end
 
-		desc "test", "This will test you"
-		def test()
-			CommitLive::Test.new().run
+		desc "test <track-slug>", "This will test your assignment. (for eg. clive test <track-slug>)"
+		def test(track_slug)
+			CommitLive::Test.new(track_slug).run
 		end
 
 		desc 'version, -v, --version', 'Display the current version of the CommitLive gem'

data/lib/commit-live/endpoint.rb

@@ -1,7 +1,7 @@
 module CommitLive
 	class Endpoint
 		END_POINTS = {
-			"PROD" => 'https://api.commit.live', 
+			"PROD" => 'https://api2.commit.live',
 			"DEV" => 'http://api.greyatom.com', 
 			"LOCAL" => 'http://api.greyatom.com'
 		}

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

@@ -13,11 +13,7 @@ module CommitLive
 		end
 
 		def getCurrentLesson(puzzle_name)
-			url = '/v1/current_track'
-			if !puzzle_name.empty?
-				url = "/v1/user/track/#{puzzle_name}"
-			end
-			getLesson(url)
+			getLesson(puzzle_name)
 		end
 
 		def token
@@ -25,12 +21,12 @@ module CommitLive
 			netrc.password
 		end
 
-		def getLesson(url)
+		def getLesson(track_slug)
 			begin
 				Timeout::timeout(15) do
 					response = CommitLive::API.new().get(
-						url,
-						headers: { 'access-token' => "#{token}" }
+						"/v2/user/track/#{track_slug}",
+						headers: { 'Authorization' => "#{token}" }
 					)
 					if response.status == 200
 						@lesson = JSON.parse(response.body)
@@ -40,7 +36,7 @@ module CommitLive
 					else
 						sentry.log_message("Get Lesson Failed",
 							{
-								'url' => url,
+								'url' => "/v2/user/track/#{track_slug}",
 								'response-body' => response.body,
 								'response-status' => response.status
 							}
@@ -62,11 +58,7 @@ module CommitLive
 
 		def getValue(key)
 			lessonData = getAttr('data')
-			if !lessonData['current_track'].nil?
-				lessonData['current_track'][key]
-			else
-				lessonData[key]
-			end
+			lessonData[key]
 		end
 		
 	end

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

@@ -7,14 +7,15 @@ require "commit-live/sentry"
 module CommitLive
 	class Submit
 		class GitHelper
-			attr_reader   :git, :currentLesson, :netrc, :status, :lessonName, :sentry
+			attr_reader   :git, :currentLesson, :netrc, :status, :lessonName, :sentry, :track_slug
 			attr_accessor :remote_name
 
 			REPO_BELONGS_TO_US = [
 				'commit-live-students'
 			]
 
-			def initialize()
+			def initialize(trackSlug)
+				@track_slug = trackSlug
 				@git = setGit
 				@netrc = CommitLive::NetrcInteractor.new()
 				@currentLesson = CommitLive::Current.new
@@ -25,19 +26,15 @@ module CommitLive
 
 			def commitAndPush
 				checkRemote
-
 				check_if_practice_lesson
-
-				testCasePassed = currentLesson.getValue('test_case_pass')
 				# Check if User passed test cases
-				if testCasePassed
+				if is_test_case_passed
 					# Push to User's Github
 					addChanges
 					commitChanges
 					push
 
-					pullRequestSubmitted = currentLesson.getValue('submitted_pull_request')
-					if !pullRequestSubmitted
+					if !is_submitted_pr
 						# Create Pull Request
 						createPullRequest
 						update_lesson_status
@@ -53,11 +50,35 @@ module CommitLive
 
 			private
 
-			def check_if_practice_lesson
-				currentLesson.getCurrentLesson(lessonName)
+			def is_test_case_passed
+				isTestCasesPassed = currentLesson.getValue('testCasesPassed')
+				!isTestCasesPassed.nil? && isTestCasesPassed == 1
+			end
+
+			def is_submitted_pr
+				isSubmittedPr = currentLesson.getValue('submittedPr')
+				!isSubmittedPr.nil? && isSubmittedPr == 1
+			end
+
+			def is_project
+				isProject = currentLesson.getValue('isProject')
+				!isProject.nil? && isProject == 1
+			end
+
+			def is_practice
 				lessonType = currentLesson.getValue('type')
-				if lessonType == "PRACTICE"
-					puts "This is a practice lesson. No need to submit anything."
+				!lessonType.nil? && lessonType == "PRACTICE"
+			end
+
+			def repo_url
+				currentLesson.getValue('repoUrl')
+			end
+
+			def check_if_practice_lesson
+				currentLesson.getCurrentLesson(track_slug)
+				if is_project || is_practice
+					puts 'This is a Project. Go to individual assignments and follow intructions given on how to submit them.' if is_project
+					puts 'This is a Practice Lesson. No need to submit your code.' if is_practice
 					exit 1
 				end
 			end
@@ -159,12 +180,11 @@ module CommitLive
 				username = netrc.login
 				begin
 					Timeout::timeout(45) do
-						parentRepo = currentLesson.getValue('repo_url')
 						pullRequest = userGithub.client.create_pull_request(
-							parentRepo,
+							repo_url,
 							'master',
 							"#{username}:master",
-							"PR by #{username}"
+							"#{track_slug} - PR by #{username}"
 						)
 					end
 				rescue Octokit::Error => err
@@ -188,7 +208,7 @@ module CommitLive
 			end
 
 			def update_lesson_status
-				status.update('submitted_pull_request', lessonName)
+				status.update('submittedPr', track_slug)
 			end
 		end
 	end

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

@@ -12,7 +12,7 @@ module CommitLive
 		attr_reader :rootDir, :lesson, :forkedRepo, :lesson_status, :sentry
 
 		HOME_DIR = File.expand_path("~")
-		ALLOWED_TYPES = ["LAB", "PRACTICE"]
+		ALLOWED_TYPES = ["CODE", "PRACTICE"]
 
 		def initialize()
 			if File.exists?("#{HOME_DIR}/.ga-config")
@@ -32,19 +32,34 @@ module CommitLive
 		end
 
 		def lesson_name
-			lesson.getValue('track_slug')
+			lesson.getValue('titleSlug')
+		end
+
+		def track_slug
+			lesson.getValue('titleSlugTestCase')
 		end
 
 		def lesson_type
 			lesson.getValue('type')
 		end
 
+		def is_project_assignment
+			isProjectAssignment = lesson.getValue('isProjectAssignment')
+			!isProjectAssignment.nil? && isProjectAssignment == 1
+		end
+
 		def lesson_forked
-			lesson.getValue('forked')
+			forked = lesson.getValue('forked')
+			!forked.nil? && forked == 1
+		end
+
+		def is_project
+			isProject = lesson.getValue('isProject')
+			!isProject.nil? && isProject == 1
 		end
 
 		def lesson_repo
-			lesson.getValue('repo_url')
+			lesson.getValue('repoUrl')
 		end
 
 		def openALesson(puzzle_name)
@@ -59,7 +74,7 @@ module CommitLive
 
 			if !File.exists?("#{rootDir}/#{lesson_name}")
 				# fork lesson repo via github api
-				if lesson_type == "LAB"
+				if lesson_type == "CODE"
 					forkCurrentLesson
 				end
 				# clone forked lesson into machine
@@ -67,10 +82,10 @@ module CommitLive
 				# change group owner
 				change_grp_owner
 				# lesson forked API change
-				if lesson_type == "LAB" && !lesson_forked
-					lesson_status.update('forked', lesson_name)
+				if !is_project && lesson_type == "CODE" && !lesson_forked
+					lesson_status.update('forked', track_slug)
 				end
-				if lesson_type == "PRACTICE"
+				if lesson_type == "PRACTICE" || is_project
 					open_lesson
 				end
 			else
@@ -148,7 +163,12 @@ module CommitLive
 					url = URI.escape("/send/#{username}")
 					message = {
 						'type': 'open-lesson',
-						'title': lesson_name
+						'title': is_project_assignment ? track_slug : lesson_name,
+						'message': {
+							'fileName': 'readme.md',
+							'type': 'forked',
+							'value': true
+						}
 					}
 					response = api.post(
 						url,

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

@@ -19,18 +19,20 @@ module CommitLive
 		end
 
 		def update(type, trackName)
-			enc_url = URI.escape("/v1/user/track/#{trackName}")
+			enc_url = URI.escape("/v2/user/track/#{trackName}")
 			begin
 				Timeout::timeout(60) do
 					response = api.post(
 						enc_url,
-						headers: { 'access-token' => "#{token}" },
-						params: { 
-							'method' => 'assignment_status',
+						headers: {
+							'Authorization' => "#{token}",
+							'Content-Type' => 'application/json'
+						},
+						body: {
 							'action' => type
 						}
 					)
-					if response.status != 202
+					if response.status != 201
 						sentry.log_message("Update Lesson Status Failed",
 							{
 								'url' => enc_url,

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

@@ -3,10 +3,10 @@ require "octokit"
 
 module CommitLive
 	class Submit
-		def run
-		  	CommitLive::Submit::GitHelper.new().commitAndPush
-		  	# Just to give GitHub a second to register the repo changes
-		  	sleep(1)
+		def run(track_slug)
+			CommitLive::Submit::GitHelper.new(track_slug).commitAndPush
+			# Just to give GitHub a second to register the repo changes
+			sleep(1)
 		end
 	end
 end

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

@@ -9,17 +9,22 @@ require "commit-live/tests/strategies/python-test"
 
 module CommitLive
 	class Test
-		attr_reader :git, :sentry
+		attr_reader :git, :sentry, :track_slug, :lesson, :rootDir
 
+		HOME_DIR = File.expand_path("~")
 		REPO_BELONGS_TO_US = [
 			'commit-live-students'
 		]
 
-		def initialize()
+		def initialize(trackSlug)
+			@track_slug = trackSlug
 			check_lesson_dir
 			check_if_practice_lesson
 			die if !strategy
 			@sentry = CommitLive::Sentry.new()
+			if File.exists?("#{HOME_DIR}/.ga-config")
+				@rootDir = YAML.load(File.read("#{HOME_DIR}/.ga-config"))[:workspace]
+			end
 		end
 
 		def set_git
@@ -60,21 +65,24 @@ module CommitLive
 			puts 'Testing lesson...'
 			strategy.check_dependencies
 			strategy.configure
-			results = strategy.run
+			results = strategy.run(test_case_dir_path)
+			if strategy.results
+				strategy.print_results
+			end
 			if updateStatus
 				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('test_case_pass', lesson_name)
+					CommitLive::Status.new().update('testCasesPassed', track_slug)
 				else
 					# test case failed
 					puts 'Oops! You still have to pass all the test cases.'
-					CommitLive::Status.new().update('test_case_fail', lesson_name)
+					CommitLive::Status.new().update('testCasesFailed', track_slug)
 				end
 			end
 			if strategy.results
-				dump_results
+				# dump_results
 			end
 			strategy.cleanup
 			return results
@@ -85,17 +93,43 @@ module CommitLive
 		end
 
 		def clear_changes_in_tests
-			system("git checkout HEAD -- tests/")
+			system("git checkout HEAD -- #{test_case_dir_path}")
+		end
+
+		def test_case_dir_path
+			filePath = ""
+			filePath += "#{test_slug}/" if is_project_assignment
+			filePath += "tests/"
+			return filePath
+		end
+
+		def test_slug
+			lesson.getValue('testCase')
+		end
+
+		def is_project_assignment
+			isProjectAssignment = lesson.getValue('isProjectAssignment')
+			!isProjectAssignment.nil? && isProjectAssignment == 1
+		end
+
+		def is_project
+			isProject = lesson.getValue('isProject')
+			!isProject.nil? && isProject == 1
+		end
+
+		def is_practice
+			lessonType = lesson.getValue('type')
+			!lessonType.nil? && lessonType == "PRACTICE"
 		end
 
 		private
 
 		def check_if_practice_lesson
-			lesson = CommitLive::Current.new
-			lesson.getCurrentLesson(lesson_name)
-			lessonType = lesson.getValue('type')
-			if lessonType == "PRACTICE"
-				puts "This is a practice lesson. No need to run test on it."
+			@lesson = CommitLive::Current.new
+			lesson.getCurrentLesson(track_slug)
+			if is_project || is_practice
+				puts 'This is a Project. Go to individual assignments and follow intructions given on how to pass test cases for them.' if is_project
+				puts 'This is a Practice Lesson. No need to run tests on it.' if is_practice
 				exit 1
 			end
 		end
@@ -107,23 +141,23 @@ module CommitLive
 					netrc = CommitLive::NetrcInteractor.new()
 					netrc.read
 					token = netrc.password
-					url = URI.escape("/v1/dumps")
+					url = URI.escape("/v2/dumps")
 					response = api.post(
 						url,
 						headers: {
-							'access-token' => "#{token}",
-							'content-type' => 'application/json',
+							'Authorization' => "#{token}",
+							'Content-Type' => 'application/json',
 						},
 						body: {
 							'data' => Oj.dump(strategy.results, mode: :compat),
-							'track_slug' => lesson_name
+							'titleSlugTestCase' => track_slug
 						}
 					)
 					if response.status != 201
 						sentry.log_message("Test Results Dump Failed",
 							{
 								'url' => url,
-								'track_slug' => lesson_name,
+								'track-slug' => track_slug,
 								'results' => strategy.results,
 								'response-body' => response.body,
 								'response-status' => response.status

data/lib/commit-live/tests/strategies/python-test.rb

@@ -1,3 +1,4 @@
+require "terminal-table"
 require "commit-live/tests/strategy"
 
 module CommitLive
@@ -11,8 +12,37 @@ module CommitLive
 				@files ||= Dir.entries('.')
 			end
 
-			def run
-				system("nosetests --verbose --with-json --json-file=\"./.results.json\"")
+			def run(dir)
+				system("nosetests #{dir} --verbose --with-json --json-file=\"./.results.json\" > /dev/null 2>&1")
+			end
+
+			def print_results
+				if File.exists?('.results.json')
+					rows = []
+					totalPassed = 0
+					totalFailed = 0
+					test_results = results
+					columns = ['Test Case', 'Status']
+					test_results["results"].each do |value|
+						newRow = [value["name"], value["type"]]
+						isErrorOrFail = value['type'] == 'failure' || value['type'] == 'error'
+						totalFailed += 1 if isErrorOrFail
+						newRow << value['message'] if isErrorOrFail
+						totalPassed += 1 if value['type'] == 'success'
+						rows << newRow
+					end
+					if totalFailed > 0
+						columns << 'Message'
+					end
+					table = Terminal::Table.new do |t|
+						t.headings = columns
+						t.rows = rows
+						t.style = { :all_separators => true }
+					end
+					puts table
+					puts "Total Passed: #{totalPassed}"
+					puts "Total Failed: #{totalFailed}"
+				end
 			end
 
 			def results

data/lib/commit-live/user.rb

@@ -13,13 +13,13 @@ module CommitLive
 	      	@netrc = CommitLive::NetrcInteractor.new()
 	    end
 
-		def validate(token)
+		def validate(userID, token)
 			puts "Authenticating..."
 			begin
 				Timeout::timeout(15) do
 					response = CommitLive::API.new().get(
-						"/v1/users/#{token}", 
-						headers: { 'access-token' => "#{token}" }
+						"/v2/users/#{userID}",
+						headers: { 'Authorization' => "#{token}" }
 					)
 					if response.status == 200
 						# Save valid user details in netrc
@@ -28,7 +28,7 @@ module CommitLive
 						if login.nil? || password.nil?
 							save(user, token)
 						else
-							username = user.fetch('data')['username']
+							username = user.fetch('data')['userName']
 							welcome(username)
 						end
 					else
@@ -50,10 +50,10 @@ module CommitLive
 
 		def save(userDetails, token)
 			user_data = userDetails.fetch('data')
-			username = user_data['username']
-			github_uid = user_data['id']
-			netrc.write(new_login: 'greyatom', new_password: token)
-			netrc.write(machine: 'ga-extra', new_login: username, new_password: github_uid)
+			username = user_data['userName']
+			userID = user_data['id']
+			netrc.write(new_login: userID, new_password: token)
+			netrc.write(machine: 'ga-extra', new_login: username, new_password: userID)
 			welcome(username)
 		end
 

data/lib/commit-live/version.rb

@@ -1,5 +1,5 @@
 module CommitLive
 	module Cli
-		VERSION = "0.0.23"
+		VERSION = "0.1.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit-live-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.1.0
 platform: ruby
 authors:
 - greyatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,6 +188,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: 
 email:
 - greyatomedutech@gmail.com