rflow-components-irc 0.0.2 → 1.0.0a2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0268a88eef6110cffb56210467baef133fee9922
+  data.tar.gz: 26f578ac2b04c07abd6d196cc580e3c08b4391c7
+SHA512:
+  metadata.gz: 13e6df4df36df74e49c8155f0a5171cf6ea010a4d3754e76e090b67b0f4c81855a056c4f8630a41f57b7cf56e0651da73ef5ad6c6ff0c1510d009f8e177daf4e
+  data.tar.gz: 3ae240268dfe449de3758d2d0bf748e69caedc508e82b30b3871c1ca62e682c80d01a8ba8417d70a41487456a7563249333431fb8a1fc0c1749cf739b01ce3a4

data/.rspec

@@ -0,0 +1 @@
+--color -fd

data/.ruby-gemset

@@ -0,0 +1 @@
+rflow-dev

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.1

data/lib/rflow/components/irc/client.rb

@@ -1,11 +1,9 @@
 require 'eventmachine'
-
 require 'rflow'
 
 class RFlow
   module Components
     module IRC
-
       # Assumes a single connection, meaning that it can choose to be
       # 'promiscuous' and not limit its sending to only those messages
       # derived from one of its own
@@ -15,7 +13,6 @@ class RFlow
 
         attr_accessor :config
         attr_accessor :client_connection
-
         attr_accessor :server, :port
 
         DEFAULT_CONFIG = {
@@ -48,7 +45,6 @@ class RFlow
           end
         end
 
-
         def process_message(input_port, input_port_key, connection, message)
           RFlow.logger.debug "Received a message"
           return unless message.data_type_name == 'RFlow::Message::Data::IRC::Message'
@@ -58,26 +54,20 @@ class RFlow
             client_connection.send_irc_message message
           else
             RFlow.logger.debug "Received an IRC::Message message, determining if its mine"
-            my_events = message.provenance.find_all {|processing_event| processing_event.component_instance_uuid == instance_uuid}
+            my_events = message.provenance.find_all {|event| event.component_instance_uuid == instance_uuid}
             RFlow.logger.debug "Found #{my_events.size} processing events from me"
-            # Attempt to send the data to each context match.  TODO:
-            # check for correctness/
-            my_events.each do |processing_event|
-              RFlow.logger.debug "Inspecting context #{client_connection.signature.to_s} == #{processing_event.context.to_s}"
-              if client_connection.signature.to_s == processing_event.context.to_s
-                RFlow.logger.debug "Found connection for #{processing_event.context}, sending message to associated client connection"
+            # Attempt to send the data to each context match.
+            # TODO: check for correctness
+            my_events.each do |event|
+              RFlow.logger.debug "Inspecting context #{client_connection.signature.to_s} == #{event.context.to_s}"
+              if client_connection.signature.to_s == event.context.to_s
+                RFlow.logger.debug "Found connection for #{event.context}, sending message to associated client connection"
                 client_connection.send_irc_message message
               end
             end
           end
         end
 
-        def shutdown!
-        end
-
-        def cleanup!
-        end
-
         class Connection < EventMachine::Connection
           include EventMachine::Protocols::LineText2
 
@@ -91,7 +81,6 @@ class RFlow
             super
           end
 
-
           def connection_completed
             @reconnecting = false
             @connected = true
@@ -105,39 +94,32 @@ class RFlow
             command "OPER", [client.config['oper_user'] || client.config['nickname'], client.config['oper_password']] unless client.config['oper_password'].nil?
           end
 
-
           def receive_line(line)
             RFlow.logger.debug("IRCClient#receive_line: #{line}")
-            processing_event = RFlow::Message::ProcessingEvent.new(client.instance_uuid, Time.now.utc)
-
             prefix, cmd, params = IRC.parse_irc_line(line)
 
-            # Now have an optional prefix, required cmd, and optional
-            # param array
-
+            # Now have an optional prefix, required cmd, and optional param array
             case cmd
             when /PING/
               command('PONG', params)
             else
               # create an IRC message here and send it along
               RFlow.logger.debug("Sending IRC message '#{line}', signature '#{signature.class}:#{signature}', '#{signature.to_s.class}:#{signature.to_s}'")
-              irc_message = RFlow::Message.new('RFlow::Message::Data::IRC::Message')
-
-              irc_message.data.prefix = prefix
-              irc_message.data.command = cmd
-              irc_message.data.parameters = params
 
-              processing_event.context = signature.to_s
-              processing_event.completed_at = Time.now.utc
-              irc_message.provenance << processing_event
-
-              client.from_server.send_message irc_message
+              client.from_server.send_message(RFlow::Message.new('RFlow::Message::Data::IRC::Message').tap do |m|
+                m.data.prefix = prefix
+                m.data.command = cmd
+                m.data.parameters = params
+                m.provenance << RFlow::Message::ProcessingEvent.new(client.instance_uuid, Time.now.utc).tap do |e|
+                  e.context = signature.to_s
+                  e.completed_at = Time.now.utc
+                end
+              end)
             end
           end
 
-
-          def unbind(reason=nil)
-            if @connected or @reconnecting
+          def unbind(reason = nil)
+            if @connected || @reconnecting
               RFlow.logger.error("Disconnected from IRC server #{client.config['server']}:#{client.config['port']} due to '#{reason}', reconnecting ...")
               EM.add_timer(client.config['reconnect_interval']) do
                 RFlow.logger.error "Attempting reconnect to IRC server #{client.config['server']}:#{client.config['port']}"
@@ -146,26 +128,21 @@ class RFlow
               @connected = false
               @reconnecting = true
             else
-              error_message = "Unable to connect to IRC server #{client.config['server']}:#{client.config['port']} due to '#{reason}'"
-              RFlow.logger.error error_message
-              raise RuntimeError, error_message
+              raise RuntimeError, "Unable to connect to IRC server #{client.config['server']}:#{client.config['port']} due to '#{reason}'"
             end
           end
 
-
           def send_irc_message(irc_message)
             RFlow.logger.debug "Sending an IRC message to #{client_ip}:#{client_port}"
             command irc_message.data.command, irc_message.data.parameters, irc_message.data.prefix
           end
 
-
           def send_irc_line(line)
             RFlow.logger.debug "Sending line '#{line}'"
             send_data "#{line}\r\n"
           end
 
-
-          def command(cmd, args=[], prefix=nil)
+          def command(cmd, args = [], prefix = nil)
             RFlow.logger.debug("command: '#{cmd}' with args ['#{args.join("', '")}'] and prefix '#{prefix}'")
             line = ''
             if prefix
@@ -175,11 +152,9 @@ class RFlow
             line << cmd.upcase
 
             last_arg = args.pop
-            unless args.empty?
-              line << " #{args.join ' '}"
-            end
+            line << " #{args.join ' '}" unless args.empty?
 
-            if last_arg =~ /\s/
+            if last_arg =~ /\s/;
               line << ' :' << last_arg
             else
               line << ' ' << last_arg
@@ -187,7 +162,6 @@ class RFlow
 
             send_irc_line line
           end
-
         end
       end
     end

data/lib/rflow/components/irc/extensions.rb

@@ -1,10 +1,7 @@
 class RFlow
   module Components
     module IRC
-
-      # The set of extensions to add capability to IRC data types
       module Extensions
-
         module IRCMessageExtension
           def self.extended(base_data)
             base_data.data_object ||= {'timestamp' => Time.now.xmlschema, 'prefix' => nil, 'command' => 'PRIVMSG', 'parameters' => []}
@@ -38,10 +35,7 @@ class RFlow
               end
             end
           end
-
-
         end
-
       end
     end
   end

data/lib/rflow/components/irc/version.rb

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module IRC
-      VERSION = "0.0.2"
+      VERSION = "1.0.0a2"
     end
   end
 end

data/lib/rflow/components/irc.rb

@@ -20,9 +20,7 @@ class RFlow
       RFlow::Configuration.add_available_data_extension('RFlow::Message::Data::IRC::Message',
                                                         RFlow::Components::IRC::Extensions::IRCMessageExtension)
 
-
       # Some useful IRC parsing methods
-
       IRC_LINE_REGEX = /^(?::(\S+) )?(\S+)(?: (.+))?$/
       IRC_PREFIX_REGEX = /^([^!]+)(?:!([^@]+))?(?:@(.*)+)?$/
 
@@ -52,7 +50,6 @@ class RFlow
         # nick/server, user, host
         match[1..3]
       end
-
     end
   end
 end

data/lib/rflow-components-irc.rb

@@ -1,3 +1,2 @@
 require 'rflow'
 require 'rflow/components/irc'
-

data/rflow-components-irc.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rflow', '~> 0.0.1'
+  s.add_dependency 'rflow', '~> 1.0.0a2'
 
-  s.add_development_dependency 'rspec', '~> 2.5.0'
-  s.add_development_dependency 'rake', '~> 0.8.7'
+  s.add_development_dependency 'rspec', '~> 2.99'
+  s.add_development_dependency 'rspec-collection_matchers', '~> 0.0.4'
+  s.add_development_dependency 'rake', '~> 0.8'
 end

data/spec/schema_spec.rb

@@ -1,27 +1,23 @@
-require 'spec_helper.rb'
+require 'spec_helper'
 
 describe 'RFlow::Message::Data::IRC::Message Avro Schema' do
-  before(:each) do
-    @schema_string = RFlow::Configuration.available_data_types['RFlow::Message::Data::IRC::Message']['avro']
-  end
+  let(:schema) { RFlow::Configuration.available_data_types['RFlow::Message::Data::IRC::Message']['avro'] }
 
   it "should encode and decode an object" do
-    irc_message = {
+    message = {
       'timestamp' => Time.now.xmlschema,
-      #      'prefix'     => nil,
       'command'    => 'PRIVMSG',
       'parameters' => ['yo yo yo'],
     }
 
-    expect {encode_avro(@schema_string, irc_message)}.to_not raise_error
-    avro_encoded_irc_message = encode_avro(@schema_string, irc_message)
-
-    expect {decode_avro(@schema_string, avro_encoded_irc_message)}.to_not raise_error
-    decoded_irc_message = decode_avro(@schema_string, avro_encoded_irc_message)
+    expect { encode_avro(schema, message) }.to_not raise_error
+    encoded_message = encode_avro(schema, message)
 
-    decoded_irc_message['prefix'].should == irc_message['prefix']
-    decoded_irc_message['command'].should == irc_message['command']
-    decoded_irc_message['parameters'].should == irc_message['parameters']
+    expect { decode_avro(schema, encoded_message) }.to_not raise_error
+    decoded_message = decode_avro(schema, encoded_message)
 
+    decoded_message['prefix'].should == message['prefix']
+    decoded_message['command'].should == message['command']
+    decoded_message['parameters'].should == message['parameters']
   end
 end

metadata

@@ -1,64 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-irc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 1.0.0a2
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0a2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0a2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
 description: IRC client and server components for the RFlow FBP framework.  Also includes
   the necessary message types
 email:
@@ -67,8 +74,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -80,35 +90,33 @@ files:
 - lib/rflow/components/irc/version.rb
 - rflow-components-irc.gemspec
 - schema/irc_message.avsc
-- spec/extensions_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/redjack/rflow-components-irc
 licenses:
 - Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rflow-components-irc
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: IRC client and server components for the RFlow FBP framework
 test_files:
-- spec/extensions_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/extensions_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper.rb'
-
-# describe RFlow::Components::File::Extensions::FileExtension do
-#   before(:each) do
-#     @schema_string = RFlow::Configuration.available_data_types['RFlow::Message::Data::File']['avro']
-#   end
-#
-#   it "should add the extension to RFlow::Configuration" do
-#     RFlow::Configuration.available_data_extensions['RFlow::Message::Data::File'].should include(described_class)
-#   end
-#
-#   it "should set the defaults" do
-#     file = RFlow::Message.new('RFlow::Message::Data::File')
-#
-#     file.data.path.should == '/'
-#     file.data.size.should == 0
-#     file.data.content.should == ''
-#     file.data.creation_timestamp.should == nil
-#     file.data.modification_timestamp.should == nil
-#     file.data.accessed_timestamp.should == nil
-#   end
-#
-#   it "should correctly use integers or strings for size field" do
-#     file = RFlow::Message.new('RFlow::Message::Data::File')
-#
-#     file.data.size.should == 0
-#     file.data.size = 10
-#     file.data.size.should == 10
-#     file.data.size = '20'
-#     file.data.size == 20
-#   end
-#
-#   it "should correctly use Time or xmlschema strings for timestamp fields" do
-#     file = RFlow::Message.new('RFlow::Message::Data::File')
-#
-#     file.data.creation_timestamp.should == nil
-#     now = Time.now
-#
-#     file.data.creation_timestamp = now
-#     file.data.creation_timestamp.should == Time.xmlschema(now.xmlschema(9))
-#
-#     file.data.creation_timestamp = now.xmlschema
-#     file.data.creation_timestamp.should == Time.xmlschema(now.xmlschema)
-#   end
-#
-#
-# end