callsigns 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dbf79c05cdf7dd9c4aa96a15eb2c3215bdd1a5c4462ef78f47f97ecb94d08a2
-  data.tar.gz: 2917c56ede4475b911cd0f312732078e2aed25ed85c22da210ac28c37f78c992
+  metadata.gz: 505baa52b37717a979325e5e502f76d7dc9fe4f97bd5c6797db3e10fff67942f
+  data.tar.gz: 062e5eb6b4f647265752a7393e86819a042a9d274ee8d20d859334b9e2b54bd2
 SHA512:
-  metadata.gz: 03fa935f932d92a2c9182992b617a55639681ea2efcf221826da8af96a365de3d55b7a2b2cbcda3e52238dab0edbc65d9576d3ac13d778198ded53c9bab20a37
-  data.tar.gz: 893ea9aedbca3ed1ebcf247b7389f84c8f53b9bf5731623f33fabeea9ac0fd16b03f8ecc48d852554b716efba1109a6aa749574b33ec2846f4468ee333b74fa9
+  metadata.gz: e35e5eedf90c7e4a44c09ec2373f607795249aa9f878794313715e1370b76599a59a1b3b7dfc656b50923cf1dce8576e363311ce5477e34217debffe14e5b14a
+  data.tar.gz: a2a78af4af305b8b1c47651e6c1a54bd76fcf37ad543014bcf711b70fe895ed1ff16bda91c93c7b1cefa48f55d86d2380d42a2793b46990f21fb46579406315d

data/bin/{callsigns_cli → callsigns_tcp}

@@ -4,5 +4,5 @@ require 'callsigns'
 require 'httparty'
 require 'json'
 
-Callsigns::CLI.main(ARGV[0])
+Callsigns::TCP.main(ARGV[0])
 

data/lib/callsigns.rb

@@ -1,4 +1,4 @@
 require_relative './callsigns/version'
 require_relative './callsigns/radioid'
 require_relative './callsigns/callook'
-require_relative './callsigns/cli'
+require_relative './callsigns/tcp'

data/lib/callsigns/callook.rb

@@ -1,43 +1,43 @@
 class Callsigns::Callook
-  def self.lookup(callsign)
+  def self.lookup(callsign, client)
     callook_uri = "https://callook.info/" + callsign.downcase + "/json"
     response = HTTParty.get(callook_uri).parsed_response
     if response["status"] == "INVALID"
-      puts "Invalid callsign. Please make sure you entered a valid USA-Based callsign"
+      client.puts "Invalid callsign. Please make sure you entered a valid USA-Based callsign"
     elsif response["status"] == "VALID"
-      puts "Callsign " + callsign.upcase + " is found!\n\n"
+      client.puts "Callsign " + callsign.upcase + " is found!\n\n"
       if response["previous"]["callsign"] == callsign.upcase
-        puts "ATTENTION: The callsign " + callsign.upcase + " is out-of-date. Operator changed callsign to: " + response["current"]["callsign"]
+        client.puts "ATTENTION: The callsign " + callsign.upcase + " is out-of-date. Operator changed callsign to: " + response["current"]["callsign"]
       end
-      puts response["current"]["callsign"]
-      puts "========="
-      puts "Type:               " + response["type"].capitalize
-      puts "Name:               " + response["name"].upcase
+      client.puts response["current"]["callsign"]
+      client.puts "========="
+      client.puts "Type:               " + response["type"].capitalize
+      client.puts "Name:               " + response["name"].upcase
       if response["type"] == "CLUB"
-        puts "Trustee:            " + response["trustee"]["name"].upcase + "  [" + response["trustee"]["callsign"] + "]"
+        client.puts "Trustee:            " + response["trustee"]["name"].upcase + "  [" + response["trustee"]["callsign"] + "]"
       elsif response["type"] == "PERSON"
-        puts "Class:              " + response["current"]["operClass"]
+        client.puts "Class:              " + response["current"]["operClass"]
       end
-      puts "Address:            " + response["address"]["line1"]
-      puts "                    " + response["address"]["line2"]
-      puts "                    " + response["address"]["attn"] if response["address"]["attn"] != ""
-      puts "Previous callsign:  " + response["previous"]["callsign"]
+      client.puts "Address:            " + response["address"]["line1"]
+      client.puts "                    " + response["address"]["line2"]
+      client.puts "                    " + response["address"]["attn"] if response["address"]["attn"] != ""
+      client.puts "Previous callsign:  " + response["previous"]["callsign"]
 
       radioid_dmr_uri = "https://database.radioid.net/api/dmr/user/?callsign=" + callsign.downcase
       response = HTTParty.get(radioid_dmr_uri).parsed_response
-      puts "DMR IDs:            " + response["count"].to_s + " IDs found"
+      client.puts "DMR IDs:            " + response["count"].to_s + " IDs found"
       if response["count"].to_i > 0
         response["results"].each do |r|
-          puts "                    " + r["id"].to_s
+          client.puts "                    " + r["id"].to_s
         end
       end
 
       radioid_nxdn_uri = "https://database.radioid.net/api/nxdn/user/?callsign=" + callsign.downcase
       response = HTTParty.get(radioid_nxdn_uri).parsed_response
-      puts "NXDN IDs:           " + response["count"].to_s + " IDs found"
+      client.puts "NXDN IDs:           " + response["count"].to_s + " IDs found"
       if response["count"].to_i > 0
         response["results"].each do |r|
-          puts "                    " + r["id"].to_s
+          client.puts "                    " + r["id"].to_s
         end
       end
 

data/lib/callsigns/radioid.rb

@@ -1,44 +1,44 @@
 class Callsigns::RadioID
-  def self.dmr(id)
+  def self.dmr(id, client)
     radioid_dmr_uri = "https://database.radioid.net/api/dmr/user/?id=" + id.to_s
     response = HTTParty.get(radioid_dmr_uri).parsed_response
     if response["count"].to_i == 1
-      puts "DMR ID " + id.to_s + " is found!\n\n"
-      puts "DMR: " + response["results"][0]["id"].to_s
-      puts "========="
-      puts "Callsign:           " + response["results"][0]["callsign"].upcase
-      puts "Name:               " + response["results"][0]["fname"] + " " + + response["results"][0]["surname"]
-      puts "City:               " + response["results"][0]["city"]
-      puts "State:              " + response["results"][0]["state"]
-      puts "Country:            " + response["results"][0]["country"]
+      client.puts "DMR ID " + id.to_s + " is found!\n\n"
+      client.puts "DMR: " + response["results"][0]["id"].to_s
+      client.puts "========="
+      client.puts "Callsign:           " + response["results"][0]["callsign"].upcase
+      client.puts "Name:               " + response["results"][0]["fname"] + " " + + response["results"][0]["surname"]
+      client.puts "City:               " + response["results"][0]["city"]
+      client.puts "State:              " + response["results"][0]["state"]
+      client.puts "Country:            " + response["results"][0]["country"]
 
       if ["A", "K", "N", "W"].include? response["results"][0]["callsign"][0]
-        puts "\nFor more information about this operator, enter [Lookup " + response["results"][0]["callsign"].upcase + "]"
+        client.puts "\nFor more information about this operator, enter [Lookup " + response["results"][0]["callsign"].upcase + "]"
       end
     else 
-      puts id.to_s + " is not a valid DMR ID."
+      client.puts id.to_s + " is not a valid DMR ID."
     end
   end
 
 
-  def self.nxdn(id)
+  def self.nxdn(id, client)
     radioid_nxdn_uri = "https://database.radioid.net/api/nxdn/user/?id=" + id.to_s
     response = HTTParty.get(radioid_nxdn_uri).parsed_response
     if response["count"].to_i > 0 && response["results"][0]["id"].to_s == id.to_s
-      puts "NXDN ID " + id.to_s + " is found!\n\n"
-      puts "NXDN: " + response["results"][0]["id"].to_s
-      puts "========="
-      puts "Callsign:           " + response["results"][0]["callsign"].upcase
-      puts "Name:               " + response["results"][0]["fname"] + " " + + response["results"][0]["surname"]
-      puts "City:               " + response["results"][0]["city"]
-      puts "State:              " + response["results"][0]["state"]
-      puts "Country:            " + response["results"][0]["country"]
+      client.puts "NXDN ID " + id.to_s + " is found!\n\n"
+      client.puts "NXDN: " + response["results"][0]["id"].to_s
+      client.puts "========="
+      client.puts "Callsign:           " + response["results"][0]["callsign"].upcase
+      client.puts "Name:               " + response["results"][0]["fname"] + " " + + response["results"][0]["surname"]
+      client.puts "City:               " + response["results"][0]["city"]
+      client.puts "State:              " + response["results"][0]["state"]
+      client.puts "Country:            " + response["results"][0]["country"]
 
       if ["A", "K", "N", "W"].include? response["results"][0]["callsign"][0]
-        puts "\nFor more information about this operator, enter [Lookup " + response["results"][0]["callsign"].upcase + "]"
+        client.puts "\nFor more information about this operator, enter [Lookup " + response["results"][0]["callsign"].upcase + "]"
       end
     else 
-      puts id.to_s + " is not a valid NXDN ID."
+      client.puts id.to_s + " is not a valid NXDN ID."
     end
   end
 end

data/lib/callsigns/tcp.rb

@@ -0,0 +1,77 @@
+require 'socket'
+
+class Callsigns::TCP
+
+  def self.greet(client)
+    client.puts "\n\nWelcome to [Callsigns by AL0Y]"
+    client.puts "This is an interactive server to search information of ham radio operators"
+    client.puts "by their callsign [only USA-based], DMR ID or NXDN ID"
+    help(client)
+  end
+
+
+  def self.help(client)
+    client.puts "\n\nAvilable commands:\n"
+    client.puts " Lookup [callsign]     - Gives information about the given callsign"
+    client.puts "                         As of now, the callsign must be USA-Based."
+    client.puts " DMR [number]          - Gives information about a DMR ID\n "
+    client.puts " NXDN [number]         - Gives information about a NXDN ID"
+    client.puts " HELP or ?             - Shows this command list"
+    client.puts " Version               - Shows the current version for this server"
+    client.puts " Bye                   - Disconnect from the Callsigns server and"
+    client.puts "                         return to node."
+
+  end
+
+  def self.goodbye(client)
+    client.puts "Thanks for using Callsigns by AL0Y. 73 de AL0Y\n\n"
+  end
+
+  def self.menu(client)
+    input = nil
+    while input != "bye"
+      client.puts "\nPlease enter a command, or type ? for a list of commands>"
+      input = client.gets.chomp.downcase
+      
+      if input == "bye"
+        goodbye(client)
+      
+      elsif input == "version"
+        client.puts "Callsigns by AL0Y - Version:" + Callsigns::VERSION.to_s
+      
+      elsif input == "?" || input == "help"
+        help
+      
+      elsif input.split(" ").count == 2 && input.split(" ")[0] == "lookup"
+        lookup_callsign = input.split(" ")[1]
+        client.puts "Getting information for " + lookup_callsign.to_s + "\n..."
+        Callsigns::Callook.lookup(lookup_callsign, client)
+      elsif input.split(" ").count == 2 && input.split(" ")[0] == "dmr"
+        dmr_id = input.split(" ")[1]
+        client.puts "Getting information for " + dmr_id.to_s
+        Callsigns::RadioID.dmr(dmr_id, client)
+      
+      elsif input.split(" ").count == 2 && input.split(" ")[0] == "nxdn"
+        nxdn_id = input.split(" ")[1]
+        client.puts "Getting information for " + nxdn_id.to_s
+        Callsigns::RadioID.nxdn(nxdn_id, client)
+      
+      else
+        client.puts "Unknown command!"
+      end
+
+    end
+  end
+
+  def self.main(port)
+    server = TCPServer.new port.to_i
+    loop do
+      Thread.start(server.accept) do |client| 
+        greet(client)
+        menu(client)
+        client.close
+      end
+    end
+  end
+
+end

data/lib/callsigns/version.rb

@@ -1,3 +1,3 @@
 module Callsigns
-  VERSION  = "1.1.5"
+  VERSION  = "1.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callsigns
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Aly Badawy
@@ -93,15 +93,15 @@ dependencies:
 description: A CLI to search hams by callsigns
 email: aly@al0y.com
 executables:
-- callsigns_cli
+- callsigns_tcp
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/callsigns_cli
+- bin/callsigns_tcp
 - lib/callsigns.rb
 - lib/callsigns/callook.rb
-- lib/callsigns/cli.rb
 - lib/callsigns/radioid.rb
+- lib/callsigns/tcp.rb
 - lib/callsigns/version.rb
 homepage: https://rubygems.org/gems/callsigns
 licenses:

data/lib/callsigns/cli.rb

@@ -1,70 +0,0 @@
-class Callsigns::CLI
-
-  def self.greet
-    puts "\n\nWelcome to [Callsigns by AL0Y]"
-    puts "This is an interactive server to search information of ham radio operators"
-    puts "by their callsign [only USA-based], DMR ID or NXDN ID"
-    help
-  end
-
-
-  def self.help
-    puts "\n\nAvilable commands:\n"
-    puts " Lookup [callsign]     - Gives information about the given callsign"
-    puts "                         As of now, the callsign must be USA-Based."
-    puts " DMR [number]          - Gives information about a DMR ID\n "
-    puts " NXDN [number]         - Gives information about a NXDN ID"
-    puts " HELP or ?             - Shows this command list"
-    puts " Version               - Shows the current version for this server"
-    puts " Bye                   - Disconnect from the Callsigns server and"
-    puts "                         return to node."
-
-  end
-
-  def self.goodbye
-    puts "Thanks for using Callsigns by AL0Y. 73 de AL0Y\n\n"
-  end
-
-  def self.menu
-    input = nil
-    while input != "bye"
-      puts "\nPlease enter a command, or type ? for a list of commands>"
-      input = STDIN.gets.chomp.downcase
-      
-      if input == "bye"
-        goodbye
-      
-      elsif input == "version"
-        puts "Callsigns by AL0Y - Version:" + Callsigns::VERSION.to_s
-      
-      elsif input == "?" || input == "help"
-        help
-      
-      elsif input.split(" ").count == 2 && input.split(" ")[0] == "lookup"
-        lookup_callsign = input.split(" ")[1]
-        puts "Getting information for " + lookup_callsign.to_s + "\n..."
-        Callsigns::Callook.lookup(lookup_callsign)
-      elsif input.split(" ").count == 2 && input.split(" ")[0] == "dmr"
-        dmr_id = input.split(" ")[1]
-        puts "Getting information for " + dmr_id.to_s
-        Callsigns::RadioID.dmr(dmr_id)
-      
-      elsif input.split(" ").count == 2 && input.split(" ")[0] == "nxdn"
-        nxdn_id = input.split(" ")[1]
-        puts "Getting information for " + nxdn_id.to_s
-        Callsigns::RadioID.nxdn(nxdn_id)
-      
-      else
-        puts "Unknown command!"
-      end
-
-    end
-  end
-
-  def self.main(args)
-    current_user = args
-    greet
-    menu
-  end
-
-end