lorj 1.0.1 → 1.0.2

data/lib/providers/mock/mock.rb

@@ -42,7 +42,7 @@ class MockController
 
     array = @@data[sObjectType]
 
-    array.each do | value |
+    array.each do |value|
       fail if value.key?(result[:name])
     end
     array << result
@@ -78,9 +78,9 @@ class MockController
 
     result = []
 
-    @@data[sObjectType].each do | value |
+    @@data[sObjectType].each do |value|
       elem = value
-      sQuery.each do | query_key, query_value |
+      sQuery.each do |query_key, query_value|
         elem = nil if !value.key?(query_key) || value[query_key] != query_value
       end
       result << elem if elem

data/lib/providers/openstack/openstack.rb

@@ -23,23 +23,23 @@ class Openstack < BaseDefinition
 
   def compute
     Fog::Compute.new(
-       :provider => :openstack,
-       :openstack_api_key => superclass.oForjAccount.get(:account_id),
-       :openstack_username => superclass.oForjAccount.get(:account_key),
-       :openstack_auth_url => superclass.oForjAccount.get(:auth_uri),
-       :openstack_tenant => superclass.oForjAccount.get(:tenant_id),
-       :openstack_region => superclass.oForjAccount.get(:compute)
+      :provider => :openstack,
+      :openstack_api_key => superclass.oForjAccount.get(:account_id),
+      :openstack_username => superclass.oForjAccount.get(:account_key),
+      :openstack_auth_url => superclass.oForjAccount.get(:auth_uri),
+      :openstack_tenant => superclass.oForjAccount.get(:tenant_id),
+      :openstack_region => superclass.oForjAccount.get(:compute)
        )
   end
 
   def network
     Fog::Network.new(
-       :provider => :openstack,
-       :openstack_api_key => superclass.oForjAccount.get(:account_id),
-       :openstack_username => superclass.oForjAccount.get(:account_key),
-       :openstack_auth_url => superclass.oForjAccount.get(:auth_uri),
-       :openstack_tenant => superclass.oForjAccount.get(:tenant_id),
-       :openstack_region => superclass.oForjAccount.get(:network)
+      :provider => :openstack,
+      :openstack_api_key => superclass.oForjAccount.get(:account_id),
+      :openstack_username => superclass.oForjAccount.get(:account_key),
+      :openstack_auth_url => superclass.oForjAccount.get(:auth_uri),
+      :openstack_tenant => superclass.oForjAccount.get(:tenant_id),
+      :openstack_region => superclass.oForjAccount.get(:network)
        )
   end
 end

data/lib/providers/templates/compute.rb

@@ -29,12 +29,12 @@ class Mycloud
     # obj_needs(:data, :<CloudDataKey},{:mapping => :<MyCloudKeyMapped>})
     # can be updated by removing the mapping => <Value>
     Fog::Compute.new(
-       :provider => :mycloud,
-       :user => @oForjAccount.get(:account_id),
-       :pwd => @oForjAccount.get(:account_key),
-       :auth_uri => @oForjAccount.get(:auth_uri),
-       :project => @oForjAccount.get(:tenant),
-       :compute_service => @oForjAccount.get(:compute)
+      :provider => :mycloud,
+      :user => @oForjAccount.get(:account_id),
+      :pwd => @oForjAccount.get(:account_key),
+      :auth_uri => @oForjAccount.get(:auth_uri),
+      :project => @oForjAccount.get(:tenant),
+      :compute_service => @oForjAccount.get(:compute)
        )
   end
 end

data/lib/rh.rb

@@ -66,9 +66,10 @@ class Hash
   #   yVal.rh_lexist? => 0
 
   def rh_lexist?(*p)
+    p = p.flatten
+
     return 0 if p.length == 0
 
-    p = p.flatten
     if p.length == 1
       return 1 if self.key?(p[0])
       return 0
@@ -212,9 +213,9 @@ class Hash
   #   # yVal  = {:test2 => {:test5 => :test, 'text' => 'blabla'},
   #              :test5 => :test }
   def rh_set(value, *p)
+    p = p.flatten
     return nil if p.length == 0
 
-    p = p.flatten
     if p.length == 1
       self[p[0]] = value
       return value
@@ -260,9 +261,10 @@ class Hash
   #   # yVal = {:test2 => {} }
   #
   def rh_del(*p)
+    p = p.flatten
+
     return nil if p.length == 0
 
-    p = p.flatten
     return delete(p[0]) if p.length == 1
 
     return nil if self[p[0]].nil?
@@ -294,7 +296,7 @@ class Hash
 
   def rh_key_to_symbol(levels = 1)
     result = {}
-    each do | key, value |
+    each do |key, value|
       new_key = key
       new_key = key.to_sym if key.is_a?(String)
       if value.is_a?(Hash) && levels > 1
@@ -325,7 +327,7 @@ class Hash
   #  rh_key_to_symbol?(3) return true
   #  rh_key_to_symbol?(4) return true
   def rh_key_to_symbol?(levels = 1)
-    each do | key, value |
+    each do |key, value|
       return true if key.is_a?(String)
 
       res = false

data/spec/04_prc_core_config_spec.rb

@@ -79,5 +79,57 @@ describe 'class: PRC::CoreConfig,' do
       expect(@config.del(:test)).to eq(:where)
       expect(@config[:test]).to equal(:found_local)
     end
+
+    it 'PRC::CoreConfig.define_layer(...) return a valid standalone layer' do
+      config = PRC::BaseConfig.new
+      layer = PRC::CoreConfig.define_layer(:name => 'instant',
+                                           :config => config)
+      expect(layer).to be
+      expect(layer[:name]).to eq('instant')
+      expect(layer[:config]).to eq(config)
+      expect(layer[:set]).to equal(true)
+      expect(layer[:load]).to equal(false)
+      expect(layer[:save]).to equal(false)
+      expect(layer[:file_set]).to equal(false)
+    end
+
+    it "config.layer_add(:name => 'instant') return true if layer is added" do
+      layer = PRC::CoreConfig.define_layer(:name => 'instant')
+      expect(@config.layer_add layer).to equal(true)
+    end
+
+    it 'config.layers return %w(instant runtime local)' do
+      expect(@config.layers).to eq(%w(instant runtime local))
+    end
+
+    it 'config.layer_add(layer) return nil if layer name already exist '\
+       'in layers' do
+      config = PRC::BaseConfig.new
+      layer = PRC::CoreConfig.define_layer(:name => 'instant',
+                                           :config => config)
+      expect(@config.layers).to eq(%w(instant runtime local))
+      expect(@config.layer_add layer).to equal(nil)
+      expect(@config.layers).to eq(%w(instant runtime local))
+    end
+
+    it "config['test'] = 'toto' is added in the 'instant' layer" do
+      @config['test'] = 'toto'
+      expect(@config.where?('test')).to eq(%w(instant))
+    end
+
+    it "config.layer_remove(:name => 'instant') return true" do
+      expect(@config.layer_remove(:name => 'instant')).to equal(true)
+    end
+
+    it "config.where?('test') return false - The layer is inexistent." do
+      expect(@config.where?('test')).to equal(false)
+    end
+
+    it "config.layer_remove(:name => 'runtime') return nil"\
+       ' - Unable to remove a layer not added at runtime' do
+      expect(@config.layers).to eq(%w(runtime local))
+      expect(@config.layer_remove(:name => 'runtime')).to equal(nil)
+      expect(@config.layers).to eq(%w(runtime local))
+    end
   end
 end

data/spec/11_lorj_config_spec.rb

@@ -251,7 +251,7 @@ describe 'class: Lorj::Config,' do
         # The defaults.yaml MUST have data exclusive set to true
         expect(@default.rh_get(:sections, :credentials, :data,
                                :account_exclusive)).to equal(true)
-        @config.meta_each do | section, key, value |
+        @config.meta_each do |section, key, value|
           expect(@default.rh_exist?(:sections, section, key)).to equal(true)
           expect(@default.rh_get(:sections, section, key)).to equal(value)
           expect([section, key,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,13 +127,30 @@ files:
 - Rakefile
 - bin/cloud_test.rb
 - example/students_1/process/students.rb
+- example/students_1/student_v1.md
 - example/students_1/students.rb
 - example/students_2/process/students.rb
+- example/students_2/student_v2.md
 - example/students_2/students.rb
 - example/students_3/controller/yaml_students.rb
-- example/students_3/controller/yaml_students_controller.rb
+- example/students_3/controller/yaml_students_code.rb
+- example/students_3/controller/yaml_students_def.rb
 - example/students_3/process/students.rb
+- example/students_3/student_v3.md
 - example/students_3/students.rb
+- example/students_4/controller/yaml_students.rb
+- example/students_4/controller/yaml_students_code.rb
+- example/students_4/controller/yaml_students_def.rb
+- example/students_4/process/students.rb
+- example/students_4/process/students/code/students.rb
+- example/students_4/process/students/definition/students.rb
+- example/students_4/student_v4.md
+- example/students_4/students.rb
+- example/students_5/controller/yaml_students.rb
+- example/students_5/controller/yaml_students_controller.rb
+- example/students_5/process/students.rb
+- example/students_5/student_v5.md
+- example/students_5/students.rb
 - example/yaml_students/students.rb
 - example/yaml_students/yaml_students.rb
 - lib/concept.md
@@ -183,6 +200,7 @@ files:
 - lib/lorj_account.rb
 - lib/lorj_config.rb
 - lib/lorj_defaults.rb
+- lib/overview.md
 - lib/prc.rb
 - lib/prc_base_config.rb
 - lib/prc_core_config.rb