copernicium 0.1.5 → 0.2
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/pushpull.rb +2 -2
- data/lib/repos.rb +1 -1
- data/lib/ui.rb +4 -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: bb49598d0bd7914847f5858ea90168e36f15ad37
|
|
4
|
+
data.tar.gz: 85637d6e9b716ecc5385227e33586637d27f3af6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 99ae824c06b7abde02396df9eac7399a0cd33a261afcb02be1dd07e56db48cccdb12aeb77b3417e1279d2827cf6a52807ed27e5481ef9dc1c7382ce32b12e8ef
|
|
7
|
+
data.tar.gz: faab1d91a0326f4927b4e358804e306af271eb5dc671db3dab6ac8793fc15683207a293b74303a1c61fdd9a0236cd82f06c4a29cb5a6636cf03ba1ef34c51e66
|
data/lib/pushpull.rb
CHANGED
|
@@ -139,7 +139,7 @@ module Copernicium
|
|
|
139
139
|
# uploading our .cn info to remote
|
|
140
140
|
%w{revs snap}.each do |file|
|
|
141
141
|
ssh.upload!("#{Dir.pwd}/.cn/#{file}/",
|
|
142
|
-
"#{@@path}/.cn
|
|
142
|
+
"#{@@path}/.cn/",
|
|
143
143
|
:recursive => true)
|
|
144
144
|
end
|
|
145
145
|
end # ssh
|
|
@@ -169,7 +169,7 @@ module Copernicium
|
|
|
169
169
|
# uploading our .cn info to remote
|
|
170
170
|
%w{revs snap}.each do |file|
|
|
171
171
|
session.download!("#{@@path}/.cn/#{file}",
|
|
172
|
-
"#{Dir.pwd}/.cn
|
|
172
|
+
"#{Dir.pwd}/.cn/",
|
|
173
173
|
:recursive => true)
|
|
174
174
|
end
|
|
175
175
|
end
|
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_'
|
|
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
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
# user interface module - parse and execute commands
|
|
2
2
|
# integrates all modules, central module
|
|
3
3
|
|
|
4
|
-
VERSION = "0.
|
|
4
|
+
VERSION = "0.2"
|
|
5
5
|
|
|
6
6
|
include Copernicium::PushPull
|
|
7
7
|
|
|
@@ -168,9 +168,12 @@ module Copernicium
|
|
|
168
168
|
elsif Repos.has_branch? branch # switch branch (branch <branch name>)
|
|
169
169
|
Repos.update_branch branch
|
|
170
170
|
puts "Current: ".grn + Repos.current
|
|
171
|
+
Workspace.checkout
|
|
171
172
|
|
|
172
173
|
else # create it, switch to it
|
|
173
174
|
Repos.create_branch branch
|
|
175
|
+
Repos.update_branch branch
|
|
176
|
+
Workspace.checkout
|
|
174
177
|
end
|
|
175
178
|
end
|
|
176
179
|
|