learn-submit 1.2.0 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4525349457cadc91740d2369a91f63b874ebbd2a
4
- data.tar.gz: 14730ab215f77ff68be6fd241119d72a2c4d8e80
3
+ metadata.gz: ccb84e8f5d4944f93fb0547f3f08c73886b34489
4
+ data.tar.gz: 64294f15b5fa352dba24f3adb1efe645b51a18df
5
5
  SHA512:
6
- metadata.gz: db069a6647bad5ca8f68d66f0bd4a86b8e835cbc94a9833f1fe3a98cf323d2eee1d7f372067c1defdf1184efaa0042382bde5423731cbe7fd01b75d0f8f3a5f1
7
- data.tar.gz: 778d96308cafa33a07974549390458a0b4ead388f8df4e1140729a5ab7c7e4138bb2075f62cdc71676006ef2f41cdb70556824550789890b729b1f9629b37cde
6
+ metadata.gz: 410baf08f2d8f5e1585eedc87b34f01abae3f64c9a06c80a038eaa8520f430991e026e9af17a1584c5b1fa51a6c0d692f719c8b6bbd13f472ea32ad86c461128
7
+ data.tar.gz: 22a0ffc2c0de43753b5058a9f821a12e8aab5486455668c1f06cce7669e942fec67c91afed529452d158efa4130b5d4a418880aa6dacb16a8e00b97c893c5c2d
data/lib/learn_submit.rb CHANGED
@@ -3,7 +3,6 @@ require 'netrc'
3
3
  require 'git'
4
4
  require 'learn_web'
5
5
  require 'fileutils'
6
- require 'socket'
7
6
 
8
7
  require 'learn_submit/version'
9
8
  require 'learn_submit/submission'
@@ -1,4 +1,5 @@
1
1
  require 'yaml'
2
+ require 'json'
2
3
 
3
4
  module LearnSubmit
4
5
  class Submission
@@ -161,14 +162,28 @@ module LearnSubmit
161
162
 
162
163
  def after_ide_submission(repo_name)
163
164
  return unless dot_learn && dot_learn['after_ide_submission']
164
- return unless Socket.gethostname.end_with? '.students.learn.co'
165
+ return unless ENV['IDE_CONTAINER'] == 'true'
165
166
 
166
167
  ide_user_home = "/home/#{ENV['USER']}"
167
- path = "#{ide_user_home}/code/labs/#{repo_name}/"
168
- url = dot_learn['after_ide_submission']
169
168
 
170
- File.open("#{ide_user_home}/.fs_changes.log", 'a') do |f|
171
- f.puts "#{path} LEARN_SUBMIT #{url}"
169
+ payload = {
170
+ command: 'after_ide_submission',
171
+ url: dot_learn['after_ide_submission']
172
+ }
173
+
174
+ File.open("#{ide_user_home}/.custom_commands.log", 'a') do |f|
175
+ f.puts payload.to_json
176
+ end
177
+
178
+ # TODO: the following can be removed when IDE versions <2.0 are no
179
+ # longer supported. There is no '.fs_changes.log' for users on >2.0.
180
+ if File.exist?("#{ide_user_home}/.fs_changes.log")
181
+ path = "#{ide_user_home}/code/labs/#{repo_name}/"
182
+ url = dot_learn['after_ide_submission']
183
+
184
+ File.open("#{ide_user_home}/.fs_changes.log", 'a') do |f|
185
+ f.puts "#{path} LEARN_SUBMIT #{url}"
186
+ end
172
187
  end
173
188
  end
174
189
  end
@@ -30,7 +30,7 @@ module LearnSubmit
30
30
 
31
31
  def repo_name(remote: remote_name)
32
32
  url = git.remote(remote).url
33
- url.match(/^.+\w+\/(.*?)(?:\.git)?$/)[1]
33
+ url.match(/^.+[\w-]+\/(.*?)(?:\.git)?$/)[1]
34
34
  end
35
35
 
36
36
  def org_name(remote: remote_name)
@@ -61,13 +61,13 @@ module LearnSubmit
61
61
  end
62
62
 
63
63
  def check_remote
64
- if git.remote.url.match(/#{username}/).nil? && git.remote.url.match(/#{LEARN_ORG_NAMES.join('|').gsub('-','\-')}/).nil?
64
+ if git.remote.url.match(/#{username}/i).nil? && git.remote.url.match(/#{LEARN_ORG_NAMES.join('|').gsub('-','\-')}/i).nil?
65
65
  puts "It doesn't look like you're in a lesson directory."
66
66
  puts 'Please cd into an appropriate directory and try again.'
67
67
 
68
68
  exit 1
69
69
  else
70
- self.remote_name = if git.remote.url.match(/#{username}/).nil?
70
+ self.remote_name = if git.remote.url.match(/#{username}/i).nil?
71
71
  fix_remote!
72
72
  else
73
73
  git.remote.name
@@ -1,3 +1,3 @@
1
1
  module LearnSubmit
2
- VERSION = '1.2.0'
2
+ VERSION = '1.3.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: learn-submit
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Flatiron School
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-14 00:00:00.000000000 Z
11
+ date: 2016-11-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -120,8 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
120
120
  version: '0'
121
121
  requirements: []
122
122
  rubyforge_project:
123
- rubygems_version: 2.4.8
123
+ rubygems_version: 2.4.5
124
124
  signing_key:
125
125
  specification_version: 4
126
126
  summary: Submit your lessons to Learn.co
127
127
  test_files: []
128
+ has_rdoc: