onion 0.1.1 → 0.1.2

data/lib/onion/parsers/stream_lists.treetop

@@ -0,0 +1,32 @@
+module Onion
+  grammar StreamLists
+		include Common
+
+    rule stream_list
+      stream_list_entry+ {
+        def streams
+          streams = []
+          self.elements.each do |stream|
+						streams << Stream.new(stream.s_id.text_value.strip, stream.c_id.text_value.strip)
+					end
+          return streams
+        end
+      }
+    end
+
+    rule stream_list_entry
+			s_id:StreamID SP s:StreamStatus SP c_id:CircuitID SP t:Target "\r\n"
+    end
+
+		rule StreamStatus
+			"NEW" / "NEWRESOLVE" / "REMAP" / "SENTCONNECT" / "SENTRESOLVE" /
+			"SUCCEEDED" / "FAILED" / "CLOSED" / "DETACHED"
+		end
+
+		rule Target
+			[$0-9a-zA-Z\.\-]+ ":" [0-9]+
+			#Address ":" Port
+		end
+		
+  end
+end

data/lib/tasks/treetop.rake

@@ -1,7 +1,7 @@
 namespace :tt do
   desc "Generate Ruby parsers from Treetop grammars."
   task :gen do
-    task_path = File.expand_path('../../lib/onion/parsers/*.treetop', __FILE__)
+    task_path = File.expand_path('../../onion/parsers/*.treetop', __FILE__)
     Dir.glob(task_path) do |filename|
 #      `tt #{filename}`
       `bundle exec tt #{filename}`

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Poet (Tim Sally)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 -05:00
+date: 2010-11-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,25 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.rdoc
+- README.txt
+- License.txt
 - Rakefile
+- lib/onion/control_client.rb
+- lib/onion/elements/circuit.rb
+- lib/onion/elements/circuit_list.rb
 - lib/onion/elements/router.rb
 - lib/onion/elements/router_list.rb
+- lib/onion/elements/stream.rb
+- lib/onion/elements/stream_list.rb
 - lib/onion/elements.rb
-- lib/onion/parsers/router_lists.treetop
+- 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

data/lib/onion/parsers/router_lists.treetop

@@ -1,133 +0,0 @@
-module Onion
-  grammar RouterLists
-
-    # --- Rule to start matching against. ----------------------------------- #
-
-    rule router_list
-      router_list_entry+ {
-        def routers
-          routers = []
-          self.elements.each do |e|
-            if e.respond_to? :s # Optional status flags are in the entry.
-              routers << Onion::Router.new(e.r.nick, e.r.id_hash, e.s.flags)
-            else
-              routers << Onion::Router.new(e.r_nos.nick, e.r_nos.id_hash, nil)
-            end
-          end
-          return routers
-        end
-      }
-    end
-
-    rule router_list_entry
-      r:router "\n" s:status "\n" / r_nos:router "\n"
-    end
-
-    # --- General use rules. ------------------------------------------------ #
-
-    rule base64_char
-      [A-Za-z0-9+/]
-    end
-
-    rule year
-      [0-9] [0-9] [0-9] [0-9]
-    end
-
-    rule month
-      [0] [1-9] / [1] [0-2]
-    end
-
-    rule day
-      [0-2] [0-9] / [3] [0-1]
-    end
-
-    rule hour
-      [0] [1-9] / [1] [0-9] / [2] [0-4]
-    end
-
-    rule minute
-      [0] [0-9] / [1-5] [0-9]
-    end
-
-    rule second
-      [0] [0-9] / [1-5] [0-9]
-    end
-
-    rule ip_addr_byte
-      [2] [5] [0-5] / [2] [0-4] [0-9] / [1] [0-9] [0-9] / [1-9] [0-9] / [0-9]
-    end
-
-    rule sp
-      " "+
-    end
-
-    # --- Rules needed to parse the router lines. --------------------------- #
-
-    rule router
-      "r " n:nick id:id_hash desc_hash desc_time ip_addr or_port dir_port {
-        def nick
-          n.text_value.strip
-        end
-
-        def id_hash
-          id.text_value.strip
-        end
-      }
-    end
-
-    rule nick
-      # TODO: This should be 1-19 alphanumeric chars, but this isn't easy
-      #       to do in Treetop.
-      [a-zA-Z0-9]+ sp
-    end
-
-    rule id_hash
-      base64_char+ sp
-    end
-
-    rule desc_hash
-      base64_char+ sp
-    end
-
-    rule desc_time
-      year "-" month "-" day " " hour ":" minute ":" second sp
-    end
-
-    rule ip_addr
-      ip_addr_byte "." ip_addr_byte "." ip_addr_byte "." ip_addr_byte sp
-    end
-
-    rule or_port
-      [0-9]+ sp
-    end
-
-    rule dir_port
-      [0-9]+ sp?
-    end
-
-    # --- Rules needed to parse the status lines. --------------------------- #
-
-    rule status
-      "s " (valid:status_flag sp? / invalid_status_flag sp?)+ {
-        def flags
-          results = []
-          self.elements[1].elements.each do |e|
-            if e.respond_to? :valid
-              results << e.valid.text_value
-            end
-          end
-          return results
-        end
-      }
-    end
-
-    rule status_flag
-       "Authority" / "BadExit" / "BadDirectory" / "Exit" / "Fast"
-        / "Guard" / "Named" / "Stable" / "Running" / "Valid" / "V2Dir"
-    end
-
-    rule invalid_status_flag
-      [a-zA-Z]+
-    end
-  end
-end