commit-live-cli 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d087ed2ece99b39781fc88a31f6ad778b9d51e
-  data.tar.gz: 034efbe8861b7d13f59da283418f29639e976734
+  metadata.gz: 98b9e2cec0855a3481eda131fb32a36dbd0aa887
+  data.tar.gz: 78fa93fd7a38369251bd103ccb54f1a7936768fd
 SHA512:
-  metadata.gz: 07d52777b0fa3e9cef684f37fded154bb8ebe4c1c6f25dccc08088c9ba7f8a516d2cd1c2c7bd8da7a4890ef7796701edf15e49156c90989acd3e6eb0db168205
-  data.tar.gz: 163bb38d935af132654c3a74ae54c672eb8dffc3738b20a4728ba703521e69f7375b8498d0f2fd70eb7ca547a3792d5c0441052efb550beca01119a02ec7ca84
+  metadata.gz: 1688df5b5612f0bc2c27e3215a8a2a22e23ede878f9711a335c76d6c02057214be800095142d0a744e01de58856788b9405085d8e7d518134210cb27aaf7bce4
+  data.tar.gz: 690565eeda7694e5b7d5731a7d37c5f417a78dc418010673e0747a747aeec1d6c6117cc97160fdc64d7fd6c9414e6aa5af36e077277e7b881cfb1c499e99fd87

data/bin/clive

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'commit-live'
+require "commit-live"
 
 if ['-v', '--version'].include?(ARGV.first)
 	puts CommitLive::Cli::VERSION

data/lib/commit-live.rb

@@ -1,7 +1,7 @@
-require 'commit-live/version'
-require 'commit-live/cli'
-require 'commit-live/options-sanitizer'
-require 'commit-live/netrc-interactor'
+require "commit-live/version"
+require "commit-live/cli"
+require "commit-live/options-sanitizer"
+require "commit-live/netrc-interactor"
 
 module CommitLive
 end

data/lib/commit-live/cli.rb

@@ -1,10 +1,10 @@
-require 'commit-live/user'
-require 'commit-live/netrc-interactor'
-require 'commit-live/tests/runner'
-require 'commit-live/lesson/submit'
-require 'commit-live/lesson/open'
-require 'commit-live/lesson/parser'
-require 'thor'
+require "commit-live/user"
+require "commit-live/netrc-interactor"
+require "commit-live/tests/runner"
+require "commit-live/lesson/submit"
+require "commit-live/lesson/open"
+require "commit-live/lesson/parser"
+require "thor"
 
 module CommitLive
 	class CLI < Thor

data/lib/commit-live/github.rb

@@ -1,5 +1,5 @@
 require "commit-live/netrc-interactor"
-require 'octokit'
+require "octokit"
 
 module CommitLive
 	class Github

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

@@ -1,13 +1,15 @@
 require "commit-live/api"
 require "commit-live/netrc-interactor"
-require 'json'
+require "commit-live/sentry"
+require "json"
 
 module CommitLive
 	class Current
-		attr_accessor :lesson, :netrc
+		attr_accessor :lesson, :netrc, :sentry
 
 		def initialize()
 			@netrc = CommitLive::NetrcInteractor.new()
+			@sentry = CommitLive::Sentry.new()
 		end
 
 		def getCurrentLesson(puzzle_name)
@@ -18,11 +20,14 @@ module CommitLive
 			getLesson(url)
 		end
 
+		def token
+			netrc.read
+			netrc.password
+		end
+
 		def getLesson(url)
 			begin
 				Timeout::timeout(15) do
-					netrc.read
-					token = netrc.password
 					response = CommitLive::API.new().get(
 						url,
 						headers: { 'access-token' => "#{token}" }
@@ -30,8 +35,12 @@ module CommitLive
 					if response.status == 200
 						@lesson = JSON.parse(response.body)
 					else
-						puts "Something went wrong. Please try again."
-						exit 1
+						sentry.log_message("Get Lesson Failed",
+							{
+								'url' => url,
+								'response' => response.body
+							}
+						)
 					end
 				end
 			rescue Timeout::Error

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

@@ -2,11 +2,12 @@ require "commit-live/lesson/current"
 require "commit-live/lesson/status"
 require "commit-live/netrc-interactor"
 require "commit-live/github"
+require "commit-live/sentry"
 
 module CommitLive
 	class Submit
 		class GitHelper
-			attr_reader   :git, :currentLesson, :netrc, :status, :lessonName
+			attr_reader   :git, :currentLesson, :netrc, :status, :lessonName, :sentry
 			attr_accessor :remote_name
 
 			REPO_BELONGS_TO_US = [
@@ -19,6 +20,7 @@ module CommitLive
 				@currentLesson = CommitLive::Current.new
 				@status = CommitLive::Status.new
 				@lessonName = repo_name(remote: 'origin')
+				@sentry = CommitLive::Sentry.new()
 			end
 
 			def commitAndPush
@@ -114,9 +116,12 @@ module CommitLive
 						git.push(push_remote)
 					end
 				rescue Git::GitExecuteError => e
-					puts 'There was an error while pushing. Please try again later.'
-					puts e.message
-					exit 1
+					sentry.log_exception(e,
+						{
+							'event': 'pushing',
+							'lesson_name' => lessonName,
+						}
+					)
 				rescue Timeout::Error
 					puts "Can't reach GitHub right now. Please try again."
 					exit 1
@@ -139,9 +144,12 @@ module CommitLive
 						)
 					end
 				rescue Octokit::Error => err
-					puts "Error while creating PR!"
-					puts err
-					exit 1
+					sentry.log_exception(err,
+						{
+							'event': 'creating-pull-request',
+							'lesson_name' => lessonName,
+						}
+					)
 				rescue Timeout::Error
 					puts "Please check your internet connection."
 					exit 1

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

@@ -2,13 +2,14 @@ require "commit-live/lesson/current"
 require "commit-live/lesson/status"
 require "commit-live/api"
 require "commit-live/github"
-require 'octokit'
-require 'git'
+require "commit-live/sentry"
+require "octokit"
+require "git"
 require "oj"
 
 module CommitLive
 	class Open
-		attr_reader :rootDir, :lesson, :forkedRepo, :lesson_status
+		attr_reader :rootDir, :lesson, :forkedRepo, :lesson_status, :sentry
 
 		HOME_DIR = File.expand_path("~")
 		ALLOWED_TYPES = ["LAB", "PRACTICE"]
@@ -19,6 +20,7 @@ module CommitLive
 			end
 			@lesson = CommitLive::Current.new
 			@lesson_status = CommitLive::Status.new
+			@sentry = CommitLive::Sentry.new()
 		end
 
 		def ssh_url
@@ -85,9 +87,12 @@ module CommitLive
 					@forkedRepo = github.client.fork(lesson_repo)
 				end
 			rescue Octokit::Error => err
-				puts "Error while forking!"
-				puts err
-				exit
+				sentry.log_exception(err,
+					{
+						'event': 'forking',
+						'lesson_name' => lesson_name,
+					}
+				)
 			rescue Timeout::Error
 				puts "Please check your internet connection."
 				exit
@@ -101,9 +106,12 @@ module CommitLive
 					Git.clone(ssh_url, lesson_name, path: rootDir)
 				end
 			rescue Git::GitExecuteError => err
-				puts "Error while cloning!"
-				puts err
-				exit
+				sentry.log_exception(err,
+					{
+						'event': 'cloning',
+						'lesson_name' => lesson_name,
+					}
+				)
 			rescue Timeout::Error
 				puts "Cannot clone this lesson right now. Please try again."
 				exit

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

@@ -1,21 +1,26 @@
 require "commit-live/api"
 require "commit-live/netrc-interactor"
+require "commit-live/sentry"
 require "uri"
 
 module CommitLive
 	class Status
-		attr_reader :api, :netrc
+		attr_reader :api, :netrc, :sentry
 
 		def initialize()
 			@api = CommitLive::API.new
 			@netrc = CommitLive::NetrcInteractor.new()
+			@sentry = CommitLive::Sentry.new()
+		end
+
+		def token
+			netrc.read
+			netrc.password
 		end
 
 		def update(type, trackName)
 			begin
 				Timeout::timeout(15) do
-					netrc.read
-					token = netrc.password
 					enc_url = URI.escape("/v1/user/track/#{trackName}")
 					response = api.post(
 						enc_url,
@@ -26,8 +31,16 @@ module CommitLive
 						}
 					)
 					if response.status != 202
-						puts "Failed updating lesson status."
-						exit 1
+						sentry.log_message("Update Lesson Status Failed",
+							{
+								'url' => enc_url,
+								'track_name' => trackName,
+								'params' => {
+									'method' => 'assignment_status',
+									'action' => type
+								}
+							}
+						)
 					end
 				end
 			rescue Timeout::Error

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

@@ -1,5 +1,5 @@
-require 'commit-live/lesson/git-helper'
-require 'octokit'
+require "commit-live/lesson/git-helper"
+require "octokit"
 
 module CommitLive
 	class Submit

data/lib/commit-live/netrc-interactor.rb

@@ -1,4 +1,4 @@
-require 'netrc'
+require "netrc"
 
 module CommitLive
 	class NetrcInteractor

data/lib/commit-live/sentry.rb

@@ -0,0 +1,49 @@
+require "commit-live/netrc-interactor"
+require "sentry-raven"
+
+module CommitLive
+	class Sentry
+		attr_accessor :netrc
+
+		def initialize()
+			@netrc = CommitLive::NetrcInteractor.new()
+		end
+
+		def token
+			netrc.read
+			netrc.password
+		end
+
+		def username
+			netrc.read(machine: 'ga-extra')
+			netrc.login
+		end
+
+		def user_info
+			{
+				'username' => username,
+				'token' => token
+			}
+		end
+
+		def merge_user_info_with_other_args(other_args)
+			user_info.merge(other_args)
+		end
+
+		def log_message(other_args)
+			Raven.capture_message("Get Lesson Failed",
+				:extra => merge_user_info_with_other_args(other_args)
+			)
+			puts "Something went wrong. Commit.Live Admin has been notified about the issue. Please wait until further instructions."
+			exit 1
+		end
+
+		def log_exception(the_exception, other_args)
+			Raven.capture_message(the_exception,
+				:extra => merge_user_info_with_other_args(other_args)
+			)
+			puts "Something went wrong. Commit.Live Admin has been notified about the issue. Please wait until further instructions."
+			exit 1
+		end
+	end
+end

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

@@ -3,12 +3,13 @@ require "oj"
 require "commit-live/lesson/current"
 require "commit-live/lesson/status"
 require "commit-live/api"
+require "commit-live/sentry"
 require "commit-live/netrc-interactor"
 require "commit-live/tests/strategies/python-test"
 
 module CommitLive
 	class Test
-		attr_reader :git
+		attr_reader :git, :sentry
 
 		REPO_BELONGS_TO_US = [
 			'commit-live-students'
@@ -18,6 +19,7 @@ module CommitLive
 			check_lesson_dir
 			check_if_practice_lesson
 			die if !strategy
+			@sentry = CommitLive::Sentry.new()
 		end
 
 		def set_git
@@ -118,7 +120,13 @@ module CommitLive
 						}
 					)
 					if response.status != 201
-						puts "Error while dumping test results."
+						sentry.log_message("Test Results Dump Failed",
+							{
+								'url' => url,
+								'track_slug' => lesson_name,
+								'results' => strategy.results
+							}
+						)
 					end
 				end
 			rescue Timeout::Error

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

@@ -1,4 +1,4 @@
-require 'commit-live/tests/strategy'
+require "commit-live/tests/strategy"
 
 module CommitLive
 	module Strategies
@@ -20,7 +20,9 @@ module CommitLive
 			end
 
 			def cleanup
-				FileUtils.rm('.results.json')
+				if File.exists?('.results.json')
+					FileUtils.rm('.results.json')
+				end
 			end
 		end
 	end

data/lib/commit-live/user.rb

@@ -1,7 +1,7 @@
 require "commit-live/api"
 require "commit-live/netrc-interactor"
-require 'json'
-require 'yaml'
+require "json"
+require "yaml"
 
 module CommitLive
 	class User

data/lib/commit-live/version.rb

@@ -1,5 +1,5 @@
 module CommitLive
 	module Cli
-		VERSION = "0.0.14"
+		VERSION = "0.0.15"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit-live-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - greyatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,6 +174,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: sentry-raven
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: 
 email:
 - greyatomedutech@gmail.com
@@ -197,6 +211,7 @@ files:
 - lib/commit-live/lesson/submit.rb
 - lib/commit-live/netrc-interactor.rb
 - lib/commit-live/options-sanitizer.rb
+- lib/commit-live/sentry.rb
 - lib/commit-live/tests/runner.rb
 - lib/commit-live/tests/strategies/python-test.rb
 - lib/commit-live/tests/strategy.rb