copernicium 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae0586e9cb32a7e0eb7923e268009975564a89bf
-  data.tar.gz: 173bdc7cef1f59e1b5ab9d42806b9a0c3425ea82
+  metadata.gz: fd3e9247c74ce89252cccb9a53e801ffed973358
+  data.tar.gz: eb9c7868a7271ad1b679edea4532f5c1dac3265f
 SHA512:
-  metadata.gz: 0ceb1bc12e11397be06875f4ebd7e61b6587313d7a02153019d0dd57b3f938df6d4d822e6d49d7593322684f8266190acf5f0c750b763b73785fe5365dde1311
-  data.tar.gz: 0c3da8661659f3827cd400603d398f3a72f7e876e0026b0fa9e108213f19bca9d9dbd41405d25688cf0aef3db55fef1f33bf9a4d0a5b146610c0a6f83eb8f284
+  metadata.gz: 22c2ad848204714087cc28d43cac3608dbeed48a874b1b47f287d68200a5fbc9436d7305909cb0d923e35d2600b5912103dde8bf832f7f384aab4ff3929e45c8
+  data.tar.gz: a5780ed3510d641f84ca8d80e9ef6573f65636ccdb91e9b8ff8f75f3f0a652d986acc0f9742f2134140dd6321f5c777caf452478a001d01b0defc7f13ca02337

data/lib/RevLog.rb

@@ -125,14 +125,6 @@ module Copernicium
       File.open(@@log_path, 'w') { |f| f.write(@@logmap.to_yaml) }
       File.open(@@hash_path, 'w') { |f| f.write(@@hashmap.to_yaml) }
     end
-
-    # def RevLog.alterFile(fileObject, fileReferenceString, versionReferenceString)
-    # end
-
-    # def RevLog.deleteFileVersion(fileReferenceString, versionReferenceString)
-    # end
-
-    # def RevLog.viewFileHistory(fileReferenceString)
-    # end
   end
 end
+

data/lib/pushpull.rb

@@ -2,39 +2,56 @@
 # CSC 253
 # PushPull Module
 # November 6, 2015
-
+#
+# How to use for Push, Pull and Clone:
+#   Push - cn push <user> <repo.host:/dir/of/repo> <branch-name>
+#   Pull - cn pull <user> <repo.host:/dir/of/repo> <branch-name>
+#   Clone - cn clone <user> <repo.host:/dir/of/repo>
+# assumes that the user has ssh keys to the remote server setup
 
 module Copernicium
-  # How to use for Push, Pull and Clone:
-  #   Push - cn push <user> <repo.host:/dir/of/repo> <branch-name>
-  #   Pull - cn pull <user> <repo.host:/dir/of/repo> <branch-name>
-  #   Clone - cn clone <user> <repo.host:/dir/of/repo>
-  class UIComm
-  end
-
+  include Workspace
   module PushPull
-    include Repos # needed for calling their methods
-    # Chris's edit
-    # Takes in Ethan's UICommandCommunicator object and calls
-    # a method based on the command
-    #
     # Fields in UIComm and what they are for me:
     #   @opts - user
     #   @repo - repo.host:/path/to/repo
+    #   @repo - :/path/to/repo
     #   @rev - branch name
-    def PushPull.UICommandParser(ui_comm)
-      case ui_comm.command
+    def PushPull.UICommandParser(comm)
+      # handle parsing out remote info
+      remote = comm.repo.split(':')
+      if remote.length == 2
+        @@host = remote[0]
+        @@path = remote[1]
+      elsif remote.length == 1
+        @@host = "cycle3.csug.rochester.edu"
+        @@path = remote[0].sub!(/^:/, '')
+      else
+        raise 'Remote host information not given'.red
+      end
+
+      @@user = comm.opts
+      case comm.command
       when "clone"
-        clone(ui_comm.repo, ui_comm.opts.first)
+        clone
       when "push"
-        push(ui_comm.repo, ui_comm.rev, ui_comm.opts.first)
+        push
       when "pull"
-        pull(ui_comm.repo, ui_comm.rev, ui_comm.opts.first)
+        pull
+      when 'test'
+        # avoid error while doing unit testing
       else
         raise "Error: Invalid command supplied to PushPull".red
       end
     end
 
+    # tell user to set up their ssh keys
+    def connection_failure(str = '')
+      puts "Connection error while: ".red + str
+      puts "Make sure SSH keys are setup.".yel
+      false
+    end
+
     # Function: connect()
     #
     # Description:
@@ -43,58 +60,13 @@ module Copernicium
     #
     # remote: the remote server, formatted "my.server"
     # user: the user to connect as
-    def PushPull.connect(remote, user, &block)
-      exit_code = false
-      puts 'inside PushPull connect'.blu
-      if(block.nil?)
-        begin
-          puts 'inside PushPull connect nil block path'.grn
-          Net::SSH.start(remote, user) do |ssh|
-            puts ssh.exec!("echo Successful Connection!")
-            exit_code = true
-          end
-        rescue
-          begin
-            print "Username for remote repo?: "
-            user = (STDIN.readline).strip
-
-            print "Password for #{user}: "
-            passwd = (STDIN.noecho(&:gets)).strip
-            puts
-
-            Net::SSH.start(remote, user, :password => passwd) do |ssh|
-              puts ssh.exec!("echo Successful Connection!")
-              exit_code = true
-            end
-          rescue
-            raise "Unsuccessful Connection".red
-          end
-        end
-      else
-        begin
-          Net::SSH.start(remote, user) do |ssh|
-            yield ssh
-          end
-          exit_code = true
-        rescue
-          begin
-            print "Username for remote repo: "
-            user = (STDIN.readline).strip
-
-            print "Password for #{user}: "
-            passwd = (STDIN.noecho(&:gets)).strip
-            puts
-
-            Net::SSH.start(remote, user, :password => passwd) do |ssh|
-              yield ssh
-            end
-            exit_code = true
-          rescue
-            raise "Unable to execute command!".red
-          end
-        end
+    def PushPull.connect
+      begin
+        Net::SSH.start(@@host, @@user) { |scp| yield scp }
+        true
+      rescue
+        connection_failure 'trying to execute a command'
       end
-      return exit_code
     end
 
     # Function: transfer()
@@ -104,29 +76,12 @@ module Copernicium
     #
     # remote: the remote server and directory to pull from, formatted "my.server"
     # user: the user to connect as
-    def PushPull.transfer(remote, user, &block)
-      exit_code = false
+    def PushPull.transfer
       begin
-        Net::SCP.start(remote, user) do |scp|
-          yield scp
-        end
-        exit_code = true
+        Net::SCP.start(@@host, @@user) { |scp| yield scp }
+        true
       rescue
-        begin
-          print "Username for remote repo: "
-          user = (STDIN.readline).strip
-
-          print "Password for #{user}: "
-          passwd = (STDIN.noecho(&:gets)).strip
-          puts
-
-          Net::SCP.start(remote, user, :passwd => passwd) do |scp|
-            yield scp
-          end
-          exit_code = true
-        rescue
-          raise "Unable to upload file!".red
-        end
+        connection_failure 'trying to upload a file'
       end
     end
 
@@ -139,56 +94,25 @@ module Copernicium
     # dest: what we want of the branch, not needed for blocked calls
     # local: where we want to put the file, not needed for blocked calls
     # user: the user to connect as
-    def PushPull.fetch(remote, dest, local, user, &block)
-      exit_code = false
-      if(block.nil?)
+    def PushPull.fetch(local = Dir.pwd, &block)
+      if block.nil? # we are cloning a repo in this section of code
         begin
-          Net::SCP.start(remote, user, :password => passwd) do |scp|
-            scp.download!(dest, local, :recursive => true)
-          end
-          exit_code = true
-        rescue
-          begin
-            print "Username for remote repo: "
-            user = (STDIN.readline).strip
-
-            print "Password for #{user}: "
-            passwd = (STDIN.noecho(&:gets)).strip
-            puts
-
-            Net::SCP.start(remote, user, :password => passwd) do |scp|
-              scp.download!(dest, local, :recursive => true)
-            end
-            exit_code = true
-          rescue
-            raise "Unable to fetch file(s)!".red
+          Net::SCP.start(@@host, @@user) do |scp|
+            scp.download!(@@path, local, :recursive => true)
           end
+          true
+        rescue # no ssh keys are setup, die
+          connection_failure 'trying to copy a file'
         end
-      else
+
+      else # fetch more than one file or folder
         begin
-          Net::SCP.start(remote, user, :password => passwd) do |scp|
-            yield scp
-          end
-          exit_code = true
+          Net::SCP.start(@@host, @@user) { |scp| yield scp }
+          true
         rescue
-          begin
-            print "Username for remote repo: "
-            user = (STDIN.readline).strip
-
-            print "Password for #{user}: "
-            passwd = (STDIN.noecho(&:gets)).strip
-            puts
-
-            Net::SCP.start(remote, user, :password => passwd) do |scp|
-              yield scp
-            end
-            exit_code = true
-          rescue
-            raise "Unable to fetch file(s)!".red
-          end
+          connection_failure "trying to fetch files"
         end
       end
-      return exit_code
     end
 
     # Function: push()
@@ -199,52 +123,27 @@ module Copernicium
     # remote: the remote server and directory to push to, formatted "my.server:/the/location/we/want"
     # branch: the branch that we are pushing to
     # user: the user to connect as
-    def PushPull.push(remote, branch, user)
-      # check contents of folder for .cn, fail if not present and remove otherwise
-      dest = remote.split(':')
-      if(dest.length != 2)
-        dest = dest.insert(0, "cycle3.csug.rochester.edu")
-      end
-      contents = Dir.entries(Dir.pwd)
-      if(!content.include? '.cn')
-        puts 'failed to push to remote, not an initialized Copernicium repo'
-        return
-      else
-        contents = contents.delete_if{|x| (x.eql? '.cn') || (x.eql? '.') || (x.eql? '..')}
-      end
-
-      # todo - check if branch exists on the remote server
-      # if so, dump contents and save a new commit saying pushed from user
-      # else, create branch and dump files, then make a new commit saying
-      # created branch
-      connect(dest[0], user) do |session|
-        session.exec!("cd #{dest[1]}")
-        result = session.exec!('ls .cn')
-        if(result.strip.eql? '')
-          puts 'remote directory not a Copernicium repo'
-          return
-        end
-        session.exec!("cn branch .temp_push_#{user}")
-        session.exec!("find . ! -name \".cn\" -exec rm -r {} \\;")
-
-        # Move the files over to the remote branch
-        transfer(dest[0], user) do |scp|
-          contents.each do |x|
-            scp.upload!(Dir.pwd+'/'+x, dest[1], :recursive => true)
-          end
+    def PushPull.push
+      transfer do |session|
+        # uploading our history to remote
+        session.upload!("#{Dir.pwd}/.cn/history",
+                        "#{@@path}/.cn/merging_#{@@user}")
+
+        # uploading our .cn info to remote
+        %w{revs snap}.each do |file|
+          session.upload!("#{Dir.pwd}/.cn/#{file}",
+                          "#{@@path}/.cn/#{file}",
+                          :recursive => true)
         end
+      end # session
 
-        # Commit the files and merge the branches
-        session.exec!('cn add .')
-        session.exec!('cn commit -m \'Temp commit for push\'')
-        session.exec!("cn checkout #{branch}")
-        session.exec!("cn merge .temp_push_#{user}")
-        session.exec!("cn branch -d .temp_push_#{user}")
+      connect do |session|
+        session.exec!("cd #{@@path}")
+        puts session.exec!("cn update #{@@user}")
       end
-
-      puts "Successfully pushed to #{remote}"
     end
 
+
     # Function: pull()
     #
     # Description:
@@ -253,56 +152,24 @@ module Copernicium
     # remote: the remote server and directory to push to, formatted "my.server:/the/location/we/want"
     # branch: the branch that we are pushing to
     # user: the user to connect as
-    def PushPull.pull(remote, branch, user)
-      # check contents of folder for .cn, fail if not present and remove otherwise
-      crbr = Repos.new.current_branch() # assumed function
-      dest = remote.split(':')
-      if(dest.length != 2)
-        dest = dest.insert(0, "cycle3.csug.rochester.edu")
-      end
-      contents = Dir.entries(Dir.pwd)
-      if(!content.include? '.cn')
-        puts 'failed to pull from remote, not an initialized Copernicium repo'
-        return
-      else
-        contents = contents.delete_if{|x| (x.eql? '.cn') || (x.eql? '.') || (x.eql? '..')}
-      end
-
-      # create a new branch and clean it in prep for the incoming files
-      system "cn branch .temp_pull_#{user}"
-      contents.each do |x|
-        system "rm -r #{x}"
-      end
-
-      # get the file list from the remote directory
-      connect(dest[0], user) do |session|
-        session.exec!("cd #{dest[1]}")
-        session.exec!("cn checkout #{branch}")
-        collection = session.exec!("ls | cat")
-      end
-
-      collection  = collection.split('\n')
-      if(!collection.include? '.cn')
-        puts 'failed to pull from remote, remote folder not an initialized Copernicium repo'
-        return
-      else
-        collection = collection.delete_if{|x| (x.eql? '.cn') || (x.eql? '.') || (x.eql? '..')}
-      end
-
-      # fetch the files from the remote directory and merge them to the branch
-      fetch(dest[0], nil, nil, user) do |scp|
-        collection.each do |x|
-          scp.download!(dest[1]+'/'+x, Dir.pwd, :recursive => true)
+    def PushPull.pull
+      fetch do |session|
+        # uploading our history to remote
+        session.download!("#{@@path}/.cn/merging_#{@@user}",
+                          "#{Dir.pwd}/.cn/history")
+
+        # uploading our .cn info to remote
+        %w{revs snap}.each do |file|
+          session.download!("#{@@path}/.cn/#{file}",
+                            "#{Dir.pwd}/.cn/#{file}",
+                            :recursive => true)
         end
       end
-      system "cn add ."
-      system "cn commit -m \'Temp commit for pull\'"
-      system "cn checkout #{crbr}"
-      system "cn merge .temp_pull_#{user}"
-      system "cn branch -d .temp_pull_#{user}"
-      puts "Successfully pulled from #{remote}"
+      system "cn update", @@user
+      puts "Remote #{@@repo} pulled.".grn
     end
 
+
     # Function: clone()
     #
     # Description:
@@ -310,20 +177,12 @@ module Copernicium
     #
     # remote: the remote server and directory to push to, formatted "my.server:/the/location/we/want"
     # user: the user to connect as
-    def PushPull.clone(remote, user = nil)
-      exit_code = false
-      dest = remote.split(':')
-      if(dest.length != 2)
-        dest = dest.insert(0, "cycle3.csug.rochester.edu")
-      end
+    def PushPull.clone
       begin
-        fetch(dest[0], dest[1], Dir.pwd, user)
-        exit_code = true
+        PushPull.fetch
       rescue
-        puts "Failed to clone the remote branch!".red
+        connection_failure 'trying to clone a repo'
       end
-
-      return exit_code
     end
   end
 end

data/lib/repos.rb

@@ -262,6 +262,41 @@ module Copernicium
       @@history.delete(branch)
       update_history
     end
+
+    # FOR PUSHPULL UPDATE
+    def Repos.update(comm = UIComm.new)
+      merge_name = File.join(@@copn,'merging_',comm.ops)
+      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]
+                status = "Merged remote history with local"
+              end
+            end
+          else
+            @@history[key] = val
+          end
+        end
+
+        File.delete(merge_name)
+        update_history
+        puts status
+      else
+        puts 'Error updating: '.red + merge_name + 'doesnt exist.'
+      end
+    end # update
   end # Repos
 end # Copernicium
 

data/lib/required.rb

@@ -15,7 +15,7 @@ require 'net/scp'       # Needed for file transfer between servers
 require_relative 'banners'
 require_relative 'RevLog'
 require_relative 'repos'
-require_relative 'pushpull'
 require_relative 'workspace'
+require_relative 'pushpull'
 require_relative 'ui'
 

data/lib/ui.rb

@@ -1,7 +1,7 @@
 # user interface module - parse and execute commands
 # integrates all modules, central module
 
-VERSION = "0.1.1"
+VERSION = "0.1.2"
 
 module Copernicium
   # Communication object that will pass commands to backend modules
@@ -52,6 +52,8 @@ module Copernicium
       # create the cn project, else already in one
       if cmd == 'init'
         noroot?? init(args) : puts(IN_REPO_WARNING.yel, getroot)
+      elsif cmd == 'clone' # allow cloning a new repo
+          clone args
       elsif noroot? # if not in a repo, warn them, tell how to create
         puts NO_REPO_WARNING.yel
       else # now, assume we are in a copernicum project
@@ -67,8 +69,6 @@ module Copernicium
           branch args
         when 'clean'
           clean args
-        when 'clone'
-          clone args
         when 'commit'
           commit args
         when 'checkout'
@@ -79,6 +79,8 @@ module Copernicium
           push args
         when 'pull'
           pull args
+        when 'update'
+          update args
         when 'init'
           # fall through - init handled above, before case statement
         else # handle an unrecognized argument, show help and exit
@@ -249,23 +251,16 @@ module Copernicium
       ui
     end
 
+    # usage: cn clone <user> <repo.host:/dir/of/repo>
     def clone(args)
-      # Command usage is:
-      #   cn clone <user> <repo.host:/dir/of/repo>
-      user = args.first
-      if user.nil?
-        user = get "username for clone"
-        # Make sure username is first arg, since PushPull is expecting this.
-        args << user
-      end
+      user = args.shift
+      user = get "username for clone" if user.nil?
 
-      repo = args[1]
-      repo = get "repo url to clone (format: <repo.host:/dir/of/repo>)" if repo.nil?
+      repo = args.first
+      repo = get "url to clone (format: <repo.host:/dir/of/repo>)" if repo.nil?
 
-      comm = UIComm.new(command: 'clone', opts: args, repo: repo)
-      # Do the clone
+      comm = UIComm.new(command: 'clone', opts: user, repo: repo)
       PushPull.UICommandParser(comm)
-
       comm
     end
 
@@ -297,7 +292,7 @@ module Copernicium
 
     def merge(args)
       if args.empty?
-        rev = get 'single commit or branch to merge'
+        rev = get 'branch to merge'
       else
         rev = args.first
       end
@@ -305,21 +300,23 @@ module Copernicium
       # If rev is a branch name, resolve it to a rev ID.
       if Repos.has_branch? rev
         rev = (Repos.history rev).last
-      end
-
-      conflicts = Workspace.merge(rev)
-
-      # If there were any conflicts, display them to the user.
-      if not conflicts.nil?
-
-        conflicts.each do |conflict|
-          puts "   #{conflict}".red
+        conflicts = Workspace.merge(rev)
+        unless conflicts.nil?
+          conflicts.each { |conflict| puts "Conflict: ".red + conflict }
         end
+      else # branch not found
+        puts "Branch not found: ".red + rev
       end
+    end
 
-      # Don't return a UIComm object, since we didn't use one for any of the
-      # backend calls.
+    def update(args)
+      if args.empty?
+        username = get "user to update to"
+      else
+        username = args.first
+      end
+      Repos.update(UIComm.new(command: 'update', ops: username))
     end
   end # Driver
-end
+end # Copernicium
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copernicium
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Team Copernicium
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy