aft 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe0209c8e20021c7a75434551cbff40ed3a0b72
-  data.tar.gz: 8d7b9f8995e79ca8f6ee483c9a3fd1294b872e42
+  metadata.gz: 5d8663463d4ccd1e7704ea73bebe0e079714fa3f
+  data.tar.gz: 7e286cb418c121ecee8583433657083273c6b527
 SHA512:
-  metadata.gz: 3a0c98fee19f443c781df7867359a5b0ff1858cc2bd418ca8c4274ab27fa799191ff43326b9b44ec527b46540b6c4a5303dccc76d594fe149009c5f1e93b1a14
-  data.tar.gz: 0c44db3fd2d655bbd25eb88b08ad6baa69f1ec94c3efe8e8042f6c5b1863f64026de299facf9a7d144eb07636ab08670c754168bf8d8ddfd2f5f59af1fa2a68e
+  metadata.gz: a89f9deafb057c8da7750d5d8a0d81e35447705aac951e3eda7ad25098d6e04fad16363ab496d197269c7226255642eaf2d4652da1fd7049c0e719a19a6b1416
+  data.tar.gz: 1b51ba2fdbd5e7df9b7a4823bbd1e1ae2073b03b026b8bd322fc5948bd5270380cbcd49263553816d27dbd0d9785ae420c6a4cf8b3f83bfb8973a6b670c400fe

data/README.md

@@ -1,14 +1,14 @@
-# Awesome File Share - *AFT*
+# Awesome File Transfer - *AFT*
 ## Aft - simple and *quick* file sharing server
-Aft comes with a couple commands, `afserver`, `afclient`.
-Also included is `afduo`, the command with both the server and client built in.
+The Aft gem contains `afserver`, `afclient`, and `afduo`.
+`afduo` has both the server and client built in.
 AFT automatically uses Zlib to compress files for efficient transfers.
 ## Up and running in less than a minute!
 Note that ruby needs to be installed first.
 
-+ Fire up your shell and type: `gem install aft`
++ Fire up your shell and type: `sudo gem install aft` (on MacOS type `sudo gem install aft -n /usr/local/bin`)
 + Next, start the file share server: `afserver filetoshare`
-+ Last, start the client on the receiving end: `afclient 10.0.0.23 filedownloaded`
++ Last, start the client on the receiving end: `afclient 10.0.0.23 filetodownload`
 
 ##### Done!
 ## Can I install without ruby gems or root?
@@ -51,9 +51,8 @@ Usage:
 	afclient  10.0.0.54 recieve.html
 ```
 ### What is afduo and how do I use it?
-`afduo` is the program that I made initially, before having the idea of making a ruby gem.
-It's slightly more complex to use than the gem, but it has the same functionality.
-
+`afduo` is slightly more complex to use than the gem, but it has the same functionality.
+With `afduo`, you just have to specify if you are the client or server with "-c", or "-s"
 `afduo --help` gives:
 ```bash
 Usage:
@@ -74,4 +73,4 @@ Usage:
 ### Contribute
 Feel free to send pull requests, suggestions, and issues to [wlib on github](https://github.com/wlib/aft)
 
-##### Author : Daniel Ethridge
+#### Author : Daniel Ethridge

data/bin/afclient

@@ -17,8 +17,7 @@ if Args.include? '-h' || '--help'
   puts Help
   exit
 else
-  puts "Starting client..."
+  puts "[*] Starting client..."
   receive()
-  puts "[+] Downloaded"
   puts "Success!"
 end

data/bin/afserver

@@ -15,7 +15,6 @@ if Args.include? '-h' || '--help'
   puts Help
   exit
 else
-  puts "[+] Started server"
+  puts "[*] Starting server"
   send()
-  puts "Sharing stopped!"
 end

data/bin/setup

@@ -5,4 +5,15 @@ set -vx
 
 bundle install
 
-# Do any other automated setup that you need to do here
+clear
+printf "\tAFT installed successfully\n\n\
+To use AFT as a server:\n\
+\t$ afserver filetoshare.txt\n\
+\t'afserver --help' for help\n\
+To use AFT as a client:\n\
+\t$ afclient [server IP] file.txt\n\
+\t'afclient --help' for help\n\n\
+Examples:\n\
+\t\$afserver log.txt\n\
+\t\$afclient 10.0.0.3\n\
+\t\$afclient 79.93.20.168 download.dat\n"

data/lib/afclient.rb

@@ -11,9 +11,33 @@ module Afclient
   def receive()
     sock = TCPSocket.new("#{$SIP}", 1174)
     rdata = sock.read
+    Signal.trap("INT") {
+      puts "\n[*] Client Stopped"  
+      exit
+    }
+    if rdata.nil?
+      puts "[-] Server not reached or responding"
+      exit
+    elsif ! rdata.nil?
+      puts "[+] Downloading..."
+    end
+    $Defaultfile = "aft.out"
+    i = 0
+    while File.exist?($Defaultfile)
+      if true
+        $Defaultfile = "aft#{i}.out"
+        i = i+1
+      end
+    end
+    if $RFile == $SIP
+      puts "[*] Filename not set, writing to #{$Defaultfile}"
+      $RFile = $Defaultfile
+    end
     rfile = File.open("#{$RFile}", 'w')
     rstream = decompress(rdata)
+    puts "[+] Decompressed data"
     rfile.write rstream
+    puts "[+] File transfer done"
     rfile.close
   end
 end

data/lib/afserver.rb

@@ -10,15 +10,31 @@ module Afserver
   end
   def send()
     server = TCPServer.new 1174
+    if $SFile.nil?
+      puts "[-] File not specified"
+      exit
+    end
+    puts "[+] Server online"
+    i = 0
+    if ! File.exist?($SFile)
+      puts "[-] File does not exist"
+      exit
+    end
     sfile = File.open("#{$SFile}", 'r')
     sstream = compress(sfile)
+    puts "[*] Serving compressed file : (#{sfile.size - sstream.size}) bytes smaller than original"
+    sfile.close
     while true
+      Signal.trap("INT") { 
+        puts "\n[*] Server Stopped"
+        exit
+      }
       Thread.new(server.accept) do |client|
         puts "[+] Connection accepted from a client"
         client.write sstream
+        puts "[*] Sent file to client, ending connection"
         client.close
       end
     end
-    sfile.close
   end
 end

data/lib/aft/version.rb

@@ -1,3 +1,3 @@
 module Aft
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aft
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Daniel Ethridge
@@ -60,7 +60,6 @@ files:
 - lib/afclient.rb
 - lib/afserver.rb
 - lib/aft/version.rb
-- pkg/zds-1.0.0.gem
 homepage: https://github.com/wlib/aft
 licenses:
 - GPL-3.0