commit-live-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be81db24b2d7f33d3f9b7a9359e5a53a99698045
-  data.tar.gz: 12e23e3064893b3a7c31436410c1b4518a7b316e
+  metadata.gz: 5191b44ad67fb9ca78c7f6510b80c63309719f92
+  data.tar.gz: 5a846a02dda610cc46ae5dc2e6f2b75f351ff451
 SHA512:
-  metadata.gz: f4df041940c12845f2f9e54b7a47aaba40d7ccd13e081def97a7a63a05cd9f72b74d719a1f58ddceb04ee92ab75bd9e1178693c882d2e3b07d58b1c858d937fb
-  data.tar.gz: eb728339f9e44a5299a917d078a5c70837e40cf0878cfe91090d3d1c4762495eb2b06571e01d0e20a153e944344ea89254c41fb087bacc47f3248664ceff085e
+  metadata.gz: 6932ea6b8953c2e72212ecca5fea53669337e059d91f079d685f973c1b4e48f227874118d8aeff471de66d12ac5d5364c030a34759e60effc64571669c87cda3
+  data.tar.gz: c12e0a098b32b132d11304bbc034be5322c797a58a3910f4f47386ece9f069a4ad26979d9e2f3bedc078d9397328f194b1cd1d8cd0c9130201f08dd71fa59c06

data/lib/commit-live/github.rb

@@ -1,16 +1,76 @@
 require "commit-live/netrc-interactor"
+require "commit-live/sentry"
+require "commit-live/api"
 require "octokit"
 
 module CommitLive
 	class Github
-		attr_accessor :client
+		attr_accessor :netrc, :post_details, :sentry
 		def initialize()
-	      	netrc = CommitLive::NetrcInteractor.new()
-	      	netrc.read
-	      	token = netrc.password
-	      	if !token.nil?
-				@client = Octokit::Client.new(:access_token => token)
-	      	end
+			@netrc = CommitLive::NetrcInteractor.new()
+			@sentry = CommitLive::Sentry.new()
+		end
+
+		def token
+			netrc.read
+			netrc.password
+		end
+
+		def owner
+			netrc.read(machine: 'ga-extra')
+			netrc.login
+		end
+
+		def getAttr(attr)
+			if !attr.nil?
+				post_details.fetch(attr)
+			end
+		end
+
+		def getValue(key)
+			data = getAttr('data')
+			data[key]
+		end
+
+		def post(repo_name, isFork = false)
+			enc_url = "/v2/github/createPullRequest"
+			log_title = "#{owner} - Pull Request Failed"
+			if isFork
+				enc_url = URI.escape("/v2/github/createFork")
+				log_title = "#{owner} - Lesson Forked Failed"
+			end
+			begin
+				Timeout::timeout(60) do
+					response = CommitLive::API.new().post(
+						enc_url,
+						headers: {
+							'Authorization' => "#{token}",
+							'Content-Type' => 'application/json'
+						},
+						body: {
+							"repoUrl": repo_name
+						}
+					)
+					@post_details = JSON.parse(response.body)
+					if response.status != 200 && !response.body.match(/A pull request already exists/)
+						sentry.log_message(log_title,
+							{
+								'url' => enc_url,
+								'repo_name' => repo_name,
+								'response-body' => response.body,
+								'response-status' => response.status
+							}
+						)
+					end
+				end
+			rescue Timeout::Error
+				sentry.log_message(log_title,
+					{
+						'url' => enc_url,
+						'track_name' => repo_name
+					}
+				)
+			end
 		end
 	end
 end

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

@@ -175,31 +175,8 @@ module CommitLive
 
 			def createPullRequest
 				puts 'Creating Pull Request...'
-				userGithub = CommitLive::Github.new()
-				netrc.read(machine: 'ga-extra')
-				username = netrc.login
-				begin
-					Timeout::timeout(45) do
-						pullRequest = userGithub.client.create_pull_request(
-							repo_url,
-							'master',
-							"#{username}:master",
-							"#{track_slug} - PR by #{username}"
-						)
-					end
-				rescue Octokit::Error => err
-					if !err.message.match(/A pull request already exists/)
-						sentry.log_exception(err,
-							{
-								'event': 'creating-pull-request',
-								'lesson_name' => lessonName,
-							}
-						)
-					end
-				rescue Timeout::Error
-					puts "Please check your internet connection."
-					exit 1
-				end
+				github = CommitLive::Github.new()
+				github.post(repo_url)
 			end
 
 			def repo_name(remote: remote_name)

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

@@ -9,7 +9,7 @@ require "oj"
 
 module CommitLive
 	class Open
-		attr_reader :rootDir, :lesson, :forkedRepo, :lesson_status, :sentry
+		attr_reader :rootDir, :lesson, :forked_ssh_url, :lesson_status, :sentry
 
 		HOME_DIR = File.expand_path("~")
 		ALLOWED_TYPES = ["CODE", "PRACTICE"]
@@ -27,7 +27,7 @@ module CommitLive
 			if lesson_type === "PRACTICE"
 				"git@github.com:#{lesson_repo}.git"
 			else
-				forkedRepo.ssh_url
+				forked_ssh_url
 			end
 		end
 
@@ -99,21 +99,8 @@ module CommitLive
 		def forkCurrentLesson
 			puts "Forking lesson..."
 			github = CommitLive::Github.new()
-			begin
-				Timeout::timeout(15) do
-					@forkedRepo = github.client.fork(lesson_repo)
-				end
-			rescue Octokit::Error => err
-				sentry.log_exception(err,
-					{
-						'event': 'forking',
-						'lesson_name' => lesson_name,
-					}
-				)
-			rescue Timeout::Error
-				puts "Please check your internet connection."
-				exit
-			end
+			github.post(lesson_repo, true)
+			@forked_ssh_url = github.getValue("sshUrl")
 		end
 
 		def cloneCurrentLesson

data/lib/commit-live/version.rb

@@ -1,5 +1,5 @@
 module CommitLive
 	module Cli
-		VERSION = "0.1.1"
+		VERSION = "0.1.2"
 	end
 end

metadata

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