skates 0.3.6 → 0.4.0

data/README.rdoc

@@ -91,7 +91,7 @@ Gems : Eventmachine, nokogiri, YAML, log4r, templater
 
 (The MIT License)
 
-Copyright (c) 2009 Julien Genestoux http://notifixio.us
+Copyright (c) 2009 Julien Genestoux http://ouvre-boite.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.add_dependency('log4r')
     gem.add_dependency('nokogiri', "= 1.4.2")
     gem.add_dependency('utf8cleaner')
-    gem.requirements = ["eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "optparse", "digest/sha1", "base64", "resolv", "utf8cleaner"]
+    gem.requirements = ["bundler", "eventmachine", "yaml", "fileutils", "log4r", "nokogiri", "optparse", "digest/sha1", "base64", "resolv", "utf8cleaner"]
     gem.executables = "skates"
     gem.files = [ "bin/skates", 
                   "lib/skates.rb", 
@@ -33,6 +33,7 @@ begin
                   "LICENSE", 
                   "Rakefile", 
                   "README.rdoc", 
+                  "templates/skates/Gemfile", 
                   "templates/skates/app/controllers/controller.rb", 
                   "templates/skates/app/views/view.rb", 
                   "templates/skates/app/stanzas/stanza.rb", 

data/lib/skates/client_connection.rb

@@ -40,20 +40,27 @@ module Skates
           # Sort SRV records: lowest priority first, highest weight first
           srv.sort! { |a,b| (a.priority != b.priority) ? (a.priority <=> b.priority) : (b.weight <=> a.weight) }
           Skates.logger.debug {
-            "Found #{srv.count} SRV records for : #{host} : #{srv.inspect}"
+            "Found #{srv.count} SRV records for #{host}."
           }
-          # And now, for each record, let's try to connect.
-          srv.each { |record|
-            Skates.logger.debug {
-              "Trying connection with : #{record.target.to_s}:#{record.port}"
-            }
-            ip    = record.target.to_s
-            port  = Integer(record.port)
-            if block.call({"host" => ip, "port" => port}) 
-              found = true
-              break
+          # And now, for each record, let's try to connect. We add a bit of randomness, without touching the priority
+          srv.group_by { |record|  
+            record.priority
+          }.each do |priority, records|
+            records.sort_by { |record|  
+              rand()
+            }.each do |record|
+              if !found
+                Skates.logger.debug {
+                  "Trying connection with : #{record.target.to_s}:#{record.port}"
+                }
+                ip    = record.target.to_s
+                port  = Integer(record.port)
+                if !found and block.call({"host" => ip, "port" => port}) 
+                  found = true
+                end
+              end
             end
-          }
+          end
           if !found
             # We failover to solving A record with default port.
             Skates.logger.debug {

data/lib/skates/generator.rb

@@ -52,6 +52,10 @@ module Skates
       end
            
       # And now add the critical files
+      file :gemfile_file do |f|
+        f.source = "#{source_root}/Gemfile"
+        f.destination = "#{application_name}/Gemfile"
+      end
       file :boot_file do |f|
         f.source = "#{source_root}/config/boot.rb"
         f.destination = "#{application_name}/config/boot.rb"
@@ -72,7 +76,6 @@ module Skates
         f.source = "#{source_root}/script/component"
         f.destination = "#{application_name}/script/component"
       end
-      
     end
     
     ##

data/lib/skates/xmpp_connection.rb

@@ -181,9 +181,9 @@ module Skates
     def receive_data(data)
       data = UTF8Cleaner.clean(data)
       begin
-        Skates.logger.debug {
-          "RECEIVED : #{data}"
-        }
+        # Skates.logger.debug {
+        #   "RECEIVED : #{data}"
+        # }
         @parser.push(data) 
       rescue
         Skates.logger.error {

data/templates/skates/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gem "skates"

data/templates/skates/config/boot.rb

@@ -4,8 +4,7 @@
 # Change directory to the app's directory.
 Dir.chdir(File.dirname(__FILE__) + "/../") 
 
-require "rubygems"
-require "skates"
+Bundler.require(:default)
 require File.dirname(__FILE__) + "/dependencies"
 
 Skates.config_file = 'config/config.yaml'

data/templates/skates/script/component

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'optparse'
+require 'bundler/setup'
 
 $: << "." # Adding the local directory to the path, so we can safely require models, controllers and views.
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: skates
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - julien Genestoux
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: skates
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 12
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -56,7 +53,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 4
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -105,6 +100,7 @@ files:
 - lib/skates/runner.rb
 - lib/skates/xmpp_connection.rb
 - lib/skates/xmpp_parser.rb
+- templates/skates/Gemfile
 - templates/skates/app/controllers/controller.rb
 - templates/skates/app/stanzas/stanza.rb
 - templates/skates/app/views/view.rb
@@ -138,8 +134,8 @@ homepage: http://github.com/julien51/skates
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -147,7 +143,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -156,11 +151,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
+- bundler
 - eventmachine
 - yaml
 - fileutils