commit-live-cli 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19318f01d88e5c412eca18e85e93996fe4e3eea
-  data.tar.gz: a7b81393f01458087f467a7db12ce7e41217fe31
+  metadata.gz: b5b31aee6b82c9e1f200ed56ddeeb4a1872a9643
+  data.tar.gz: a30692eb817f2cfa092a814d74ecb6af3bdeb709
 SHA512:
-  metadata.gz: 8e14e1aec39dfb6d56165e038e39688be0d9ff8cfde446ca09a20ca7515bbe19433a02fee2ab4c2fe6f84e853a534a0ea6a4c1d4d9e5f0dded774ef5b5eb1b9e
-  data.tar.gz: fe7a3cf6de78503bdcd0f7e4ffe9b6f00a73aee0c1ab439319b2f21c13bed4cf7b50a98b457dba1e2a651e76f54eb046ce69730fd37f20888436fbd6ab76380f
+  metadata.gz: e8c435641b96def863e44a03c32ed8b87748ea43792e351826e300cb61258bcd20e859082bcb63c2a9d986618d34cee765ab483671608c81fcda7ddeef87b91a
+  data.tar.gz: 8711f052b2f9c80c979616fedac3c70dc534f35ef9e472de464515493a9145e12a8436c57274aba0e79ddbffd0f24b282f7bc9fb3bc4105e6c0d5936db9d7399

data/bin/clive

@@ -3,8 +3,8 @@
 require 'commit-live'
 
 if ['-v', '--version'].include?(ARGV.first)
-  puts CommitLive::Cli::VERSION
-  exit
+	puts CommitLive::Cli::VERSION
+	exit
 end
 
 CommitLive::OptionsSanitizer.new( ARGV ).sanitize!

data/lib/commit-live/api.rb

@@ -1,66 +1,66 @@
 require "faraday"
 
 module CommitLive
-  class API
-    attr_reader :conn
+	class API
+		attr_reader :conn
 
-    URL = 'https://api.myjson.com'
-    API_ROOT  = '/api/v1'
+		URL = 'http://api.greyatom.com'
+		API_ROOT  = '/api/v1'
 
-    def initialize()
-      @conn = Faraday.new(url: URL) do |faraday|
-        faraday.adapter Faraday.default_adapter
-      end
-    end
+		def initialize()
+			@conn = Faraday.new(url: URL) do |faraday|
+				faraday.adapter Faraday.default_adapter
+			end
+		end
 
-    def get(url, options = {})
-      request :get, url, options
-    end
+		def get(url, options = {})
+			request :get, url, options
+		end
 
-    def post(url, options = {})
-      request :post, url, options
-    end
-    
-    private
+		def post(url, options = {})
+			request :post, url, options
+		end
+		
+		private
 
-    def request(method, url, options = {})
-      begin
-        connection = options[:client] || @conn
-        connection.send(method) do |req|
-          req.url url
-          buildRequest(req, options)
-        end
-      rescue Faraday::ConnectionFailed
-        puts "Connection error. Please try again."
-      end
-    end
+		def request(method, url, options = {})
+			begin
+				connection = options[:client] || @conn
+				connection.send(method) do |req|
+					req.url url
+					buildRequest(req, options)
+				end
+			rescue Faraday::ConnectionFailed
+				puts "Connection error. Please try again."
+			end
+		end
 
-    def buildRequest(request, options)
-      buildHeaders(request, options[:headers])
-      buildParams(request, options[:params])
-      buildBody(request, options[:body])
-    end
+		def buildRequest(request, options)
+			buildHeaders(request, options[:headers])
+			buildParams(request, options[:params])
+			buildBody(request, options[:body])
+		end
 
-    def buildHeaders(request, headers)
-      if headers
-        headers.each do |header, value|
-          request.headers[header] = value
-        end
-      end
-    end
+		def buildHeaders(request, headers)
+			if headers
+				headers.each do |header, value|
+					request.headers[header] = value
+				end
+			end
+		end
 
-    def buildParams(request, params)
-      if params
-        params.each do |param, value|
-          request.params[param] = value
-        end
-      end
-    end
+		def buildParams(request, params)
+			if params
+				params.each do |param, value|
+					request.params[param] = value
+				end
+			end
+		end
 
-    def buildBody(request, body)
-      if body
-        request.body = Oj.dump(body, mode: :compat)
-      end
-    end
-  end
+		def buildBody(request, body)
+			if body
+				request.body = Oj.dump(body, mode: :compat)
+			end
+		end
+	end
 end

data/lib/commit-live/cli.rb

@@ -7,56 +7,56 @@ require 'commit-live/lesson/parser'
 require 'thor'
 
 module CommitLive
-  class CLI < Thor
-    desc "hello", "This will greet you"
-    def hello()
-      puts "Hello World!"
-    end
+	class CLI < Thor
+		desc "hello", "This will greet you"
+		def hello()
+			puts "Hello World!"
+		end
 
-    desc "setup", "This will ask for token"
-    def setup(retries: 5)
-      # Check if token already present
-      login, password = CommitLive::NetrcInteractor.new().read
-      if login.nil? || password.nil?
-        print 'Enter your github token here and press [ENTER]: '
-        password = STDIN.gets.chomp
-        if password.empty?
-          puts "No token provided."
-          exit
-        end
-      end
-      # Check if token is valid
-      user = CommitLive::User.new()
-      user.validate(password)
-      user.setDefaultWorkspace
-    end
-    
-    desc "reset", "This will forget you"
-    def reset()
-      CommitLive::User.new().confirmAndReset
-    end
-    
-    desc "open", "This will fork new work"
-    def open(*puzzle_name)
-      # Fork and Clone User's current lesson
-      lab_name = CommitLive::Puzzle::Parser.new(puzzle_name.join(' ')).parse!
-      CommitLive::Open.new().openALesson(lab_name)
-    end
-    
-    desc "submit", "This will submit your work"
-    def submit()
-      CommitLive::Submit.new().run
-    end
-    
-    desc "test", "This will test you"
-    def test()
-      puts 'Testing...'
-      CommitLive::Test.new().run
-    end
+		desc "setup", "This will ask for token"
+		def setup(retries: 5)
+			# Check if token already present
+			login, password = CommitLive::NetrcInteractor.new().read
+			if login.nil? || password.nil?
+				print 'Enter your github token here and press [ENTER]: '
+				password = STDIN.gets.chomp
+				if password.empty?
+					puts "No token provided."
+					exit
+				end
+			end
+			# Check if token is valid
+			user = CommitLive::User.new()
+			user.validate(password)
+			user.setDefaultWorkspace
+		end
 
-    desc 'version, -v, --version', 'Display the current version of the CommitLive gem'
-    def version
-      puts CommitLive::Cli::VERSION
-    end
-  end
+		desc "reset", "This will forget you"
+		def reset()
+			CommitLive::User.new().confirmAndReset
+		end
+
+		desc "open", "This will fork new work"
+		def open(*puzzle_name)
+			# Fork and Clone User's current lesson
+			lab_name = CommitLive::Puzzle::Parser.new(puzzle_name.join(' ')).parse!
+			CommitLive::Open.new().openALesson(lab_name)
+		end
+
+		desc "submit", "This will submit your work"
+		def submit()
+			CommitLive::Submit.new().run
+		end
+
+		desc "test", "This will test you"
+		def test()
+			puts 'Testing...'
+			CommitLive::Test.new().run
+		end
+
+		desc 'version, -v, --version', 'Display the current version of the CommitLive gem'
+		def version
+			puts CommitLive::Cli::VERSION
+		end
+	end
 end

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

@@ -1,21 +1,29 @@
 require "commit-live/api"
+require "commit-live/netrc-interactor"
 require 'json'
 
 module CommitLive
 	class Current
-		attr_accessor :lesson
+		attr_accessor :lesson, :netrc
+
+		def initialize()
+			@netrc = CommitLive::NetrcInteractor.new()
+		end
 
 		def getCurrentLesson(*puzzle_name)
 			begin
 				Timeout::timeout(15) do
-					response = CommitLive::API.new().get('/bins/k8lsj')
+					netrc.read
+					token = netrc.password
+					response = CommitLive::API.new().get(
+						'/v1/current_lesson',
+						headers: { 'access-token' => "#{token}" }
+					)
 					if response.status == 200
 						@lesson = JSON.parse(response.body)
-						# @lessonRepo = lesson.fetch('github_repo')
-						# @lessonName = lesson.fetch('lesson_name')
 					else
-		             	puts "Something went wrong. Please try again."
-		              	exit 1
+						puts "Something went wrong. Please try again."
+						exit 1
 					end
 				end
 			rescue Timeout::Error

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

@@ -1,122 +1,136 @@
 require "commit-live/lesson/current"
+require "commit-live/lesson/status"
 require "commit-live/netrc-interactor"
 require "commit-live/github"
 
 module CommitLive
-  class Submit
-    class GitHelper
-      attr_reader   :git, :dummyUsername, :currentLesson, :netrc
-      attr_accessor :remote_name
+	class Submit
+		class GitHelper
+			attr_reader   :git, :currentLesson, :netrc, :status
+			attr_accessor :remote_name
 
-      REPO_BELONGS_TO_US = [
-        'Rubygemtrial'
-      ]
+			REPO_BELONGS_TO_US = [
+				'commit-live-students'
+			]
 
-      def initialize()
-        @git = setGit
-        @dummyUsername = 'gitint'
-        @netrc = CommitLive::NetrcInteractor.new()
-        @currentLesson = CommitLive::Current.new
-      end
+			def initialize()
+				@git = setGit
+				@netrc = CommitLive::NetrcInteractor.new()
+				@currentLesson = CommitLive::Current.new
+				@status = CommitLive::Status.new
+			end
 
-      def commitAndPush
-        checkRemote
-        addChanges
-        commitChanges
+			def commitAndPush
+				checkRemote
+				addChanges
+				commitChanges
 
-        push
-        createPullRequest
-      end
+				push
+				createPullRequest
+				update_lesson_status
+			end
 
-      private
+			private
 
-      def setGit
-        begin
-          Git.open(FileUtils.pwd)
-        rescue ArgumentError => e
-          if e.message.match(/path does not exist/)
-            puts "It doesn't look like you're in a lesson directory."
-            puts 'Please cd into an appropriate directory and try again.'
+			def setGit
+				begin
+					Git.open(FileUtils.pwd)
+				rescue ArgumentError => e
+					if e.message.match(/path does not exist/)
+						puts "It doesn't look like you're in a lesson directory."
+						puts 'Please cd into an appropriate directory and try again.'
 
-            exit 1
-          else
-            puts 'Sorry, something went wrong. Please try again.'
-            exit 1
-          end
-        end
-      end
+						exit 1
+					else
+						puts 'Sorry, something went wrong. Please try again.'
+						exit 1
+					end
+				end
+			end
 
-      def checkRemote
-        netrc.read(machine: 'ga-extra')
-        username = dummyUsername || netrc.login
-        if git.remote.url.match(/#{username}/i).nil? && git.remote.url.match(/#{REPO_BELONGS_TO_US.join('|').gsub('-','\-')}/i).nil?
-          puts "It doesn't look like you're in a lesson directory."
-          puts 'Please cd into an appropriate directory and try again.'
+			def checkRemote
+				netrc.read(machine: 'ga-extra')
+				username = netrc.login
+				if git.remote.url.match(/#{username}/i).nil? && git.remote.url.match(/#{REPO_BELONGS_TO_US.join('|').gsub('-','\-')}/i).nil?
+					puts "It doesn't look like you're in a lesson directory."
+					puts 'Please cd into an appropriate directory and try again.'
+					exit 1
+				else
+					self.remote_name = git.remote.name
+				end
+			end
 
-          exit 1
-        else
-          self.remote_name = git.remote.name
-        end
-      end
+			def addChanges
+				puts 'Adding changes...'
+				git.add(all: true)
+			end
 
-      def addChanges
-        puts 'Adding changes...'
-        git.add(all: true)
-      end
+			def commitChanges
+				puts 'Committing changes...'
+				begin
+					git.commit('Done')
+				rescue Git::GitExecuteError => e
+					if e.message.match(/nothing to commit/)
+						puts "It looks like you have no changes to commit."
+						exit 1
+					else
+						puts 'Sorry, something went wrong. Please try again.'
+						exit 1
+					end
+				end
+			end
 
-      def commitChanges
-        puts 'Committing changes...'
-        begin
-          git.commit('Done')
-        rescue Git::GitExecuteError => e
-          if e.message.match(/nothing to commit/)
-            puts "It looks like you have no changes to commit."
-            exit 1
-          else
-            puts 'Sorry, something went wrong. Please try again.'
-            exit 1
-          end
-        end
-      end
+			def push()
+				puts 'Pushing changes to GitHub...'
+				push_remote = git.remote(self.remote_name)
+				begin
+					Timeout::timeout(15) do
+						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
+				rescue Timeout::Error
+					puts "Can't reach GitHub right now. Please try again."
+					exit 1
+				end
+			end
 
-      def push()
-        puts 'Pushing changes to GitHub...'
-        push_remote = git.remote(self.remote_name)
-        begin
-          Timeout::timeout(15) do
-            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
-        rescue Timeout::Error
-          puts "Can't reach GitHub right now. Please try again."
-          exit 1
-        end
-      end
+			def createPullRequest
+				puts 'Creating Pull Request...'
+				currentLesson.getCurrentLesson
+				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
+				rescue Octokit::Error => err
+					puts "Error while creating PR!"
+					puts err
+					exit 1
+				rescue Timeout::Error
+					puts "Please check your internet connection."
+					exit 1
+				end
+			end
 
-      def createPullRequest
-        puts 'Creating Pull Request...'
-        currentLesson.getCurrentLesson
-        userGithub = CommitLive::Github.new()
-        netrc.read
-        username = dummyUsername || netrc.login
-        begin
-          Timeout::timeout(45) do
-            parentRepo = currentLesson.getAttr('github_repo')
-            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
-          exit
-        rescue Timeout::Error
-          puts "Please check your internet connection."
-          exit
-        end
-      end
-    end
-  end
+			def update_lesson_status
+				puts 'Updating lesson status...'
+				lessonData = currentLesson.getAttr('data')
+				lessonName = lessonData['chapters']['lessons']['title']
+				status.update('submitted_pull_request', lessonName)
+			end
+		end
+	end
 end

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

@@ -1,4 +1,5 @@
 require "commit-live/lesson/current"
+require "commit-live/lesson/status"
 require "commit-live/netrc-interactor"
 require "commit-live/api"
 require "commit-live/github"
@@ -7,22 +8,24 @@ require 'git'
 
 module CommitLive
 	class Open
-		attr_reader :lessonName, :rootDir, :lesson
+		attr_reader :lessonName, :rootDir, :lesson, :forkedRepo, :lesson_status
 
 		HOME_DIR = File.expand_path("~")
 
-	    def initialize()
-	      	if File.exists?("#{HOME_DIR}/.ga-config")
-	      		@rootDir = YAML.load(File.read("#{HOME_DIR}/.ga-config"))[:workspace]
-	      	end
-	      	@lesson = CommitLive::Current.new
-	    end
+		def initialize()
+			if File.exists?("#{HOME_DIR}/.ga-config")
+				@rootDir = YAML.load(File.read("#{HOME_DIR}/.ga-config"))[:workspace]
+			end
+			@lesson = CommitLive::Current.new
+			@lesson_status = CommitLive::Status.new
+		end
 
 		def openALesson(*puzzle_name)
 			# get currently active lesson
 			puts "Getting current lesson..."
 			lesson.getCurrentLesson(puzzle_name)
-			@lessonName = lesson.getAttr('lesson_name')
+			lessonData = lesson.getAttr('data')
+			@lessonName = lessonData['chapters']['lessons']['title']
 			if !File.exists?("#{rootDir}/#{lessonName}")
 				# fork lesson repo via github api
 				forkCurrentLesson
@@ -30,6 +33,9 @@ module CommitLive
 				cloneCurrentLesson
 				# change group owner
 				change_grp_owner
+				# lesson forked API change
+				puts 'Updating lesson status...'
+				lesson_status.update('lesson_forked', lessonName)
 			end
 			# install dependencies
 			# cd into it and invoke bash
@@ -41,8 +47,9 @@ module CommitLive
 			github = CommitLive::Github.new()
 			begin
 				Timeout::timeout(15) do
-					lessonRepo = lesson.getAttr('github_repo')
-					forkedRepo = github.client.fork(lessonRepo)
+					lessonData = lesson.getAttr('data')
+					lessonRepo = lessonData['chapters']['lessons']['repo_url']
+					@forkedRepo = github.client.fork(lessonRepo)
 				end
 			rescue Octokit::Error => err
 				puts "Error while forking!"
@@ -57,18 +64,17 @@ module CommitLive
 		def cloneCurrentLesson
 			puts "Cloning lesson..."
 			begin
-	          	Timeout::timeout(15) do
-	          		cloneUrl = lesson.getAttr('forked_repo')
-	            	Git.clone("git@github.com:#{cloneUrl}.git", lessonName, path: rootDir)
-	          	end
-	        rescue Git::GitExecuteError => err
-	            puts "Error while cloning!"
-	            puts err
-	            exit
-	        rescue Timeout::Error
-	            puts "Cannot clone this lesson right now. Please try again."
-	            exit
-	        end
+				Timeout::timeout(15) do
+					Git.clone(forkedRepo.ssh_url, lessonName, path: rootDir)
+				end
+			rescue Git::GitExecuteError => err
+				puts "Error while cloning!"
+				puts err
+				exit
+			rescue Timeout::Error
+				puts "Cannot clone this lesson right now. Please try again."
+				exit
+			end
 		end
 
 		def change_grp_owner
@@ -76,7 +82,7 @@ module CommitLive
 			if results
 				puts "..."
 			else
-	            puts "Couldn't change group ownership"
+				puts "Couldn't change group ownership"
 			end
 		end
 

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

@@ -1,25 +1,25 @@
 module CommitLive
-  module Puzzle
-    class Parser
-      attr_reader :name
+	module Puzzle
+		class Parser
+			attr_reader :name
 
-      def initialize(name)
-        @name = name
-      end
+			def initialize(name)
+				@name = name
+			end
 
-      def parse!
-        if name.chars.include?(' ')
-          slugify_name!
-        else
-          name.downcase.strip
-        end
-      end
+			def parse!
+				if name.chars.include?(' ')
+					slugify_name!
+				else
+					name.downcase.strip
+				end
+			end
 
-      private
+			private
 
-      def slugify_name!
-        name.downcase.gsub(' ', '-').strip
-      end
-    end
-  end
+			def slugify_name!
+				name.downcase.gsub(' ', '-').strip
+			end
+		end
+	end
 end

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

@@ -0,0 +1,42 @@
+require "commit-live/api"
+require "commit-live/netrc-interactor"
+require 'uri'
+
+module CommitLive
+	class Status
+		attr_reader :api, :netrc
+
+		def initialize()
+			@api = CommitLive::API.new
+			@netrc = CommitLive::NetrcInteractor.new()
+		end
+
+		def update(type, lessonName)
+			begin
+				Timeout::timeout(15) do
+					netrc.read
+					token = netrc.password
+					enc_url = URI.escape("/v1/user/lesson/#{lessonName}")
+					response = api.post(
+						enc_url,
+						headers: { 'access-token' => "#{token}" },
+						params: { 
+							'method' => 'assignment_status',
+							'action' => type
+						}
+					)
+					if response.status == 202
+						puts "Lesson Status updated!"
+					else
+						puts "Something went wrong. Please try again."
+						exit 1
+					end
+				end
+			rescue Timeout::Error
+				puts "Error while updating lesson status."
+				puts "Please check your internet connection."
+				exit
+			end
+		end
+	end
+end

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

@@ -2,11 +2,11 @@ require 'commit-live/lesson/git-helper'
 require 'octokit'
 
 module CommitLive
-  class Submit
-    def run
-      CommitLive::Submit::GitHelper.new().commitAndPush
-      # Just to give GitHub a second to register the repo changes
-      sleep(1)
-    end
-  end
+	class Submit
+		def run
+		  	CommitLive::Submit::GitHelper.new().commitAndPush
+		  	# Just to give GitHub a second to register the repo changes
+		  	sleep(1)
+		end
+	end
 end

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

@@ -1,34 +1,34 @@
 require 'netrc'
 
 module CommitLive
-  class NetrcInteractor
-    attr_reader :login, :password, :netrc
+	class NetrcInteractor
+		attr_reader :login, :password, :netrc
 
-    def initialize
-      ensure_proper_permissions!
-    end
+		def initialize
+			ensure_proper_permissions!
+		end
 
-    def read(machine: 'ga-config')
-      @netrc = Netrc.read
-      @login, @password = netrc[machine]
-    end
+		def read(machine: 'ga-config')
+			@netrc = Netrc.read
+			@login, @password = netrc[machine]
+		end
 
-    def write(machine: 'ga-config', new_login:, new_password:)
-      netrc[machine] = new_login, new_password
-      netrc.save
-    end
+		def write(machine: 'ga-config', new_login:, new_password:)
+			netrc[machine] = new_login, new_password
+			netrc.save
+		end
 
-    def delete!(machine:)
-      @netrc = Netrc.read
+		def delete!(machine:)
+			@netrc = Netrc.read
 
-      netrc.delete(machine)
-      netrc.save
-    end
+			netrc.delete(machine)
+			netrc.save
+		end
 
-    private
+		private
 
-    def ensure_proper_permissions!
-      system('chmod 0600 ~/.netrc &>/dev/null')
-    end
-  end
+		def ensure_proper_permissions!
+			system('chmod 0600 ~/.netrc &>/dev/null')
+		end
+	end
 end

data/lib/commit-live/options-sanitizer.rb

@@ -1,44 +1,44 @@
 module CommitLive
-  class OptionsSanitizer
-    attr_reader :args
+    class OptionsSanitizer
+        attr_reader :args
 
-    KNOWN_COMMANDS = [
-      'test',
-      'hello',
-      'help',
-      'version',
-      '-v',
-      '--version',
-      'submit',
-      'open',
-      'reset',
-      'setup'
-    ]
+        KNOWN_COMMANDS = [
+            'test',
+            'hello',
+            'help',
+            'version',
+            '-v',
+            '--version',
+            'submit',
+            'open',
+            'reset',
+            'setup'
+        ]
 
-    def initialize(args)
-      @args = args
-    end
+        def initialize(args)
+            @args = args
+        end
 
-    def sanitize!
-      sanitizeTestArgs!
-    end
+        def sanitize!
+            sanitizeTestArgs!
+        end
 
-    private
+        private
 
-    def sanitizeTestArgs!
-      if missingOrUnknownArgs?
-        exitWithCannotUnderstand
-      end
-    end
+        def sanitizeTestArgs!
+            if missingOrUnknownArgs?
+                exitWithCannotUnderstand
+            end
+        end
 
-    # Arg check methods
-    def missingOrUnknownArgs?
-      args.empty? || !KNOWN_COMMANDS.include?(args[0])
-    end
+        # Arg check methods
+        def missingOrUnknownArgs?
+            args.empty? || !KNOWN_COMMANDS.include?(args[0])
+        end
 
-    def exitWithCannotUnderstand
-      puts "Sorry, I can't understand what you're trying to do. Type `clive help` for help."
-      exit
+        def exitWithCannotUnderstand
+            puts "Sorry, I can't understand what you're trying to do. Type `clive help` for help."
+            exit
+        end
     end
-  end
 end

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

@@ -1,34 +1,73 @@
 require 'yaml'
+require "commit-live/lesson/status"
+require "commit-live/netrc-interactor"
 require 'commit-live/tests/strategies/python-test'
 
 module CommitLive
-  class Test
-
-    def initialize()
-      die if !strategy
-    end
-
-    def run
-      strategy.check_dependencies
-      strategy.configure
-      strategy.run
-    end
-
-    def strategy
-      @strategy ||= strategies.map{ |s| s.new() }.detect(&:detect)
-    end
-
-    private
-
-    def strategies
-      [
-        CommitLive::Strategies::PythonUnittest
-      ]
-    end
-
-    def die
-      puts "This directory doesn't appear to have any specs in it."
-      exit
-    end
-  end
+	class Test
+		REPO_BELONGS_TO_US = [
+			'commit-live-students'
+		]
+
+		def initialize()
+			check_lesson_dir
+			die if !strategy
+		end
+
+		def set_git
+			begin
+				Git.open(FileUtils.pwd)
+			rescue => e
+				put_error_msg
+			end
+		end
+
+		def check_lesson_dir
+			git = set_git
+			netrc = CommitLive::NetrcInteractor.new()
+			netrc.read(machine: 'ga-extra')
+			username = netrc.login
+			if git.remote.url.match(/#{username}/i).nil? && git.remote.url.match(/#{REPO_BELONGS_TO_US.join('|').gsub('-','\-')}/i).nil?
+				put_error_msg
+			end
+		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.'
+			exit 1
+		end
+
+		def run
+			strategy.check_dependencies
+			strategy.configure
+			results = strategy.run
+			puts 'Updating lesson status...'
+			lessonName = File.basename(Dir.getwd)
+			if results
+				# test case passed
+				CommitLive::Status.new().update('test_case_pass', lessonName)
+			else
+				# test case failed
+				CommitLive::Status.new().update('test_case_fail', lessonName)
+			end
+		end
+
+		def strategy
+			@strategy ||= strategies.map{ |s| s.new() }.detect(&:detect)
+		end
+
+		private
+
+		def strategies
+			[
+				CommitLive::Strategies::PythonUnittest
+			]
+		end
+
+		def die
+			puts "This directory doesn't appear to have any specs in it."
+			exit
+		end
+	end
 end

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

@@ -1,21 +1,19 @@
 require 'commit-live/tests/strategy'
 
 module CommitLive
-  module Strategies
-    class PythonUnittest < CommitLive::Strategy
+	module Strategies
+		class PythonUnittest < CommitLive::Strategy
+			def detect
+				files.any? {|f| f.match(/.*.py$/) }
+			end
 
-      def detect
-        files.any? {|f| f.match(/.*.py$/) }
-      end
+			def files
+				@files ||= Dir.entries('.')
+			end
 
-      def files
-        @files ||= Dir.entries('.')
-      end
-
-      def run
-        system("nosetests")
-      end
-
-    end
-  end
+			def run
+				system("nosetests --verbose")
+			end
+		end
+	end
 end

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

@@ -1,15 +1,13 @@
 module CommitLive
-  class Strategy
+	class Strategy
+		def check_dependencies
+		end
 
-    def check_dependencies
-    end
+		def configure
+		end
 
-    def configure
-    end
-
-    def run
-      raise NotImplementedError, 'you must implement how this strategy runs its tests'
-    end
-    
-  end
+		def run
+		  	raise NotImplementedError, 'you must implement how this strategy runs its tests'
+		end
+	end
 end

data/lib/commit-live/user.rb

@@ -17,7 +17,10 @@ module CommitLive
 			puts "Authenticating..."
 			begin
 				Timeout::timeout(15) do
-					response = CommitLive::API.new().get('/bins/c4vbn')
+					response = CommitLive::API.new().get(
+						"/v1/users/#{token}", 
+						headers: { 'access-token' => "#{token}" }
+					)
 					if response.status == 200
 						# Save valid user details in netrc
 						user = JSON.parse(response.body)
@@ -25,17 +28,17 @@ module CommitLive
 						if login.nil? || password.nil?
 							save(user, token)
 						else
-							username = user.fetch('username')
+							username = user.fetch('data')['username']
 							welcome(username)
 						end
 					else
 						case response.status
 			            when 401
-			              puts "It seems your OAuth token is incorrect. Please retry with correct token."
-			              exit 1
+			              	puts "It seems your OAuth token is incorrect. Please retry with correct token."
+			              	exit 1
 			            else
-			              puts "Something went wrong. Please try again."
-			              exit 1
+			              	puts "Something went wrong. Please try again."
+			              	exit 1
 			            end
 					end
 				end
@@ -46,8 +49,9 @@ module CommitLive
 		end
 
 		def save(userDetails, token)
-			username = userDetails.fetch('username')
-			github_uid = userDetails.fetch('github_uid')
+			user_data = userDetails.fetch('data')
+			username = user_data['username']
+			github_uid = user_data['id']
 			netrc.write(new_login: 'greyatom', new_password: token)
 			netrc.write(machine: 'ga-extra', new_login: username, new_password: github_uid)
 			welcome(username)

data/lib/commit-live/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commit-live-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - greyatom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,7 @@ files:
 - lib/commit-live/lesson/git-helper.rb
 - lib/commit-live/lesson/open.rb
 - lib/commit-live/lesson/parser.rb
+- lib/commit-live/lesson/status.rb
 - lib/commit-live/lesson/submit.rb
 - lib/commit-live/netrc-interactor.rb
 - lib/commit-live/options-sanitizer.rb