copernicium 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cffaf1f93a4556043ac0a484ef0e10c24f7ea692
-  data.tar.gz: 41ece5cd459baf3690d2701e153b232293f3a433
+  metadata.gz: c7ec43a07b4f3d15b9d556319b6d7afd72e5cc7f
+  data.tar.gz: ed07ade71e83ac560723852e8b81bfee6dc58946
 SHA512:
-  metadata.gz: 215e18ebaa93fb182b3ea4407bbf266cee5004baef77e1ff195cbcd32061a7314e7c49b02b1f762482c950436c495b802f302d8d2bf976c0b17518bd17d5444c
-  data.tar.gz: ebf39e146f63bc17bc70de329ea98c2b5f0cbea79f6a4aa620f9f21719f96879ea7737864e34a2d747ee75861ba2c5f9daad1c9a6f55c81a509a6a95a324f265
+  metadata.gz: a7f2f92fbb43d8d08babd1d201396ca896f7e4e9418d8ea3c6fd1ae2dc4e0df6a2b52c9899ac57e58d1bc3578ceaa6b1794d3efbb1a08bafd4d278fef50e2062
+  data.tar.gz: 563d55b11341b39786aeea08cf535677476c7bc96ba6d08ea8c4c2577a5c499baa1c52a2655eb41eba4b31f85f2e565bfbb9f7afe609b8cc5a440e8a412780b8

data/lib/RevLog.rb

@@ -26,37 +26,35 @@
 
 module Copernicium
   class RevLog
-    def initialize(project_path)
-      @project_path = project_path
-      @cop_path = File.join(project_path, ".cop")
-      @log_path = File.join(@cop_path, "logmap.yaml")
-      @hash_path = File.join(@cop_path, "hashmap.yaml")
-      if File.exist?(@log_path) and File.exist?(@hash_path) then
-        @logmap = default_hash_factory.merge(YAML.load_file(@log_path))
-        @hashmap = default_hash_factory.merge(YAML.load_file(@hash_path))
+    def initialize(root)
+      @root = root
+      @cop_path = File.join(root, '.cn')
+      @log_path = File.join(@cop_path, 'logmap.yaml')
+      @hash_path = File.join(@cop_path, 'hashmap.yaml')
+      if File.exist?(@log_path) && File.exist?(@hash_path)
+        @logmap = hash_array.merge(YAML.load_file(@log_path))
+        @hashmap = hash_array.merge(YAML.load_file(@hash_path))
       else
-        @logmap = default_hash_factory()
-        @hashmap = default_hash_factory()
-        unless File.exist?(@cop_path)
-          Dir.mkdir(@cop_path)
-        end
+        @logmap = hash_array
+        @hashmap = hash_array
+        Dir.mkdir(@cop_path) unless File.exist?(@cop_path)
       end
     end
 
-    def default_hash_factory()
-      Hash.new {[]}
-    end
+  def hash_array
+    Hash.new {[]}
+  end
 
     def add_file(file_name, content)
       hash = hash_file(file_name, content)
-      File.open(File.join(@cop_path, hash), "w") { |f|
+      File.open(File.join(@cop_path, hash), 'w') { |f|
         f.write(content)
       }
       @logmap[file_name] = @logmap[file_name] << {:time => Time.now,
                                                   :hash => hash}
       @hashmap[hash] = @hashmap[hash] << {:time => Time.now,
                                           :filename => file_name}
-      update_log_file()
+      update_log_file
       return hash
     end
 
@@ -64,13 +62,9 @@ module Copernicium
     def delete_file(file_id)
       begin
         file_name = @hashmap[file_id][0][:filename]
-        @hashmap[file_id].delete_if { |e|
-          e[:filename] == file_name
-        }
-        @logmap[file_name].delete_if { |e|
-          e[:hash] == file_id
-        }
-        update_log_file()
+        @hashmap[file_id].delete_if { |e| e[:filename] == file_name }
+        @logmap[file_name].delete_if { |e| e[:hash] == file_id }
+        update_log_file
         File.delete(File.join(@cop_path, file_id))
         return 1
       rescue Exception
@@ -79,54 +73,41 @@ module Copernicium
     end
 
 
-    def get_file(file_id)
-      file_path = File.join(@cop_path, file_id)
-      if File.exist?(file_path)
-        File.open(file_path, "r") { |f|
-          return f.read
-        }
+    def get_file(id)
+      file_path = File.join(@cop_path, id)
+      if File.exist? file_path
+        File.open(file_path, 'r') { |f| return f.read }
       else
-        raise Exception, "Invalid file_id!"
+        raise Exception, 'Invalid id!'
       end
     end
 
 
     def diff_files(file_id1, file_id2)
-      return Diffy::Diff.new(get_file(file_id1),
-                             get_file(file_id2)).to_s()
+      Diffy::Diff.new(get_file(file_id1), get_file(file_id2)).to_s()
     end
 
     def hash_file(file_name, content)
       Digest::SHA256.hexdigest(file_name + content.to_s)
     end
 
-    def merge(file_id1, file_id2)
-      diff_a = Diffy::Diff.new(get_file(file_id1),
-                               get_file(file_id2)).each_chunk.to_a()
-      if diff_a.all? { |d| d[0]!="-"}
-        return get_file(file_id2)
-      end
-      # if diff_a.all? { |d| d[0]!="+"}
-      #   return get_file(file_id1)
-      # end
-      return diff_a
+    def merge(id1, id2)
+      diff_a = Diffy::Diff.new(get_file(id1), get_file(id2)).each_chunk.to_a
+      return get_file(id2) if diff_a.all? { |d| d[0]!='-'}
+      # return get_file(id1) if diff_a.all? { |d| d[0]!='+'}
+      diff_a
     end
 
     def history(file_name)
       hashs = []
-      for m in @logmap[file_name]
-        hashs << m[:hash]
-      end
-      return hashs
+      @logmap[file_name].each { |m| hashs << m[:hash] }
+      hashs
     end
 
-    def update_log_file()
-      File.open(File.join(@cop_path, "logmap.yaml"), "w") { |f|
-        f.write(@logmap.to_yaml)
-      }
-      File.open(File.join(@cop_path, "hashmap.yaml"), "w") { |f|
-        f.write(@hashmap.to_yaml)
-      }
+    def update_log_file
+      # writeFile defined in workspace.rb
+      writeFile(File.join(@cop_path, 'logmap.yaml'), @logmap.to_yaml)
+      writeFile(File.join(@cop_path, 'hashmap.yaml'), @hashmap.to_yaml)
     end
 
     # def alterFile(fileObject, fileReferenceString, versionReferenceString)

data/lib/banners.rb

@@ -1,23 +1,49 @@
-# file for large constant strings
+# open up string class, enable terminal colors
+# add some colors, windowing methods
 
+class String
+  def colorize(color, mod)
+    "\033[#{mod};#{color};49m#{self}\033[0;0m"
+  end
+
+  def reset() colorize(0,0) end
+  def blu()  colorize(34,0) end
+  def yel()  colorize(33,0) end
+  def grn()  colorize(32,0) end
+  def red()  colorize(31,0) end
+end
+
+# create large constant strings
 
 HELP_BANNER = <<-EOS
-Copernicium - simple DVCS
+Copernicium (cn) - simple DVCS
 
-Starting:
+Starting out:
     init - create a new repository
     status - check repo status
+    help - show more commands
+EOS
 
+
+COMMAND_BANNER = <<-EOS
+#{HELP_BANNER}
 Commands:
-    commit <files> -m [message]
-    checkout [branch name]
-    merge [branch name]
-    clone [remote url]
-    push <remote name>
-    pull <remote name>
+    clean [files]
+    commit [files] -m <message>
+    checkout [files] <commit id>
+    branch [opt] [branchname]
+      -r | rename current branch
+      -c | create a new branch
+    merge <branch name>
+    clone <remote url>
+    push [remote name]
+    pull [remote name]
 
 Options:
     -v: print version
     -h: show help
+
+Note: [optional] <required>
+
 EOS
 

data/lib/pushpull.rb

@@ -7,6 +7,25 @@
 module Copernicium
   class PushPull
 
+    # Chris's edit
+    # Takes in Ethan's UICommandCommunicator object and calls
+    # a method based on the command
+    def UICommandParser(ui_comm)
+      case ui_comm.command
+      when "clone"
+        #clone()
+      when "merge"
+        # do merge stuff
+      when "push"
+        #push(ui_comm.)
+      when "pull"
+        #pull(ui_comm.branchname,)
+      else
+        print "Error: Invalid command supplied to PushPull!" # Bad error handling, will fix later
+        return nil
+      end
+    end
+
     def connect(remote, user = nil, passwd = nil, &block)
       exit_code = false
       if(block.nil?)

data/lib/repos.rb

@@ -1,14 +1,8 @@
-# repos module
-
-#require 'marshal'
-# Details from this link:
-#   https://docs.google.com/document/d/1r3-NquhyRLbCncqTOQPwsznSZ-en6G6xzLbWIAmxhys/edit#heading=h.7pyingf1unu
-
-
 # Repos Top Level Function Definitions (Logan)
 
 # make_snapshot: Creates new snapshot from current files and versions
-#   in - array of file objects. file object = array of all versions: {id, content}
+#   in - array of file objects. file object = array of all versions:
+#   {id, content}
 #   out - hash id of snapshot
 
 # restore_snapshot: Set current file versions to specified snapshot
@@ -39,127 +33,133 @@
 
 module Copernicium
   class Snapshot
-    def initialize(in_array)
-      @files = in_array
-      @id = ""
-      # id = hash of in array?
+    attr_accessor :id, :files
+    # id is computed after creation
+    def initialize(files = [])
+      @files = files
+      @id = id
+    end
+  end
+
+  class Repos
+    attr_reader :snaps
+    # read in file of snapshots (.cn/history)
+    # check the current branch (.cn/branch)
+    def initialize(root, branch = 'master')
+      @root = root
+      @copn = File.join(@root, '.cn')
+      @bpath = File.join(@copn, 'branch')
+      @spath = File.join(@copn, 'history')
+
+      # check if files exist, read them
+      if File.exist?(@spath) && File.exist?(@bpath)
+        @snaps = Marshal.read readFile(@spath)
+        @branch = readFile(@bpath)
+      else # use defaults
+        @snaps = {branch => []}
+        @branch = branch
+      end
     end
 
-    def set_id(in_id)
-      @id = in_id
+    # returns the hash if of an object
+    def hasher(obj)
+      Digest::SHA256.hexdigest Marshal.dump(obj)
     end
 
-    # drop get prefix?
-    def get_id()
-      @id
+    # array of hashes constructor
+    def hash_array
+      Hash.new {[]}
     end
 
-    def get_files()
-      @files
+    # Return string array of what branches we have
+    def branches
+      @snaps.keys
     end
-    # Initialize hash at startup
-    # Possible? Or problem with self object?
-  end
 
-  class Repos
-    def initialize()
-      # Create manifest
-      # It's a list of snapshots in chronological order
-      @manifest = {"default" => []}
-      @curr_branch = "default"
-      # what to do about branch IDs?
-      # Read in project path and make manifest file?
-      # Create current
+    def update_snap
+      writeFile(@spath, Marshal.dump(@snaps))
     end
 
-    def manifest()
-      @manifest
+    def update_branch
+      writeFile(@bpath, @branch)
     end
 
-    def make_snapshot(file_array)
-      # Return hash ID of snapshot
-      new_snap = Snapshot.new(file_array)
-      # Set ID, consider breaking up that line
-      new_snap.set_id(Digest::SHA256.hexdigest(Marshal.dump(new_snap)))
-      @manifest[@curr_branch].push(new_snap)
-      # Update manifest file?
-      return new_snap.get_id()
+    # Create snapshot, and return hash ID of snapshot
+    def make_snapshot(files = [])
+      snap = Snapshot.new(files)
+      snap.id = hasher snap
+      @snaps[@branch] << snap
+
+      # Update snaps file
+      update_snap
+      snap.id
     end
 
+    # Find snapshot, return snapshot (or just contents) given id
     def get_snapshot(target_id)
-      # Return snapshot (or just contents) given id
-      # Find snapshot
-      found_index = @manifest[@curr_branch].index{ |x| x.get_id() == target_id }
-      # Handle not found case
-      # Return it
-      if(found_index)
-        return @manifest[@curr_branch][found_index]
+      found_index = @snaps[@branch].index { |x| x.id == target_id }
+      if found_index
+        @snaps[@branch][found_index]
       else
-        return found_index
+        Snapshot.new
       end
-      #return ret_snap
     end
 
-    # Not sure how I'm gonna do this one
+    # Return comm object with status
+    # change files in workspace back to specified commit
+    # get clear the current workspace
+    # revert back to given commit
     def restore_snapshot(target_id)
-      # Return comm object with status
-      # Need a way to change files in workspace
-      return 1
+      # todo
     end
 
-    #def history(branch_name)
-    def history()
-      # Return array of snapshot IDs
-      names_list = []
-      @manifest[@curr_branch].each {|x| names_list.push(x.get_id())}
-      return names_list
+    # Return array of snapshot IDs
+    def history(branch_name = nil)
+      snapids = []
+      if branch_name.nil?
+        @snaps[@branch].each {|x| snapids << x.id }
+      else
+        @snaps[branch_name].each{|x| snapids << x.id }
+      end
+      snapids
     end
 
+    # Find snapshot, delete from snaps/memory
     def delete_snapshot(target_id)
-      # Return comm object with status
-      # Find snapshot, delete from manifest/memory
-      @manifest[@curr_branch].delete_if { |x| x.get_id() == target_id }
-      # catch error
-      # update manifest file?
+      @snaps[@branch].delete_if { |x| x.id == target_id }
+      update_snap
     end
 
-    # Finds the files in snap1 that aren't in snap2, change this?
-    # Consider using diffy?
+    # Return list of filenames and versions
     def diff_snapshots(id1, id2)
-      # Return list of filenames and versions
-      diff_files = []
+      diffed = []
+
       # Put in error catching
-      files1 = get_snapshot(id1).get_files()
-      files2 = get_snapshot(id2).get_files()
-      # Find snapshot1 and snapshot2
-      files1.each do |x|
-        if(!files2.include?(x))
-          diff_files.push(x)
-        end
-      end
-      return diff_files
-      # Use revlog diff on each set of files? Look at Diffy
-    end
+      files1 = get_snapshot(id1).files
+      files2 = get_snapshot(id2).files
+
+      # Find difference between snapshot1 and snapshot2
+      files1.each { |x| diffed << x unless !files2.include?(x) }
 
-    def make_branch(branch_name)
-      # Return hash ID of new branch
-      # Not sure where to store branches
-      # What goes in to the hash?
-      @manifest[branch_name] = @manifest[@curr_branch]
-      @curr_branch = branch_name
-      return 1
+      diffed
     end
 
-    def delete_branch(branch_name)
-      # Exit status code
-      @manifest.delete("branch_name")
+    # Return hash ID of new branch
+    def make_branch(branch)
+      @snaps[branch] = @snaps[@branch]
+      @branch = branch
+      hasher 1
     end
 
-    def clear()
-      # Just a placeholder for now
+    # Merge the target branch into current
+    def merge_branch(branch)
+      # todo
     end
 
-  end
+    # Exit status code
+    def delete_branch(branch)
+      @snaps.delete(branch)
+    end
+  end # repo class
 end
 
-

data/lib/required.rb

@@ -9,6 +9,8 @@ require 'socket'        # Socket needed for communicating over the network
 require 'io/console'    # Needed to hide password at console
 require 'net/ssh'       # Needed to communicate with the remote
 require 'net/scp'       # Needed for file transfer between servers
+#require 'marshal'
+
 
 # coperncicium files
 

data/lib/ui.rb

@@ -2,9 +2,15 @@
 # integrates all modules, central module
 
 
-VERSION = "0.0.1"
+VERSION = "0.0.2"
 
 module Copernicium
+  # Print and exit with a specific code
+  def pexit(msg, sig)
+    puts msg
+    exit sig
+  end
+
   class Driver
     # Get some info from the user when they dont specify it
     def get(info)
@@ -12,12 +18,6 @@ module Copernicium
       gets.chomp # read a line from user, and return it
     end
 
-    # Print and exit with a specific code
-    def pexit(msg, sig)
-      puts msg
-      exit sig
-    end
-
     # Executes the required action for a given user command.
     #
     # Parameters:
@@ -37,7 +37,7 @@ module Copernicium
       cmd = args.shift
 
       # if no arguments given show help information
-      pexit HELP_BANNER, 0 if cmd == '-h'
+      pexit COMMAND_BANNER, 0 if (cmd == '-h' || cmd == 'help')
 
       # if -v flag givem show version
       pexit VERSION, 0 if cmd == '-v'
@@ -48,6 +48,10 @@ module Copernicium
         init args
       when 'status'
         status args
+      when 'branch'
+        branch args
+      when 'clean'
+        clean args
       when 'clone'
         clone args
       when 'commit'
@@ -61,18 +65,34 @@ module Copernicium
       when 'pull'
         pull args
       else # handle an unrecognized argument, show help and exit
-        pexit "Unrecognized command #{cmd}\n" + HELP_BANNER, 1
+        pexit "Unrecognized command #{cmd}\n" + COMMAND_BANNER, 1
       end
     end # run
 
     def init(args)
+      if args.nil?
+        Workspace.new
+      else # init into a folder
+        target = File.join Dir.pwd, args.join(' ')
+        Dir.mkdir target if !File.exists? target
+        Dir.chdir target
+        Workspace.new
+      end
+      puts "Created Copernicium repo in " + Dir.pwd
       UIComm.new(command: 'init', opts: args)
-      # todo - make call to repos to create repo
     end
 
     def status(args)
-      UIComm.new(command: 'status', opts: args)
-      # todo - make call to workspace, get and show status
+      ui = UIComm.new(command: 'status', opts: args)
+      st = Workspace.new.status(ui)
+      puts "added:".grn + st[0].join(', ')   unless st[0].empty?
+      puts "edited:".yel + st[1].join(', ')   unless st[1].empty?
+      puts "removed:".red + st[2].join(', ') unless st[2].empty?
+      ui
+    end
+
+    def branch(args)
+      # todo - switch branches, create branches
     end
 
     def push(args)
@@ -93,12 +113,20 @@ module Copernicium
         files = args
       end
 
-      # todo - call repos checkout the given / branch
       # todo - also, figure out if is branch or rev id
       # this can be done by checking if it is a branch, and if not, then just
       # assume it is a rev id. if it isnt, then something will break :/
 
-      UIComm.new(command: 'checkout', rev: rev, files: files)
+      # call workspace checkout the given / branch
+      ui = UIComm.new(command: 'checkout', rev: rev, files: files)
+      Workspace.new.checkout(ui)
+      ui
+    end
+
+    def clean(args = [])
+      ui = UIComm.new(command: 'clean', files: args)
+      Workspace.new.clean(ui)
+      ui
     end
 
     def clone(args)
@@ -118,21 +146,26 @@ module Copernicium
       messflag = args.find_index('-m')
       if messflag.nil?
         message = get 'commit message'
-      else # mash everything after -m into a single string
+      elsif message == 0 # commit everything
+        # mash everything after -m into a string
         message = args[messflag + 1..-1].join ' '
+      else # commit only some files
+        files = args[0..messflag - 1]
       end
 
-      # todo parse file list, in case just commiting some files
-      # todo call revlog, commit files
-      # todo call repos, update commit
+      # specified the -m flag, but didnt give anything
+      message = get 'commit message' if message.nil?
 
-      UIComm.new(command: 'commit', commit_message: message)
+      # perform the commit, with workspace
+      ui = UIComm.new(command: 'commit', files: files, commit_message: message)
+      Workspace.new.commit(ui)
+      ui
     end
 
     def merge(args)
       if args.empty?
-        puts 'I need a commit to merge.'
-        rev = get 'single commit to merge'
+        puts 'I need a commit or branch to merge.'
+        rev = get 'single commit or branch to merge'
       else # use given
         rev = args.first
       end

data/lib/workspace.rb

@@ -1,12 +1,24 @@
-# This is the workspace module
-# The functions are clean, commit, checkout and status
+# workspace module - linfeng and qiguang
 
 module Copernicium
+  def writeFile(path, content)
+    f = open(path, 'w')
+    f.write(content)
+    f.close
+  end
+
+  def readFile(path)
+    f = open(path, 'r')
+    txt = f.read
+    f.close
+    txt
+  end
+
   class FileObj
-    attr_reader :path, :history_hash_ids
+    attr_reader :path, :history
     def initialize(path, ids)
+      @history = ids
       @path = path
-      @history_hash_ids = ids
     end
 
     def ==(rhs)
@@ -19,30 +31,35 @@ module Copernicium
   end
 
   class Workspace
-    def writeFile(path, content)
-      f = open(path, 'w')
-      f.write(content)
-      f.close
-    end
-
-    def readFile(path)
-      f = open(path, 'r')
-      txt = f.read
-      f.close
-      txt
+    attr_reader :repos, :revlog
+    def initialize(bname = 'master')
+      @files = []
+      @cwd = Dir.pwd
+      @root = getroot
+      Dir.chdir(@cwd)
+      @root = @cwd if @root.nil?
+      @cwd.sub!(@root, '.')
+      @branch = bname
+      @repo = Repos.new(@cwd)
+      @revlog = RevLog.new(@cwd)
+
+      pexit 'Copernicium folder (.cn) not found.', 1 if @root.nil?
     end
 
-    #private_class_method :writeFile
-    #private_class_method :readFile
+    # find where the root .cn folder is
+    def getroot
+      max = 0
+      def notroot() Dir.pwd != '/' end
+      def notcn() File.exists? File.join(Dir.pwd, '.cn') end
+      while max < 10 && notroot && notcn
+        Dir.chdir(File.join(Dir.pwd, '..'))
+        max += 1
+      end
 
-    def initialize(bname = 'master', rootdir = './workspace')
-      @files = []
-      @branch_name = bname
-      @revlog = Copernicium::RevLog.new('.')
-      @repos = Copernicium::Repos.new
-      @root = rootdir
-      if !File.directory?(@root)
-        Dir.mkdir(@root)
+      if notcn # return where cn was found
+        Dir.pwd
+      else # directory not found
+        nil
       end
     end
 
@@ -58,70 +75,53 @@ module Copernicium
     end
 
     # if include all the elements in list_files
-    def include?(list_files)
-      list_files.each do |x|
-        if indexOf(x) == -1
-          return false
-        end
-      end
+    def include?(files)
+      files.each { |x| return false if indexOf(x) == -1 }
       true
     end
 
+    # get all files currently in workspace
+    def ws_files
+      Dir[ File.join(@root, '**', '*') ].reject { |p| File.directory? p }
+    end
+
+    # Clear the current workspace
+    def clear
+      @files.each{ |x| File.delete(x.path) }
+      @files = []
+    end
+
+    # reset first: delete them from disk and reset @files
+    # restore it with checkout() if we have had a branch name
+    # or it is the initial state, no commit and no checkout
     # if list_files is nil, then rollback the list of files from the branch
     # or rollback to the entire branch head pointed
     def clean(comm)
-      list_files = comm.files
-      if list_files.nil? # reset first: delete them from disk and reset @files
-        @files.each{|x| File.delete(x.path)}
-        @files = []
-        # restore it with checkout() if we have had a branch name
-        if @branch_name != ''
-          # or it is the initial state, no commit and no checkout
-          return checkout(@branch_name)
-        else
-          return 0
-        end
+      if comm.files.empty?
+        clear # reset, checkout last commit
+        checkout
+      else # list_files are not nil
 
-      else #list_files are not nil
-        # check that every file need to be reset should have been recognized by the workspace
-        #workspace_files_paths = @files.each{|x| x.path}
-        return -1 if (self.include? list_files) == false
+        # exit if the specified file is not in the workspace
+        return -1 if (self.include? comm.files) == false
 
         # the actual action, delete all of them from the workspace first
-        list_files.each do |x|
+        comm.files.each do |x|
           File.delete(x)
           idx = indexOf(x)
-          if !idx==-1
-            @files.delete_at(idx)
-          end
+          @files.delete_at(idx) if !idx == -1
         end
 
         # if we have had a branch, first we get the latest snapshot of it
         # and then checkout with the restored version of them
-        if @branch_name != ''
-          return checkout(list_files)
-        else
-          return 0
-        end
+        checkout
       end
     end
 
     # commit a list of files or the entire workspace to make a new snapshot
     def commit(comm)
-      # for this commented version, we first get all files in the workspace and then add files from comm obj
-      # it's not used at this time
-      # Linfeng Song
-      #list_files = @files.each{|x| x.path}
-      #if comm.files != nil
-      #  comm.files.each do |x|
-      #    if indexOf(x) == -1
-      #      list_files.push(x)
-      #    end
-      #  end
-      #end
-      list_files = Dir[ File.join(@root, '**', '*') ].reject { |p| File.directory? p }
-      if list_files != nil
-        list_files.each do |x|
+      unless ws_files.empty?
+        ws_files.each do |x|
           if indexOf(x) == -1
             content = readFile(x)
             hash = @revlog.add_file(x, content)
@@ -130,82 +130,77 @@ module Copernicium
           else
             content = readFile(x)
             hash = @revlog.add_file(x, content)
-            if @files[indexOf(x)].history_hash_ids[-1] != hash
-              @files[indexOf(x)].history_hash_ids << hash
+            if @files[indexOf(x)].history[-1] != hash
+              @files[indexOf(x)].history << hash
             end
           end
         end
       end
-      return @repos.make_snapshot(@files)
+      @repo.make_snapshot(@files) # return snapshot id
     end
 
-    def checkout(comm)
-      argu = comm.files
-      # if argu is an Array Object, we assume it is a list of files to be added to the workspace
-      if argu != nil
-        # we add the list of files to @files regardless whether it has been in it.
-        # that means there may be multiple versions of a file.
-        list_files = argu
-        snapshot_id = @repos.history()[-1]
-        returned_snapshot = @repos.get_snapshot(snapshot_id)
-        list_files_last_commit = returned_snapshot.get_files()
+    def checkout(comm = UIComm.new(rev: @branch))
+=begin
+      # just support branches for now
+      # if argu is an Array Object, we assume it is a list of files to be added
+      # # to the workspace # we add the list of files to @files regardless
+      # whether it has been in # it. that means there may be multiple versions
+      # of a file.
+      unless comm.files.nil?
+        list_files = comm.files
+        returned_snapshot = @repo.get_snapshot(@repo.history.last)
+        list_files_last_commit = returned_snapshot.files
         list_files_last_commit.each do |x|
           if list_files.include? x.path
-            path = x.path
-            content = @revlog.get_file(x.history_hash_ids[-1])
+            content = @revlog.get_file(x.history.last)
             idx = indexOf(x.path)
             if  idx == -1
-              @files.push(x)
+              @files << x
             else
               @files[idx] = x
             end
-            writeFile(path,content)
+            writeFile(x.path, content)
           end
         end
-        # if argu is not an Array, we assume it is a String, representing the branch name
-        # we first get the last snapshot id of the branch, and then get the commit object
-        # and finally push all files of it to the workspace
-      else
-        argu = comm.rev #branch name
-        snapshot_id = @repos.history()[-1]
-        snapshot_obj = @repos.get_snapshot(snapshot_id).get_files()
-        snapshot_obj.each do |fff|
-          idx = indexOf(fff.path)
-          if  idx == -1
-            @files.push(fff)
-          else
-            @files[idx] = fff
-          end
-          path = fff.path
-          content = @revlog.get_file(fff.history_hash_ids[-1])
-          writeFile(path,content)
+      else # if argu is not an Array, we assume it is a String, representing the
+      end
+=end
+
+      clear # reset workspace
+
+      # we first get the last snapshot id of the branch, and then get the commit
+      # object and finally push all files of it to the # workspace
+      @repo.get_snapshot(@repo.history.last).files.each do |file|
+        idx = indexOf(file.path)
+        if  idx == -1
+          @files << file
+        else
+          @files[idx] = file
         end
+        content = @revlog.get_file(file.history.last)
+        writeFile(file.path, content)
       end
     end
 
     def status(comm)
-      adds = []
-      deletes = []
+      added = []
       edits = []
-      wsFiles = Dir[ File.join(@root, '**', '*') ].reject { |p| File.directory? p }
-      wsFiles.each do |f|
+      remov = []
+      ws_files.each do |f|
         idx = indexOf(f)
-        if idx != -1
-          x1 = @revlog.get_file(@files[idx].history_hash_ids[-1])
-          x2 = readFile(f)
-          if x1 != x2
-            edits.push(f)
-          end
-        else
-          adds.push(f)
+        if idx == -1 # new file
+          added << f
+        else # changed file?
+          x2 = readFile(f) # get the current version
+          x1 = @revlog.get_file(@files[idx].history.last)
+          edits << f if x1 != x2
         end
       end
-      @files.each do |f|
-        if ! (wsFiles.include? f.path)
-          deletes.push(f.path)
-        end
-      end
-      return [adds, edits, deletes]
+
+      # any deleted files from the last commit?
+      @files.each { |f| remov << f.path unless (ws_files.include? f.path) }
+
+      [added, edits, remov]
     end
   end
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: copernicium
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Team Copernicium
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.8.1
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
 description: A simple distributed version control system written in Ruby.
@@ -135,12 +135,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []