commit-live-cli 0.0.19 → 0.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/commit-live/lesson/git-helper.rb +33 -12
- data/lib/commit-live/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 38743cbc13c194ddba0d135f047366ec1062b7b3
|
|
4
|
+
data.tar.gz: 846837b4836fafbcac89b5e6ebe0af1369d21974
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f58480d94e856c15a2a661d8abf9cece60aa2290c0d4d6cca4bca73cabb2d7be8df175a32176a612bc020f6e496a3d1d76c38e9c9497799fd3d72765d5f65c7c
|
|
7
|
+
data.tar.gz: f40d80d4ab258a9448e43538405c8af8d491c428a54112632742ee288f23fb16a48690506e07f1f2b02a68e5f37bbaa6837a10b09f16098009148fdb1c8bdaeb
|
|
@@ -112,6 +112,19 @@ module CommitLive
|
|
|
112
112
|
system("git reset HEAD~1")
|
|
113
113
|
end
|
|
114
114
|
|
|
115
|
+
def pull_changes
|
|
116
|
+
begin
|
|
117
|
+
Timeout::timeout(15) do
|
|
118
|
+
git.pull
|
|
119
|
+
puts "Now you will have to run `clive submit` again."
|
|
120
|
+
exit 1
|
|
121
|
+
end
|
|
122
|
+
rescue Timeout::Error
|
|
123
|
+
puts "Can't reach GitHub right now. Please try again."
|
|
124
|
+
exit 1
|
|
125
|
+
end
|
|
126
|
+
end
|
|
127
|
+
|
|
115
128
|
def push()
|
|
116
129
|
puts 'Pushing changes to GitHub...'
|
|
117
130
|
push_remote = git.remote(self.remote_name)
|
|
@@ -121,12 +134,18 @@ module CommitLive
|
|
|
121
134
|
end
|
|
122
135
|
rescue Git::GitExecuteError => e
|
|
123
136
|
rollback_last_commit()
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
137
|
+
if e.message.match(/You may want to first integrate the remote changes/)
|
|
138
|
+
puts "It seems that you have made changes to the assignment outside of our IDE."
|
|
139
|
+
puts "Pulling the changes..."
|
|
140
|
+
pull_changes
|
|
141
|
+
else
|
|
142
|
+
sentry.log_exception(e,
|
|
143
|
+
{
|
|
144
|
+
'event': 'pushing',
|
|
145
|
+
'lesson_name' => lessonName,
|
|
146
|
+
}
|
|
147
|
+
)
|
|
148
|
+
end
|
|
130
149
|
rescue Timeout::Error
|
|
131
150
|
puts "Can't reach GitHub right now. Please try again."
|
|
132
151
|
exit 1
|
|
@@ -149,12 +168,14 @@ module CommitLive
|
|
|
149
168
|
)
|
|
150
169
|
end
|
|
151
170
|
rescue Octokit::Error => err
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
171
|
+
if !err.message.match(/A pull request already exists/)
|
|
172
|
+
sentry.log_exception(err,
|
|
173
|
+
{
|
|
174
|
+
'event': 'creating-pull-request',
|
|
175
|
+
'lesson_name' => lessonName,
|
|
176
|
+
}
|
|
177
|
+
)
|
|
178
|
+
end
|
|
158
179
|
rescue Timeout::Error
|
|
159
180
|
puts "Please check your internet connection."
|
|
160
181
|
exit 1
|
data/lib/commit-live/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: commit-live-cli
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.20
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- greyatom
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-06-
|
|
11
|
+
date: 2017-06-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|