carioca 1.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5725ebfdae23b3175784bfc8f961a8ee5d31c455
-  data.tar.gz: 564985d9a48ab2e72017dca0b08d0c556ae0627b
+  metadata.gz: 7452e3def3859f67723245f65eaca57325c02df7
+  data.tar.gz: e62a5e8df75b45796408e2b23b8ffa3f7272b9dc
 SHA512:
-  metadata.gz: 7690724ad858c0f2a29f48bde4b7dd1674afdc9ed9a3cb0a5adfecb00b55e0338a33ddee6842829783140684f3e3bd2f014eabee48ab07c45f0468ce1d33207d
-  data.tar.gz: 6a3ab862d8c13fab2ddb0ac9fb7de1fd3ef4d6ce47e83750254e242dc36de6a68eaee9efe720840421744d39540f4c5b7f964b6895983c50b5dc14303bf43b6e
+  metadata.gz: da22b8fb540c74436f8a594500a8be39a6f40c5fa449b4354a2499da95b9e67a4557a117a544f11645a67a68178eeb3c3b1c54c52eedea4767a43a78f60ce924
+  data.tar.gz: 226b261c12350b1b31729bc42631c7e4ba4f62d6d69de13da218e4daa11c81fdf362082eeb3ab2f7d795f19013609a7fd17dfc21d6cc44cd329c37db04542a45

data/Gemfile.lock

@@ -1,11 +1,21 @@
+PATH
+  remote: .
+  specs:
+    carioca (1.0)
+      dorsal
+      methodic
+
 GEM
   remote: http://rubygems.org/
   specs:
+    code_statistics (0.2.13)
+    daemons (1.1.9)
     diff-lcs (1.2.1)
+    dorsal (1.0)
+      daemons
     macaddr (1.6.1)
       systemu (~> 2.5.0)
     methodic (1.2)
-    rake (10.0.4)
     rdoc (4.0.0)
     roodi (2.2.0)
       ruby_parser (~> 2.3.0)
@@ -31,11 +41,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  methodic
-  rake
+  carioca!
+  code_statistics
   rdoc
   roodi
   rspec
   uuid
   yard
   yard-rspec
+
+BUNDLED WITH
+   1.10.3

data/carioca.gemspec

@@ -1,7 +1,8 @@
 Gem::Specification.new do |s|
   s.name = %q{carioca}
   s.author = "Romain GEORGES"
-  s.version = "1.1"
+  s.version = "1.3"
+  s.license =  "BSD-2"
   s.date = %q{2013-02-18}
   s.summary = %q{Carioca : Configuration Agent and Registry with Inversion Of Control for your Applications}
   s.email = %q{romain@ultragreen.net}
@@ -9,17 +10,24 @@ Gem::Specification.new do |s|
   s.description = %q{Carioca : provide a full IoC light Container for designing your applications}
   s.has_rdoc = true
   s.files = Dir['*/*/*/*'] + Dir['*/*/*'] + Dir['*/*'] + Dir['*']
-  s.add_development_dependency('rspec')
-  s.add_development_dependency('yard')
-  s.add_development_dependency('rdoc')
-  s.add_development_dependency('roodi')
-  s.add_development_dependency('uuid')
-  s.add_development_dependency('code_statistics')
-  s.add_development_dependency('yard-rspec')
-  s.add_dependency('dorsal')
-  s.add_dependency('methodic')
+
+  s.add_development_dependency "bundler", "~> 1.5"
+  s.add_development_dependency "rake", "~> 10.5"
+  s.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'
+  s.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7.2'
+  s.add_development_dependency 'rdoc', '~> 4.0', '>= 4.0.1'
+  s.add_development_dependency 'roodi', '~> 3.1', '>= 3.1.1'
+  s.add_development_dependency 'code_statistics', '~> 0.2', '>= 0.2.13'
+  s.add_development_dependency 'yard-rspec', '~> 0.1'
+
+  
+
+  s.add_dependency 'dorsal', "~> 1.0"
+  s.add_dependency 'methodic', "~> 1.2", '>= 1.2'
+  s.add_dependency 'xml-simple', "~> 1.1", '>= 1.1.5'	
+
   s.required_ruby_version = '>= 1.8.1'
   s.rdoc_options << '--title' << 'Carioca : Gem documentation' << '--main' << 'doc/manual.rdoc' << '--line-numbers' 
   # << '--diagram'
   s.rubyforge_project = "nowarning"
-end
+end

data/lib/carioca/services/configuration.rb

@@ -17,9 +17,10 @@
 
 require 'rubygems'
 require 'methodic'
-require 'carioca/services'
+require_relative '../services'
 require 'yaml'
 require 'drb/drb'
+require 'xmlsimple'
 
 # overwriting Hash class 
 # @private
@@ -66,22 +67,35 @@ module Carioca
       # the name of the config file in YAML format
       attr_accessor :config_file
       
-      # constructor  (pre-open the config file in YAML)
+      # 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
       # @option options [String] :context a context (root) name to bind in YAML Structure
+      # @option options [String] :content a string (xml or yaml) content for configuration
+      # @option options [String] :xml_input a boolean if you want load and save in XML
       def initialize(options = {})
         @config_file = options[:config_file]
+        @xml_input = options[:xml_input]
+        @content  = options[:content]
         newsets = {}
-        if File::exist?(@config_file) then
-          newsets = YAML::load_file(@config_file).deep_symbolize
-          newsets = newsets[options[:context].to_sym] if options[:context] && newsets[options[:context].to_sym]
-          deep_merge!(self, 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' ],
+                                        'KeepRoot' => true,
+                                      }).deep_symbolize_keys
+        else
+          newsets = YAML::load(@content).deep_symbolize_keys
+        end
+        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
       def save!
         res = false
         File.open(@config_file, "w") do |f|

data/spec/carioca_spec.rb

@@ -1,6 +1,7 @@
 require'rubygems'
 require'rspec'
 require 'carioca'
+require 'fileutils'
 
 $debug = true
 
@@ -35,7 +36,7 @@ describe Carioca do
         carioca1 = Carioca::Services::Registry.init
         carioca2 = Carioca::Services::Registry.init
         test = (carioca1.inspect == carioca2.inspect)
-        test.should be_true
+        test.should be true
       end
       
 
@@ -175,7 +176,7 @@ describe Carioca do
           
           it "should be saved in other file" do 
             $conf.config_file = '/tmp/.config'
-            $conf.save!.should be_true
+            $conf.save!.should be true
             
           end
           it "should stop the configuration service" do
@@ -221,7 +222,7 @@ describe Carioca do
             $dummy_dist = subject.start_service :name => 'distdummy'        
           end
           it "should exist a processus Ring server" do 
-            File::exist?('/tmp/dorsal/ringserver.pid').should be_true
+            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
           end
@@ -283,14 +284,14 @@ 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        
+          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}'`
           pid.should be_empty
         end
         it "should not exist the pid file of this stopped services" do
-          File::exist?('/tmp/dorsal/service-distdummy.pid').should be_false
+          File::exist?('/tmp/dorsal/service-distdummy.pid').should be false
           $dummy_dist = subject.start_service :name => 'distdummy'
         end
       end
@@ -398,7 +399,7 @@ describe Carioca do
         prev = subject.registry_filename
         subject.registry_filename = '/tmp/test.reg'
         subject.save!
-        File::exist?('/tmp/test.reg').should be_true
+        File::exist?('/tmp/test.reg').should be true
         subject.registry_filename = prev
         subject.registry_filename.should eq "spec/config/services.registry"
       end
@@ -449,6 +450,20 @@ describe Carioca do
       end
     end
   end
+  after :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')
+    pid = `ps aux|grep ruby|grep -v grep |grep 'Ultragreen Ring Server'|awk '{ print $2}'`
+    unless pid.empty? then
+      res = `kill -TERM #{pid.chomp}`
+    end
+    pid = `ps aux|grep ruby|grep -v grep |grep 'a dummy test service'|awk '{ print $2}'`
+    unless pid.empty? then
+      res = `kill -TERM #{pid.chomp}`
+    end
+  end
+
 end
 
 

data/spec/spec_helper.rb

@@ -5,7 +5,14 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+#  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
 #  config.filter_run :focus
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carioca
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.3'
 platform: ruby
 authors:
 - Romain GEORGES
@@ -11,191 +11,262 @@ cert_chain: []
 date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: roodi
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7.2
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: roodi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: code_statistics
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: yard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dorsal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: methodic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 description: 'Carioca : provide a full IoC light Container for designing your applications'
 email: romain@ultragreen.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/carioca/tasks/rake.rb
-- lib/carioca/tasks/registry_init.rake
+- AUTHORS
+- COPYRIGHT
+- ChangeLog
+- Gemfile
+- Gemfile.lock
+- INSTALL
+- README.md
+- Rakefile
+- carioca.gemspec
+- doc/manual.rdoc
+- lib/carioca.rb
+- lib/carioca/exceptions.rb
+- lib/carioca/helpers.rb
+- lib/carioca/private.rb
+- lib/carioca/services.rb
 - lib/carioca/services/configuration.rb
 - lib/carioca/services/debug.rb
 - lib/carioca/services/logger.rb
-- spec/samples/dummy.rb
-- spec/samples/requireddummy.rb
-- spec/samples/otherdummy.rb
+- lib/carioca/tasks/rake.rb
+- lib/carioca/tasks/registry_init.rake
+- spec/carioca_spec.rb
 - spec/config/services.registry
-- lib/carioca/services.rb
-- lib/carioca/private.rb
-- lib/carioca/exceptions.rb
-- lib/carioca/helpers.rb
-- doc/manual.rdoc
 - spec/init_spec.rb
+- spec/samples/dummy.rb
+- spec/samples/otherdummy.rb
+- spec/samples/requireddummy.rb
 - spec/spec_helper.rb
-- spec/carioca_spec.rb
-- lib/carioca.rb
-- Gemfile.lock
-- Gemfile
-- ChangeLog
-- COPYRIGHT
-- ultragreen_roodi_coding_convention.yml
-- AUTHORS
-- README.md
 - test.rb
-- carioca.gemspec
-- Rakefile
-- INSTALL
+- ultragreen_roodi_coding_convention.yml
 homepage: http://www.ultragreen.net
-licenses: []
+licenses:
+- BSD-2
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - 'Carioca : Gem documentation'
-- --main
+- "--main"
 - doc/manual.rdoc
-- --line-numbers
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.0.7
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: 'Carioca : Configuration Agent and Registry with Inversion Of Control for