commit-live-cli 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b31aee6b82c9e1f200ed56ddeeb4a1872a9643
-  data.tar.gz: a30692eb817f2cfa092a814d74ecb6af3bdeb709
+  metadata.gz: 74baeabdd3c9227117b5c1170e10df0cb660be0d
+  data.tar.gz: 103fa9e8c6f7459b3736a86e384f0617277037b2
 SHA512:
-  metadata.gz: e8c435641b96def863e44a03c32ed8b87748ea43792e351826e300cb61258bcd20e859082bcb63c2a9d986618d34cee765ab483671608c81fcda7ddeef87b91a
-  data.tar.gz: 8711f052b2f9c80c979616fedac3c70dc534f35ef9e472de464515493a9145e12a8436c57274aba0e79ddbffd0f24b282f7bc9fb3bc4105e6c0d5936db9d7399
+  metadata.gz: 65a20d039813f73d1c192611f90bedba23bed6ec7b04cc5b799ad270128c031b23a644429d5856ea3ed744abd51977bbad496266e825287115c67adc4f1bbefc
+  data.tar.gz: 8d443f3e1641e6ed9a8d2c4b0db33d209ca94aa65de5da1c3751398d412930e7dd18ec55714fe2f2e58e03e6e6ab68f7ad40b50ded43ada78fe038aa62280614

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

@@ -10,13 +10,21 @@ module CommitLive
 			@netrc = CommitLive::NetrcInteractor.new()
 		end
 
-		def getCurrentLesson(*puzzle_name)
+		def getCurrentLesson(puzzle_name)
+			url = '/v1/current_lesson'
+			if !puzzle_name.empty?
+				url = "/v1/user/lesson/#{puzzle_name}"
+			end
+			getLesson(url)
+		end
+
+		def getLesson(url)
 			begin
 				Timeout::timeout(15) do
 					netrc.read
 					token = netrc.password
 					response = CommitLive::API.new().get(
-						'/v1/current_lesson',
+						url,
 						headers: { 'access-token' => "#{token}" }
 					)
 					if response.status == 200

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

@@ -99,22 +99,23 @@ module CommitLive
 
 			def createPullRequest
 				puts 'Creating Pull Request...'
-				currentLesson.getCurrentLesson
+				lessonName = repo_name(remote: 'origin')
+				currentLesson.getCurrentLesson(lessonName)
 				userGithub = CommitLive::Github.new()
 				netrc.read(machine: 'ga-extra')
 				username = netrc.login
 				begin
 					Timeout::timeout(45) do
-					lessonData = currentLesson.getAttr('data')
-					parentRepo = lessonData['chapters']['lessons']['repo_url']
-					pullRequest = userGithub.client.create_pull_request(
-						parentRepo,
-						'master',
-						"#{username}:master",
-						"PR by #{username}"
-					)
-					puts "Lesson submitted successfully!"
-				end
+						lessonData = currentLesson.getAttr('data')
+						parentRepo = lessonData['repo_url']
+						pullRequest = userGithub.client.create_pull_request(
+							parentRepo,
+							'master',
+							"#{username}:master",
+							"PR by #{username}"
+						)
+						puts "Lesson submitted successfully!"
+					end
 				rescue Octokit::Error => err
 					puts "Error while creating PR!"
 					puts err
@@ -125,10 +126,14 @@ module CommitLive
 				end
 			end
 
+			def repo_name(remote: remote_name)
+				url = git.remote(remote).url
+				url.match(/^.+[\w-]+\/(.*?)(?:\.git)?$/)[1]
+			end
+
 			def update_lesson_status
 				puts 'Updating lesson status...'
-				lessonData = currentLesson.getAttr('data')
-				lessonName = lessonData['chapters']['lessons']['title']
+				lessonName = repo_name(remote: 'origin')
 				status.update('submitted_pull_request', lessonName)
 			end
 		end

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

@@ -20,12 +20,16 @@ module CommitLive
 			@lesson_status = CommitLive::Status.new
 		end
 
-		def openALesson(*puzzle_name)
+		def openALesson(puzzle_name)
 			# get currently active lesson
 			puts "Getting current lesson..."
 			lesson.getCurrentLesson(puzzle_name)
 			lessonData = lesson.getAttr('data')
-			@lessonName = lessonData['chapters']['lessons']['title']
+			if !lessonData['chapters'].nil?
+				@lessonName = lessonData['chapters']['lessons']['title']
+			else
+				@lessonName = lessonData['title']
+			end
 			if !File.exists?("#{rootDir}/#{lessonName}")
 				# fork lesson repo via github api
 				forkCurrentLesson

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

@@ -5,6 +5,8 @@ require 'commit-live/tests/strategies/python-test'
 
 module CommitLive
 	class Test
+		attr_reader :git
+
 		REPO_BELONGS_TO_US = [
 			'commit-live-students'
 		]
@@ -23,7 +25,7 @@ module CommitLive
 		end
 
 		def check_lesson_dir
-			git = set_git
+			@git = set_git
 			netrc = CommitLive::NetrcInteractor.new()
 			netrc.read(machine: 'ga-extra')
 			username = netrc.login
@@ -32,6 +34,11 @@ module CommitLive
 			end
 		end
 
+		def repo_name(remote: remote_name)
+			url = git.remote(remote).url
+			url.match(/^.+[\w-]+\/(.*?)(?:\.git)?$/)[1]
+		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.'
@@ -43,7 +50,7 @@ module CommitLive
 			strategy.configure
 			results = strategy.run
 			puts 'Updating lesson status...'
-			lessonName = File.basename(Dir.getwd)
+			lessonName = repo_name(remote: 'origin')
 			if results
 				# test case passed
 				CommitLive::Status.new().update('test_case_pass', lessonName)

data/lib/commit-live/version.rb

@@ -1,5 +1,5 @@
 module CommitLive
 	module Cli
-		VERSION = "0.0.2"
+		VERSION = "0.0.3"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit-live-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - greyatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler