learn-submit 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9517ce44fc87974bc5910af238aa67b5c34d63d9
-  data.tar.gz: 24165e50ea22b2b9e20bf2a12bbe206da60035c0
+  metadata.gz: 4525349457cadc91740d2369a91f63b874ebbd2a
+  data.tar.gz: 14730ab215f77ff68be6fd241119d72a2c4d8e80
 SHA512:
-  metadata.gz: df221ac7311ef21e3a15794c064f122cd501a341c185704c33d9acffe75396c788e962d84bb0029e79f562276d911ddfe81ea788723525eb4cffbdd7bd8a1c08
-  data.tar.gz: 0a82d3c1f00feabc468254c8473c528c590be838dcbb9cefa060d9d193c675212379f19fc02dcd11fc252616add9ce80680e284e4ae92e67b0b952fd3973eb99
+  metadata.gz: db069a6647bad5ca8f68d66f0bd4a86b8e835cbc94a9833f1fe3a98cf323d2eee1d7f372067c1defdf1184efaa0042382bde5423731cbe7fd01b75d0f8f3a5f1
+  data.tar.gz: 778d96308cafa33a07974549390458a0b4ead388f8df4e1140729a5ab7c7e4138bb2075f62cdc71676006ef2f41cdb70556824550789890b729b1f9629b37cde

data/learn-submit.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "netrc"
   spec.add_runtime_dependency "git", "~> 1.2"
-  spec.add_runtime_dependency "learn-web", ">= 1.4.2"
+  spec.add_runtime_dependency "learn-web", ">= 1.5.0"
 end

data/lib/learn_submit/submission/git_interactor.rb

@@ -23,11 +23,21 @@ module LearnSubmit
         push!
       end
 
-      def repo_name
-        url = git.remote(remote_name).url
+      def commit
+        add_changes
+        commit_changes
+      end
+
+      def repo_name(remote: remote_name)
+        url = git.remote(remote).url
         url.match(/^.+\w+\/(.*?)(?:\.git)?$/)[1]
       end
 
+      def org_name(remote: remote_name)
+        url = git.remote(remote).url
+        url.match(/^.+github\.com(?::|\/)(.+)\/.*?(?:\.git)?$/)[1]
+      end
+
       def branch_name
         git.branch.name
       end

data/lib/learn_submit/submission.rb

@@ -1,19 +1,22 @@
+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
@@ -41,62 +44,131 @@ module LearnSubmit
 
     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

data/lib/learn_submit/version.rb

@@ -1,3 +1,3 @@
 module LearnSubmit
-  VERSION = '1.1.7'
+  VERSION = '1.2.0'
 end

data/lib/learn_submit.rb

@@ -3,6 +3,7 @@ require 'netrc'
 require 'git'
 require 'learn_web'
 require 'fileutils'
+require 'socket'
 
 require 'learn_submit/version'
 require 'learn_submit/submission'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-submit
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
 description: 
 email:
 - learn@flatironschool.com