c3s 0.3.3 → 0.3.4

data/Manifest

@@ -1,7 +1,5 @@
-Manifest
 README.rdoc
 Rakefile
-c3s
 lib/c3s.rb
 lib/c3s_logger.rb
 lib/component.rb
@@ -14,3 +12,4 @@ lib/pubsub/nodetracker.rb
 lib/pubsub/publisher.rb
 lib/pubsub/subscriber.rb
 lib/republisher.rb
+Manifest

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('c3s', '0.3.3') do |p|
+Echoe.new('c3s', '0.3.4') do |p|
   p.description    = "C3s library gem."
   p.url            = "http://github.com/rikas/c3s"
   p.author         = "Ricardo Otero"

data/c3s.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{c3s}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ricardo Otero"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-04-08}
   s.description = %q{C3s library gem.}
   s.email = %q{oterosantos@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/pubsub/node.rb", "lib/pubsub/nodetracker.rb", "lib/pubsub/publisher.rb", "lib/pubsub/subscriber.rb", "lib/republisher.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "c3s", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/pubsub/node.rb", "lib/pubsub/nodetracker.rb", "lib/pubsub/publisher.rb", "lib/pubsub/subscriber.rb", "lib/republisher.rb", "c3s.gemspec"]
+  s.files = ["README.rdoc", "Rakefile", "c3s.gemspec", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/pubsub/node.rb", "lib/pubsub/nodetracker.rb", "lib/pubsub/publisher.rb", "lib/pubsub/subscriber.rb", "lib/republisher.rb", "Manifest"]
   s.homepage = %q{http://github.com/rikas/c3s}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "C3s", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{c3s}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{C3s library gem.}
 
   if s.respond_to? :specification_version then

data/lib/component.rb

@@ -33,7 +33,7 @@ module C3s
     # Throws ClientAuthenticationFailure
     def connect
       super(config['url'], config['port'])
-
+      
       if is_connected?
         auth(config['password'])
       else
@@ -51,17 +51,17 @@ module C3s
       Thread.abort_on_exception = true
 
       add_iq_callback do |iq|
-        t = Thread.new do
+        t1 = Thread.new do
           handle_iq(iq)
         end
-        t.join
+        t1.join
       end
       
       add_message_callback do |msg|
-        t = Thread.new do
+        t2 = Thread.new do
           handle_msg(msg)
         end
-        t.join
+        t2.join
       end
     end
     
@@ -113,10 +113,19 @@ module C3s
     # iq:: [Jabber::IQ] the received IQ packet
     def handle_set(iq)
       stanza = iq.query.first_element(config['name']) # TODO assuming that pubsubnode = xml root
-
+      data = {}
+      
+      # It's admin setting the information for someone
+      adminJID = "admin@#{config['url']}"
+      if iq.from.bare.to_s.eql?(adminJID)
+        if stanza.attributes['jid']
+          data = {:jid => stanza.attributes['jid']}
+        end
+      end
+      
       # Build data for activerecord object. The jid is taken from
       # the 'jid' attribute on the main tag under the <query>
-      data = {:jid => iq.from.to_s}
+      data = {:jid => iq.from.to_s} if data.empty?
       self.model.new.nodes.each do |node|
         data.merge!(node => stanza.first_element_text(node))
       end
@@ -130,8 +139,8 @@ module C3s
       object.save!
       
       if object.errors.count == 0
-        $LOG.info "Publishing data to node #{config['name']}:#{iq.from.to_s}"
-        c3snode = C3s::Node.new("#{config['name']}:#{iq.from.to_s}")
+        $LOG.info "Publishing data to node #{config['name']}:#{data[:jid]} (data changed: #{changed})"
+        c3snode = C3s::Node.new("#{config['name']}:#{data[:jid]}")
         publish(c3snode, stanza, changed)
         send_ok(iq)
       end
@@ -183,6 +192,7 @@ module C3s
     # changed:: [Boolean] the data is different from last set operation?
     def publish(c3snode, data, changed)
       if changed
+        $LOG.info "Information for node '#{c3snode.to_s}' changed. Publishing data..."
         pub = Publisher.new(self, config['pubsub'])
         pub.create_tree(c3snode)
         pub.publish(c3snode, data)

data/lib/component_connection.rb

@@ -57,9 +57,9 @@ module C3s
       
       # TODO - use this to do something useful?
       @component.on_exception do |e, component, where|
-        $LOG.error "************** FATAL ERROR"
-        $LOG.error e.backtrace.join("\n")
-        #exit
+        component.disconnect
+        $LOG.error e.backtrace.join("\n") if e
+        exit 1
       end
       
       puts "Starting messaging loop..."

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Ricardo Otero
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +00:00
+date: 2010-04-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -39,10 +39,9 @@ extra_rdoc_files:
 - lib/pubsub/subscriber.rb
 - lib/republisher.rb
 files: 
-- Manifest
 - README.rdoc
 - Rakefile
-- c3s
+- c3s.gemspec
 - lib/c3s.rb
 - lib/c3s_logger.rb
 - lib/component.rb
@@ -55,7 +54,7 @@ files:
 - lib/pubsub/publisher.rb
 - lib/pubsub/subscriber.rb
 - lib/republisher.rb
-- c3s.gemspec
+- Manifest
 has_rdoc: true
 homepage: http://github.com/rikas/c3s
 licenses: []

data/c3s

@@ -1,59 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This is the command used to run the component
-
-require 'rubygems'
-
-# Check for gem versions
-gem 'c3s', '>=0.3.2'
-gem 'xmpp4r', '>=0.5'
-
-require 'c3s'
-require 'pathname'
-
-PROVIDERS_DIR = File.join(ENV['HOME'], "ptcb", "code", "providers")
-
-def usage
-  puts "Usage: provider [provider_dir]"
-  puts ""
-  puts "Available providers: #{available_providers}"
-  puts ""
-  exit
-end
-
-def available_providers
-  available_providers = []
-  Dir.glob(File.join(PROVIDERS_DIR, "*")) do |dir|
-    next unless File.directory?(dir)
-    conf = File.join(dir, "component.yml")
-    path = Pathname.new(dir)
-    available_providers << path.basename if File.exist?(conf)
-  end
-  available_providers.join(", ")
-end
-
-args = ARGV
-if (args.size!=1)
-  usage
-else
-  provider = File.join(PROVIDERS_DIR, args.last)
-  if (!File.directory?(provider))
-    puts "Couldn't find '#{args.last}' provider"
-    exit
-  end
-end
-
-# Set process name to provider
-$0 = args.last
-
-# Set the dir variables
-C3S_COMPONENT_DIR = File.join(PROVIDERS_DIR, args.last)
-C3S_LIB_DIR = File.join(C3S_COMPONENT_DIR, 'lib')
-C3S_LOG_DIR = File.join(C3S_COMPONENT_DIR, 'logs')
-
-# Power to the requires
-$:.unshift C3S_COMPONENT_DIR
-$:.unshift C3S_LIB_DIR
-$:.unshift File.join(C3S_LIB_DIR, args.last)
-
-require 'lib/runner'