forj 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613daa28b3ba9524c23beed49420d1893e909c24
-  data.tar.gz: da633b67dda381136608a689d9c47c484d5618c7
+  metadata.gz: 312576a6319c822544600e056e1c8cf131d6b14e
+  data.tar.gz: 7cb0109cb4327892975a9e80d1dd9a67dd69c939
 SHA512:
-  metadata.gz: dbddb2c23bf804063c3106a646d08985c685dfc0b30363825bcda8b645534b7f09fec7a08c528bc0879bd9f8f38950cf054bab790fb069d6c1424a37411881eb
-  data.tar.gz: 5e8fcd27a45a2ce4153e699c5b70522637749f0fdb41460ed6f2d86bd98f33120869ec8b336cff7936ae8e822bb5f8deed187f5eb9beddab775c2f4a534a9f80
+  metadata.gz: dbae1414fa3b0417da43eb8b19945ba249aa62f348ae7cf3285a21d1ac9f64ac138a4f89b57373a82d0106a042e94e9f158be24ff10359fb8073381e42212bb0
+  data.tar.gz: e7fbb5342219e1b81b6e7dcecb98b113b200419aa2e6b4825bcb6ae90fe63316df267c2d518e566337339c8fcfaf139e1583b98c666e764eadb6949b6dc56d0a

data/Gemfile

@@ -18,23 +18,3 @@
 source 'https://rubygems.org'
 
 gemspec
-# group(:development, :test) do
-#  gem 'rake'
-#  gem 'debugger'
-#  gem 'byebug'
-#  gem 'rspec', "~> 3.1.0", :require => false
-# end
-
-# if updating here, update forj.gemspec as well, to be coherent.
-# gem 'mime-types','1.25.1'
-# gem 'excon','0.31.0'
-# gem 'json','1.7.5'
-# gem 'nokogiri','1.5.11'
-# gem 'fog', '1.19.0'
-# gem 'git', '>=1.2.7'
-# gem 'rainbow'
-# gem 'thor', '>=0.16.0'
-# gem 'highline','>=1.6.21'
-# gem 'ansi','>=1.4.3'
-# gem 'encryptor','>=1.3.0'
-# gem 'bundler', '1.7.3'

data/bin/forj

@@ -16,8 +16,6 @@
 #    limitations under the License.
 
 require 'rubygems'
-#  require 'debugger' # Use to debug with Ruby < 2.0
-#  require 'byebug'   # Use to debug with Ruby >= 2.0
 require 'bundler/setup'
 require 'thor'
 require 'ansi'
@@ -45,6 +43,8 @@ require 'forj-settings.rb' # Settings features
 class ForjThor < Thor
   class_option :debug,   :aliases => '-d', :desc => 'Set debug mode'
   class_option :verbose, :aliases => '-v', :desc => 'Set verbose mode'
+  class_option :quiet,   :aliases => '-q', :desc => 'Set quiet mode'
+  class_option :real_quiet, :desc => 'Set REAL quiet mode (errors/fatal only)'
   class_option :config,  :aliases => '-c', :desc => 'Path to a different forj'\
     ' config file. By default, use ~/.forj/config.yaml'
   class_option :lorj_debug, :desc => 'Set lorj debug level verbosity. 1 to 5.'\
@@ -178,6 +178,10 @@ If you want to check/updated them, use `forj get [-a account]`
                                          ' your cloud'
   method_option :ca_root_cert,  :desc => 'Certificate Authorities file used by'\
     ' your compagny to authenticate your intranet servers.'
+  method_option :disable_lorj, :type => :boolean,
+                               :desc => 'If set, Maestro - gardener (Cloud'\
+    ' management) will use internal FOG cloud implementation to build your '\
+    'forge. By default, Maestro gardener delegate this task to Lorj_cloud.'
 
   def boot(blueprint, on_or_name, old_accountname = nil, as = nil,
            old_name = nil)

data/forj.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.name        = 'forj'
   s.homepage = 'https://www.forj.io'
 
-  s.version     = '1.0.14'
-  s.date        = '2015-06-05'
+  s.version     = '1.0.15'
+  s.date        = '2015-06-24'
   s.summary     = 'forj command line'
   s.description = 'forj cli - See https://www.forj.io for documentation/information'
 
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://forj.io'
   s.license     = 'Apache License, Version 2.0.'
   s.post_install_message = 'Go to docs.forj.io for more information on how to use forj cli'
-  s.required_ruby_version = '>= 1.8.5'
+  s.required_ruby_version = '>= 1.9.3'
 
   s.bindir = 'bin'
 
@@ -51,11 +51,19 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '1.7.5'
   s.add_runtime_dependency 'bundler'
   s.add_runtime_dependency 'nokogiri','1.5.11'
-  s.add_runtime_dependency 'lorj_cloud', '~> 0.1.1'
+  s.add_runtime_dependency 'lorj_cloud', '>= 0.1.4'
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.1.0"
-  s.add_development_dependency "rubocop", ">=0.30.0"
+  if RUBY_VERSION.match(/1\.8/)
+    s.add_development_dependency "ruby-debug"
+  elsif RUBY_VERSION.match(/1\.9/)
+    s.add_development_dependency "debugger"
+    s.add_development_dependency "rubocop", ">= 0.30.0"
+  else
+    s.add_development_dependency "byebug"
+    s.add_development_dependency "rubocop", ">= 0.30.0"
+  end
   s.rdoc_options << '--title' << 'Lorj - The Process Controllers framework system' <<
   '--main' << 'README.md'
 end

data/lib/appinit.rb

@@ -43,3 +43,20 @@ module Forj
     @file_version = v unless @file_version
   end
 end
+
+if ENV['RUBY_DEBUG'] == 'true'
+  if /1\.8/ =~ RUBY_VERSION
+    require 'ruby-debug'
+    Debugger.start
+    alias stop debugger # rubocop: disable Style/Alias
+  elsif /1\.9/ =~ RUBY_VERSION
+    require 'debugger'
+    alias stop debugger # rubocop: disable Style/Alias
+  else
+    require 'byebug'
+    alias stop byebug # rubocop: disable Style/Alias
+  end
+else
+  def stop
+  end
+end

data/lib/boot.rb

@@ -53,8 +53,8 @@ module Forj
 
     def self.load_options(options, options_map)
       options_map.each do |opt_key, ac_key|
-        if options.key?(opt_key.to_s)
-          value = yield(opt_key, options[opt_key.to_s])
+        if options.key?(opt_key)
+          value = yield(opt_key, options[opt_key])
           @account.set(ac_key, value) unless value.nil?
         end
       end
@@ -100,8 +100,6 @@ module Forj
       end
     end
   end
-  # rubocop: disable Metrics/CyclomaticComplexity
-  # rubocop: disable Metrics/MethodLength
 
   #
   module Boot
@@ -127,8 +125,8 @@ module Forj
                      @account[:account_name], @account[:account_name])
       end
 
-      options['tb_path'] = nil if options.key?('test_box') &&
-                                  !options.key?('tb_path')
+      options[:tb_path] = nil if options.key?(:test_box) &&
+                                 !options.key?(:tb_path)
       options_map = { :infra          => :infra_repo,
                       :key_name       => :keypair_name,
                       :key_path       => :keypair_path,
@@ -142,7 +140,9 @@ module Forj
                       :tb_path        => :test_box_path,
                       :ca_root_cert   => :ca_root_cert,
                       :extra_metadata => :extra_metadata,
-                      :webproxy       => :webproxy }
+                      :webproxy       => :webproxy,
+                      :disable_lorj   => :lorj_disabled
+                    }
 
       load_options(options, options_map) { |k, v| complete_boot_options(k, v) }
 
@@ -157,7 +157,13 @@ module Forj
                             @account[:instance_name],
                             PrcLib.log_file)
 
-      o_cloud.create(:forge)
+      o_cloud.create(:forge,
+                     :server_name    => "maestro.#{@account[:instance_name]}",
+                     :image_name     => @account['maestro#image_name'],
+                     :flavor_name    => @account['maestro#flavor_name'],
+                     :network_name   => @account['maestro#network_name'],
+                     :security_group => @account['maestro#security_group'],
+                     :ports          => @account[:ports])
     end
   end
   # rubocop: enable Metrics/CyclomaticComplexity
@@ -182,8 +188,13 @@ module Forj
     def self.tb_repo_detect(paths)
       res = {}
       paths.each do |path|
+        PrcLib.debug("tb_repo_detect: checking #{path}")
         cmd = <<-CMD
 cd "#{path}"
+if [ $? -ne 0 ]
+then
+  exit 1
+fi
 git rev-parse --show-toplevel 2>/dev/null 1>&2
 if [ $? -ne 0 ]
 then
@@ -203,11 +214,22 @@ pwd
         # Ruby bug. tested with:
         # ruby 2.0.0p353 (2013-11-22 revision 43784) [x86_64-linux]
         # rubocop: disable Style/SpecialGlobalVars
-        next unless $?.exitstatus == 0
+        unless $?.exitstatus == 0
+          PrcLib.warning("tb_repo_detect: #{path} seems not to be a GIT "\
+                         "repo.\n"\
+                         "#{cmd_res.join("\n")}")
+          next
+        end
         # rubocop: enable Style/SpecialGlobalVars
         repo_found = cmd_res[0].match(%r{.*/(.*)(.git)?})
-        next unless repo_found
+        unless repo_found
+          PrcLib.warning("tb_repo_detect: Unable to find the repo path.\n"\
+                         "#{cmd_res.join("\n")}")
+
+          next
+        end
         res[repo_found[1]] = cmd_res[1]
+        PrcLib.debug("tb_repo_detect: FOUND #{cmd_res[1]}")
       end
       res
     end
@@ -228,6 +250,7 @@ pwd
                        'test-box is disabled.', script)
           return nil
         end
+        PrcLib.debug("tb_repo_detect: FOUND #{script_found}")
         return script_found
       end
 
@@ -237,6 +260,7 @@ pwd
         script_found = tb_check_bin(path)
         break unless script_found.nil?
       end
+      PrcLib.debug("tb_repo_detect: FOUND #{script_found}")
 
       script_found
     end

data/lib/cloud_test.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-# require 'byebug'
-
 APP_PATH = File.dirname(__FILE__)
 LIB_PATH = File.expand_path(File.join(File.dirname(APP_PATH), 'lib'))
 

data/lib/forj-settings.rb

@@ -26,6 +26,9 @@ module Forj
         PrcLib.debug('Thor options converted to use Symbol instead of String '\
                      'in keys')
       end
+      PrcLib.level = Logger::INFO
+      PrcLib.level = Logger::ERROR if opts[:real_quiet]
+      PrcLib.level = Logger::WARN if opts[:quiet]
       PrcLib.level = Logger::INFO if opts[:verbose]
       PrcLib.level = Logger::DEBUG if opts[:debug]
       unless opts[:lorj_debug].nil?
@@ -33,6 +36,7 @@ module Forj
         PrcLib.level = Logger::DEBUG
       end
       latest_version?(opts[:account_name]) if opts[:account_name]
+
       opts
     end
 
@@ -47,7 +51,10 @@ module Forj
                    account_name) \
                    unless config.latest_version?('account')
     end
+  end
 
+  # This module helps you to setup your forge's account
+  module Settings
     def self.account_show_all(account_name)
       config = Lorj::Account.new
 

data/lib/process/forj_core/data.yaml

@@ -27,10 +27,22 @@
     :gardener_config:
       :desc:    "Maestro gardener Cloud configuration:"
       :explanation:        |-
-        Maestro gardener is currently configured to access your cloud Compute service with fog openstack.
-        Fog openstack is compatible with hpcloud services
+        Maestro gardener is currently the layer used by Maestro to access your cloud.
 
-        It requires the openstack uri, project name, user and password.
+        First versions of gardener call directly the Openstack API from FOG for compute/network
+        and call directly hpcloud FOG API to manage DNS records.
+
+        The new gardener version, now implements an agnostic cloud library called 'Lorj_cloud'
+        and replace the Openstack FOG API with compute/network.
+
+        The DNS management will be replaced as well in next version of gardener.
+
+        'Lorj_cloud' is used as the default compute/network cloud management.
+        As those changes are in transition, the old gardener behavior has been kept and can be re-enabled.
+        See 'lorj_disabled' paramater in 'forj get/set' or --disable-lorj from cli.
+
+        In order to switch easily on Maestro between FOG <=> LORJ_CLOUD, setup
+        will still requires the openstack uri, project name, user and password.
     :bp_config:
       :desc:    "Maestro and blueprint configuration:"
     :maestro_access_config:
@@ -202,6 +214,9 @@
       :validate:        !ruby/regexp /^\w?\w*$/
       :default_value:   "forj"
       :ask_step:        :maestro_config
+    :ports:
+      :desc:            "Ports open in the security groups given."
+      :default_value:   [22, 80, 443, 3000, 3131-3135, 4505-4506, 5000, 5666, 8000, 8080-8081, 8083, 8125, 8139-8140, 8773-8776, 9292, 29418, 35357]
     :maestro_repo:
       :desc:       "To use a different Maestro repository already cloned."
     :infra_repo:
@@ -274,7 +289,9 @@
       :desc:            "Additional bootstrap directories (separated by space) to add in the bootstrap loop."
     :bootstrap_extra_dir:
       :desc:            "Additional bootstrap directory to add in the bootstrap loop, before :bootstrap_dirs and after maestro default bootstrap directory."
-
+    :lorj_disabled:
+      :desc:            "True if maestro gardener by default will use FOG to access the cloud. Otherwise, it will use LORJ_CLOUD."
+      :default_value:   false
 
   # Defines certificates
 

data/lib/process/forj_core/process/declare.rb

@@ -41,9 +41,14 @@ class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
   obj_needs :data,         :infra_repo
   obj_needs :data,         :branch
 
+  # ******************* Lorj_cloud account
+  define_obj :lorj_account,
+             :create_e => :build_lorj_account
+
+  obj_needs :data, 'maestro#lorj_disabled'
+
   # ******************* metadata object
   define_obj :metadata,
-
              :create_e => :build_metadata
 
   obj_needs :data,   :instance_name
@@ -63,6 +68,8 @@ class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
   obj_needs :data,   'credentials#account_id'
   obj_needs :data,   'credentials#account_key'
   obj_needs :data,   'credentials#auth_uri'
+  obj_needs :data,   :server_name
+  obj_needs :CloudObject, :lorj_account
   obj_needs_optional
 
   obj_needs :data,   'network#webproxy'
@@ -105,6 +112,8 @@ class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
   obj_needs :data,        'maestro#flavor_name',    :for => [:create_e]
   obj_needs :data,        'maestro#network_name',   :for => [:create_e]
   obj_needs :data,        'maestro#security_group', :for => [:create_e]
+  obj_needs :data,        :ports,                   :for => [:create_e]
+  obj_needs :CloudObject, :lorj_account,            :for => [:create_e]
 
   obj_needs_optional
   obj_needs :CloudObject,  :server
@@ -121,6 +130,9 @@ class Lorj::BaseDefinition # rubocop: disable Style/ClassAndModuleChildren
   # Adding support of ca-root-cert file to send out.
   obj_needs :data,      'certs#ca_root_cert', :for => [:create_e]
 
+  # Lorj_disabled support
+  obj_needs :data,   'maestro#lorj_disabled', :for => [:create_e]
+
   # Defines how cli will control FORJ features
   # boot/down/ssh/...
 

data/lib/process/forj_core/process/forj_process.rb

@@ -53,6 +53,7 @@ class ForjCoreProcess
     maestro_create_status(s_status)
 
     o_address = hParams.refresh[:public_ip, :ObjectData]
+    o_address = Lorj::Data.new if o_address.nil?
 
     s_status = active_server?(server, o_address, boot_options[:keys],
                               boot_options[:coherent], s_status)
@@ -69,11 +70,7 @@ class ForjCoreProcess
     o_forge = process_get(sObjectType, config[:instance_name])
     if o_forge.empty? || o_forge[:servers].length == 0
       PrcLib.high_level_msg("\nBuilding your forge...\n")
-      process_create(:internet_server,
-                     :image_name => hParams['maestro#image_name'],
-                     :flavor_name => hParams['maestro#flavor_name'],
-                     :network_name => hParams['maestro#network_name'],
-                     :security_group => hParams['maestro#security_group'])
+      process_create(:internet_server)
       o_forge[:servers, 'maestro'] = hParams.refresh[:server]
     else
       o_forge = load_existing_forge(o_forge, hParams)
@@ -88,7 +85,8 @@ class ForjCoreProcess
     if o_server
       query = { :server_id => o_server[:id] }
       register(o_server)
-      o_ip = process_query(:public_ip, query)
+      o_ip = process_query(:public_ip, query,
+                           :network_name   => hParams['maestro#network_name'])
       register(o_ip[0]) if o_ip.length > 0
     else
       PrcLib.high_level_msg("\nYour forge exist, without maestro." \
@@ -160,6 +158,8 @@ class ForjCoreProcess
                      keypair_coherent, s_status
                     )
     if o_server[:attrs][:status] == :active
+      return :assign_ip if o_address[:public_ip].nil?
+
       image = server_get_image o_server
 
       s_msg = format('Your forj Maestro server is up and running and is '\
@@ -195,8 +195,6 @@ class ForjCoreProcess
   end
 end
 
-# rubocop:disable Metrics/ClassLength
-
 # Functions for boot - build_forge
 class ForjCoreProcess
   # TODO: Rewrite this function to break it for rubocop.
@@ -285,12 +283,13 @@ class ForjCoreProcess
       if s_status == :starting
         s_status = :assign_ip if o_server[:status] == :active
       elsif s_status == :assign_ip
-        s_status = assign_ip_boot(o_address, boot_options, s_status, o_server)
+        s_status = assign_ip_boot(o_address, boot_options, s_status, o_server,
+                                  hParams)
       else # analyze the log output
         output_options = { :status => s_status, :error => m_cloud_init_error,
                            :old_log => o_old_log, :cur_act => i_cur_act
         }
-        output_options = analyze_log_output(output_options, s_status)
+        output_options = analyze_log_output(output_options, s_status, hParams)
         s_status = output_options[:status]
         m_cloud_init_error = output_options[:error]
         o_old_log = output_options[:old_log]
@@ -298,6 +297,7 @@ class ForjCoreProcess
 
         tb_detect(hParams, o_old_log)
         ca_root_detect(hParams, o_old_log)
+        lorj_detect(hParams, o_old_log, boot_options)
 
         if pending_count == 60
           image = server_get_image o_server
@@ -356,7 +356,7 @@ end
 
 # Functions for boot - build_forge
 class ForjCoreProcess
-  def assign_ip_boot(o_address, boot_options, s_status, o_server)
+  def assign_ip_boot(o_address, boot_options, s_status, o_server, hParams)
     if o_address.empty?
       # To be able to ask for server IP assigned
       query_cache_cleanup(:public_ip)
@@ -368,8 +368,7 @@ class ForjCoreProcess
         o_address = o_addresses[0]
       end
     end
-
-    image = data_objects(:image, :ObjectData)
+    image = hParams.refresh[:image]
     s_msg = <<-END
 Public IP for server '%s' is assigned.
 Now, as soon as the server respond to the ssh port,
@@ -394,7 +393,7 @@ done
     s_status
   end
 
-  def analyze_log_output(output_options, s_status)
+  def analyze_log_output(output_options, s_status, hParams)
     o_log = process_get(:server_log, 25)
     return output_options if o_log.nil? || o_log.empty?
 
@@ -414,7 +413,8 @@ done
       )
     else
       # validate server status
-      output_options = analyze_server_status(s_status, log, output_options)
+      output_options = analyze_server_status(s_status, log,
+                                             output_options, hParams)
     end
     output_options
   end
@@ -446,7 +446,7 @@ end
 
 # Functions for boot - build_forge
 class ForjCoreProcess
-  def analyze_server_status(s_status, o_log, output_options)
+  def analyze_server_status(s_status, o_log, output_options, _hParams)
     if s_status == :cloud_init &&
        /cloud-init-nonet gave up waiting for a network device/ =~ o_log
       # Valid for ubuntu image 12.04
@@ -584,10 +584,10 @@ DNS_SECRET='#{hParams['credentials#account_key']}'
   def load_h_meta(hParams, hpcloud_priv)
     h_meta = {
       'flavor_name' => hParams['maestro#bp_flavor'],
-      'cdksite' => config.get(:server_name),
+      'cdksite' => hParams[:server_name],
       'cdkdomain' => hParams['dns#domain_name'],
       'eroip' => '127.0.0.1',
-      'erosite' => config.get(:server_name),
+      'erosite' => hParams[:server_name],
       'erodomain' => hParams['dns#domain_name'],
       'gitbranch' => hParams['maestro#branch'],
       'security_groups' => hParams['maestro#security_group'],
@@ -626,6 +626,7 @@ DNS_SECRET='#{hParams['credentials#account_key']}'
     tb_metadata(hParams, h_meta)
     ca_root_metadata(hParams, h_meta)
     proxy_metadata(hParams, h_meta)
+    lorj_metadata(hParams, h_meta)
 
     h_meta
   end
@@ -639,18 +640,20 @@ DNS_SECRET='#{hParams['credentials#account_key']}'
 
     hpcloud_priv = load_hpcloud(hParams, os_key)
 
-    config.set(
-      :server_name,
-      format('maestro.%s', hParams[:instance_name])
-    ) # Used by :server object
-
     h_meta = load_h_meta(hParams, hpcloud_priv)
 
     config.set(:meta_data, h_meta) # Used by :server object
 
     h_meta_printable = h_meta.clone
     h_meta_printable['hpcloud_priv'] = 'XXX - data hidden - XXX'
-    PrcLib.info("Metadata set:\n%s", h_meta_printable)
+    m_print = ''
+    max_key = 0
+    h_meta_printable.keys.each { |k| max_key = [max_key, k.length].max }
+    h_meta_printable.keys.sort.each do |k|
+      m_print += format("%-#{max_key}s : %s\n",
+                        k, ANSI.bold(h_meta_printable[k]))
+    end
+    PrcLib.info("Metadata set:\n%s", m_print)
 
     o_meta_data = register(h_meta, sObjectType)
     o_meta_data[:meta_data] = h_meta
@@ -945,7 +948,7 @@ class ForjCoreProcess
     ) unless File.exist?(mime)
   end
 
-  def build_userdata(sObjectType, hParams) # rubocop: disable Metrics/AbcSize
+  def build_userdata(sObjectType, hParams)
     # get the paths for maestro and infra repositories
     # maestro_path = hParams[:maestro_repository].values
     # infra_path = hParams[:infra_repository].values
@@ -1404,22 +1407,18 @@ class ForjCoreProcess
   def get_forge(sCloudObj, sForgeId, _hParams)
     s_query = {}
     servers = {}
-    s_query[:name] = sForgeId
+    s_query[:name] = Regexp.new("\\.#{sForgeId}$")
 
-    o_servers = process_query(:server, s_query)
-
-    regex =  Regexp.new(format('\.%s$', sForgeId))
+    o_servers = process_query(:server, s_query,
+                              :search_for => "for instance #{sForgeId}")
 
     o_servers.each do |o_server|
-      name = o_server[:name]
-      next unless regex =~ name
-
-      type = name.clone
+      type = o_server[:name].clone
       type['.' + sForgeId] = ''
       servers[type] = o_server
     end
     PrcLib.info('%s server(s) were found under instance name %s ',
-                servers.count, s_query[:name])
+                servers.count, sForgeId)
 
     o_forge = register({}, sCloudObj)
     o_forge[:servers] = servers

data/lib/process/forj_core/process/lorj_account.rb

@@ -0,0 +1,130 @@
+# encoding: UTF-8
+
+# (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.
+
+# Process to call lorj_export
+
+require 'lorj'
+
+# lorj_account process functions
+class ForjCoreProcess
+  def build_lorj_account(sObjectType, hParams)
+    data = {}
+
+    map = {
+      'credentials#auth_uri'     => {},
+      'credentials#account_id'   => {},
+      'credentials#account_key'  => {},
+      'credentials#tenant'       => {},
+      'credentials#keypair_name' => {},
+      'services#compute'         => {},
+      'services#network'         => {},
+      'maestro#image_name'       => { :keys => [:server, :image_name] },
+      'maestro#ssh_user'         => { :keys => [:server, :ssh_user] },
+      'maestro#flavor_name'      => { :keys => [:server, :flavor_name] },
+      'maestro#network_name'     => { :keys => [:server, :network_name] },
+      'maestro#security_group'   => { :keys => [:server, :security_group] },
+      'dns#domain_name'          => {},
+      'network#webproxy'         => {}
+    }
+
+    data[:key], data[:data] = account_export(map)
+    data_registered = register(data, sObjectType)
+    data_registered[:key] = Base64.strict_encode64(data[:key].to_yaml)
+    data_registered[:data] = data[:data]
+    enabled = !hParams['maestro#lorj_disabled'].is_a?(TrueClass)
+    data_registered[:enabled] = enabled
+    data_registered
+  end
+
+  def lorj_metadata(hParams, h_meta)
+    h_meta['lorj_enabled'] = hParams[:lorj_account, :enabled].to_s
+  end
+
+  def lorj_detect(hParams, log_output, keypair)
+    return unless hParams.exist?(:lorj_account, :data)
+
+    # the server must wait with 4 last lines in server log:
+    # [...] - forj-cli: lorj_tmp_file=[...] lorj_tmp_key=[...] flag_file=[...]
+    # [...] - build.sh: [...]
+    # [...] - forj-cli: Waiting for [...]
+    # [...] - On your workstation, [...]
+
+    re = /forj-cli: lorj_tmp_file=(.*) lorj_tmp_key=(.*) flag_file=(.*)/
+    res = log_output.split("\n")[-4].match(re)
+
+    return unless res
+    PrcLib.info('lorj: your box is waiting for your cloud data. '\
+                'One moment.')
+
+    # TODO : Add tb_ensure_ssh_config task to set this server in ~/.ssh/config.
+    # unless tb_ensure_ssh_config(hParams)
+    #  PrcLib.info('test-box: Unable to configure ssh config with this server.'\
+    #               ' You needs to do it yourself manually. Remote box boot '\
+    #               "process is waiting for #{test_box_dir}")
+    #   return
+    # end
+    PrcLib.warning('lorj: ssh config is currently not managed. You may '\
+                   "need to configure it yourself, otherwise forj won't "\
+                   'connect and transfert the data to the box.')
+
+    pubip = hParams[:public_ip, :public_ip]
+    user = hParams[:image, :ssh_user]
+    identity = File.join(keypair[:keypair_path], keypair[:private_key_name])
+    if keypair[:coherent]
+      ssh_options = '-o StrictHostKeyChecking=no -o ServerAliveInterval=180'
+      ssh_options += " -i #{identity}"
+      ssh_options += " #{user}@#{pubip}"
+      ssh_cmd = "echo \"#{hParams[:lorj_account, :data]}\" > #{res[1]}"
+      ssh_cmd += "; echo \"#{hParams[:lorj_account, :key]}\" > #{res[2]}"
+      ssh_cmd += "; touch \"#{res[3]}\""
+
+      # TODO: Implement testing branch warning. See build.sh lines 618 -> 632
+      cmd = "ssh #{ssh_options} '#{ssh_cmd}'"
+
+      PrcLib.info "Running following shell instructions:\n#{cmd}"
+
+      return if system(cmd)
+    end
+
+    msg <<-EOF
+Unable to copy Lorj data to the server '#{pubip}'. You need to do it yourself
+manually, now. To do it, execute following instructions:
+1. Connect to server #{pubip} as #{user}.
+   You need to find the proper way to connect to '#{pubip}' as the cloud keypair
+   found is not coherent with some local SSH keys in
+   #{PrcLib.data_path}/keypairs
+
+   Ex: ssh #{ssh_options}
+
+2. Create 2 files with the following data:
+   $ echo '#{hParams[:lorj_account, :data]}' > '#{res[1]}'
+   $ echo '#{hParams[:lorj_account, :key]}' > '#{res[2]}'
+
+3. touch the flag file
+   $ touch '#{res[3]}'
+
+4. Disconnect.
+   $ exit
+
+As soon as those instructions are done, Maestro should go on.
+    EOF
+
+    PrcLib.error msg
+    loop do
+      break if ask("When you are done, type 'DONE'") == 'DONE'
+    end
+  end
+end

data/lib/process/forj_core_process.rb

@@ -19,7 +19,7 @@ FORJCORE_PATH = File.expand_path(File.dirname(__FILE__))
 
 # Define model
 
-lorj_objects = %w(forj_process test_box ca_root_cert proxy declare)
+lorj_objects = %w(lorj_account forj_process test_box ca_root_cert proxy declare)
 
 lorj_objects.each do |name|
   load File.join(FORJCORE_PATH, 'forj_core', 'process', name + '.rb')

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.21
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: encryptor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
@@ -98,14 +98,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,56 +126,70 @@ dependencies:
   name: lorj_cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.30.0
 description: forj cli - See https://www.forj.io for documentation/information
@@ -186,9 +200,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitreview
-- .rubocop.yml
+- ".gitignore"
+- ".gitreview"
+- ".rubocop.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -211,6 +225,7 @@ files:
 - lib/process/forj_core/process/ca_root_cert.rb
 - lib/process/forj_core/process/declare.rb
 - lib/process/forj_core/process/forj_process.rb
+- lib/process/forj_core/process/lorj_account.rb
 - lib/process/forj_core/process/proxy.rb
 - lib/process/forj_core/process/test_box.rb
 - lib/process/forj_core_process.rb
@@ -231,25 +246,25 @@ licenses:
 metadata: {}
 post_install_message: Go to docs.forj.io for more information on how to use forj cli
 rdoc_options:
-- --title
+- "--title"
 - Lorj - The Process Controllers framework system
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.5
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: forj command line