lorj 1.0.12 → 1.0.13

data/lib/lorj/version.rb

@@ -16,6 +16,6 @@
 
 # Lorj version
 module Lorj
-  VERSION = '1.0.12'
-  DATE = '2015-06-15'
+  VERSION = '1.0.13'
+  DATE = '2015-06-22'
 end

data/lib/lorj.rb

@@ -48,6 +48,7 @@ require 'core/core_controller'     # Lorj core controller functions
 require 'core/core_object_data'    # Lorj ObjectData class
 require 'core/lorj_data'           # Lorj Lorj::Data object
 require 'core/lorj_basedefinition' # Lorj Lorj::BaseDefinition object
+require 'core/core_import_export'  # Import/export functions
 require 'core/lorj_baseprocess'    # Lorj Lorj::BaseProcess object
 require 'core/lorj_basecontroller' # Lorj Lorj::BaseController object
 require 'core/lorj_keypath'        # Lorj Lorj::BaseDefinition object

data/lib/lorj_account.rb

@@ -459,15 +459,31 @@ module Lorj
   # Defines Account exclusive functions
   class Account
     def ac_new(sAccountName, provider_name)
+      return nil if sAccountName.nil?
+      ac_erase
+      ac_update(sAccountName, provider_name)
+    end
+
+    # update Account protected data
+    # account name and provider name.
+    #
+    def ac_update(sAccountName, provider_name)
       return nil if sAccountName.nil?
       @account_name = sAccountName
       index = layer_index('account')
 
       account = @config_layers[index][:config]
-      account.erase
       account.ac_new sAccountName, provider_name
     end
 
+    def ac_erase
+      index = layer_index('account')
+
+      account = @config_layers[index][:config]
+      account.erase
+      true
+    end
+
     # Load Account Information
     def ac_load(sAccountName = @account_name)
       @account_name = sAccountName unless !sAccountName.nil? &&

data/lorj-spec/cache/.key

@@ -0,0 +1,2 @@
+LS0tCjprZXk6IDMyZG00ZmxqejYKOnNhbHQ6ICcxNDM0NTQ5NTQ2Jwo6aXY6
+IDE4QnUrRU4yUS9tWnVUdUNQcm1xUWc9PQo=

data/lorj-spec/data/accounts/test.yaml

@@ -0,0 +1,21 @@
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Account example file. The structure on this file is defined by
+:account:
+  :name: test
+  :provider: :mock
+:credentials:
+  :keypair_name: 'mykey'
+  :key: 'txE/s8KgWVaYZjYkGIZ3yA=='

data/lorj-spec/data/config.yaml

@@ -0,0 +1,15 @@
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+---
+:default:

data/lorj-spec/process/mock/data.yaml

@@ -0,0 +1,39 @@
+# (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+# Sample of Object data model definition for :mock process
+:setup:
+  - :desc: 'Step 1'
+    :explanation: |-
+      My complete explanation is in
+      multiline <%= config['text'] %>
+  - :desc: 'Step 2'
+    :add:
+     - :data
+
+:sections:
+  :credentials:
+    :keypair_name:
+    :data:
+      :account_exclusive: true
+    :key:
+      :desc: 'An encrypted key data'
+      :encrypted: true
+  :maestro:
+    :maestro_url:
+  :lorj_default:
+    :default_case:
+      :default_value: 'success'
+    :default_case2:
+      :default_value: 'incorrect - meta-default value'

data/lorj-spec/process/mock/defaults.yaml

@@ -20,23 +20,3 @@
   :default_case2: 'success'
 :description:
   :FORJ_HPC: Testing extra application default value.
-:setup:
-  - :desc: 'Step 1'
-    :explanation: |-
-      My complete explanation is in
-      multiline <%= config['text'] %>
-  - :desc: 'Step 2'
-    :add:
-     - :data
-:sections:
-  :credentials:
-    :keypair_name:
-    :data:
-      :account_exclusive: true
-  :maestro:
-    :maestro_url:
-  :lorj_default:
-    :default_case:
-      :default_value: 'success'
-    :default_case2:
-      :default_value: 'incorrect - meta-default value'

data/lorj.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
     '--title Lorj - The Process Controllers framework system' << \
     '--main README.md'
 
-  spec.add_runtime_dependency 'config_layers', '~>0.1.4'
+  spec.add_runtime_dependency 'config_layers', '~>0.1.5'
   spec.add_runtime_dependency 'highline', '~> 1.6.21'
   spec.add_runtime_dependency 'ansi', '>= 1.4.3'
   spec.add_runtime_dependency 'encryptor', '1.3.0'

data/spec/05_lorj_keypath_spec.rb

@@ -15,12 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
-
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib/core')
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
-require 'lorj'
+app_path = File.dirname(__FILE__)
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'Lorj::KeyPath' do
   context '.new(:test)' do

data/spec/06_lorj_object_data_spec.rb

@@ -15,12 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
-
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib/core')
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
-require 'lorj'
+app_path = File.dirname(__FILE__)
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'Lorj::ObjectData' do
   context 'initialize with internal false' do

data/spec/09_prc_spec.rb

@@ -15,23 +15,47 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-#  require 'byebug'
-
-require 'rubygems'
-require 'spec_helper'
+# This spec manipulate Lorj and PrcLib module
+#
+# In the context on a complete rspec run (rake spec)
+# modules required are loaded once only.
+# So, PrcLib will need to be reloaded (load) with the spec addon.
+
+# spec_helper added:
+# PrcLib.spec_cleanup, to simply cleanup the library loaded.
+# This is easier than unload module and reload them later with load from all
+# Files which update PrcLib.
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
 app_path = File.dirname(__FILE__)
-$LOAD_PATH << File.join(app_path, '..', 'lib')
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'Module PrcLib: ' do
   after(:all) do
     Object.send(:remove_const, :PrcLib)
     load File.join(app_path, '..', 'lib', 'prc.rb') # Load prc
     load File.join(app_path, '..', 'lib', 'logging.rb') # Load logging
+    load File.join(app_path, '..', 'lib', 'lorj.rb') # Load prc
+    load File.join(app_path, 'spec_helper.rb') # Reload spec PrcLib addon
   end
 
   it 'load Lorj and PrcLib Modules' do
-    require 'lorj' # Load lorj framework
     expect(Lorj).to be
     expect(PrcLib).to be
   end
@@ -42,6 +66,7 @@ describe 'Module PrcLib: ' do
   end
 
   it 'default app is lorj and cannot be updated.' do
+    PrcLib.spec_cleanup
     expect(PrcLib.app_name).to eq('lorj')
     PrcLib.app_name = 'lorj-spec'
     expect(PrcLib.app_name).to eq('lorj')

data/spec/10_lorj_log_spec.rb

@@ -15,12 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
-
-app_path = File.dirname(File.dirname(__FILE__))
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+app_path = File.dirname(__FILE__)
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 # This spec HAVE to the the first one executed!
 # Do never create a file or rename this file, which will
@@ -42,7 +56,7 @@ describe 'Module: Lorj,' do
     end
 
     it 'PrcLib module exist' do
-      require 'lorj' # Load lorj framework
+      #  require 'lorj' # Load lorj framework
       expect(PrcLib.class).to equal(Module)
 
       expect(PrcLib.log).to be_nil
@@ -63,7 +77,7 @@ describe 'Module: Lorj,' do
     it 'create PrcLib.log object at first message' do
       PrcLib.level = Logger::FATAL
       PrcLib.app_name = 'lorj-spec'
-      PrcLib.app_defaults = File.join(app_path, 'lorj-spec')
+      PrcLib.app_defaults = File.join(File.dirname(app_path), 'lorj-spec')
 
       PrcLib.debug 'Rspec logging ...'
 

data/spec/11_lorj_defaults_spec.rb

@@ -15,14 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
 app_path = File.dirname(__FILE__)
-
-$LOAD_PATH << File.join(app_path, '..', 'lib')
-
-require 'lorj' # Load lorj framework
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'class: Lorj::Default loaded lorj_spec/defaults.yaml, '\
          'no controller data,' do

data/spec/12_lorj_config_spec.rb

@@ -15,14 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
 app_path = File.dirname(__FILE__)
-
-$LOAD_PATH << File.join(app_path, '..', 'lib')
-
-require 'lorj' # Load lorj framework
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'class: Lorj::Config,' do
   context 'new instance, with no default local config files, ' do

data/spec/13_lorj_account_spec.rb

@@ -15,14 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
 app_path = File.dirname(__FILE__)
-
-$LOAD_PATH << File.join(app_path, '..', 'lib')
-
-require 'lorj' # Load lorj framework
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'class: Lorj::Account,' do
   context 'Lorj::Account.new,' do
@@ -217,6 +229,13 @@ describe 'class: Lorj::Account,' do
       expect(@account.where?(:data)).to eq(%w(runtime account))
     end
 
+    it 'account.ac_erase return true, and :data disappeared.' do
+      expect(@account.ac_erase).to equal(true)
+      expect(@account.where?(:data)).to eq(%w(runtime))
+      expect(@account.ac_load 'test1').to equal(true)
+      expect(@account.where?(:data)).to eq(%w(runtime account))
+    end
+
     it "account.get(:keypair_name, :name => 'account') return "\
        "saved 'nova_test2'" do
       expect(@account.get(:keypair_name, nil,

data/spec/20_lorj_meta_spec.rb

@@ -15,14 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
 app_path = File.dirname(__FILE__)
-
-$LOAD_PATH << File.join(app_path, '..', 'lib')
-
-require 'lorj' # Load lorj framework
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'Lorj::MetaAppConfig,' do
   context 'core with sample initialized,' do
@@ -57,11 +69,12 @@ YAMLDOC
           p_get(options)
         end
       end
-      stop
+
       @metadata = MetaAppConfigSpec.new YAML.load(data)
     end
 
     it 'sections returns [:section1, :section2].' do
+      # Ruby 1.8 requires to use sort, as Hash do not have order garantee
       expect(@metadata.sections.sort).to eq([:section1, :section2, :section3])
     end
 
@@ -70,11 +83,13 @@ YAMLDOC
     end
 
     it 'sections(:data2) returns [:section1, :section2].' do
+      # Ruby 1.8 requires to use sort, as Hash do not have order garantee
       expect(@metadata.sections(:data2).sort).to eq([:section1, :section2])
     end
 
     it 'datas returns [:data1, :data2, :data3].' do
-      expect(@metadata.datas).to eq([:data1, :data2, :data3])
+      # Ruby 1.8 requires to use sort, as Hash do not have order garantee
+      expect(@metadata.datas.sort).to eq([:data1, :data2, :data3].sort)
     end
 
     if /1\.8/ =~ RUBY_VERSION
@@ -160,6 +175,7 @@ YAMLDOC
       expect(@metadata[:sections, :section2, :data2, :option2]).to eq('value3')
       expect(@metadata.define_controller_data(:section2,
                                               :data2, data)).to eq(data)
+      # Ruby 1.8 requires to use sort, as Hash do not have order garantee
       expect(@metadata.sections(:data2).sort).to eq([:section1, :section2])
       expect(@metadata[:sections, :section2, :data2, :option2]).to eq(:value4)
     end

data/spec/21_lorj_processes_spec.rb

@@ -15,14 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
 app_path = File.dirname(__FILE__)
-
-$LOAD_PATH << File.join(app_path, '..', 'lib')
-
-require 'lorj' # Load lorj framework
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'Lorj::Process,' do
   context 'Lorj::ProcessResource,' do

data/spec/22_lorj_core_spec.rb

@@ -15,14 +15,26 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'spec_helper'
+# To debug spec, depending on Ruby version, you may need to install
+# 1.8 => ruby-debug
+# 1.9 => debugger
+# 2.0+ => byebug
+# The right debugger should be installed by default by bundle
+# So, just call:
+#
+#     bundle
+#
+# Then set RSPEC_DEBUG=true, put a 'stop' where you want in the spec code
+# and start rspec or even rake spec.
+#
+#     RSPEC_DEBUG=true rake spec_local (or spec which includes docker spec)
+# OR
+#     RSPEC_DEBUG=true rspec -f doc --color spec/<file>_spec.rb
+#
 
 app_path = File.dirname(__FILE__)
-
-$LOAD_PATH << File.join(app_path, '..', 'lib')
-
-require 'lorj' # Load lorj framework
+$LOAD_PATH << app_path unless $LOAD_PATH.include?(app_path)
+require 'spec_helper'
 
 describe 'Lorj::Core,' do
   context 'Using lorj-spec process, ' do
@@ -36,6 +48,7 @@ describe 'Lorj::Core,' do
   it 'Lorj::Core.new(nil, :mock) return an error' do
     expect { Lorj::Core.new(nil, :mock) }.to raise_error(Lorj::PrcError)
   end
+
   it 'Lorj::Core.new(nil, [{ :process_module => :mock}]) gets loaded.' do
     expect(core = Lorj::Core.new(nil, [{ :process_module => :mock }])).to be
     expect(core.config).to be