lib/learn_submit/submission.rb in learn-submit-1.1.7 vs lib/learn_submit/submission.rb in learn-submit-1.2.0

@@ -1,21 +1,24 @@
+require 'yaml'
+
 module LearnSubmit
   class Submission
-    attr_reader :git, :client, :file_path, :message, :save
+    attr_reader :git, :client, :file_path, :message, :save, :token, :dot_learn
 
     def self.create(message: nil, save: false)
       new(message: message, save: save).create
     end
 
     def initialize(message:, save:)
-      _login, token = Netrc.read['learn-config']
+      _login, @token = Netrc.read['learn-config']
 
-      @client    = LearnWeb::Client.new(token: token)
+      @client    = LearnWeb::Client.new(token: @token)
       @git       = LearnSubmit::Submission::GitInteractor.new(username: user.username, message: message)
       @file_path = File.expand_path('~/.learn-submit-tmp')
       @message   = message
       @save      = save
+      @dot_learn = YAML.load(File.read("#{FileUtils.pwd}/.learn")) if File.exist?("#{FileUtils.pwd}/.learn")
     end
 
     def create
       setup_tmp_file
 
@@ -39,65 +42,134 @@
       @user ||= client.me
     end
 
     private
 
+    def simulate_submission!(retries=3)
+      begin
+        repo_name = git.repo_name(remote: 'origin')
+        org_name  = git.org_name(remote: 'origin')
+
+        if retries == 3
+          puts 'Pushing changes to GitHub...'
+          sleep(1)
+          puts 'Submitting lesson...'
+        end
+
+        Timeout::timeout(15) do
+          client.submit_event(
+            event: 'pull_request',
+            action: 'opened',
+            learn_oauth_token: token,
+            repo_name: repo_name,
+            base_org_name: org_name,
+            forkee: { full_name: nil },
+            pull_request: {
+              head: {
+                repo: {
+                  full_name: "#{org_name}/#{repo_name}",
+                  name: repo_name
+                }
+              }
+            },
+            summary: {
+              action: 'opened'
+            }
+          )
+        end
+
+        after_ide_submission(repo_name)
+      rescue Timeout::Error
+        if retries > 0
+          puts "There was a problem submitting this lab. Retrying..."
+          simulate_submission!(retries-1)
+        else
+          puts "There is an issue connecting to Learn. Please try again."
+          File.write(file_path, 'ERROR: Error connecting to Learn')
+          exit
+        end
+      end
+    end
+
     def commit_and_push!
       File.write(file_path, 'Pushing your code to GitHub...')
-      git.commit_and_push
 
+      if dot_learn && dot_learn['github'] == false
+        git.commit
+      else
+        git.commit_and_push
+      end
+
       # Just to give GitHub a second to register the repo changes
       sleep(1)
     end
 
     def submit!(retries=3)
-      if retries >= 2
-        puts 'Submitting lesson...'
-        File.write(file_path, 'Opening a Pull Request...')
-      end
-      repo_name   = git.repo_name
-      branch_name = git.branch_name
-      sleep(1)
+      if dot_learn && dot_learn['github'] == false
+        simulate_submission!
+      else
+        if retries >= 2
+          puts 'Submitting lesson...'
+          File.write(file_path, 'Opening a Pull Request...')
+        end
+        repo_name   = git.repo_name
+        branch_name = git.branch_name
+        sleep(1)
 
-      begin
-        pr_response = Timeout::timeout(15) do
-          client.issue_pull_request(repo_name: repo_name, branch_name: branch_name, message: message)
+        begin
+          pr_response = Timeout::timeout(15) do
+            client.issue_pull_request(repo_name: repo_name, branch_name: branch_name, message: message)
+          end
+        rescue Timeout::Error
+          if retries > 0
+            puts "It seems like there's a problem connecting to Learn. Trying again..."
+            submit!(retries-1)
+          else
+            puts "Sorry, there's a problem reaching Learn right now. Please try again."
+            File.write(file_path, 'ERROR: Error connecting to learn.')
+            exit 1
+          end
         end
-      rescue Timeout::Error
-        if retries > 0
-          puts "It seems like there's a problem connecting to Learn. Trying again..."
-          submit!(retries-1)
-        else
-          puts "Sorry, there's a problem reaching Learn right now. Please try again."
+
+        case pr_response.status
+        when 200
+          puts "Done."
+          after_ide_submission(repo_name)
+          File.write(file_path, 'Done.')
+          exit
+        when 404
+          puts 'Sorry, it seems like there was a problem connecting with Learn. Please try again.'
           File.write(file_path, 'ERROR: Error connecting to learn.')
           exit 1
+        else
+          if retries > 0
+            sleep(2)
+            submit!(0)
+          else
+            puts pr_response.message
+
+            if pr_response.message.match(/looks the same/)
+              File.write(file_path, 'ERROR: Nothing to submit')
+            else
+              File.write(file_path, 'Done.')
+            end
+
+            exit 1
+          end
         end
       end
+    end
 
-      case pr_response.status
-      when 200
-        puts "Done."
-        File.write(file_path, 'Done.')
-        exit
-      when 404
-        puts 'Sorry, it seems like there was a problem connecting with Learn. Please try again.'
-        File.write(file_path, 'ERROR: Error connecting to learn.')
-        exit 1
-      else
-        if retries > 0
-          sleep(2)
-          submit!(0)
-        else
-          puts pr_response.message
+    def after_ide_submission(repo_name)
+      return unless dot_learn && dot_learn['after_ide_submission']
+      return unless Socket.gethostname.end_with? '.students.learn.co'
 
-          if pr_response.message.match(/looks the same/)
-            File.write(file_path, 'ERROR: Nothing to submit')
-          else
-            File.write(file_path, 'Done.')
-          end
+      ide_user_home = "/home/#{ENV['USER']}"
+      path = "#{ide_user_home}/code/labs/#{repo_name}/"
+      url = dot_learn['after_ide_submission']
 
-          exit 1
-        end
+      File.open("#{ide_user_home}/.fs_changes.log", 'a') do |f|
+        f.puts "#{path} LEARN_SUBMIT #{url}"
       end
     end
   end
 end