learn-submit 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4525349457cadc91740d2369a91f63b874ebbd2a
-  data.tar.gz: 14730ab215f77ff68be6fd241119d72a2c4d8e80
+  metadata.gz: ccb84e8f5d4944f93fb0547f3f08c73886b34489
+  data.tar.gz: 64294f15b5fa352dba24f3adb1efe645b51a18df
 SHA512:
-  metadata.gz: db069a6647bad5ca8f68d66f0bd4a86b8e835cbc94a9833f1fe3a98cf323d2eee1d7f372067c1defdf1184efaa0042382bde5423731cbe7fd01b75d0f8f3a5f1
-  data.tar.gz: 778d96308cafa33a07974549390458a0b4ead388f8df4e1140729a5ab7c7e4138bb2075f62cdc71676006ef2f41cdb70556824550789890b729b1f9629b37cde
+  metadata.gz: 410baf08f2d8f5e1585eedc87b34f01abae3f64c9a06c80a038eaa8520f430991e026e9af17a1584c5b1fa51a6c0d692f719c8b6bbd13f472ea32ad86c461128
+  data.tar.gz: 22a0ffc2c0de43753b5058a9f821a12e8aab5486455668c1f06cce7669e942fec67c91afed529452d158efa4130b5d4a418880aa6dacb16a8e00b97c893c5c2d

data/lib/learn_submit.rb

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

data/lib/learn_submit/submission.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'json'
 
 module LearnSubmit
   class Submission
@@ -161,14 +162,28 @@ module LearnSubmit
 
     def after_ide_submission(repo_name)
       return unless dot_learn && dot_learn['after_ide_submission']
-      return unless Socket.gethostname.end_with? '.students.learn.co'
+      return unless ENV['IDE_CONTAINER'] == 'true'
 
       ide_user_home = "/home/#{ENV['USER']}"
-      path = "#{ide_user_home}/code/labs/#{repo_name}/"
-      url = dot_learn['after_ide_submission']
 
-      File.open("#{ide_user_home}/.fs_changes.log", 'a') do |f|
-        f.puts "#{path} LEARN_SUBMIT #{url}"
+      payload = {
+        command: 'after_ide_submission',
+        url: dot_learn['after_ide_submission']
+      }
+
+      File.open("#{ide_user_home}/.custom_commands.log", 'a') do |f|
+        f.puts payload.to_json
+      end
+
+      # TODO: the following can be removed when IDE versions <2.0 are no
+      # longer supported. There is no '.fs_changes.log' for users on >2.0.
+      if File.exist?("#{ide_user_home}/.fs_changes.log")
+        path = "#{ide_user_home}/code/labs/#{repo_name}/"
+        url = dot_learn['after_ide_submission']
+
+        File.open("#{ide_user_home}/.fs_changes.log", 'a') do |f|
+          f.puts "#{path} LEARN_SUBMIT #{url}"
+        end
       end
     end
   end

data/lib/learn_submit/submission/git_interactor.rb

@@ -30,7 +30,7 @@ module LearnSubmit
 
       def repo_name(remote: remote_name)
         url = git.remote(remote).url
-        url.match(/^.+\w+\/(.*?)(?:\.git)?$/)[1]
+        url.match(/^.+[\w-]+\/(.*?)(?:\.git)?$/)[1]
       end
 
       def org_name(remote: remote_name)
@@ -61,13 +61,13 @@ module LearnSubmit
       end
 
       def check_remote
-        if git.remote.url.match(/#{username}/).nil? && git.remote.url.match(/#{LEARN_ORG_NAMES.join('|').gsub('-','\-')}/).nil?
+        if git.remote.url.match(/#{username}/i).nil? && git.remote.url.match(/#{LEARN_ORG_NAMES.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 = if git.remote.url.match(/#{username}/).nil?
+          self.remote_name = if git.remote.url.match(/#{username}/i).nil?
             fix_remote!
           else
             git.remote.name

data/lib/learn_submit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-submit
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,8 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Submit your lessons to Learn.co
 test_files: []
+has_rdoc: