copernicium 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd169e6af9efa888468a19d10ad6f35d24dbb73f
-  data.tar.gz: cd05372657960e8983bbffc8d8a0a754be1176a8
+  metadata.gz: 7a5ffa814cbc75d8cef5aa496ae365e64055544f
+  data.tar.gz: dcdc64d513fc8d4ab767ca371446fd04897984a8
 SHA512:
-  metadata.gz: 089e0411d8b921641843ce1e4baca1fb07f6f25f28cb31825d63c18f008c8205e29e9ff87cd0a58249b5d37d0d7b684f00060118d9b72f68002638a802edce13
-  data.tar.gz: 8bbadc0b3ca53af1fa3d65475081594732a101667e20cf06df03e159039ed1d22a3f1bea6c604f82d9d9201f9adae2b14e93f4be86d61e28e1a105d47fdd0c83
+  metadata.gz: dfa00b3ba05c58cb3c7f5fe99c7c910bc3e3ea09500d1473adaccd50640a11e0c8e554d234d14fb9e3609f09f7e58feb7bbca4d6813500b33c9c7ec37fe2d927
+  data.tar.gz: 2c29c875e7dcc63d6e0698e4c6ff414b1fb7806d277ce66718cb2e5a6f7bf7d300d0a8a73b72b2defa9888522894cbdb535489228597e3dfd4bba6f6f1bab1ce

data/lib/pushpull.rb

@@ -1,7 +1,7 @@
 # Frank Tamburrino
-# CSC 253
+# CSC 254
 # PushPull Module
-# November 6, 2015
+# November 7, 2015
 #
 # How to use for Push, Pull and Clone:
 #   Push - cn push <user> <repo.host:/dir/of/repo> <branch-name>
@@ -11,7 +11,6 @@
 
 
 module Copernicium
-  include Workspace
   module PushPull
     def PushPull.UICommandParser(comm)
       # handle parsing out remote info
@@ -32,11 +31,11 @@ module Copernicium
       @@user = comm.opts
       case comm.command
       when "clone"
-        clone
+        PushPull.pclone
       when "push"
-        push
+        PushPull.ppush
       when "pull"
-        pull
+        PushPull.ppull
       when 'test'
         # avoid error while doing unit testing
       else
@@ -45,9 +44,11 @@ module Copernicium
     end
 
     # tell user to set up their ssh keys
-    def PushPull.connection_failure(str = '')
+    def PushPull.connection_failure(str = '', err = '')
+      puts "Make sure SSH keys are setup to the host server.".grn
       puts "Connection error while: ".red + str
-      puts "Make sure SSH keys are setup.".yel
+      puts "Error: ".red + err.to_s
+      puts "Backtrace:\n\t".red + "#{err.backtrace.join("\n\t")}"
       puts "User: ".yel + @@user
       puts "Host: ".yel + @@host
       puts "Path: ".yel + @@path
@@ -63,8 +64,8 @@ module Copernicium
       begin
         Net::SSH.start(@@host, @@user) { |ssh| yield ssh }
         true
-      rescue
-        connection_failure 'trying to execute a command'
+      rescue => error
+        connection_failure 'trying to execute a command', error
       end
     end
 
@@ -73,11 +74,11 @@ module Copernicium
     #
     # Description:
     #   Grabs a repository from a remote server
-    def PushPull.clone
+    def PushPull.pclone
       begin
         PushPull.fetch
-      rescue
-        connection_failure 'trying to clone a repo'
+      rescue => error
+        connection_failure 'trying to clone a repo', error
       end
     end
 
@@ -90,8 +91,8 @@ module Copernicium
       begin
         Net::SCP.start(@@host, @@user) { |scp| yield scp }
         true
-      rescue
-        connection_failure 'trying to upload a file'
+      rescue => error
+        connection_failure 'trying to upload a file', error
       end
     end
 
@@ -102,34 +103,34 @@ module Copernicium
     #   a net/scp wrapper to copy from server, can take a block or do a one-off copy without one
     #
     # local: where we want to put the file, not needed for blocked calls
-    def PushPull.fetch(local = Dir.pwd, &block)
-      if block.nil? # we are cloning a repo in this section of code
+    def PushPull.fetch
+      if block_given? # fetch more than one file or folder
         begin
-          Net::SCP.start(@@host, @@user) do |scp|
-            scp.download! @@path, local, :recursive => true
-          end
-        rescue # no ssh keys are setup, die
-          connection_failure 'trying to copy a file'
+          Net::SCP.start(@@host, @@user) { |scp| yield scp }
+        rescue => error
+          connection_failure "trying to fetch files", error
         end
 
-      else # fetch more than one file or folder
+      else # no block given, clone the repo
         begin
-          Net::SCP.start(@@host, @@user) { |scp| yield scp }
-        rescue
-          connection_failure "trying to fetch files"
+          Net::SCP.start(@@host, @@user) do |scp|
+            scp.download!(@@path, Dir.pwd, :recursive => true)
+          end
+        rescue => error
+          connection_failure 'trying to clone a repo', error
         end
       end
       true
     end
 
 
-    # Function: push()
+    # Function: ppush()
     #
     # Description:
     #   pushes local changes on the current branch to a remote branch
-    def PushPull.push
+    def PushPull.ppush
       begin
-        transfer do |ssh|
+        PushPull.transfer do |ssh|
           # uploading our history to remote
           ssh.upload!("#{Dir.pwd}/.cn/history",
                       "#{@@path}/.cn/merging_#{@@user}")
@@ -142,25 +143,25 @@ module Copernicium
           end
         end # ssh
 
-        connect do |ssh|
+        PushPull.connect do |ssh|
           ssh.exec! "cd #{@@path}"
           puts ssh.exec! "cn update #{@@user}"
         end
-      rescue
-        connection_failure "trying to push files"
+      rescue => error
+        connection_failure "trying to push files", error
       end
       true
     end
 
 
-    # Function: pull()
+    # Function: ppull()
     #
     # Description:
     #   pulls remote changes to the current branch from remote branch
     #
-    def PushPull.pull
+    def PushPull.ppull
       begin
-        fetch do |session|
+        PushPull.fetch do |session|
           # uploading our history to remote
           session.download!("#{@@path}/.cn/merging_#{@@user}",
                             "#{Dir.pwd}/.cn/history")
@@ -174,8 +175,8 @@ module Copernicium
         end
         system "cn update", @@user
         puts "Remote pulled: ".grn + @@host + @@path
-      rescue
-        connection_failure "trying to pull files"
+      rescue => error
+        connection_failure "trying to pull files", error
       end
       true
     end

data/lib/ui.rb

@@ -1,7 +1,9 @@
 # user interface module - parse and execute commands
 # integrates all modules, central module
 
-VERSION = "0.1.3"
+VERSION = "0.1.4"
+
+include Copernicium::PushPull
 
 module Copernicium
   # Communication object that will pass commands to backend modules
@@ -21,10 +23,10 @@ module Copernicium
     end
   end
 
-  # todo - consider refactoring some UIComm usage
   # main driver for the command line user interface
   module Driver
     include Workspace # needed for most high level commands
+    include PushPull # needed for most high level commands
     # Executes the required action for a given user command.
     #
     # Parameters:
@@ -53,7 +55,7 @@ module Copernicium
       if cmd == 'init'
         noroot?? init(args) : puts(IN_REPO_WARNING.yel, getroot)
       elsif cmd == 'clone' # allow cloning a new repo
-          clone args
+          clonecn 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
@@ -172,12 +174,12 @@ module Copernicium
       end
     end
 
-    def clone(args)
+    def clonecn(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)
+      comm = UIComm.new(command: 'clone', repo: host, opts: user)
       PushPull.UICommandParser(comm)
       return comm
     end
@@ -187,7 +189,7 @@ module Copernicium
       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)
+      comm = UIComm.new(command: 'push', repo: host, opts: user)
       PushPull.UICommandParser(comm)
       return comm
     end
@@ -197,7 +199,7 @@ module Copernicium
       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)
+      comm = UIComm.new(command: 'pull', repo: host, opts: user)
       PushPull.UICommandParser(comm)
       return comm
     end
@@ -282,7 +284,7 @@ module Copernicium
       else
         username = args.first
       end
-      Repos.update(UIComm.new(command: 'update', ops: username))
+      Repos.update(UIComm.new(command: 'update', opts: username))
     end
   end # Driver
 end # Copernicium

metadata

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