carioca 1.3 → 1.4

data/lib/carioca/services.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# coding: utf-8
 #---
 # Author : Romain GEORGES
 # type : gem component library
@@ -11,13 +11,13 @@ module Carioca
 
   # namespace Services for Registry AND buitlins
   module  Services
-    # class method returning full path in Carioca gem for builtin services files according to installed gem path. 
+    # class method returning full path in Carioca gem for builtin services files according to installed gem path.
     # @note do not use directly for generale purpose (expert/hacks only)
     # @param [String] _name the name of a service
     # @return [String,false] the full path filename orfalse if not found
     def Services::search_builtins(_name)
       if Gem::Specification.respond_to?(:find_by_name)
-        begin 
+        begin
         spec = Gem::Specification.find_by_name('carioca')
         rescue LoadError
           spec = nil
@@ -44,13 +44,13 @@ module Carioca
         return false
       end
     end
-    
+
     # class method returning the path of a file in gem if exist or false
     # @note do not use directly for generale purpose (expert/hacks only)
     # @return [String|FalseClass] the full path of a service file
     def Services::search_file_in_gem(_gem,_file)
       if Gem::Specification.respond_to?(:find_by_name)
-        begin 
+        begin
         spec = Gem::Specification.find_by_name(_gem)
         rescue LoadError
           spec = nil
@@ -79,7 +79,7 @@ module Carioca
     # @return [Hash] the [Carioca::Services::Registry]@list complement
     def Services::discover_builtins
       if Gem::Specification.respond_to?(:find_by_name)
-        begin 
+        begin
           spec = Gem::Specification.find_by_name('carioca')
         rescue LoadError
           spec = nil
@@ -114,7 +114,7 @@ module Carioca
     def Services::validate_service(file,res)
         init_options =  {}
         if open(file).grep(/^# \$BUILTIN/).size > 0 then
-          service = open(file).grep(/# \$SERVICE/).first.split[2] 
+          service = open(file).grep(/# \$SERVICE/).first.split[2]
           resource = open(file).grep(/# \$RESOURCE/).first.split[2]
           desc = open(file).grep(/# \$DESCRIPTION/).first
           desc = desc.split(' ')
@@ -124,13 +124,13 @@ module Carioca
             prev = opt.split
             init_options[prev[2].to_sym] = prev[4]
           end
-          distributed = (open(file).grep(/# \$DISTRIBUTED/))? true : false 
+          distributed = (open(file).grep(/# \$DISTRIBUTED/))? true : false
           req = open(file).grep(/# \$REQUIRES/)
           if req.empty? then
             requires = []
           else
             requires = req.split
-            requires.shift   
+            requires.shift
           end
 
         end
@@ -138,6 +138,6 @@ module Carioca
           res[resource] = { :service => service, :type => :builtin, :description => description, :resource => resource}
           res[resource][:init_options] = init_options unless init_options.empty?
         end
-    end    
+    end
   end
 end

data/lib/carioca/services/configuration.rb

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
+# coding: utf-8
 # $BUILTIN
 # $NAME configuration
-# $SERVICE Carioca::Services::Configuration 
+# $SERVICE Carioca::Services::Configuration
 # $RESOURCE configuration
 # $DESCRIPTION The Carioca Configuration Service
 # $INIT_OPTIONS config_file => ./.config
 
 # Copyright Ultragreen (c) 2005
 #---
-# Author : Romain GEORGES 
+# Author : Romain GEORGES
 # type : class definition Ruby
 # obj : Generic config library
 #---
@@ -21,12 +21,13 @@ require_relative '../services'
 require 'yaml'
 require 'drb/drb'
 require 'xmlsimple'
+require 'active_support/all'
 
-# overwriting Hash class 
+# overwriting Hash class
 # @private
 class Hash
 
-  # recursively transform Hash keys form String to Symbols 
+  # recursively transform Hash keys form String to Symbols
   # come from Rails code
   # exist in Ruby 2.0
   def deep_symbolize
@@ -40,7 +41,7 @@ class Hash
 
   # pretty accessor for hash record
   # like ahash[:key] => ahash.key
-  # r/w accessor 
+  # r/w accessor
   def method_missing(name, *args, &block)
     if name.to_s =~ /(.+)=$/
       self[$1.to_sym] = args.first
@@ -49,14 +50,14 @@ class Hash
     end
   end
 end
-    
+
 
 
 
 
 module Carioca
 
-  module Services 
+  module Services
 
     # settings Hash record utilities class
     # @note please do not use Standalone ( dependancy of Configuration class )
@@ -66,7 +67,7 @@ module Carioca
 
       # the name of the config file in YAML format
       attr_accessor :config_file
-      
+
       # constructor  (pre-open the config file in default:YAML)
       # @param [Hash] options the options records
       # @option options [String] :config_file (REQUIRED) the name of the config file
@@ -77,13 +78,14 @@ module Carioca
         @config_file = options[:config_file]
         @xml_input = options[:xml_input]
         @content  = options[:content]
+        @force_array =  options[:force_array]
         newsets = {}
         if @config_file then
           @content = File::readlines(@config_file).join if File::exist?(@config_file)
         end
         if options[:xml_input] then
           newsets = XmlSimple.xml_in( @content, {
-                                        'ForceArray' => [ 'sequence', 'step' ],
+                                        'ForceArray' => @force_array,
                                         'KeepRoot' => true,
                                       }).deep_symbolize_keys
         else
@@ -92,7 +94,7 @@ module Carioca
         newsets = newsets[options[:context].to_sym] if options[:context] && newsets[options[:context].to_sym]
         deep_merge!(self, newsets)
       end
-      
+
       # save the Hash(self) in the file named by @config_file
       # @return [TrueClass,FalseClass] true if save! successfull
       # @note TODO save in XML format
@@ -106,7 +108,7 @@ module Carioca
 
 
       private
-      # full recursive merger for hash 
+      # full recursive merger for hash
       def deep_merge!(target, data)
         merger = proc{|key, v1, v2|
           Settings === v1 && Settings === v2 ? v1.merge(v2, &merger) : v2 }
@@ -116,22 +118,22 @@ module Carioca
 
     end
 
-    
-    
-    
+
+
+
     # Service Configuration of Carioca
-    class Configuration 
-      
+    class Configuration
+
       include DRb::DRbUndumped
-      
-      # @example 
+
+      # @example
       #   config = Carioca::Services::Configuration::new :config_file => 'afilename', :context => 'production'
       #   p config.config_file
       #   config_file = 'newfilename'
       # @attr_reader [String] the filename of the YAML struct
       attr_accessor :settings
 
-      
+
       # Configuration service constructor (open config)
       # @param [Hash] _options the params
       # @option _options [String] :config_file the filename of the config
@@ -143,28 +145,28 @@ module Carioca
         options.merge
         @settings = Carioca::Services::Settings.new(options)
       end
-      
-      # Proxy to @settings.save! 
+
+      # Proxy to @settings.save!
       #  save the Hash(self) in the file named by @config_file
       # @return [TrueClass,FalseClass] true if save! successfull
       # @example usage
       #   config = Carioca::Services::Configuration::new :config_file => 'afilename', :context => 'production'
-      #   config.config_file = 'newfile'   
+      #   config.config_file = 'newfile'
       #   config.save!
       def save!
         @settings.save!
       end
 
-      
+
       # reading wrapper to @settings.config_file accessor
-      # @return [String] @config_file the file name  
+      # @return [String] @config_file the file name
       # @example usage
       #   config = Carioca::Services::Configuration::new :config_file => 'afilename', :context => 'production'
-      #   p config.config_file 
+      #   p config.config_file
       def config_file
         @settings.config_file
       end
-      
+
       # writting wrapper to @settings.config_file accessor
       # @param [String] name the file name
       # @example usage
@@ -182,7 +184,7 @@ module Carioca
         @settings = nil
         return true
       end
-      
+
     end
   end
 end
@@ -191,7 +193,7 @@ end
 
 
 
-# interactive hacks 
+# interactive hacks
 if $0 == __FILE__ then
   conf =Carioca::Services::Configuration::new :config_file => 'spec/config/.config'
   p conf

data/lib/carioca/services/debug.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# coding: utf-8
 # $BUILTIN
 # $NAME debug
 # $SERVICE Carioca::Services::ProxyDebug
@@ -6,7 +6,7 @@
 # $DESCRIPTION Proxy class debugger Service for Carioca
 # Copyright Ultragreen (c) 2012
 #---
-# Author : Romain GEORGES 
+# Author : Romain GEORGES
 # type : class definition Ruby
 # obj : Generic Debugs tools library
 #---
@@ -18,12 +18,12 @@ require 'methodic'
 
 module Carioca
   module Services
-    
-    
+
+
     # Service Debug of Carioca
     # Proxy Class Debug for devs
     class ProxyDebug
-      
+
       # ProxyDebug service constructor (has a class proxy => so a service proxy)
       # @param [Hash] _options the params
       # @option _options [String] :service the name of the service you want to proxyfying
@@ -41,10 +41,10 @@ module Carioca
         @log  = Registry.init.get_service :name => 'logger'
         @mapped_service = options[:service]
       end
-      
-      # method_missing overload to make the class proxy efficient 
+
+      # method_missing overload to make the class proxy efficient
       def method_missing(methodname, *args,&block)
-        @log.debug("ProxyDebug") { "BEGIN CALL for mapped service #{@mapped_service} "} 
+        @log.debug("ProxyDebug") { "BEGIN CALL for mapped service #{@mapped_service} "}
         @log.debug("ProxyDebug") { "called: #{methodname} " }
         @log.debug("ProxyDebug") { "args : #{args.join " "}" }
         if block_given? then
@@ -69,5 +69,3 @@ if $0 == __FILE__ then
   puts 'this is a RUBY library file'
   puts "Copyright (c) Ultragreen"
 end
-
-

data/lib/carioca/services/logger.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# coding: utf-8
 # $BUILTIN
 # $NAME logger
 # $SERVICE Carioca::Services::InternalLogger
@@ -7,7 +7,7 @@
 # $INIT_OPTIONS target => /tmp/log.file
 # Copyright Ultragreen (c) 2005
 #---
-# Author : Romain GEORGES 
+# Author : Romain GEORGES
 # type : class definition Ruby
 # obj : Generic config library
 #---
@@ -18,16 +18,16 @@ require 'logger'
 require 'methodic'
 
 module Carioca
-  module Services 
+  module Services
 
     # Service Logger (InternalLogger) of Carioca,
     # @note integrally based on Logger from logger Gem
     class InternalLogger < Logger
-      
+
       private
-      
+
       # logger service constructor (open log)
-      # @param [Hash] _options the params 
+      # @param [Hash] _options the params
       # @option _options [String] :target the filename where to log
       def initialize(_options = {})
         options = Methodic.get_options(_options)
@@ -35,22 +35,22 @@ module Carioca
         options.merge
         super(options[:target])
       end
-      
+
       # garbage service hook
-      # @note close the logger 
+      # @note close the logger
       def garbage
         self.close
       end
-      
+
     end
   end
-  
-  
-  
+
+
+
 end
 
 
-# interactive hacks 
+# interactive hacks
 if $0 == __FILE__ then
   puts "#{File::basename(__FILE__)}:"
   puts 'this is a RUBY library file'

data/lib/carioca/tasks/rake.rb

@@ -1,5 +1,6 @@
+# coding: utf-8
 require 'rake'
-require 'rubygems' 
+require 'rubygems'
 require 'carioca'
 
 $VERBOSE = nil
@@ -18,6 +19,5 @@ end
 res.pop
 tasks_path = res.join('/').concat('/lib/carioca/tasks/')
 
-  
-Dir["#{tasks_path}/*.rake"].each { |ext| load ext }
 
+Dir["#{tasks_path}/*.rake"].each { |ext| load ext }

data/lib/carioca/tasks/registry_init.rake

@@ -1,4 +1,5 @@
-require 'carioca' 
+# coding: utf-8
+require 'carioca'
 namespace :carioca  do
   desc "initialize Carioca Registry"
   task :init_registry do

data/spec/carioca_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require'rubygems'
 require'rspec'
 require 'carioca'
@@ -7,7 +8,7 @@ $debug = true
 
 describe Carioca do
 
-  before :all do 
+  before :all do
     FileUtils.rm_rf("/tmp/log.file")
     File::unlink('/tmp/dorsal/ringserver.pid') if File::exist?('/tmp/dorsal/ringserver.pid')
     File::unlink('/tmp/dorsal/service-distdummy.pid') if File::exist?('/tmp/dorsal/service-distdummy.pid')
@@ -20,25 +21,25 @@ describe Carioca do
       res = `kill -TERM #{pid.chomp}`
     end
     $carioca = Carioca::Services::Registry.init :file => 'spec/config/services.registry', :debug => $debug
-  end  
-  
+  end
+
   subject { Carioca }
   it { should be_an_instance_of Module}
   context "Carioca::Services" do
     subject { Carioca::Services }
     it { should be_an_instance_of Module }
   end
-  
+
   context "Carioca::Services::Registry"  do
     subject { $carioca }
-    context "#init" do 
-      it "should be a Singleton" do 
+    context "#init" do
+      it "should be a Singleton" do
         carioca1 = Carioca::Services::Registry.init
         carioca2 = Carioca::Services::Registry.init
         test = (carioca1.inspect == carioca2.inspect)
         test.should be true
       end
-      
+
 
       it { should be_an_instance_of Carioca::Services::Registry }
       it { $carioca.list.keys.should include "logger" }
@@ -52,7 +53,7 @@ describe Carioca do
 
       it "should be possible to log with this primary service" do
         $logger = subject.get_service :name => 'logger'
-        $logger.info("test").should eq true 
+        $logger.info("test").should eq true
         open('/tmp/log.file').grep(/INFO -- : test/).size.should eq 1
         $logger.warn("test").should eq true
         open('/tmp/log.file').grep(/WARN -- : test/).size.should eq 1
@@ -69,11 +70,11 @@ describe Carioca do
       context "#debug (RW)" do
         it { should respond_to :debug }
         it { should respond_to :debug= }
-        it "should be true if debug mode", :if => $debug do 
-          subject.debug.should eq true 
+        it "should be true if debug mode", :if => $debug do
+          subject.debug.should eq true
         end
         it "should be false if not debug mode", :unless => $debug do
-          subject.debug.should eq false 
+          subject.debug.should eq false
         end
       end
 
@@ -97,7 +98,7 @@ describe Carioca do
         it { subject.loaded_services.should be_an_instance_of Hash }
         it { $carioca.loaded_services.keys.should eq ["logger"] }
       end
-      
+
       context "#registry_filename" do
         it { should respond_to :registry_filename }
         it { should respond_to :registry_filename= }
@@ -107,42 +108,42 @@ describe Carioca do
 
     end
 
-    context "#start_service" do 
+    context "#start_service" do
       it { should respond_to :start_service }
       it { should respond_to :get_service }
 
       context "Builtin services" do
         context "Logger service" do
-          it "should be possible to get the builtin logger service" do 
+          it "should be possible to get the builtin logger service" do
             $logger = subject.get_service :name => 'logger'
           end
-          it "should log if debug mode", :if => $debug do 
+          it "should log if debug mode", :if => $debug do
             open('/tmp/log.file').grep(/DEBUG -- Carioca: getting service logger/).size.should >= 1
           end
-          it "should not log if debug mode", :unless => $debug do 
+          it "should not log if debug mode", :unless => $debug do
             open('/tmp/log.file').grep(/DEBUG -- Carioca: getting service logger/).size.should eq 0
           end
         end
-        
+
 
         context "Debug Proxy Service" do
-          it "should start the builtin service debug" do 
+          it "should start the builtin service debug" do
             myservice = subject.start_service :name => 'debug' , :params => {:service => 'dummy'}
-            myservice.test 'titi'            
+            myservice.test 'titi'
           end
           it { subject.list.keys.should include "debug" }
-          it "should log a proxy service log sequence", :if => $debug do 
-            open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: BEGIN CALL for mapped service dummy/).size.should eq 1 
-            open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: called: test/).size.should eq 1 
+          it "should log a proxy service log sequence", :if => $debug do
+            open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: BEGIN CALL for mapped service dummy/).size.should eq 1
+            open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: called: test/).size.should eq 1
             open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: args : titi/).size.should eq 1
-            open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: => returned: OK/).size.should eq 1 
+            open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: => returned: OK/).size.should eq 1
             open('/tmp/log.file').grep(/DEBUG -- ProxyDebug: END CALL/).size.should eq 1
           end
         end
-        
+
         context "Configuration Service" do
           it "should start the builtin configuration service" do
-            $conf = subject.start_service :name => 'configuration' 
+            $conf = subject.start_service :name => 'configuration'
           end
           it "should access flat settings" do
             $conf.settings.context1.key0.should eq 'value'
@@ -150,21 +151,21 @@ describe Carioca do
             $conf.settings.context1.node.key2 eq 'value2'
             $conf.settings.context2.key0.should eq 'value'
             $conf.settings.context2.node.key1 eq 'value3'
-            $conf.settings.context2.node.key2 eq 'value4'            
+            $conf.settings.context2.node.key2 eq 'value4'
           end
           it "should access contextualized settings" do
             $conf = subject.restart_service :name => 'configuration', :params => { :context => 'context2' }
             $conf.settings.key0.should eq 'value'
             $conf.settings.node.key1 eq 'value3'
-            $conf.settings.node.key2 eq 'value4'            
+            $conf.settings.node.key2 eq 'value4'
           end
           it "should access inherited settings from YAML" do
             $conf = subject.restart_service :name => 'configuration', :params => { :context => 'context3' }
             $conf.settings.key0.should eq 'value'
             $conf.settings.node.key1 eq 'value3'
-            $conf.settings.node.key2 eq 'value4'            
+            $conf.settings.node.key2 eq 'value4'
           end
-          it "should be possible to override a config value" do 
+          it "should be possible to override a config value" do
             $conf.settings.node.key2 = 'value8'
             $conf.settings.node.key2.should eq 'value8'
             $conf.settings[:node][:key2] = 'value6'
@@ -173,23 +174,23 @@ describe Carioca do
           it { $conf.should respond_to :config_file }
           it { $conf.should respond_to :config_file= }
           it { $conf.should respond_to :save! }
-          
-          it "should be saved in other file" do 
+
+          it "should be saved in other file" do
             $conf.config_file = '/tmp/.config'
             $conf.save!.should be true
-            
+
           end
           it "should stop the configuration service" do
             subject.stop_service({:name => 'configuration'}).should eq true
           end
         end
-        
+
       end
 
       context "External services" do
-        
-        it "should start a dummy service precised in registry YAML configuration" do 
-          
+
+        it "should start a dummy service precised in registry YAML configuration" do
+
           $dummy = subject.start_service :name => 'dummy'
           $dummy.should be_an_instance_of ExternalServices::Dummy
         end
@@ -218,10 +219,10 @@ describe Carioca do
 
 
         context "Distributed service" do
-          it "should be possible to execute a distributed service" do 
-            $dummy_dist = subject.start_service :name => 'distdummy'        
+          it "should be possible to execute a distributed service" do
+            $dummy_dist = subject.start_service :name => 'distdummy'
           end
-          it "should exist a processus Ring server" do 
+          it "should exist a processus Ring server" do
             File::exist?('/tmp/dorsal/ringserver.pid').should be true
             pid = `ps aux|grep ruby|grep -v grep |grep 'Ultragreen Ring Server'|awk '{ print $2}'`
             pid.should_not be_empty
@@ -235,12 +236,12 @@ describe Carioca do
           it "should include 'distdummy' in @loaded_services.keys" do
             subject.loaded_services.should include "distdummy"
           end
-          it "should distdummy be a DRbObject" do 
+          it "should distdummy be a DRbObject" do
             $dummy_dist.should be_a_kind_of DRb::DRbObject
           end
           it "should be possible to use test method of the distributed dummy service, and return 'OK'" do
             $dummy_dist.test.should eq 'OK'
-          end 
+          end
         end
 
       end
@@ -256,19 +257,19 @@ describe Carioca do
       it "should return true if service really stop" do
         subject.stop_service({:name => 'dummy'}).should eq true
       end
-      it "should log if debug mode", :if => $debug do 
+      it "should log if debug mode", :if => $debug do
         open('/tmp/log.file').grep(/DEBUG -- Carioca: Service dummy stopped/).size.should >= 1
       end
-      it "should not log if debug mode", :unless => $debug do 
+      it "should not log if debug mode", :unless => $debug do
         open('/tmp/log.file').grep(/DEBUG -- Carioca: Service dummy stopped/).size.should eq 0
       end
       it "should return false if service not already running" do
         subject.stop_service({:name => 'dum'}).should eq false
       end
-      it "should log if debug mode and service not loaded", :if => $debug do 
+      it "should log if debug mode and service not loaded", :if => $debug do
         open('/tmp/log.file').grep(/DEBUG -- Carioca: Service dum not loaded/).size.should >= 1
       end
-      it "should not log if debug mode and service not loaded", :unless => $debug do 
+      it "should not log if debug mode and service not loaded", :unless => $debug do
         open('/tmp/log.file').grep(/DEBUG -- Carioca: Service dum not loaded/).size.should eq 0
       end
       it "should return false if service :name is logger" do
@@ -283,8 +284,8 @@ describe Carioca do
 
       context "Distributed Service" do
         it "should be possible to stop a distributed service" do
-          $dummy_dist = subject.start_service :name => 'distdummy'        
-          subject.stop_service({:name => 'distdummy'}).should be true        
+          $dummy_dist = subject.start_service :name => 'distdummy'
+          subject.stop_service({:name => 'distdummy'}).should be true
         end
         it "should not exist forked daemon instance for this stopped service" do
           pid = `ps aux|grep ruby|grep -v grep |grep 'a dummy test service'|awk '{ print $2}'`
@@ -295,16 +296,16 @@ describe Carioca do
           $dummy_dist = subject.start_service :name => 'distdummy'
         end
       end
-      
+
     end
 
     context "#restart_service" do
       it { should respond_to :start_service }
-      it "should start an instance of a service like dummy_one" do 
+      it "should start an instance of a service like dummy_one" do
         $dummy = subject.restart_service :name => 'dummy_one'
         $dummy = subject.restart_service :name => 'dummy'
         $dummy.should be_an_instance_of ExternalServices::Dummy
-        $carioca.loaded_services.keys.should include 'dummy' 
+        $carioca.loaded_services.keys.should include 'dummy'
         $carioca.loaded_services.keys.should include 'dummy_one'
       end
       it "should restart a service already loaded and log it" do
@@ -332,7 +333,7 @@ describe Carioca do
 
     context "#unregister_service" do
       it { should respond_to :unregister_service }
-      it "should be possible te unregistered the configuration service" do 
+      it "should be possible te unregistered the configuration service" do
         subject.list.keys.should include "configuration"
         subject.unregister_service :name => "configuration"
         subject.list.keys.should_not include "configuration"
@@ -343,23 +344,23 @@ describe Carioca do
       it "should raise RegistryError if trying to unregister a loaded service" do
         lambda { subject.unregister_service :name => "dummy"}.should raise_error RegistryError
       end
-      
+
     end
 
     context "#discover_builtins" do
       it { should respond_to :discover_builtins }
-      it "should rebuild builtin service in @list" do 
+      it "should rebuild builtin service in @list" do
         subject.discover_builtins
-        subject.list.keys.should include "configuration" 
+        subject.list.keys.should include "configuration"
       end
     end
 
     context "#register_service" do
       it { should respond_to :register_service }
-      it "should add a new service" do 
-        subject.register_service :name => 'otherdummy', 
-                                 :type => :file, 
-                                 :resource => './spec/samples/otherdummy.rb', 
+      it "should add a new service" do
+        subject.register_service :name => 'otherdummy',
+                                 :type => :file,
+                                 :resource => './spec/samples/otherdummy.rb',
                                  :service =>'ExternalServices::OtherDummy',
                                  :description => 'An other Dummy Service',
                                  :requires => ['requireddummy']
@@ -378,10 +379,10 @@ describe Carioca do
         subject.loaded_services.keys.should include 'requireddummy'
         subject.loaded_services.keys.should include 'otherdummy'
       end
-      it "should raise Argument error if :type is not :gem, :file, :gem_file or :builtin" do 
-        lambda { subject.register_service :name => 'otherdummy', 
-                                 :type => :error, 
-                                 :resource => 'spec/samples/otherdummy.rb', 
+      it "should raise Argument error if :type is not :gem, :file, :gem_file or :builtin" do
+        lambda { subject.register_service :name => 'otherdummy',
+                                 :type => :error,
+                                 :resource => 'spec/samples/otherdummy.rb',
                                  :service =>'ExternalServices::OtherDummy',
                                  :description => 'An other Dummy Service'}.should raise_error ArgumentError
 
@@ -390,11 +391,11 @@ describe Carioca do
 
 
 
-    
-    
+
+
     context "#save!" do
       it { should respond_to :save! }
-      it "should save the config to an other file @registry_filename" do 
+      it "should save the config to an other file @registry_filename" do
         File::unlink('/tmp/test.reg') if File::exist?('/tmp/test.reg')
         prev = subject.registry_filename
         subject.registry_filename = '/tmp/test.reg'
@@ -405,14 +406,14 @@ describe Carioca do
       end
 
     end
-    
-    
-    
-    context "#close" do    
+
+
+
+    context "#close" do
       context "Closing the Carioca registry" do
         it { should respond_to :close }
         it "should close" do
-          subject.close.should eq true    
+          subject.close.should eq true
         end
         it "should log a registry closing notification if debug mode", :if => $debug do
           open('/tmp/log.file').grep(/DEBUG -- Carioca: closing Registry .../).size.should eq 1
@@ -444,7 +445,7 @@ describe Carioca do
         end
         it "should loaded services empty" do
           subject.loaded_services.empty?.should eq true
-        end  
+        end
         context "Distributed service" do
         end
       end
@@ -465,10 +466,3 @@ describe Carioca do
   end
 
 end
-
-
-
-
-
-
-