copernicium 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb6fba68a58e08a40c7ce16a1e17bc9eccfbffe
-  data.tar.gz: a758b66457ad81b6a60678250154d71d3f85d448
+  metadata.gz: eb6640d45f2e8340d6773a90b84562c18f49e081
+  data.tar.gz: b7167785efeb0792ef678319288627cc6c1c1c18
 SHA512:
-  metadata.gz: 9fb0f72fc70a568d58573e0e245955694c2e9bffc7e4356058fedd7274b9999268496dd35e428f0bd670070309e31c70094490561901bd370a8ab283d4641be2
-  data.tar.gz: 9c31d2562c0e248161c60ee7e2f0ad6c84c29a04d80764dc0ef40ae9d4edb63e7c2f431da39c591369f79197b2785525c54a5a69b095abef18ae822f690dcf44
+  metadata.gz: 087e52e28beb477b9b588812f1874f2cd98ba982c12585e794ace85a5c7afd114b88b1ab279a365a9f5fb8627c4b86f4c308a3104742c63db1baea94a86d1833
+  data.tar.gz: b6dc121c1b32d9905f41254af357c9ff90387497d9f5fe921245cb8870b0acfc28724bfed6c962408ac38da65def9e29effca7f9f76e0ea506daccbc045585b9

data/lib/banners.rb

@@ -54,14 +54,24 @@ EOS
 
 
 IN_REPO_WARNING = <<-EOS
-You are currently in a Copernicium repo... `cn init` is not valid here!
+You are currently in a Copernicium repo...
+`cn init` is not valid here!
 EOS
 
 NO_REPO_WARNING = <<-EOS
-You are not currently in a Copernicium repo... run `cn init` to create one!
+You are not currently in a Copernicium repo...
+Run `cn init` to create one!
 EOS
 
 AUTHOR_BANNER = <<-EOS
-  todo
+  Jeremy Warner
+  Luisa Neves
+  Chris Wong
+  Xiang-Ru Lian
+  Logan Gittelson
+  Linfeng Song
+  Qiguang Liu
+  Frank Tamburrino
+  Ethan Johnson
 EOS
 

data/lib/repos.rb

@@ -104,6 +104,16 @@ module Copernicium
       File.write @@hist, YAML.dump(@@history) # write history
     end
 
+    def Repos.merge_history(branch, hist)
+      @@history[branch] = sort_history(@@history[branch] + hist).uniq
+    end
+
+    def Repos.sort_history(hist)
+      #fails if there is no snapshot with the target id (a | b)
+      #hist.sort { |a, b| get_snapshot(a).date <=> get_snapshot(b).date }
+      hist
+    end
+
     # Return array of snapshot IDs
     def Repos.history(branch = nil)
       if branch.nil? # return a list of unique all commits
@@ -268,51 +278,51 @@ module Copernicium
     # 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
+    # - give a comm with user's history to merge
     def Repos.update(comm = UIComm.new)
       merge_name = File.join(@@copn, 'merging_' + comm.opts)
-      status = "Remote is either up-to-date or ahead of local"
 
-      if File.exist?(merge_name)
+      if File.exist?(merge_name) # merge history
         branches = YAML.load File.read(merge_name)
+        statuses = {}
 
         # merge @@history with remote hash
         branches.each do |branch, hist|
-          if Repos.has_branch? branch
+          statuses[branch] = 'is up-to-date with remote'
+          if Repos.has_branch? branch # update
             hist.each_with_index do |snap, i|
 
+              #byebug
               # merger hist length is longer than ours
               if @@history[branch][i].nil?
-                status = "Updated successfully"
+                statuses[branch] = 'updated successfully'
                 Repos.merge_history branch, hist
                 break
 
-              # merger hist diverged from our system
+                # merger hist diverged from our system
               elsif @@history[branch][i] != snap
-                status = "Merged remote history with local"
+                statuses[branch] = 'merged history with local'
                 Repos.merge_history branch, hist
                 break
-              end
+
+              end # else synchronized - no differences
             end # will exit cleanly if we are more up-to-date
           else # branch does not exist locally yet, copy
+            statuses[branch] = 'created ok'
             @@history[branch] = hist
           end
-        end
+          puts "Success: ".grn + "#{branch} ".yel + statuses[branch]
+        end # end branch iterations
 
-        puts 'Result: '.grn + status
-        File.delete(merge_name)
+        # cleaning up...persist
+        File.delete merge_name
         update_history
-        return status
       else
         puts 'Error updating: '.red + merge_name + ' does not exist.'
       end
+      statuses
     end # update
   end # Repos
 end # Copernicium

data/lib/ui.rb

@@ -1,7 +1,7 @@
 # user interface module - parse and execute commands
 # integrates all modules, central module
 
-VERSION = "0.2.2"
+VERSION = "0.2.3"
 
 include Copernicium::PushPull
 
@@ -139,14 +139,15 @@ module Copernicium
       branch = args.shift
       if branch.nil? # show all branches
         puts "Current: ".grn + Repos.current
-        puts "Branches: ".grn + Repos.branches.join(' ')
+        Repos.branches.each { |br| puts 'Branch: ' + br }
+        puts "Total: ".grn + Repos.branches.length.to_s
 
-      elsif branch == '-c' # try to create a new branch
+      elsif branch == '-c' # create a new branch
         branch = args.first # get from the user
         branch = get "new branch name" if branch.nil?
         create_branch branch
 
-      elsif branch == '-r' # rename the current branch
+      elsif branch == '-r' # rename branch
         newname = args.first # get if not specified
         newname = get "new name for current branch" if newname.nil?
         oldname = Repos.current
@@ -155,7 +156,7 @@ module Copernicium
         puts "Deleted branch '#{oldname}'".grn
         puts "Renamed branch '#{oldname}' to '#{newname}'".grn
 
-      elsif branch == '-d' # Delete the specified branch
+      elsif branch == '-d' # delete branch
         branch = args.first # If not specified, get
         branch = get "branch to delete" if branch.nil?
         if branch == Repos.current
@@ -167,7 +168,7 @@ module Copernicium
 
       elsif Repos.has_branch? branch # switch branch (branch <branch name>)
         Repos.update_branch branch
-        puts "Current: ".grn + Repos.current
+        puts 'Current: '.grn + Repos.current
         Workspace.checkout
 
       else # create it, switch to it
@@ -180,8 +181,8 @@ module Copernicium
     def clonecn(args)
       user = args.first
       host = args.last
-      user = get "username for push" if user.nil?
-      host = get "host path (<host:/dir/of/repo>)" if host.nil? || user == host
+      user = get 'username for push' if user.nil?
+      host = get 'host path (<host:/dir/of/repo>)' if host.nil? || user == host
       comm = UIComm.new(command: 'clone', repo: host, opts: user)
       PushPull.UICommandParser(comm)
       return comm
@@ -190,8 +191,8 @@ module Copernicium
     def push(args)
       user = args.first
       host = args.last
-      user = get "username for push" if user.nil?
-      host = get "host path (<host:/dir/of/repo>)" if host.nil? || user == host
+      user = get 'username for push' if user.nil?
+      host = get 'host path (<host:/dir/of/repo>)' if host.nil? || user == host
       comm = UIComm.new(command: 'push', repo: host, opts: user)
       PushPull.UICommandParser(comm)
       return comm
@@ -200,8 +201,8 @@ module Copernicium
     def pull(args)
       user = args.first
       host = args.last
-      user = get "username for push" if user.nil?
-      host = get "host path (<host:/dir/of/repo>)" if host.nil? || user == host
+      user = get 'username for push' if user.nil?
+      host = get 'host path (<host:/dir/of/repo>)' if host.nil? || user == host
       comm = UIComm.new(command: 'pull', repo: host, opts: user)
       PushPull.UICommandParser(comm)
       return comm
@@ -214,7 +215,7 @@ module Copernicium
         rev = get 'branch or commit id'
       else
         rev = args.shift
-        files = args
+        files = args unless args.empty?
       end
 
       # if 'head' keyword, grab the head
@@ -252,7 +253,7 @@ module Copernicium
 
       # perform the commit, with workspace
       ui = UIComm.new(command: 'commit', files: files, cmt_msg: message)
-      puts "New commit: ".grn + Workspace.commit(ui)
+      puts 'New commit: '.grn + Workspace.commit(ui)
       ui
     end
 
@@ -274,16 +275,16 @@ module Copernicium
         rev = (Repos.history rev).last
         conflicts = Workspace.merge(rev)
         unless conflicts.nil?
-          conflicts.each { |conflict| puts "Conflict: ".red + conflict }
+          conflicts.each { |conflict| puts 'Conflict: '.red + conflict }
         end
       else # branch not found
-        puts "Branch not found: ".red + rev
+        puts 'Branch not found: '.red + rev
       end
     end
 
     def update(args)
       if args.empty?
-        username = get "user to update to"
+        username = get 'user to update to'
       else
         username = args.first
       end

data/lib/workspace.rb

@@ -1,10 +1,11 @@
-# workspace module - linfeng and qiguang
-
+# workspace module
+# linfeng song, qiguang liu
 
 module Copernicium
   class FileObj
-    attr_reader :path, :history
+    attr_reader :path, :base, :history
     def initialize(path, ids)
+      @base =  File.dirname(path)
       @history = ids
       @path = path
     end
@@ -123,6 +124,7 @@ module Copernicium
     def Workspace.checkout_file(file)
       idx = indexOf(file.path)
       idx.nil?? @@files << file : @@files[idx] = file
+      Dir.mkdir file.base unless Dir.exist? file.base
       File.write(file.path, RevLog.get_file(file.last))
     end
 
@@ -136,8 +138,9 @@ module Copernicium
           Workspace.checkout_file file
         end
       else # just checkout given files
-        Repos.get_snapshot(comm.rev).files.select { |f|
-          comm.files.include? f.path }.each do |file|
+        Repos.get_snapshot(comm.rev).files.select do |f|
+          comm.files.include? f.path
+        end .each do |file|
           Workspace.checkout_file file
         end
       end

metadata

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