lorj 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b033bdd31601389a91bf2772c3960307fdb7e2b
-  data.tar.gz: 73451dacdb51d7c898d43f3f4752ed4dd340cfad
+  metadata.gz: 87a576b3dc28cb49cdd93e91746117af62bc1be4
+  data.tar.gz: cba9b715107fdb921c4f5f7f5d3400f6f32ead93
 SHA512:
-  metadata.gz: c0807c1c536cf7bbccb7fc2fe224e7f136e29721bc3fe691339c3aad337f68ea6eeeef8728ce1b070cbe4483bf5e3d99f18361f6114ddd3e8831aa9db2a80c9a
-  data.tar.gz: bd5b1c98d312503272591359658e86b3a9a3fd280a0ca6623bfc86398273351afe50d332a269fb75f55bbd19371cd97772f0c9dd3549122aa881bcc430a1c23b
+  metadata.gz: f0c80f5d67e1239406e106e9f3748258f75e6856e098352154f86b93a5bda9d1a09d01b97c249b9ebdc57e00474d9748cb5bb964300901936c4908c39b0085c4
+  data.tar.gz: d0b3371678052bcfc7febbcd7c2052e7815a1d72f37ae445cf1b42f11ea80434fc0fdd54a0c2629bc68ec305415a3a9fb4b607d9ac5ae89cfc0eb06d5d89319f

data/bin/lorj_account_import.rb

@@ -22,18 +22,67 @@ require 'lorj'
 #  require 'ruby-debug'
 #  Debugger.start
 
+# Class to test encryted data.
+class Test < Lorj::BaseDefinition
+  def initialize(core)
+    @core = core
+  end
+
+  def self.def_internal(name)
+    spec_name = 's' + name
+
+    # To call the function identified internally with 'spec' prefix
+    define_method(spec_name) do |*p|
+      send(name, *p)
+    end
+  end
+
+  # Internal function to test.
+  def_internal '_get_encrypt_key'
+  def_internal '_get_encrypted_value'
+
+  def run
+    puts 'Checking imported account...'
+    tests = [:account_key_test]
+    tests.each { |t| send(t) if self.class.private_method_defined?(t) }
+  end
+
+  private
+
+  def account_key_test
+    entr = _get_encrypt_key
+    data = @core.config['credentials#account_key']
+
+    res = _get_encrypted_value(data, entr, 'credentials#account_key')
+
+    test_state(!res.nil?, 'Account key', data)
+  end
+
+  def test_state(res, test, value)
+    test_str = "#{test}. (#{value})"
+    if res
+      puts "OK   : #{test_str}"
+    else
+      puts "FAIL : #{test_str}"
+    end
+  end
+end
+
+# TODO: Implement Thor instead of ARGV use.
 if ARGV.length <= 3
   puts "Syntax is 'ruby #{__FILE__}' <LorjRef> <key> <CloudDataFile> "\
        "[<AccountName[@provider]>]\n"\
        "where:\n"\
        "LorjRef       : Lorj application struture to use. \n"\
-       "                Format: <datapath>=<process>[@<libToLoad]\n"\
+       '                Format: <datapath[|<pdatapath>]>='\
+       "<process>[@<libToLoad]\n"\
        "  datapath    : Path where Lorj store data.\n"\
+       "  pdatapath   : Path where Lorj store private data.\n"\
        "  process     : Lorj process name to load. It can be a path to a\n"\
-       '                process file.'\
+       "                process file.\n"\
        "  libToLoad   : Optional. Ruby library containing The Lorj process.\n"\
        "                If missing, it will try to load a lib named \n"\
-       '                lorj_<process>'\
+       "                lorj_<process>\n"\
        'key           : Base64 encoded key. Used to decrypt the <CloudDataFi'\
        "le>\n"\
        "CloudDataFile : File containing the Lorj cloud data to import.\n"\
@@ -45,20 +94,23 @@ end
 
 ref, key_encoded, data_file, account = ARGV
 
-ref_found = ref.match(/^(.*)=(.*?)(@(.*))?$/)
+ref_found = ref.match(/^(.*(\|(.*))?)=(.*?)(@(.*))?$/)
 
 unless ref_found
-  puts 'LorjRef must be formatted as : <datapath>=<process>[@<libToLoad]'
+  puts 'LorjRef must be formatted as : <datapath[|<pdatapath>]>='\
+       '<process>[@<libToLoad]'
   exit 1
 end
 
 datapath = ref_found[1]
-process = ref_found[2]
+pdatapath = datapath
+pdatapath = ref_found[3] unless ref_found[3].nil?
+process = ref_found[4]
 
-if ref_found[3].nil?
+if ref_found[6].nil?
   lib_name = "lorj_#{process}"
 else
-  lib_name = ref_found[4]
+  lib_name = ref_found[6]
 end
 
 unless File.exist?(data_file)
@@ -105,6 +157,7 @@ end
 name, controller = account.split('@') unless account.nil?
 
 PrcLib.data_path = datapath
+PrcLib.pdata_path = pdatapath
 
 keypath = Lorj::KeyPath.new(process)
 
@@ -114,15 +167,16 @@ core = Lorj::Core.new(Lorj::Account.new, processes)
 
 data = File.read(data_file).strip
 
-#  debugger # rubocop: disable Lint/Debugger
-
 core.account_import(entr, data, name, controller)
 
 puts 'Import done.'
 
-if core.config.ac_save
-  puts "Config imported and saved in #{core.config['account#name']}"
-  exit 0
+unless core.config.ac_save
+  puts 'Issue during configuration saved.'
+  exit 1
 end
-puts 'Issue during configuration saved.'
-exit 1
+puts "Config imported and saved in #{core.config['account#name']}"
+
+Test.new(core).run
+
+puts 'Import process done.'

data/lib/logging.rb

@@ -82,8 +82,6 @@ module PrcLib
   # For details, see Logging functions
   #
   class Logging
-    attr_reader :level
-
     # Initialize Logging instance
     # The log file name is defined by PrcLib.log_file
     # The log path is defined by PrcLib.app_name and will be kept as
@@ -96,7 +94,7 @@ module PrcLib
       file_logger_initialize
 
       @out_logger = Logger.new(STDOUT)
-      @level = (PrcLib.level.nil? ? Logger::WARN : PrcLib.level)
+      @level = Logger::WARN
       @out_logger.level = @level
       @out_logger.formatter = proc do |severity, _datetime, _progname, msg|
         case severity
@@ -169,6 +167,8 @@ module PrcLib
       @out_logger.level = level
     end
 
+    attr_reader :level
+
     # Print out a message, not logged in the log file. This message is printed
     # out systematically as not taking care of logger level.
     def unknown(message)
@@ -267,6 +267,10 @@ module PrcLib
     nil
   end
 
+  def level
+    log_object.level
+  end
+
   # Print the message to the same line.
   def state(message, *p)
     print(format("%s%s ...\r", ANSI.clear_line,

data/lib/lorj/compat.rb

@@ -86,7 +86,7 @@ module Base64
   # This method complies with RFC 4648.
   # No line feeds are added.
   def strict_encode64(bin)
-    [bin].pack('m0')
+    [bin].pack('m0').strip
   end
 
   # Returns the Base64-decoded version of +str+.

data/lib/lorj/version.rb

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

data/lib/lorj_account.rb

@@ -386,6 +386,8 @@ module Lorj
     # * *Raises* :
     #   Nothing
     def set(key, value, options = {})
+      options[:name] = 'runtime' unless options.key?(:name)
+
       parameters = validate_key_and_options(key, options)
       return nil if parameters.nil?
 

data/spec/10_lorj_log_spec.rb

@@ -74,8 +74,12 @@ describe 'Module: Lorj,' do
       expect(PrcLib.log_file).to eq(log)
     end
 
-    it 'create PrcLib.log object at first message' do
+    it 'set logger level' do
       PrcLib.level = Logger::FATAL
+      expect(PrcLib.level).to equal(Logger::FATAL)
+    end
+
+    it 'create PrcLib.log object at first message' do
       PrcLib.app_name = 'lorj-spec'
       PrcLib.app_defaults = File.join(File.dirname(app_path), 'lorj-spec')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorj
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler