commit-live-cli 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba81323b5f5c7f8ca8d5f820d683d1e180f1629
-  data.tar.gz: 22efc594c1e70294b7de25e80fc9486a027f90a5
+  metadata.gz: 4ee94f5abf354545825381e45b21b4963df7ad04
+  data.tar.gz: b7e29ad9cab705dbd8df0be2e601b4e8621ae916
 SHA512:
-  metadata.gz: ae40e6ab867dd6ac55788e39c95dc7e53a10e5505117006d9fb82c0397f83c92651930ae31bb67a588db1336fec8c00b882225083b9cdcc83a52cc07f870a5a9
-  data.tar.gz: 643f94b1b676a3941ee41948afa01d9abdcc2fae2095fd32b004b8487e1e8537b21ff889ee849790e29ec0781fd15889b9510902da855592d57beb70f980f04e
+  metadata.gz: 75a67be0ff19a908cec43b56b7a824e9371c1fa51b3476429eade4cd9cd2b37262883358a065b2be1b35eaeb3cf64c9e146b5e25276295176673f9b203b27a60
+  data.tar.gz: 38f60d388d8851116ea3f21b27b35919933361dd856c05b7cdebb89bb4436742c885971c87fa70c332b4d0df3f1baaf61ba6881f7691e76a1e0258dfaed4544e

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

@@ -100,7 +100,7 @@ module CommitLive
 				rescue Git::GitExecuteError => e
 					if e.message.match(/nothing to commit/)
 						puts "It looks like you have no changes to commit."
-						exit 1
+						puts "Pushing previous commits if any."
 					else
 						puts 'Sorry, something went wrong. Please try again.'
 						exit 1
@@ -134,8 +134,8 @@ module CommitLive
 					end
 				rescue Git::GitExecuteError => e
 					rollback_last_commit()
-					if e.message.match(/You may want to first integrate the remote changes/)
-						puts "It seems that you have made changes to the assignment outside of our IDE."
+					if e.message.match(/Integrate the remote changes/)
+						puts "There are some remote changes to pull."
 						puts "Pulling the changes..."
 						pull_changes
 					else

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

@@ -73,6 +73,8 @@ module CommitLive
 				if lesson_type == "PRACTICE"
 					open_lesson
 				end
+			else
+				open_lesson
 			end
 			# install dependencies
 			# cd into it and invoke bash

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

@@ -19,9 +19,9 @@ module CommitLive
 		end
 
 		def update(type, trackName)
+			enc_url = URI.escape("/v1/user/track/#{trackName}")
 			begin
-				Timeout::timeout(15) do
-					enc_url = URI.escape("/v1/user/track/#{trackName}")
+				Timeout::timeout(60) do
 					response = api.post(
 						enc_url,
 						headers: { 'access-token' => "#{token}" },
@@ -47,8 +47,16 @@ module CommitLive
 				end
 			rescue Timeout::Error
 				puts "Error while updating lesson status."
-				puts "Please check your internet connection."
-				exit
+				sentry.log_message("Update Lesson Status Failed",
+					{
+						'url' => enc_url,
+						'track_name' => trackName,
+						'params' => {
+							'method' => 'assignment_status',
+							'action' => type
+						},
+					}
+				)
 			end
 		end
 	end

data/lib/commit-live/version.rb

@@ -1,5 +1,5 @@
 module CommitLive
 	module Cli
-		VERSION = "0.0.21"
+		VERSION = "0.0.22"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit-live-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - greyatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler