SkypeR 0.0.4 → 0.0.5

data/bin/iskype.rb

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 $:.unshift File.join(File.dirname(__FILE__))
 
+require 'rubygems'
+#require_gem 'yaparc'
+require 'yaparc'
 require 'readline'
 require 'optparse'
 require 'logger'
@@ -39,6 +42,7 @@ module SkypeR
     def initialize(name, log = nil, parse = false)
       @debug = false
       @application = Service::Application.new(name)
+      @parse = parse
       @headers = []
       @logger = Logger.new(log ? log : $stderr)
       @commands = {
@@ -52,23 +56,18 @@ module SkypeR
                 proc { |args| @libraries << args }],
         'test' => ['test if the repl is ok by running a printf through it.',
                    proc { xsb_command('printf("repl is ok\n");') }],
-        's' => ['cause a segfault to let crepl attempt to recover.',
-                proc do
-                  puts 'attempting segfault'
-                  xsb_command '*((char*)0) = 0;'
-                end],
         'help' => ['show help on commands.', proc { show_help }]
       }
     end
 
 
-    def skype_command(code)
-      command = Service::Command.new(code)
-      if @application.validate(command)
-        @application.invoke(command, 40)
-      else
-        "Parse Error"
-      end
+    def skype_command(command_statement)
+      command_message = Service::CommandMessage.new(command_statement)
+    end
+
+    def skype_response(response_statement, response_instance)
+      response = Service::ResponseMessage.new(response_statement, response_instance)
+      result = @application.parse(response)
     end
 
     def skype_exit
@@ -106,18 +105,48 @@ Commands start with a . and are as follows:
             @logger.debug("OUTPUT> See you again.")
             return
           else
-            result = skype_command(line)
-            puts "=> #{result}"
-            @logger.debug("OUTPUT> #{result}")
+            response_statement = nil
+            command_message = SkypeR::Service::CommandMessage.new(line)
+            if @parse
+              case result = @application.parse(command_message)
+              when Yaparc::OK
+                response_statement = @application.invoke(command_message, 30)
+#                response_instance = result.value[:command_instance].response
+#                skype_response(response_statement, response_instance)
+              when Yaparc::Fail
+                response_statement = "##{command_message.command_id} Parse Error"
+              else
+                raise
+              end
+            else # in case of parse option disabled
+              response_statement = @application.invoke(command_message, 30)
+            end
+            unless response_statement.empty?
+              response_id, response_statement = split_response(response_statement)
+              puts "=> #{response_statement}"
+              @logger.debug("OUTPUT> #{response_statement}")
+            end
           end
         end
         Readline::HISTORY.push(line)
       end
       @interpreter.close
-    end # of Command
+
+    end # of input_loop method
+
+    private
+    def split_response(response_statement)
+      if match = Regexp.new(/(#[0-9]+) (.*)$/).match(response_statement)
+        [match[1], match[2]]
+      else
+        p "#{response_statement}"
+        raise
+      end
+    end
   end # of Service
 end # of SkypeR
 
+
 begin
   arguments = SkypeR::Arguments.new(ARGV)
   if name = arguments[:name]

data/bin/iskype.rb~

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 $:.unshift File.join(File.dirname(__FILE__))
 
+require 'rubygems'
+require_gem 'yaparc'
 require 'readline'
 require 'optparse'
 require 'logger'
@@ -22,6 +24,10 @@ module SkypeR
           self[:log] = string || '$'
         end
 
+        opts.on('-p', '--parse', 'parsing enabled') do
+          self[:parse] = true
+        end
+
         opts.on_tail('-h', '--help', 'display this help') do
           puts opts
           exit
@@ -32,9 +38,10 @@ module SkypeR
   end
 
   class REPL
-    def initialize(name, log = nil)
+    def initialize(name, log = nil, parse = false)
       @debug = false
       @application = Service::Application.new(name)
+      @parse = parse
       @headers = []
       @logger = Logger.new(log ? log : $stderr)
       @commands = {
@@ -42,26 +49,24 @@ module SkypeR
                 proc { @debug = !@debug; puts "debug is #{@debug?'on':'off'}" }],
         'logger' => ['"logger on": bring logger active.',
                      proc {|args|
-                       @headers << args 
+                       @headers << args
                      }],
         'l' => ['"l m": bring in a C library.',
                 proc { |args| @libraries << args }],
         'test' => ['test if the repl is ok by running a printf through it.',
                    proc { xsb_command('printf("repl is ok\n");') }],
-        's' => ['cause a segfault to let crepl attempt to recover.',
-                proc do
-                  puts 'attempting segfault'
-                  xsb_command '*((char*)0) = 0;'
-                end],
         'help' => ['show help on commands.', proc { show_help }]
       }
     end
 
 
-    def skype_command(code)
-      command = Service::Command.new(code)
-      @application.invoke(command, 40)
-#      @application.invoke_with_timeout(command, 40)
+    def skype_command(command_statement)
+      command_message = Service::CommandMessage.new(command_statement)
+    end
+
+    def skype_response(response_statement, response_instance)
+      response = Service::ResponseMessage.new(response_statement, response_instance)
+      result = @application.parse(response)
     end
 
     def skype_exit
@@ -99,33 +104,62 @@ Commands start with a . and are as follows:
             @logger.debug("OUTPUT> See you again.")
             return
           else
-            result = skype_command(line)
-            puts "=> #{result}"
-            @logger.debug("OUTPUT> #{result}")
+            response_statement = nil
+            command_message = SkypeR::Service::CommandMessage.new(line)
+            if @parse
+              case result = @application.parse(command_message)
+              when Yaparc::OK
+                response_statement = @application.invoke(command_message, 30)
+#                response_instance = result.value[:command_instance].response
+#                skype_response(response_statement, response_instance)
+              when Yaparc::Fail
+                response_statement = "##{command_message.command_id} Parse Error"
+              else
+                raise
+              end
+            else # in case of parse option disabled
+              response_statement = @application.invoke(command_message, 30)
+            end
+            unless response_statement.empty?
+              response_id, response_statement = split_response(response_statement)
+              puts "=> #{response_statement}"
+              @logger.debug("OUTPUT> #{response_statement}")
+            end
           end
         end
         Readline::HISTORY.push(line)
       end
       @interpreter.close
-    end # of Command
+
+    end # of input_loop method
+
+    private
+    def split_response(response_statement)
+      if match = Regexp.new(/(#[0-9]+) (.*)$/).match(response_statement)
+        [match[1], match[2]]
+      else
+        p "#{response_statement}"
+        raise
+      end
+    end
   end # of Service
 end # of SkypeR
 
+
 begin
   arguments = SkypeR::Arguments.new(ARGV)
-#  p "arguments[:name] = #{arguments[:name]}"
   if name = arguments[:name]
-    repl = SkypeR::REPL.new(name, arguments[:log])
+    repl = SkypeR::REPL.new(name, arguments[:log], arguments[:parse])
   else
-    repl = SkypeR::REPL.new('test', 'log/iskype.log')
+    repl = SkypeR::REPL.new('test', 'log/iskype.log', arguments[:parse])
   end
   repl.input_loop
-rescue Exception => e
-  puts e.message
-  puts "Backtrace:"
-  e.backtrace.each {|line|
-    puts line
-  }
+# rescue Exception => e
+#   puts e.message
+#   puts "Backtrace:"
+#   e.backtrace.each {|line|
+#     puts line
+#   }
 end
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: SkypeR
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2008-01-10 00:00:00 +09:00
+  version: 0.0.5
+date: 2008-01-16 00:00:00 +09:00
 summary: a SkypeAPI library for Ruby
 require_paths: 
 - lib
@@ -63,5 +63,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.8
+        version: 0.1.0
     version: