copernicium 0.0.2 → 0.0.3

data/lib/repos.rb

@@ -4,162 +4,234 @@
 #   in - array of file objects. file object = array of all versions:
 #   {id, content}
 #   out - hash id of snapshot
-
+# merge_snapshot: merge in a branch’s history into the current branch. if
+#   in - branch name
+#   out - [{path => content}, [conflicting paths]]
+# get_snapshot: Return a specific snapshot
+#   in - snapshot id
+#   out - snapshot object
 # restore_snapshot: Set current file versions to specified snapshot
 #   in - id of target snapshot
 #   out - Comm object with status
-
 # history: Returns ids for all snapshots
 #   in - branch name
 #   out - Array of snapshot ids
-
 # delete_snapshot: delete specified a snapshot
 #   in - target snapshot
 #   out -  Comm object with status
-
 # diff_snapshots: Returns diff between two different snapshots
 #   in - two ids of snapshots to perform diff on
 #   out - list of filenames and versions
-
 # make_branch: make a new branch
 #   in - branch name
 #   out - hash id of new branch
-
 # delete_branch: delete a branch
 #   in - branch name
 #   out - exit status code
 
-# Also do a get_snapshot
-
 module Copernicium
   class Snapshot
     attr_accessor :id, :files
     # id is computed after creation
     def initialize(files = [])
-      @files = files
-      @id = id
+      @@files = files
+      @@id = id
     end
   end
 
-  class Repos
-    attr_reader :snaps
-    # read in file of snapshots (.cn/history)
+  module Repos
+    include RevLog # needs diffing and merging
     # 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')
+    # read in file of snapshots (.cn/history)
+    def Repos.setup(root = Dir.pwd, branch = 'master')
+      @@root = root
+      @@copn = File.join(@@root, '.cn')
+      @@repo = File.join(@@copn, 'repo')
+      @@bpath = File.join(@@repo, 'branch')
+      @@spath = File.join(@@repo, 'history')
+      Dir.mkdir(@@copn) unless Dir.exist?(@@copn)
+      Dir.mkdir(@@repo) unless Dir.exist?(@@repo)
+
+      # check if files exist, read them
+      if File.exist?(@@spath) && File.exist?(@@bpath)
+        @@branches = Marshal.load readFile(@@spath)
+        @@branch = readFile(@@bpath)
+      else # use defaults
+        @@branches = {branch => []}
+        @@branch = branch
+      end
 
       # check if files exist, read them
-      if File.exist?(@spath) && File.exist?(@bpath)
-        @snaps = Marshal.read readFile(@spath)
-        @branch = readFile(@bpath)
+      if File.exist?(@@spath) && File.exist?(@@bpath)
+        @@branches = Marshal.load readFile(@@spath)
+        @@branch = readFile(@@bpath)
       else # use defaults
-        @snaps = {branch => []}
-        @branch = branch
+        @@branches = {branch => []}
+        @@branch = branch
       end
     end
 
-    # returns the hash if of an object
-    def hasher(obj)
-      Digest::SHA256.hexdigest Marshal.dump(obj)
+    # helper methods for file IO
+    def writeFile(path, content)
+      f = open(path, 'w')
+      f.write(content)
+      f.close
     end
 
-    # array of hashes constructor
-    def hash_array
-      Hash.new {[]}
+    # helper methods for file IO
+    def readFile(path)
+      f = open(path, 'r')
+      txt = f.read
+      f.close
+      txt
     end
 
-    # Return string array of what branches we have
-    def branches
-      @snaps.keys
+    # check if any snapshots exist, if not exit
+    def Repos.has_snapshots?
+      ! Repos.history(@@branch).empty?
+    end
+
+    def Repos.hash_array
+      Hash.new {[]}
     end
 
-    def update_snap
-      writeFile(@spath, Marshal.dump(@snaps))
+    # returns the hash of an object
+    def Repos.hasher(obj)
+      Digest::SHA256.hexdigest Marshal.dump(obj)
     end
 
-    def update_branch
-      writeFile(@bpath, @branch)
+    # Return string array of what branches we have
+    def Repos.branches
+      @@branches.keys
     end
 
-    # Create snapshot, and return hash ID of snapshot
-    def make_snapshot(files = [])
+    # Create and return snapshot
+    def Repos.make_snapshot(files = [])
       snap = Snapshot.new(files)
       snap.id = hasher snap
-      @snaps[@branch] << snap
+      @@branches[@@branch] << snap
 
       # Update snaps file
       update_snap
       snap.id
     end
 
-    # Find snapshot, return snapshot (or just contents) given id
-    def get_snapshot(target_id)
-      found_index = @snaps[@branch].index { |x| x.id == target_id }
-      if found_index
-        @snaps[@branch][found_index]
-      else
-        Snapshot.new
+    # helper to write a snapshot, saving a new commit
+    def Repos.update_snap
+      writeFile @@spath, Marshal.dump(@@branches)
+    end
+
+    # todo - Check to make sure id is from a different branch
+    # Merge the target snapshot into HEAD snapshot of the current branch
+    def Repos.merge_snapshot(id)
+      # run diff to get conflicts
+      current = @@branches[@@branch].last
+      difference = diff_snapshots(current.id, id)
+      conflicts = difference[1]
+
+      if conflicts.empty? # make snapshot
+        make_snap current.files + diffset(get_snapshot(id).files, current.files)
       end
+
+      # returns [{path => content}, [conflicting paths]]
+      difference
     end
 
-    # 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)
-      # todo
+    # Find snapshot and return snapshot from id
+    def Repos.get_snapshot(id)
+      @@branches.keys.each do |br|
+        @@branches[br].each do |sn|
+          return sn if sn.id == id
+        end
+      end
+
+      raise "Snapshot not found in this repo."
     end
 
     # Return array of snapshot IDs
-    def history(branch_name = nil)
+    def Repos.history(branch = nil)
       snapids = []
-      if branch_name.nil?
-        @snaps[@branch].each {|x| snapids << x.id }
-      else
-        @snaps[branch_name].each{|x| snapids << x.id }
+      if branch.nil?
+        @@branches[@@branch].each { |x| snapids << x.id }
+      elsif
+        @@branches[branch].each { |x| snapids << x.id }
       end
       snapids
     end
 
     # Find snapshot, delete from snaps/memory
-    def delete_snapshot(target_id)
-      @snaps[@branch].delete_if { |x| x.id == target_id }
+    def Repos.delete_snapshot(id)
+      @@branches[@@branch].delete_if { |x| x.id == id }
       update_snap
     end
 
-    # Return list of filenames and versions
-    def diff_snapshots(id1, id2)
-      diffed = []
-
-      # Put in error catching
+    #diff_snapshots needs to catch both files in snap1 that aren’t and snap2 and
+    #find individual differences in between the files by calling RevLogs diffy.
+    # Return same thing as merge # note: id1 gets priority for history
+    def Repos.diff_snapshots(id1, id2)
+      new_files = []
+      conflicts = []
+      diffed = {}
       files1 = get_snapshot(id1).files
       files2 = get_snapshot(id2).files
+      new_files = diffset(files2, files1)
+
+      # adding each new file from the merged snapshot
+      new_files.each { |x| diffed[x.path] = get_file(x.last) }
+
+      # handle files that exist in both snapshots
+      files1.each do |file|
+        # find corresponding file object
+        f2_index = files2.index { |y| y == file }
+
+        # If found, check if same content
+        unless f2_index.nil?
+          id1 = file.last
+          id2 = files2[f2_index].last
+
+          # get file contents
+          content1 = get_file(id1)
+          content2 = get_file(id2)
+
+          # check if the file content for each path is the same
+          if content1 == content2
+            diffed[file.path] = content1
+          else # If not same, diff and add to conflicts
+            diffed[file.path] = diff_files(id1, id2)
+            conflicts << file.path
+          end
+        else # not found, use our version
+          diffed[file.path] = content1
+        end
+      end
 
-      # Find difference between snapshot1 and snapshot2
-      files1.each { |x| diffed << x unless !files2.include?(x) }
+      # returns [{path => content}, [conflicting paths]]
+      [diffed, conflicts]
+    end
 
-      diffed
+    # Select all elements of array1 that are not in array2
+    def Repos.diffset(array1, array2)
+      array1.select { |x| !array2.any? { |y| x == y } }
     end
 
+    # BRANCHING
+    def current() @@branches end
+
     # Return hash ID of new branch
-    def make_branch(branch)
-      @snaps[branch] = @snaps[@branch]
-      @branch = branch
-      hasher 1
+    def Repos.make_branch(branch)
+      @@branches[branch] = @@branches[@@branch]
+      @@branch = branch
+      hasher @@branches[branch]
     end
 
-    # Merge the target branch into current
-    def merge_branch(branch)
-      # todo
+    def Repos.update_branch(branch)
+      writeFile(@@bpath, branch)
+      @@branch = branch
     end
 
-    # Exit status code
-    def delete_branch(branch)
-      @snaps.delete(branch)
+    def Repos.delete_branch(branch)
+      @@branches.delete(branch)
     end
-  end # repo class
-end
+  end # Repos
+end # Copernicium
 

data/lib/required.rb

@@ -9,15 +9,13 @@ 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
 
-require_relative "ui"
-require_relative "repos"
-require_relative "RevLog"
 require_relative "banners"
+require_relative "RevLog"
+require_relative "repos"
 require_relative "pushpull"
 require_relative "workspace"
+require_relative "ui"
 

data/lib/ui.rb

@@ -1,21 +1,34 @@
 # user interface module - parse and execute commands
 # integrates all modules, central module
 
-
-VERSION = "0.0.2"
+VERSION = "0.0.3"
 
 module Copernicium
-  # Print and exit with a specific code
-  def pexit(msg, sig)
-    puts msg
-    exit sig
+  # Communication object that will pass commands to backend modules
+  # also used in unit test to make sure command is being parsed ok
+  # rev - revision indicator (commit #, branch name, HEAD, etc.)
+  # repo - URL/path to a remote repository
+  class UIComm
+    attr_reader :command, :files, :rev, :cmt_msg, :repo, :opts
+    def initialize(command: nil, files: nil, rev: nil,
+                   cmt_msg: nil, repo: nil, opts: nil)
+      @cmt_msg = cmt_msg
+      @command = command
+      @files = files
+      @opts = opts
+      @repo = repo
+      @rev = rev
+    end
   end
 
-  class Driver
-    # Get some info from the user when they dont specify it
-    def get(info)
-      puts "Hi, #{info} not specified. Enter #{info}:"
-      gets.chomp # read a line from user, and return it
+  # main driver for the command line user interface
+  module Driver
+    include Repos # needed to get branch and history info
+    include Workspace # needed for most high level commands
+    def setup
+      Repos.setup
+      RevLog.setup
+      Workspace.setup
     end
 
     # Executes the required action for a given user command.
@@ -36,11 +49,14 @@ module Copernicium
       # get first command
       cmd = args.shift
 
+      # if -v flag givem show version
+      pexit VERSION, 0 if cmd == '-v'
+
       # if no arguments given show help information
       pexit COMMAND_BANNER, 0 if (cmd == '-h' || cmd == 'help')
 
-      # if -v flag givem show version
-      pexit VERSION, 0 if cmd == '-v'
+      # if not in a repo, warn them, tell how to create
+      puts REPO_WARNING.yel if (noroot? && cmd != 'init')
 
       # Handle standard commands
       case cmd
@@ -48,6 +64,8 @@ module Copernicium
         init args
       when 'status'
         status args
+      when 'history'
+        history args
       when 'branch'
         branch args
       when 'clean'
@@ -69,30 +87,94 @@ module Copernicium
       end
     end # run
 
+    # Print and exit with a specific code
+    def pexit(msg, sig)
+      puts msg
+      exit sig
+    end
+
+    # Get some info from the user when they dont specify it
+    def get(info)
+      puts "Note: #{info} not specified. Enter #{info} to continue."
+      gets.chomp # read a line from user, and return it
+    end
+
+    # create a new copernicium repository
     def init(args)
-      if args.nil?
-        Workspace.new
+      if args.empty?
+        Workspace.create_project
       else # init into a folder
-        target = File.join Dir.pwd, args.join(' ')
-        Dir.mkdir target if !File.exists? target
-        Dir.chdir target
-        Workspace.new
+        Workspace.create_project args.first
       end
-      puts "Created Copernicium repo in " + Dir.pwd
+      puts "Created Copernicium repo in " + Dir.pwd.grn
       UIComm.new(command: 'init', opts: args)
     end
 
+    # show the current repos status
     def status(args)
       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?
+      st = Workspace.status
+      st[0].each { |f| puts "Added:\t".grn + f }
+      st[1].each { |f| puts "Edited:\t".yel + f }
+      st[2].each { |f| puts "Removed:\t".red + f }
       ui
     end
 
+    # check whether a specific branch exists
+    def isbranch?(branch)
+      Repos.branches.include? branch
+    end
+
+    # create and switch to a new branch
+    def create_branch(branch)
+      new_branch_hash = Repos.make_branch branch
+      Repos.update_branch branch
+      puts "Created new branch '#{branch}' with head #{new_branch_hash}".grn
+    end
+
     def branch(args)
-      # todo - switch branches, create branches
+      branch = args.first
+      if branch.nil? # show all branches
+        puts "Branches: ".grn + Repos.branches.join(' ')
+      elsif branch == '-c' # try to create a new branch
+        # If branch name not specified, get it from the user
+        branch = args[1]
+        branch = get "new branch name" if branch.nil?
+
+        # Create and switch to the new branch
+        create_branch branch
+      elsif branch == '-r' # rename the current branch
+        # If branch name not specified, get it from the user
+        newname = args[1]
+        newname = get "new name for current branch" if newname.nil?
+
+        oldname = Repos.branch
+
+        # Create and switch to a new branch with the given name
+        create_branch newname
+
+        # Delete the branch with the old name
+        Repos.delete_branch oldname
+        puts "Deleted branch '#{oldname}'".grn
+        puts "Renamed branch '#{oldname}' to '#{newname}'".grn
+      elsif branch == '-d' # Delete the specified branch
+        # If branch name not specified, get it from the user
+        branch = args[1]
+        branch = get "branch to delete" if branch.nil?
+
+        # Do not delete the current branch
+        if branch == Repos.branch
+          pexit "Cannot delete the current branch!".red, 1
+        end
+
+        # Delete the specified branch
+        Repos.delete_branch branch
+        puts "Deleted branch '#{branch}'".grn
+      elsif isbranch? branch # switch branch
+        Repos.update_branch  branch
+      else # branch does not exist, create it, switch to it
+        Repos.create_branch branch
+      end
     end
 
     def push(args)
@@ -102,6 +184,7 @@ module Copernicium
 
     def pull(args)
       UIComm.new(command: 'pull', opts: args)
+      #def pull(remote, branch', remote_dir)
       # todo - make call to pushpull, pull remote
     end
 
@@ -113,24 +196,22 @@ module Copernicium
         files = args
       end
 
-      # 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 :/
+      # if it is a branch, get the last head of it
+      rev = Repos.history(rev).last.id if isbranch? rev
 
       # call workspace checkout the given / branch
       ui = UIComm.new(command: 'checkout', rev: rev, files: files)
-      Workspace.new.checkout(ui)
+      Workspace.checkout(ui)
       ui
     end
 
     def clean(args = [])
       ui = UIComm.new(command: 'clean', files: args)
-      Workspace.new.clean(ui)
+      Workspace.clean(ui)
       ui
     end
 
     def clone(args)
-      # todo - optionally check for folder to clone into, instead of cwd
       if args.empty?
         repo = get 'repo url to clone'
       else
@@ -146,9 +227,9 @@ module Copernicium
       messflag = args.find_index('-m')
       if messflag.nil?
         message = get 'commit message'
-      elsif message == 0 # commit everything
+      elsif messflag == 0 # commit everything
         # mash everything after -m into a string
-        message = args[messflag + 1..-1].join ' '
+        message = args[1..-1].join ' '
       else # commit only some files
         files = args[0..messflag - 1]
       end
@@ -157,38 +238,29 @@ module Copernicium
       message = get 'commit message' if message.nil?
 
       # perform the commit, with workspace
-      ui = UIComm.new(command: 'commit', files: files, commit_message: message)
-      Workspace.new.commit(ui)
+      ui = UIComm.new(command: 'commit', files: files, cmt_msg: message)
+      Workspace.commit(ui)
       ui
     end
 
+    def history(args)
+      puts Repos.history
+    end
+
     def merge(args)
       if args.empty?
         puts 'I need a commit or branch to merge.'
         rev = get 'single commit or branch to merge'
       else # use given
         rev = args.first
+        # get all branchs, see if arg is in it.
+        # if so, look up snapshot of <branch> head
+        # TODO - parse whether given arg is a branch name, else assume snap id
+        # todo - call repos merge command
+        # todo show conflicting files
+        UIComm.new(command: 'merge', rev: rev)
       end
-
-      # todo - call repos merge command
-
-      UIComm.new(command: 'merge', rev: rev)
     end
-  end
-
-  # Communication object that will pass commands to backend modules
-  # rev - A single revision indicator (commit #, branch name, HEAD, etc.)
-  # repo - URL/path to a remote repository
-  class UIComm
-    attr_reader :command, :arguments, :files, :rev, :commit_message, :repo
-    def initialize(command: nil, files: nil, rev: nil,
-                   commit_message: nil, repo: nil, opts: nil)
-      @commit_message = commit_message
-      @command = command
-      @files = files
-      @opts = opts
-      @repo = repo
-      @rev = rev
-    end
-  end
+  end # Driver
 end
+