cyc-console 0.0.5 → 0.0.7

data/.gitignore

@@ -0,0 +1,7 @@
+*.gem
+.*.sw?
+.bundle
+Gemfile
+Gemfile.lock
+work
+doc

data/README.txt

@@ -66,9 +66,20 @@ And then try to install the gem once again:
 
 == BASIC USAGE: 
 
-The gem comes with +cyc+ command, so you can simply type 
-(provided the Cyc server is running on localhost on the default
-port and you have rubygems bin directory in your path):
+Prerequisites:
+* Cyc server is running 
+  * you can download it from http://www.opencyc.org
+* Telnet connection is on
+  * type (enable-tcp-server :cyc-api 3601) in the cyc console or Cyc Browser
+    -> Tools -> Interactor
+* rubygems +bin+ directory is in your PATH variable:
+  * +export PATH=/usr/lib/ruby/gems/1.8/bin+
+  * you might have to adjust it to your system (e.g. in Debian it would be
+    +/var/lib/gems.../+
+  * you might want to store it in your +.bashrc+
+  
+
+The gem comes with +cyc+ command, so you can simply type:
 
   $ cyc
   cyc@localhost:3601>

data/bin/cyc

@@ -1,6 +1,6 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 # encoding: utf-8
-require 'readline'
+
 require 'cyc/console'
 
 if Readline.respond_to?("basic_word_break_characters=")

data/changelog.txt

@@ -1,3 +1,7 @@
+0.0.7
+  - update cycr to v 0.2.0
+0.0.6
+  - dependency on cycr replacing built-in Cyc connection mechanism
 0.0.5
   - missing dependency on *colors* added
 0.0.4

data/cyc-console.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "cyc-console"
-  s.version = "0.0.5"
-  s.date = "2009-10-08"
+  s.version = "0.0.7"
+  s.date = "#{Time.now.strftime("%Y-%m-%d")}"
   s.summary = "Ruby console for the Cyc ontology"
   s.email = "apohllo@o2.pl"
   s.homepage = "http://github.com/apohllo/cyc-console"
@@ -11,18 +11,15 @@ Gem::Specification.new do |s|
   # the lib path is added to the LOAD_PATH
   s.require_path = "lib"
   # include Rakefile, gemspec, README and all the source files
-  s.files = [
-    'lib/cyc/console.rb',
-    "Rakefile", 
-    "cyc-console.gemspec", 
-    "README.txt",
-    "changelog.txt"
-  ] 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   # include README while generating rdoc
   s.rdoc_options = ["--main", "README.txt"]
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.txt"]
   s.executables = ['cyc']
   s.add_dependency("colors", [">= 0.0.4"])
+  s.add_dependency("cycr", ["~> 0.2.0"])
 end
 

data/lib/cyc/console.rb

@@ -2,13 +2,11 @@
 
 require 'readline'
 require 'colors'
-require 'net/telnet'
+require 'cycr'
 
 module Cyc
-  class ParenthesisNotMatched < RuntimeError; end
-
   class Configurable
-  
+
     attr_reader :configuration
     attr_writer :verbose
 
@@ -43,7 +41,7 @@ module Cyc
 
  end
   #
-  # Stolen (with permission from the author :) from Wirble history for IRB 
+  # Stolen (with permission from the author :) from Wirble history for IRB
   # http://pablotron.org/software/wirble/
   #
   class History < Configurable
@@ -82,7 +80,7 @@ module Cyc
       :path   => ENV['CYC_FUNCTIONS_FILE'] || "~/.cyc_functions",
       :perms  => File::WRONLY | File::CREAT | File::TRUNC
     }
- 
+
     def initialize(opt = nil)
       @opt = DEFAULTS.merge(opt || {})
       super()
@@ -104,32 +102,11 @@ module Cyc
       History.new({})
       @host = host
       @port = port
-      @conn = Net::Telnet.new("Port" => @port, "Telnetmode" => false, 
-                              "Host" => @host, "Timeout" => 600)
+      @cyc = Cyc::Client.new(:host => @host,:port => @port)
       @line = ""
       @count = 0
     end
 
-    # Scans the :str: to find out if the parenthesis are matched
-    # raises ParenthesisNotMatched exception if there is not matched closing 
-    # parenthesis. The message of the exception contains the string with the 
-    # unmatched parenthesis highlighted.
-    def match_par(str)
-      position = 0
-      str.scan(/./) do |char| 
-        position += 1
-        next if char !~ /\(|\)/
-        @count += (char == "(" ?  1 : -1)
-        if @count < 0 
-          @count = 0
-          raise ParenthesisNotMatched.
-            new((position > 1 ? str[0..position-2] : "") + 
-              ")".hl(:red) + str[position..-1])
-        end
-      end
-      @count == 0
-    end
-
     def add_autocompletion(str)
       @@constants |= str.split(/[() ]/).select{|e| e =~ /\#\$/}
     end
@@ -138,38 +115,35 @@ module Cyc
     def main_loop
       loop do
         begin
-          line = Readline::readline(("cyc@" + "#{@host}:#{@port}" + 
-              (@count > 0 ? ":#{"("*@count}" : "") + "> ").hl(:blue)) 
-          case line 
-          when API_QUIT 
-            @conn.puts(line)
+          line = Readline::readline(("cyc@" + "#{@host}:#{@port}" +
+              (@count > 0 ? ":#{"("*@count}" : "") + "> "))
+          case line
+          when nil
+            puts
             break
-          when "exit"
-            @conn.puts(API_QUIT)
+          when API_QUIT,"exit"
+            @cyc.raw_talk(API_QUIT) rescue nil
             break
           else
             @line += "\n" unless @line.empty?
             @line += line
             letters = @line.split("")
             Readline::HISTORY.push(@line) if line
-            if match_par(line)
-              @conn.puts(@line)
-              @line = ""
-              answer = @conn.waitfor(/\d\d\d/)
-              message = answer.sub(/(\d\d\d) (.*)\n/,"\\2") if answer
-              if($1.to_i == 200)
-                puts message
-                add_autocompletion(message)
-              else
-                puts "Error: " + answer.to_s
-              end
-            end
+            message = @cyc.raw_talk(@line)
+            @line = ""
+            @count = 0
+            puts message.gsub(/(\#\$[\w-]+)/,"\\1".hl(:blue))
+            add_autocompletion(message)
           end
-        rescue ParenthesisNotMatched => exception
-          puts exception
+        rescue ::Cyc::UnbalancedClosingParenthesis => exception
+          puts exception.to_s.sub(/<error>([^<]*)<\/error>/,"\\1".hl(:red))
+          @line = ""
+        rescue ::Cyc::UnbalancedOpeningParenthesis => exception
+          @count = exception.count
+        rescue Exception => exception
+          puts "Error: " + exception.to_s
+          @count = 0
           @line = ""
-#        rescue Exception => exception
-#          puts exception
         end
       end
     end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cyc-console
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -9,19 +10,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +02:00
-default_executable: 
+date: 2012-03-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colors
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.0.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cycr
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id002
 description: Ruby console for the Cyc ontology with support for readline, colorful output, history, etc.
 email: apohllo@o2.pl
 executables: 
@@ -31,12 +43,13 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
-- lib/cyc/console.rb
-- Rakefile
-- cyc-console.gemspec
+- .gitignore
 - README.txt
+- Rakefile
+- bin/cyc
 - changelog.txt
-has_rdoc: true
+- cyc-console.gemspec
+- lib/cyc/console.rb
 homepage: http://github.com/apohllo/cyc-console
 licenses: []
 
@@ -47,21 +60,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby console for the Cyc ontology