copernicium 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10780d8221be1720570ca3e1b2c6cd60ea7235e0
-  data.tar.gz: de4d95fefe2dce4d81d323946db88db272380a48
+  metadata.gz: fbb6fba68a58e08a40c7ce16a1e17bc9eccfbffe
+  data.tar.gz: a758b66457ad81b6a60678250154d71d3f85d448
 SHA512:
-  metadata.gz: 493c6dc906e01453e355de01a6e137a92e563c990218390f18d0d4a9fbc08ce6cc9a603bda2a47e80fd0a60eaea309062988a4282bdfde33f11d6632fd469a6a
-  data.tar.gz: b8981fde53cbc665a9137ee1eacc71cb211e09770c7c8efff51194242997941692169a0cc628ced1e1ac29e849839f6089e70553653601f1c6f363c9aa1177c2
+  metadata.gz: 9fb0f72fc70a568d58573e0e245955694c2e9bffc7e4356058fedd7274b9999268496dd35e428f0bd670070309e31c70094490561901bd370a8ab283d4641be2
+  data.tar.gz: 9c31d2562c0e248161c60ee7e2f0ad6c84c29a04d80764dc0ef40ae9d4edb63e7c2f431da39c591369f79197b2785525c54a5a69b095abef18ae822f690dcf44

data/lib/pushpull.rb

@@ -22,7 +22,7 @@ module Copernicium
         @@host = remote[0]
         @@path = remote[1]
       elsif remote.length == 1
-        @@host = "cycle3.csug.rochester.edu"
+        @@host = "cycle1.csug.rochester.edu"
         @@path = remote.first
       else
         raise 'Remote host information not given.'.red
@@ -129,6 +129,7 @@ module Copernicium
     #
     # Description:
     #   pushes local changes on the current branch to a remote branch
+    #
     def PushPull.ppush
       begin
         PushPull.transfer do |ssh|
@@ -146,6 +147,7 @@ module Copernicium
 
         PushPull.connect do |ssh|
           puts ssh.exec! "cd #{@@path} && cn update #{@@user}"
+          puts ssh.exec! "cd #{@@path} && cn checkout head"
         end
       rescue => error
         connection_failure "trying to push files", error
@@ -163,17 +165,18 @@ module Copernicium
       begin
         PushPull.fetch do |session|
           # uploading our history to remote
-          session.download!("#{@@path}/.cn/merging_#{@@user}",
-                            "#{Dir.pwd}/.cn/history")
+          session.download!( "#{@@path}/.cn/history",
+                            "#{Dir.pwd}/.cn/merging_#{@@user}")
 
           # uploading our .cn info to remote
           %w{revs snap}.each do |file|
             session.download!("#{@@path}/.cn/#{file}",
                               "#{Dir.pwd}/.cn/",
-                              :recursive => true)
+                                :recursive => true)
           end
         end
         system "cn update", @@user
+        system "cn checkout head"
         puts "Remote pulled: ".grn + @@host + @@path
       rescue => error
         connection_failure "trying to pull files", error

data/lib/repos.rb

@@ -263,38 +263,55 @@ module Copernicium
       update_history
     end
 
+    # only append commits that arent already in there
+    # thus - the order is not the same, but that is ok
+    # bc each snapshot in our repo is atomic, not diffed
+    # snap here is the id of a specific commit id
+    # todo - optionally sort these by timestamp, sync
+    def Repos.merge_history(branch, hist)
+      hist.each do |snap|
+        @@history[branch] << snap unless @@history[branch].include? snap
+      end
+    end
+
     # FOR PUSHPULL UPDATE
+    # - give a comm with username hist to merge
     def Repos.update(comm = UIComm.new)
-      merge_name = File.join(@@copn, 'merging_'+comm.opts)
+      merge_name = File.join(@@copn, 'merging_' + comm.opts)
       status = "Remote is either up-to-date or ahead of local"
 
       if File.exist?(merge_name)
-        merger = YAML.load File.read(merge_name)
-
-        # merge @@history with merger hash
-        merger.each do |key, val|
-          if @@history.keys.include? key
-            val.each_with_index do |snap, index|
-              if @@history[key][index].nil?
-                @@history[key] += val[index..-1]
-                status = "Updated remote successfully"
-              elsif @@history[key][index] == snap
-                next
-              elsif @@history[key][index] != snap
-                @@history[key] += val[index..-1]
+        branches = YAML.load File.read(merge_name)
+
+        # merge @@history with remote hash
+        branches.each do |branch, hist|
+          if Repos.has_branch? branch
+            hist.each_with_index do |snap, i|
+
+              # merger hist length is longer than ours
+              if @@history[branch][i].nil?
+                status = "Updated successfully"
+                Repos.merge_history branch, hist
+                break
+
+              # merger hist diverged from our system
+              elsif @@history[branch][i] != snap
                 status = "Merged remote history with local"
+                Repos.merge_history branch, hist
+                break
               end
-            end
-          else
-            @@history[key] = val
+            end # will exit cleanly if we are more up-to-date
+          else # branch does not exist locally yet, copy
+            @@history[branch] = hist
           end
         end
 
+        puts 'Result: '.grn + status
         File.delete(merge_name)
         update_history
-        puts status
+        return status
       else
-        puts 'Error updating: '.red + merge_name + 'doesnt exist.'
+        puts 'Error updating: '.red + merge_name + ' does not exist.'
       end
     end # update
   end # Repos

data/lib/ui.rb

@@ -1,7 +1,7 @@
 # user interface module - parse and execute commands
 # integrates all modules, central module
 
-VERSION = "0.2.1"
+VERSION = "0.2.2"
 
 include Copernicium::PushPull
 

data/lib/workspace.rb

@@ -173,7 +173,7 @@ module Copernicium
       elsif remov.include? x
         @@files.delete_at(indexOf x)
       else
-        puts 'Failed, no changes: '.yel + x
+        puts 'No changes: '.yel + x
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copernicium
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Team Copernicium