copernicium 0.0.2 → 0.0.3

data/lib/workspace.rb

@@ -1,19 +1,7 @@
 # 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
 
+module Copernicium
   class FileObj
     attr_reader :path, :history
     def initialize(path, ids)
@@ -28,44 +16,80 @@ module Copernicium
         @path == rhs.path
       end
     end
+
+    # returns most recent file id in the snapshot it was saved in
+    def last
+      @history.last
+    end
+  end
+
+  # helper methods for file IO
+  def writeFile(path, content)
+    f = open(path, 'w')
+    f.write(content)
+    f.close
+  end
+
+  # helper methods for file IO
+  def readFile(path)
+    f = open(path, 'r')
+    txt = f.read
+    f.close
+    txt
   end
 
-  class Workspace
-    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)
+  module Workspace
+    include Repos # needed for keeping track of history
+    def Workspace.setup(bname = 'master')
+      @@files = []
+      @@cwd = Dir.pwd
+      @@root = (noroot?? @@cwd : getroot)
+      @@copn = File.join(@@root, '.cn')
+      Dir.mkdir(@@copn) unless Dir.exist?(@@copn)
+      @@cwd.sub!(@@root, '.')
+      @@branch = bname
+      RevLog.setup @@root
+      Repos.setup @@root
+    end
 
-      pexit 'Copernicium folder (.cn) not found.', 1 if @root.nil?
+    # create a new copernicium project
+    def Workspace.create_project(location = Dir.pwd)
+      Dir.mkdir location if !File.exists? location
+      Dir.chdir location
+      errmsg = 'Copernicium folder (.cn) not found, could not create.'.red
+      pexit errmsg, 1 if noroot?
     end
 
-    # find where the root .cn folder is
+    # find  the root .cn folder
     def getroot
+      cwd = Dir.pwd
       max = 0
-      def notroot() Dir.pwd != '/' end
-      def notcn() File.exists? File.join(Dir.pwd, '.cn') end
-      while max < 10 && notroot && notcn
+      def more_folders() Dir.pwd != '/' end
+      def root_found() Dir.exist? File.join(Dir.pwd, '.cn') end
+      while max < 10 && more_folders && !root_found
         Dir.chdir(File.join(Dir.pwd, '..'))
         max += 1
       end
 
-      if notcn # return where cn was found
-        Dir.pwd
+      if root_found # return where cn was found
+        cnroot = Dir.pwd
+        Dir.chdir(cwd)
+        cnroot
       else # directory not found
+        Dir.chdir(cwd)
         nil
       end
     end
 
-    def indexOf(x)
+    # tells us whether we are in a cn project or not
+    def noroot?
+      getroot.nil?
+    end
+
+    # workspace management
+    def Workspace.indexOf(x)
       index = -1
-      @files.each_with_index do |e,i|
+      @@files.each_with_index do |e,i|
         if e.path == x
           index = i
           break
@@ -75,32 +99,34 @@ module Copernicium
     end
 
     # if include all the elements in list_files
-    def include?(files)
+    def Workspace.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 }
+    # get all files currently in workspace, except folders and .cn/*
+    def Workspace.ws_files
+      Dir[ File.join(@@root, '**', '*') ].reject do |p|
+        File.directory? p || File.join(@@root,'.cn').include?(p) == false
+      end
     end
 
     # Clear the current workspace
-    def clear
-      @files.each{ |x| File.delete(x.path) }
-      @files = []
+    def Workspace.clear
+      @@files.each{ |x| File.delete(x.path) }
+      @@files = []
     end
 
-    # reset first: delete them from disk and reset @files
+    # 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)
-      if comm.files.empty?
-        clear # reset, checkout last commit
-        checkout
-      else # list_files are not nil
+    def Workspace.clean(comm)
+      if comm.files.empty? # reset, checkout last commit
+        Workspace.clear
+        Workspace.checkout
+      else # files are not nil
 
         # exit if the specified file is not in the workspace
         return -1 if (self.include? comm.files) == false
@@ -109,7 +135,7 @@ module Copernicium
         comm.files.each do |x|
           File.delete(x)
           idx = indexOf(x)
-          @files.delete_at(idx) if !idx == -1
+          @@files.delete_at(idx) if !idx == -1
         end
 
         # if we have had a branch, first we get the latest snapshot of it
@@ -119,45 +145,46 @@ module Copernicium
     end
 
     # commit a list of files or the entire workspace to make a new snapshot
-    def commit(comm)
-      unless ws_files.empty?
-        ws_files.each do |x|
+    def Workspace.commit(comm)
+      if comm.files.nil? # commit everything
+        Workspace.ws_files.each do |x|
           if indexOf(x) == -1
             content = readFile(x)
-            hash = @revlog.add_file(x, content)
+            hash = RevLog.add_file(x, content)
             fobj = FileObj.new(x, [hash,])
-            @files.push(fobj)
-          else
+            @@files.push(fobj)
+          else # file exists
             content = readFile(x)
-            hash = @revlog.add_file(x, content)
-            if @files[indexOf(x)].history[-1] != hash
-              @files[indexOf(x)].history << hash
+            hash = RevLog.add_file(x, content)
+            if @@files[indexOf(x)].history[-1] != hash
+              @@files[indexOf(x)].history << hash
             end
           end
         end
+      else # just commit certain files
       end
-      @repo.make_snapshot(@files) # return snapshot id
+      Repos.make_snapshot(@@files) # return snapshot id
     end
 
-    def checkout(comm = UIComm.new(rev: @branch))
+    def Workspace.checkout(comm)
 =begin
-      # just support branches for now
+      # just support revisions 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
+      # # 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)
+        returned_snapshot = Repos.get_snapshot(Repos.history.last)
         list_files_last_commit = returned_snapshot.files
         list_files_last_commit.each do |x|
           if list_files.include? x.path
-            content = @revlog.get_file(x.history.last)
+            content = RevLog.get_file(x.history.last)
             idx = indexOf(x.path)
             if  idx == -1
-              @files << x
+              @@files << x
             else
-              @files[idx] = x
+              @@files[idx] = x
             end
             writeFile(x.path, content)
           end
@@ -168,21 +195,42 @@ module Copernicium
 
       clear # reset workspace
 
-      # we first get the last snapshot id of the branch, and then get the commit
+      # Dec. 3th, 2015 by Linfeng,
+      # for this command, the comm.rev should be a string representing the branch name
+      @@branch = comm.rev
+      Repos.update_branch(@@branch)
+
+      # if not snapshots exist, dont checkout
+      return -1 unless Repos.has_snapshots?
+
+      # if no snapshot files, dont checkout
+      snap = Repos.get_snapshot(comm.rev)
+      return -1 if snap.files.nil?
+
       # object and finally push all files of it to the # workspace
-      @repo.get_snapshot(@repo.history.last).files.each do |file|
+      snap.files.each do |file|
         idx = indexOf(file.path)
+        puts file
         if  idx == -1
-          @files << file
+          @@files << file
         else
-          @files[idx] = file
+          @@files[idx] = file
         end
-        content = @revlog.get_file(file.history.last)
+        content = RevLog.get_file(file.history.last)
         writeFile(file.path, content)
       end
     end
 
-    def status(comm)
+    # wrapper for Repos merge_snapshot, update workspace with result
+    def Workspace.merge(id)
+      # returns [{path => content}, [conflicting paths]]
+      Repos.merge_snapshot(id)
+
+      # todo update workspace with result
+      # todo return any conflicting files
+    end
+
+    def Workspace.status
       added = []
       edits = []
       remov = []
@@ -192,13 +240,13 @@ module Copernicium
           added << f
         else # changed file?
           x2 = readFile(f) # get the current version
-          x1 = @revlog.get_file(@files[idx].history.last)
+          x1 = RevLog.get_file(@@files[idx].history.last)
           edits << f if x1 != x2
         end
       end
 
       # any deleted files from the last commit?
-      @files.each { |f| remov << f.path unless (ws_files.include? f.path) }
+      @@files.each { |f| remov << f.path unless (ws_files.include? f.path) }
 
       [added, edits, remov]
     end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: copernicium
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Team Copernicium
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-03 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,17 +135,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple DVCS in Ruby.