copernicium 0.1.4 → 0.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/pushpull.rb +3 -3
- data/lib/repos.rb +1 -1
- data/lib/ui.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 83ec826f3d14cdbcb995b248af87f070a72bf824
|
4
|
+
data.tar.gz: 612121ddaf591375956f07cb4a21e7d3efbab340
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 962d4c277e254076c342888aaecd93f603d9294f3149532df8c04e01d8ecbd92fff192c51ae8e6c0473e3b79f920327538d6a03d05815852783d9e51a5f02d63
|
7
|
+
data.tar.gz: dd22e97f46e08031d06e7c75e7b1489d8e1ff68fa19f01ce280ef8b7781239acbce022e9be5981cee61a329da2db5b216b9d3db98fefe730188775d0a130058d
|
data/lib/pushpull.rb
CHANGED
@@ -100,7 +100,8 @@ module Copernicium
|
|
100
100
|
# Function: fetch()
|
101
101
|
#
|
102
102
|
# Description:
|
103
|
-
# a net/scp wrapper to copy from server, can take a block or do a one-off
|
103
|
+
# a net/scp wrapper to copy from server, can take a block or do a one-off
|
104
|
+
# copy without one
|
104
105
|
#
|
105
106
|
# local: where we want to put the file, not needed for blocked calls
|
106
107
|
def PushPull.fetch
|
@@ -144,8 +145,7 @@ module Copernicium
|
|
144
145
|
end # ssh
|
145
146
|
|
146
147
|
PushPull.connect do |ssh|
|
147
|
-
ssh.exec! "cd #{@@path}"
|
148
|
-
puts ssh.exec! "cn update #{@@user}"
|
148
|
+
puts ssh.exec! "cd #{@@path} && cn update #{@@user}"
|
149
149
|
end
|
150
150
|
rescue => error
|
151
151
|
connection_failure "trying to push files", error
|
data/lib/repos.rb
CHANGED
@@ -265,7 +265,7 @@ module Copernicium
|
|
265
265
|
|
266
266
|
# FOR PUSHPULL UPDATE
|
267
267
|
def Repos.update(comm = UIComm.new)
|
268
|
-
merge_name = File.join(@@copn,'merging_',comm.
|
268
|
+
merge_name = File.join(@@copn,'merging_',comm.opts)
|
269
269
|
status = "Remote is either up-to-date or ahead of local"
|
270
270
|
|
271
271
|
if File.exist?(merge_name)
|
data/lib/ui.rb
CHANGED