rflow-components-irc 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a278a2b1cbefadcddb0b5425906e8ae62bfe1702
-  data.tar.gz: 3504f90b41efd1b92c9bd535086957303b5be865
+  metadata.gz: bfb79dc8f8a832d4326d97e85f9ed6fb259a4f94
+  data.tar.gz: ef0d7d05223440784d24303cea0e9d7a0a2bdc3c
 SHA512:
-  metadata.gz: 8afebdd4b908e95a83d3bb8935f6bf377f768003a40e0bc8a28a163f423a601ced2c2be7a8873545dacba6a099fe6ebf584df3671d94186bae0401e924fca662
-  data.tar.gz: c94e513b3cb974adf5ed6145e295d7823876cf2ed67b9a31adc6807a50f2a1c49821955dcb0673aa3134782bcc724bbe7b7176d626b46d358f5817ccdc139538
+  metadata.gz: 8d102cf9be927b2a4ebb5e24a3f2b80b1bc36683065b7bc41299f972beb0786c5daad999192250e39757fd112bb067bcb7660debc9093515e8cfdfa3c8893205
+  data.tar.gz: cf64251f82bcd83ae7088b097df4c90eb55f31c3b9597222ed8a392522143ba71d798997f607c02db7e18d7475618437975d540dd97e7cc5998605c3e265a793

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
 before_install:
   - sudo apt-get install libtool autoconf automake uuid-dev build-essential
   - wget http://download.zeromq.org/zeromq-3.2.4.tar.gz && tar zxvf zeromq-3.2.4.tar.gz && cd zeromq-3.2.4 && ./configure && make && sudo make install && cd ..
+  - gem update bundler
 # Only has 4.0.4, need 3.2 version due to old em-zeromq
 #  - sudo add-apt-repository -y ppa:chris-lea/zeromq
 #  - sudo apt-get update

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

@@ -10,6 +10,7 @@ class RFlow
       class Client < RFlow::Component
         input_port :to_server
         output_port :from_server
+        output_port :log_port
 
         attr_accessor :config
         attr_accessor :client_connection
@@ -55,7 +56,7 @@ class RFlow
             client_connection.send_irc_message message
           else
             RFlow.logger.debug { "#{name}: Received an IRC::Message message, determining if it's mine" }
-            my_events = message.provenance.find_all {|event| event.component_instance_uuid == instance_uuid}
+            my_events = message.provenance.find_all {|event| event.component_instance_uuid == uuid}
             RFlow.logger.debug { "#{name}: Found #{my_events.size} processing events from me" }
             # Attempt to send the data to each context match.
             # TODO: check for correctness
@@ -110,7 +111,7 @@ class RFlow
                 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|
+                m.provenance << RFlow::Message::ProcessingEvent.new(client.uuid, Time.now.utc).tap do |e|
                   e.context = signature.to_s
                   e.completed_at = Time.now.utc
                 end
@@ -121,8 +122,15 @@ class RFlow
           def unbind(reason = nil)
             if @connected || @reconnecting
               RFlow.logger.error "#{client.name}: Disconnected from IRC server #{client.config['server']}:#{client.config['port']} due to '#{reason}', reconnecting ..."
+
+              client.log_port.send_message(RFlow::Message.new('RFlow::Message::Data::Log').tap do |m|
+                m.data.timestamp = Integer(Time.now.to_f * 1000) # ms since epoch
+                m.data.level = 'INFO'
+                m.data.text = "IRC disconnected. Reconnecting in #{client.config['reconnect_interval']} seconds."
+              end)
+
               EM.add_timer(client.config['reconnect_interval']) do
-                RFlow.logger.error "#{client.name}: Attempting reconnect to IRC server #{client.config['server']}:#{client.config['port']}"
+                RFlow.logger.info "#{client.name}: Attempting reconnect to IRC server #{client.config['server']}:#{client.config['port']}"
                 reconnect(client.config['server'], client.config['port'])
               end
               @connected = false

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

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module IRC
-      VERSION = "1.0.1"
+      VERSION = "1.1.0"
     end
   end
 end

data/rflow-components-irc.gemspec

@@ -21,7 +21,7 @@ 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', '~> 1.0.0'
+  s.add_dependency 'rflow', '~> 1.1', '>= 1.1.1'
 
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-collection_matchers', '~> 1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-irc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rflow-components-irc
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: IRC client and server components for the RFlow FBP framework