onion 0.1.2 → 0.1.3

data/lib/onion/control_client.rb

@@ -55,18 +55,14 @@ module Onion
     def router_status_info(nicknames=nil,fingerprints=nil)
       statuses = ""
       
-      p "start!"
-      
       if nicknames
         nicknames.each do |name| 
           send("getinfo ns/name/#{name}")
-          statuses << @sock.gets          
-        end        
-        while not @sock.eof?
-          statuses << @sock.gets
+          result << @sock.gets
         end
+        result << @sock.gets
       end
-      p "done!"
+      
       Onion::RouterList.new(statuses)
     end
     

data/lib/onion/parsers/circuit_lists.treetop

@@ -1,40 +1,40 @@
 module Onion
   grammar CircuitLists
-		include Common
-		
-    rule circuit_list
-      circuit_list_entry+ {
-        def circuits
-          circuits = []
-          self.elements.each do |circuit|
-						if circuit.respond_to? :p
-							to_process = [circuit.p.first] 
-							counter = 1
-							circuit.p.rest.elements.each do |e|
-								to_process << e.LongName
-							end
-							routers = []
-							to_process.each do |router|
-								if router.respond_to? :n
-							    routers << Router.new(router.n.text_value.strip, router.f.text_value.strip, nil)
-							  else
-							    routers << Router.new(nil, nil, nil)
-							  end
-							end
-							circuits << Circuit.new(circuit.id.text_value.strip, routers)
-						else
-							circuits << Circuit.new(circuit.id.text_value.strip, [])
-						end
+  include Common
+  
+  rule circuit_list
+  circuit_list_entry+ {
+    def circuits
+      circuits = []
+      self.elements.each do |circuit|
+        if circuit.respond_to? :p
+          to_process = [circuit.p.first] 
+          counter = 1
+          circuit.p.rest.elements.each do |e|
+            to_process << e.LongName
+          end
+          routers = []
+          to_process.each do |router|
+            if router.respond_to? :n
+              routers << Router.new(router.n.text_value.strip, router.f.text_value.strip, nil)
+            else
+              routers << Router.new(nil, nil, nil)
+            end
           end
-          return circuits
+          circuits << Circuit.new(circuit.id.text_value.strip, routers)
+        else
+          circuits << Circuit.new(circuit.id.text_value.strip, [])
         end
-      }
+      end
+      return circuits
     end
+  }
+end
 
-    rule circuit_list_entry
-			id:CircuitID SP s:CircStatus SP p:Path SP "PURPOSE=" purp:Purpose "\n" /
-      id:CircuitID SP s:CircStatus SP p:Path "\n" / 
-			id:CircuitID SP s:CircStatus "\n"
+rule circuit_list_entry
+id:CircuitID SP s:CircStatus SP p:Path SP "PURPOSE=" purp:Purpose "\n" /
+  id:CircuitID SP s:CircStatus SP p:Path "\n" / 
+  id:CircuitID SP s:CircStatus "\n"
     end
 
 		rule Path
@@ -51,3 +51,4 @@ module Onion
 
   end
 end
+

metadata

@@ -1,20 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: onion
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors: 
-- Poet (Tim Sally)
+- Tim Sally
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -06:00
+date: 2011-04-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,15 +21,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 8
         version: 1.4.8
   type: :runtime
   version_requirements: *id001
 description: Interact with Tor.
-email: poet@stack.io
+email: tss@timsally.com
 executables: []
 
 extensions: []
@@ -42,7 +34,6 @@ extra_rdoc_files: []
 
 files: 
 - README.txt
-- License.txt
 - Rakefile
 - lib/onion/control_client.rb
 - lib/onion/elements/circuit.rb
@@ -52,18 +43,14 @@ files:
 - lib/onion/elements/stream.rb
 - lib/onion/elements/stream_list.rb
 - lib/onion/elements.rb
-- lib/onion/parsers/circuit_lists.rb
 - lib/onion/parsers/circuit_lists.treetop
-- lib/onion/parsers/common.rb
 - lib/onion/parsers/common.treetop
-- lib/onion/parsers/router_statuses.rb
 - lib/onion/parsers/router_statuses.treetop
-- lib/onion/parsers/stream_lists.rb
 - lib/onion/parsers/stream_lists.treetop
 - lib/onion.rb
 - lib/tasks/treetop.rake
 has_rdoc: true
-homepage: http://stack.io
+homepage: http://www.timsally.com
 licenses: []
 
 post_install_message: 
@@ -76,21 +63,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Onion is a library you can use to interact with Tor.  It includes parsers and clients for Tor's protocols.

data/License.txt

@@ -1,23 +0,0 @@
-LICENSE.txt
-===========
-
-Copyright (c) 2010 Tim Sally
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/onion/parsers/circuit_lists.rb

@@ -1,491 +0,0 @@
-# Autogenerated from a Treetop grammar. Edits may be lost.
-
-
-module Onion
-  module CircuitLists
-    include Treetop::Runtime
-
-    def root
-      @root ||= :circuit_list
-    end
-
-    include Common
-
-    module CircuitList0
-      def circuits
-        circuits = []
-        self.elements.each do |circuit|
-						if circuit.respond_to? :p
-							to_process = [circuit.p.first] 
-							counter = 1
-							circuit.p.rest.elements.each do |e|
-								to_process << e.LongName
-							end
-							routers = []
-							to_process.each do |router|
-								if router.respond_to? :n
-							    routers << Router.new(router.n.text_value.strip, router.f.text_value.strip, nil)
-							  else
-							    routers << Router.new(nil, nil, nil)
-							  end
-							end
-							circuits << Circuit.new(circuit.id.text_value.strip, routers)
-						else
-							circuits << Circuit.new(circuit.id.text_value.strip, [])
-						end
-        end
-        return circuits
-      end
-    end
-
-    def _nt_circuit_list
-      start_index = index
-      if node_cache[:circuit_list].has_key?(index)
-        cached = node_cache[:circuit_list][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      s0, i0 = [], index
-      loop do
-        r1 = _nt_circuit_list_entry
-        if r1
-          s0 << r1
-        else
-          break
-        end
-      end
-      if s0.empty?
-        @index = i0
-        r0 = nil
-      else
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        r0.extend(CircuitList0)
-      end
-
-      node_cache[:circuit_list][start_index] = r0
-
-      r0
-    end
-
-    module CircuitListEntry0
-      def id
-        elements[0]
-      end
-
-      def SP1
-        elements[1]
-      end
-
-      def s
-        elements[2]
-      end
-
-      def SP2
-        elements[3]
-      end
-
-      def p
-        elements[4]
-      end
-
-      def SP3
-        elements[5]
-      end
-
-      def purp
-        elements[7]
-      end
-
-    end
-
-    module CircuitListEntry1
-      def id
-        elements[0]
-      end
-
-      def SP1
-        elements[1]
-      end
-
-      def s
-        elements[2]
-      end
-
-      def SP2
-        elements[3]
-      end
-
-      def p
-        elements[4]
-      end
-
-    end
-
-    module CircuitListEntry2
-      def id
-        elements[0]
-      end
-
-      def SP
-        elements[1]
-      end
-
-      def s
-        elements[2]
-      end
-
-    end
-
-    def _nt_circuit_list_entry
-      start_index = index
-      if node_cache[:circuit_list_entry].has_key?(index)
-        cached = node_cache[:circuit_list_entry][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0 = index
-      i1, s1 = index, []
-      r2 = _nt_CircuitID
-      s1 << r2
-      if r2
-        r3 = _nt_SP
-        s1 << r3
-        if r3
-          r4 = _nt_CircStatus
-          s1 << r4
-          if r4
-            r5 = _nt_SP
-            s1 << r5
-            if r5
-              r6 = _nt_Path
-              s1 << r6
-              if r6
-                r7 = _nt_SP
-                s1 << r7
-                if r7
-                  if has_terminal?("PURPOSE=", false, index)
-                    r8 = instantiate_node(SyntaxNode,input, index...(index + 8))
-                    @index += 8
-                  else
-                    terminal_parse_failure("PURPOSE=")
-                    r8 = nil
-                  end
-                  s1 << r8
-                  if r8
-                    r9 = _nt_Purpose
-                    s1 << r9
-                    if r9
-                      if has_terminal?("\n", false, index)
-                        r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                        @index += 1
-                      else
-                        terminal_parse_failure("\n")
-                        r10 = nil
-                      end
-                      s1 << r10
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-      if s1.last
-        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-        r1.extend(CircuitListEntry0)
-      else
-        @index = i1
-        r1 = nil
-      end
-      if r1
-        r0 = r1
-      else
-        i11, s11 = index, []
-        r12 = _nt_CircuitID
-        s11 << r12
-        if r12
-          r13 = _nt_SP
-          s11 << r13
-          if r13
-            r14 = _nt_CircStatus
-            s11 << r14
-            if r14
-              r15 = _nt_SP
-              s11 << r15
-              if r15
-                r16 = _nt_Path
-                s11 << r16
-                if r16
-                  if has_terminal?("\n", false, index)
-                    r17 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
-                  else
-                    terminal_parse_failure("\n")
-                    r17 = nil
-                  end
-                  s11 << r17
-                end
-              end
-            end
-          end
-        end
-        if s11.last
-          r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-          r11.extend(CircuitListEntry1)
-        else
-          @index = i11
-          r11 = nil
-        end
-        if r11
-          r0 = r11
-        else
-          i18, s18 = index, []
-          r19 = _nt_CircuitID
-          s18 << r19
-          if r19
-            r20 = _nt_SP
-            s18 << r20
-            if r20
-              r21 = _nt_CircStatus
-              s18 << r21
-              if r21
-                if has_terminal?("\n", false, index)
-                  r22 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure("\n")
-                  r22 = nil
-                end
-                s18 << r22
-              end
-            end
-          end
-          if s18.last
-            r18 = instantiate_node(SyntaxNode,input, i18...index, s18)
-            r18.extend(CircuitListEntry2)
-          else
-            @index = i18
-            r18 = nil
-          end
-          if r18
-            r0 = r18
-          else
-            @index = i0
-            r0 = nil
-          end
-        end
-      end
-
-      node_cache[:circuit_list_entry][start_index] = r0
-
-      r0
-    end
-
-    module Path0
-      def LongName
-        elements[1]
-      end
-    end
-
-    module Path1
-      def first
-        elements[0]
-      end
-
-      def rest
-        elements[1]
-      end
-    end
-
-    def _nt_Path
-      start_index = index
-      if node_cache[:Path].has_key?(index)
-        cached = node_cache[:Path][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0, s0 = index, []
-      r1 = _nt_LongName
-      s0 << r1
-      if r1
-        s2, i2 = [], index
-        loop do
-          i3, s3 = index, []
-          if has_terminal?(",", false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure(",")
-            r4 = nil
-          end
-          s3 << r4
-          if r4
-            r5 = _nt_LongName
-            s3 << r5
-          end
-          if s3.last
-            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-            r3.extend(Path0)
-          else
-            @index = i3
-            r3 = nil
-          end
-          if r3
-            s2 << r3
-          else
-            break
-          end
-        end
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        s0 << r2
-      end
-      if s0.last
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        r0.extend(Path1)
-      else
-        @index = i0
-        r0 = nil
-      end
-
-      node_cache[:Path][start_index] = r0
-
-      r0
-    end
-
-    def _nt_CircStatus
-      start_index = index
-      if node_cache[:CircStatus].has_key?(index)
-        cached = node_cache[:CircStatus][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0 = index
-      if has_terminal?("LAUNCHED", false, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 8))
-        @index += 8
-      else
-        terminal_parse_failure("LAUNCHED")
-        r1 = nil
-      end
-      if r1
-        r0 = r1
-      else
-        if has_terminal?("BUILT", false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 5))
-          @index += 5
-        else
-          terminal_parse_failure("BUILT")
-          r2 = nil
-        end
-        if r2
-          r0 = r2
-        else
-          if has_terminal?("EXTENDED", false, index)
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 8))
-            @index += 8
-          else
-            terminal_parse_failure("EXTENDED")
-            r3 = nil
-          end
-          if r3
-            r0 = r3
-          else
-            if has_terminal?("FAILED", false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 6))
-              @index += 6
-            else
-              terminal_parse_failure("FAILED")
-              r4 = nil
-            end
-            if r4
-              r0 = r4
-            else
-              if has_terminal?("CLOSED", false, index)
-                r5 = instantiate_node(SyntaxNode,input, index...(index + 6))
-                @index += 6
-              else
-                terminal_parse_failure("CLOSED")
-                r5 = nil
-              end
-              if r5
-                r0 = r5
-              else
-                @index = i0
-                r0 = nil
-              end
-            end
-          end
-        end
-      end
-
-      node_cache[:CircStatus][start_index] = r0
-
-      r0
-    end
-
-    def _nt_Purpose
-      start_index = index
-      if node_cache[:Purpose].has_key?(index)
-        cached = node_cache[:Purpose][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0 = index
-      if has_terminal?("GENERAL", false, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 7))
-        @index += 7
-      else
-        terminal_parse_failure("GENERAL")
-        r1 = nil
-      end
-      if r1
-        r0 = r1
-      else
-        if has_terminal?("CONTROLER", false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 9))
-          @index += 9
-        else
-          terminal_parse_failure("CONTROLER")
-          r2 = nil
-        end
-        if r2
-          r0 = r2
-        else
-          @index = i0
-          r0 = nil
-        end
-      end
-
-      node_cache[:Purpose][start_index] = r0
-
-      r0
-    end
-
-  end
-
-  class CircuitListsParser < Treetop::Runtime::CompiledParser
-    include CircuitLists
-  end
-
-end