copernicium 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd3e9247c74ce89252cccb9a53e801ffed973358
-  data.tar.gz: eb9c7868a7271ad1b679edea4532f5c1dac3265f
+  metadata.gz: fd169e6af9efa888468a19d10ad6f35d24dbb73f
+  data.tar.gz: cd05372657960e8983bbffc8d8a0a754be1176a8
 SHA512:
-  metadata.gz: 22c2ad848204714087cc28d43cac3608dbeed48a874b1b47f287d68200a5fbc9436d7305909cb0d923e35d2600b5912103dde8bf832f7f384aab4ff3929e45c8
-  data.tar.gz: a5780ed3510d641f84ca8d80e9ef6573f65636ccdb91e9b8ff8f75f3f0a652d986acc0f9742f2134140dd6321f5c777caf452478a001d01b0defc7f13ca02337
+  metadata.gz: 089e0411d8b921641843ce1e4baca1fb07f6f25f28cb31825d63c18f008c8205e29e9ff87cd0a58249b5d37d0d7b684f00060118d9b72f68002638a802edce13
+  data.tar.gz: 8bbadc0b3ca53af1fa3d65475081594732a101667e20cf06df03e159039ed1d22a3f1bea6c604f82d9d9201f9adae2b14e93f4be86d61e28e1a105d47fdd0c83

data/lib/pushpull.rb

@@ -9,25 +9,24 @@
 #   Clone - cn clone <user> <repo.host:/dir/of/repo>
 # assumes that the user has ssh keys to the remote server setup
 
+
 module Copernicium
   include Workspace
   module PushPull
-    # 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(comm)
       # handle parsing out remote info
+      #   @opts - user
+      #   @repo - repo.host:/path/to/repo
+      #        OR /path/to/repo
       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!(/^:/, '')
+        @@path = remote.first
       else
-        raise 'Remote host information not given'.red
+        raise 'Remote host information not given.'.red
       end
 
       @@user = comm.opts
@@ -46,9 +45,12 @@ module Copernicium
     end
 
     # tell user to set up their ssh keys
-    def connection_failure(str = '')
+    def PushPull.connection_failure(str = '')
       puts "Connection error while: ".red + str
       puts "Make sure SSH keys are setup.".yel
+      puts "User: ".yel + @@user
+      puts "Host: ".yel + @@host
+      puts "Path: ".yel + @@path
       false
     end
 
@@ -57,25 +59,33 @@ module Copernicium
     # Description:
     #   a net/ssh wrapper, if given a block will execute block on server,
     #   otherwise tests connection.
-    #
-    # remote: the remote server, formatted "my.server"
-    # user: the user to connect as
     def PushPull.connect
       begin
-        Net::SSH.start(@@host, @@user) { |scp| yield scp }
+        Net::SSH.start(@@host, @@user) { |ssh| yield ssh }
         true
       rescue
         connection_failure 'trying to execute a command'
       end
     end
 
+
+    # Function: clone()
+    #
+    # Description:
+    #   Grabs a repository from a remote server
+    def PushPull.clone
+      begin
+        PushPull.fetch
+      rescue
+        connection_failure 'trying to clone a repo'
+      end
+    end
+
+
     # Function: transfer()
     #
     # Description:
     #   a net/scp wrapper to copy to server
-    #
-    # remote: the remote server and directory to pull from, formatted "my.server"
-    # user: the user to connect as
     def PushPull.transfer
       begin
         Net::SCP.start(@@host, @@user) { |scp| yield scp }
@@ -85,22 +95,19 @@ module Copernicium
       end
     end
 
+
     # Function: fetch()
     #
     # Description:
     #   a net/scp wrapper to copy from server, can take a block or do a one-off copy without one
     #
-    # remote: the remote server and directory to push to, formatted "my.server:/the/location/we/want"
-    # 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(local = Dir.pwd, &block)
       if block.nil? # we are cloning a repo in this section of code
         begin
           Net::SCP.start(@@host, @@user) do |scp|
-            scp.download!(@@path, local, :recursive => true)
+            scp.download! @@path, local, :recursive => true
           end
-          true
         rescue # no ssh keys are setup, die
           connection_failure 'trying to copy a file'
         end
@@ -108,39 +115,41 @@ module Copernicium
       else # fetch more than one file or folder
         begin
           Net::SCP.start(@@host, @@user) { |scp| yield scp }
-          true
         rescue
           connection_failure "trying to fetch files"
         end
       end
+      true
     end
 
+
     # Function: push()
     #
     # Description:
     #   pushes local changes on the current branch to a remote branch
-    #
-    # 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
-      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
+      begin
+        transfer do |ssh|
+          # uploading our history to remote
+          ssh.upload!("#{Dir.pwd}/.cn/history",
+                      "#{@@path}/.cn/merging_#{@@user}")
+
+          # uploading our .cn info to remote
+          %w{revs snap}.each do |file|
+            ssh.upload!("#{Dir.pwd}/.cn/#{file}/",
+                        "#{@@path}/.cn/#{file}/",
+                        :recursive => true)
+          end
+        end # ssh
 
-      connect do |session|
-        session.exec!("cd #{@@path}")
-        puts session.exec!("cn update #{@@user}")
+        connect do |ssh|
+          ssh.exec! "cd #{@@path}"
+          puts ssh.exec! "cn update #{@@user}"
+        end
+      rescue
+        connection_failure "trying to push files"
       end
+      true
     end
 
 
@@ -149,40 +158,26 @@ module Copernicium
     # Description:
     #   pulls remote changes to the current branch from remote branch
     #
-    # 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
-      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 update", @@user
-      puts "Remote #{@@repo} pulled.".grn
-    end
-
-
-    # Function: clone()
-    #
-    # Description:
-    #   Grabs a repository from a remote server
-    #
-    # 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
       begin
-        PushPull.fetch
+        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 update", @@user
+        puts "Remote pulled: ".grn + @@host + @@path
       rescue
-        connection_failure 'trying to clone a repo'
+        connection_failure "trying to pull files"
       end
+      true
     end
   end
 end

data/lib/ui.rb

@@ -1,7 +1,7 @@
 # user interface module - parse and execute commands
 # integrates all modules, central module
 
-VERSION = "0.1.2"
+VERSION = "0.1.3"
 
 module Copernicium
   # Communication object that will pass commands to backend modules
@@ -172,54 +172,34 @@ module Copernicium
       end
     end
 
-    def push(args)
-      # Command usage is:
-      #   cn push <user> <repo.host:/dir/of/repo> <branch-name>
-      #
-      # If username not given, get it from the user.
-      user = args[0]
-      if user.nil?
-        user = get "username for push"
-        # Make sure username is the first arg, since PushPull is expecting this.
-        args << user
-      end
-
-      remote = args[1]
-      remote = get "remote path to push to (format: <repo.host:/dir/of/repo>)" if remote.nil?
-
-      branchname = args[2]
-      branchname = get "remote branch to push to" if branchname.nil?
-
-      comm = UIComm.new(command: 'push', opts: args, repo: remote, rev: branchname)
-      # Do the push
+    def clone(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
+      comm = UIComm.new(command: 'clone', opts: user, repo: host)
       PushPull.UICommandParser(comm)
+      return comm
+    end
 
-      comm
+    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
+      comm = UIComm.new(command: 'push', opts: user, repo: host)
+      PushPull.UICommandParser(comm)
+      return comm
     end
 
     def pull(args)
-      # Command usage is:
-      #   cn pull <user> <repo.host:/dir/of/repo> <branch-name>
-      #
-      # If username not given, get it from the user.
-      user = args[0]
-      if user.nil?
-        user = get "username for pull"
-        # Make sure username is the first arg, since PushPull is expecting this.
-        args << user
-      end
-
-      remote = args[1]
-      remote = get "remote path to pull from (format: <repo.host:/dir/of/repo>)" if remote.nil?
-
-      branchname = args[2]
-      branchname = get "remote branch to pull from" if branchname.nil?
-
-      comm = UIComm.new(command: 'pull', opts: args, repo: remote, rev: branchname)
-      # Do the pull
+      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
+      comm = UIComm.new(command: 'pull', opts: user, repo: host)
       PushPull.UICommandParser(comm)
-
-      comm
+      return comm
     end
 
     # Take in a revision (snaptshot) id or branch
@@ -251,19 +231,6 @@ module Copernicium
       ui
     end
 
-    # usage: cn clone <user> <repo.host:/dir/of/repo>
-    def clone(args)
-      user = args.shift
-      user = get "username for clone" if user.nil?
-
-      repo = args.first
-      repo = get "url to clone (format: <repo.host:/dir/of/repo>)" if repo.nil?
-
-      comm = UIComm.new(command: 'clone', opts: user, repo: repo)
-      PushPull.UICommandParser(comm)
-      comm
-    end
-
     def commit(args)
       messflag = args.find_index('-m')
       if messflag.nil?

metadata

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