commit-live-cli 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aea2c473eea988b5bdb7f1c13ce6b26e323610b
-  data.tar.gz: 5a1520b6bd145c4c03246d16b772884456c54099
+  metadata.gz: 47eab11485d97b319cfe86b06681d66c474bdc88
+  data.tar.gz: cf16223e13c52a45422f4a90c66f46660b605cae
 SHA512:
-  metadata.gz: 3619d5873942a10d81c40a7973e68a891758ce3969b70b80e5419592534f968f78ff2e645b6f67381a692e3ddad18a6c992432afbd823f0e6c99e40b4cb724a4
-  data.tar.gz: 86c7c8db6f4a3a7dfeca500126957c463ee8b41ee341d7934d7639f232fba60699cd075532ca5078e9d465e012a6d9745bfd5421aa5dc774ba9121965b40a9cd
+  metadata.gz: d167094a0053f99a311445cf3723dd2aa2d662514882ece1f873b439b09e4c838c6d9f25d021e34a0a953c0380a501abcb5af8b5bdec66a4939300988f35c3e0
+  data.tar.gz: 61561352d2902a28f543e346677a3a3b35018f1a0ba975b5b5e2889626a9092352636e69fd98535682887ffd1327089651259ca32e4e743e5b5be16b7632f54e

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

@@ -46,6 +46,15 @@ module CommitLive
 				lesson.fetch(attr)
 			end
 		end
+
+		def getValue(key)
+			lessonData = getAttr('data')
+			if !lessonData['current_track'].nil?
+				lessonData['current_track'][key]
+			else
+				lessonData[key]
+			end
+		end
 		
 	end
 end

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

@@ -24,9 +24,9 @@ module CommitLive
 			def commitAndPush
 				checkRemote
 
-				currentLesson.getCurrentLesson(lessonName)
-				lessonData = currentLesson.getAttr('data')
-				testCasePassed = lessonData['test_case_pass']
+				check_if_practice_lesson
+
+				testCasePassed = currentLesson.getValue('test_case_pass')
 				# Check if User passed test cases
 				if testCasePassed
 					# Push to User's Github
@@ -34,7 +34,7 @@ module CommitLive
 					commitChanges
 					push
 
-					pullRequestSubmitted = lessonData['submitted_pull_request']
+					pullRequestSubmitted = currentLesson.getValue('submitted_pull_request')
 					if !pullRequestSubmitted
 						# Create Pull Request
 						createPullRequest
@@ -51,6 +51,15 @@ module CommitLive
 
 			private
 
+			def check_if_practice_lesson
+				currentLesson.getCurrentLesson(lessonName)
+				lessonType = currentLesson.getValue('type')
+				if lessonType == "PRACTICE"
+					puts "This is a practice lesson. No need to submit anything."
+					exit 1
+				end
+			end
+
 			def setGit
 				begin
 					Git.open(FileUtils.pwd)
@@ -123,8 +132,7 @@ module CommitLive
 				username = netrc.login
 				begin
 					Timeout::timeout(45) do
-						lessonData = currentLesson.getAttr('data')
-						parentRepo = lessonData['repo_url']
+						parentRepo = currentLesson.getValue('repo_url')
 						pullRequest = userGithub.client.create_pull_request(
 							parentRepo,
 							'master',

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

@@ -7,9 +7,10 @@ require 'git'
 
 module CommitLive
 	class Open
-		attr_reader :lessonName, :rootDir, :lesson, :forkedRepo, :lesson_status
+		attr_reader :rootDir, :lesson, :forkedRepo, :lesson_status
 
 		HOME_DIR = File.expand_path("~")
+		ALLOWED_TYPES = ["LAB", "PRACTICE"]
 
 		def initialize()
 			if File.exists?("#{HOME_DIR}/.ga-config")
@@ -19,35 +20,52 @@ module CommitLive
 			@lesson_status = CommitLive::Status.new
 		end
 
+		def ssh_url
+			if lesson_type === "PRACTICE"
+				"git@github.com:#{lesson_repo}.git"
+			else
+				forkedRepo.ssh_url
+			end
+		end
+
+		def lesson_name
+			lesson.getValue('track_slug')
+		end
+
+		def lesson_type
+			lesson.getValue('type')
+		end
+
+		def lesson_forked
+			lesson.getValue('forked')
+		end
+
+		def lesson_repo
+			lesson.getValue('repo_url')
+		end
+
 		def openALesson(puzzle_name)
 			# get currently active lesson
 			puts "Getting current lesson..."
 			lesson.getCurrentLesson(puzzle_name)
-			lessonData = lesson.getAttr('data')
-			isAssignment = false;
-			if !lessonData['current_track'].nil?
-				@lessonName = lessonData['current_track']['track_slug']
-				isAssignment = lessonData['current_track']['assignment_flag']
-				forked = lessonData['current_track']['forked']
-			else
-				@lessonName = lessonData['track_slug']
-				isAssignment = lessonData['assignment_flag']
-				forked = lessonData['forked']
-			end
-			if !isAssignment
+
+			if !ALLOWED_TYPES.include? lesson_type
 				puts "This is a read only lesson!"
 				exit
 			end
-			if !File.exists?("#{rootDir}/#{lessonName}")
+
+			if !File.exists?("#{rootDir}/#{lesson_name}")
 				# fork lesson repo via github api
-				forkCurrentLesson
+				if lesson_type == "LAB"
+					forkCurrentLesson
+				end
 				# clone forked lesson into machine
 				cloneCurrentLesson
 				# change group owner
 				change_grp_owner
 				# lesson forked API change
-				if !forked
-					lesson_status.update('forked', lessonName)
+				if lesson_type == "LAB" && !lesson_forked
+					lesson_status.update('forked', lesson_name)
 				end
 			end
 			# install dependencies
@@ -60,13 +78,7 @@ module CommitLive
 			github = CommitLive::Github.new()
 			begin
 				Timeout::timeout(15) do
-					lessonData = lesson.getAttr('data')
-					if !lessonData['current_track'].nil?
-						lessonRepo = lessonData['current_track']['repo_url']
-					else
-						lessonRepo = lessonData['repo_url']
-					end
-					@forkedRepo = github.client.fork(lessonRepo)
+					@forkedRepo = github.client.fork(lesson_repo)
 				end
 			rescue Octokit::Error => err
 				puts "Error while forking!"
@@ -82,7 +94,7 @@ module CommitLive
 			puts "Cloning lesson..."
 			begin
 				Timeout::timeout(15) do
-					Git.clone(forkedRepo.ssh_url, lessonName, path: rootDir)
+					Git.clone(ssh_url, lesson_name, path: rootDir)
 				end
 			rescue Git::GitExecuteError => err
 				puts "Error while cloning!"
@@ -95,12 +107,12 @@ module CommitLive
 		end
 
 		def change_grp_owner
-			system("chgrp -R ubuntu #{rootDir}/#{lessonName}")
+			system("chgrp -R ubuntu #{rootDir}/#{lesson_name}")
 		end
 
 		def cdToLesson
 			puts "Opening lesson..."
-			Dir.chdir("#{rootDir}/#{lessonName}")
+			Dir.chdir("#{rootDir}/#{lesson_name}")
 			puts "Done."
 			exec("#{ENV['SHELL']} -l")
 		end

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

@@ -1,6 +1,6 @@
 require "commit-live/api"
 require "commit-live/netrc-interactor"
-require 'uri'
+require "uri"
 
 module CommitLive
 	class Status

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

@@ -1,7 +1,10 @@
-require 'yaml'
+require "yaml"
+require "oj"
+require "commit-live/lesson/current"
 require "commit-live/lesson/status"
+require "commit-live/api"
 require "commit-live/netrc-interactor"
-require 'commit-live/tests/strategies/python-test'
+require "commit-live/tests/strategies/python-test"
 
 module CommitLive
 	class Test
@@ -13,6 +16,7 @@ module CommitLive
 
 		def initialize()
 			check_lesson_dir
+			check_if_practice_lesson
 			die if !strategy
 		end
 
@@ -39,6 +43,10 @@ module CommitLive
 			url.match(/^.+[\w-]+\/(.*?)(?:\.git)?$/)[1]
 		end
 
+		def lesson_name
+			repo_name(remote: 'origin')
+		end
+
 		def put_error_msg
 			puts "It doesn't look like you're in a lesson directory."
 			puts 'Please cd into an appropriate directory and try again.'
@@ -51,15 +59,19 @@ module CommitLive
 			strategy.configure
 			results = strategy.run
 			if updateStatus
-				lessonName = repo_name(remote: 'origin')
 				if results
 					# test case passed
-					CommitLive::Status.new().update('test_case_pass', lessonName)
+					CommitLive::Status.new().update('test_case_pass', lesson_name)
 				else
 					# test case failed
-					CommitLive::Status.new().update('test_case_fail', lessonName)
+					CommitLive::Status.new().update('test_case_fail', lesson_name)
 				end
 			end
+			if strategy.results
+				dump_results
+			end
+			strategy.cleanup
+			puts 'Done.'
 			return results
 		end
 
@@ -73,6 +85,45 @@ module CommitLive
 
 		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."
+				exit 1
+			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("/v1/dumps")
+					response = api.post(
+						url,
+						headers: {
+							'access-token' => "#{token}",
+							'content-type' => 'application/json',
+						},
+						body: {
+							'data' => Oj.dump(strategy.results, mode: :compat),
+							'track_slug' => lesson_name
+						}
+					)
+					if response.status != 201
+						puts "Error while dumping test results."
+					end
+				end
+			rescue Timeout::Error
+				puts "Error while dumping test results."
+				exit
+			end
+		end
+
 		def strategies
 			[
 				CommitLive::Strategies::PythonUnittest

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

@@ -12,7 +12,15 @@ module CommitLive
 			end
 
 			def run
-				system("nosetests --verbose")
+				system("nosetests --verbose --with-json --json-file=\"./.results.json\"")
+			end
+
+			def results
+				@output ||= Oj.load(File.read('.results.json'), mode: :compat)
+			end
+
+			def cleanup
+				FileUtils.rm('.results.json')
 			end
 		end
 	end

data/lib/commit-live/version.rb

@@ -1,5 +1,5 @@
 module CommitLive
 	module Cli
-		VERSION = "0.0.12"
+		VERSION = "0.0.13"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit-live-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - greyatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 description: 
 email:
 - greyatomedutech@gmail.com