iniquity 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9001f15929c9f44e4c3546d735956a27966b0b4cc694f8a713047543c7f0fd
-  data.tar.gz: 2569087434e51adf14359e51975b0188d6a6cca76ad7257eda40cbbb1b1a4952
+  metadata.gz: 5ec2fa013429fed19f81402fc56fc0be516efe6f8e8f266e3f8d4e9e81fe199b
+  data.tar.gz: 83fbdc3240335b39db1f4347defcced20ae6558a7698421edad5f1db4e88b40d
 SHA512:
-  metadata.gz: 3f9b730e269728db1d80c6bc12baced11ec991469894c84145fd99a41eebbe484f4c86e953316e419a48ce266cb1cca61d9330f07a5f9f85db82a1b38099231b
-  data.tar.gz: e135fe80131248f09c1747babb1e6ae6b6dc847f2fbde85f5fef8254455f44985fc0f361fba57be6bcf0622de87c49c3aa77d2e46a66564b4b4a32fd29dd4dd9
+  metadata.gz: 2f3cc9682bd01693e20e43b39553af5e0ac78aab0120e594a634c70335007524298815f9dbb11d94a0c5f225e2254fdc162bccbe0fcb1b0c86c1dcaf3ece9874
+  data.tar.gz: c65e9888f1608dc76c517c8fd452c4a29209fb21694c47b803d25996e61490e9801cfaa7037f2948666c90741975f214af51ecd2ba68bcce259ff85f5b298e5b

data/bin/iniquity

@@ -27,12 +27,13 @@ ENV["INIQUITY_SYSTEM"] = SYSTEM
 require "inifile"
 require "thin"
 require "socksify"
+require "sqlite3"
 
 class Telnet < EM::Connection
 
     def initialize
         super
-        send_data "\nIniquity BBS 0.0.15 - Telnet Service\n"
+        send_data "\nIniquity BBS 0.0.16 - Telnet Service\n"
     end
 
     def post_init
@@ -80,17 +81,27 @@ IO.readlines(artwork).each do |line|
     puts line.force_encoding(Encoding::IBM437).encode(Encoding::UTF_8)
 end
 
+DB = SQLite3::Database.new "#{SYSTEM}/iniquity.db"
+
 # If "init" passed...
 if ARGV[0] && ARGV[0] == "init"
     new_system_file = File.new(SYSTEM + "/iniquity.ini", "w")
     new_system_file.puts "[profile]\nname=NewBBS\n"
-    new_system_file.puts "\n[ipm]\nsources=iniquitybbs\n"
+    new_system_file.puts "\n[iqmod]\nsources=iniquitybbs\n"
     new_system_file.puts "\n[telnet]\nenabled=yes\n"
     new_system_file.puts "port=3023\n"
     new_system_file.puts "\n[rest]\nenabled=yes\n"
     new_system_file.puts "port=3080\n"
     new_system_file.close
-    abort "iniquity - Initialized directory as a new system.\n\n"
+
+    DB.execute <<-SQL
+        create table system (
+            name varchar(30),
+            val int
+        );
+    SQL
+
+    abort "\niniquity - Initialized directory as a new system.\n\n"
 end
 
 if File.exists?(SYSTEM + "/iniquity.ini")

data/bin/iqmod

@@ -46,28 +46,28 @@ else
     abort "iqmod - An Iniquity system must have an iniquity.ini file.\n\n"
 end
 
-# Find all available iqmod packages across all sources...
-available_packages = []
+# Find all available modules across all GitHub sources...
+available_modules = []
 
 if CONFIG["iqmod"]["sources"]
     CONFIG["iqmod"]["sources"].split(",").each do |source|
 
         repositories = Github.repos.list user: "#{source}"
 
-        repositories.each do |pkg|
-            if pkg.name.match(/^ip/)
-                available_packages.push(pkg)
+        repositories.each do |iqmod|
+            if iqmod.name.match(/^iqmod/)
+                available_modules.push(iqmod)
             end
         end
     end
 end
 
-installed_packages = []
+installed_modules = []
 
 Dir.chdir SYSTEM
-Dir.glob('iqmod*').select { |pkg|
-    if File.directory? pkg
-        installed_packages.push pkg
+Dir.glob('iqmod*').select { |iqmod|
+    if File.directory? iqmod
+        installed_modules.push iqmod
     end
 }
 
@@ -78,7 +78,7 @@ if ARGV[0] && ARGV[0] == "install"
 
     if ARGV[0]
         ARGV.each do |install|
-            available_packages.each do |iqmod|
+            available_modules.each do |iqmod|
 
                 if install == iqmod.name
                     next if Dir.exists? SYSTEM + "/#{iqmod.name}"
@@ -96,7 +96,7 @@ if ARGV[0] && ARGV[0] == "install"
 
                     FileUtils.mv SYSTEM + "/#{iqmod.name}-master", SYSTEM + "/#{iqmod.name}"
                     FileUtils.rm SYSTEM + "/#{iqmod.name}.zip"
-                    puts "iqmod - Installed #{iqmod.name}\n\n"
+                    puts "iqmod - Installed #{iqmod.name}.\n\n"
                 end
             end
         end
@@ -117,24 +117,36 @@ if ARGV[0] && ARGV[0] == "uninstall"
     end
 end
 
+# If "search" passed.
+if ARGV[0] && ARGV[0] == "search"
+
+    #ARGV.shift
+
+    if ARGV[0]
+        ARGV.each do |search|
+            abort "iqmod - Sorry, search doesn't work yet.\n\n"
+        end
+    end
+end
+
 # If no options passed.
 unless ARGV[0]
 
-    if available_packages.length > 0
+    if available_modules.length > 0
         puts "iqmod - Modules available for installation.\n\n"
 
-        available_packages.each do |iqmod|
+        available_modules.each do |iqmod|
             puts iqmod.name
             puts iqmod.description
-            #puts "https://github.com/#{iqmod.full_name}/archive/master.zip"
+            puts "https://github.com/#{iqmod.full_name}/archive/master.zip"
             puts ""
         end
     end
 
-    if installed_packages.length > 0
+    if installed_modules.length > 0
         puts "iqmod - Modules currently installed.\n\n"
 
-        installed_packages.each do |iqmod|
+        installed_modules.each do |iqmod|
             puts iqmod
         end
     end

data/bin/iqterm

@@ -29,6 +29,9 @@ require "github_api"
 require "highline"
 require "open-uri"
 require "zip"
+require 'rubygems'
+require 'eventmachine'
+require "socksify"
 
 ### Iniquity Terminal Utility
 
@@ -45,3 +48,47 @@ if File.exists?(SYSTEM + "/iniquity.ini")
 else
     abort "iqterm - An Iniquity system must have an iniquity.ini file.\n\n"
 end
+
+class BBSTerm < EM::Connection
+
+    def post_init
+      @initialization = true
+      init_buffer
+    end
+
+    def init_buffer
+      @read_buffer = ""
+    end
+
+    def receive_data(data)
+      @read_buffer += data.force_encoding(Encoding::IBM437).encode(Encoding::UTF_8)
+
+      if @initialization and @read_buffer =~ /\e\[6n/
+        @initialization = false
+        send_data "\e[6n\r\n"
+      end
+
+      @read_buffer.gsub!(/\r\n/, "\n")
+      print @read_buffer
+
+      init_buffer
+    end
+  end
+
+  class STDINReader < EM::Connection
+
+    def initialize(em)
+      @em = em
+    end
+
+    def receive_data(data)
+      my_data = data.force_encoding(Encoding::UTF_8).encode(Encoding::IBM437)
+      my_data.gsub!(/\n/, "\r\n")
+      EM.next_tick { @em.send_data(my_data) }
+    end
+  end
+
+  EM.run do
+    obj = EM.connect(ARGV[0] || "localhost", ARGV[1] || 3023, BBSTerm)
+    EM.attach($stdin, STDINReader, obj)
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iniquity
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Dan Stephenson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A re-imagining of the iconic BBS software.
 email: ispyhumanfly@gmail.com
 executables: