forj 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a1fe0343f80a945b67a3f98b10b7f2b2f9c135
-  data.tar.gz: dcaee3a1b90afe832babe588437cdfdeab38a4cc
+  metadata.gz: 502bfc6edeb25b5ff031e55b707cb8c27800dcea
+  data.tar.gz: a58602925d8e68d05907eb3834d959e46b080bf1
 SHA512:
-  metadata.gz: 5de9a2ff618c7eb3f1c353a9245b950fa4f2606490d7577eec61ff17841819c5f2b3d1a5a93582356c95d4b62f8f163759b3035f8b1e47664466bcd691086ce9
-  data.tar.gz: 17f9f2bfe2e7dd40ae4b7f297a75e0c0b99ccdc1bfadf5cee980ec094e2b7476813bc01715816786ec21128b72a9c49d28db207b4c7a27ca954e763ee5e15776
+  metadata.gz: f6112e2d51cf46da0c29b44be1221135c8cff7b6cb631725c4c3bbc8204242b61f107865673cfa7ca8f242ffb136ad8a0af9079df0548b404ac7b06be96c42f0
+  data.tar.gz: 895f7bc30b598051e49612b21b54a3ded559dd06556a3475b131367ada6490c7da02604c53f9a20228fbcb078a85aae1b0f61734bdfb20a0bbe170ee7da0c0b1

data/.rubocop.yml

@@ -0,0 +1,59 @@
+# Copyright 2013 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.
+
+# use: rubocop --show-cops
+#      to validate configuration.
+# rubocop config
+AllCops:
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+  Exclude:
+    - 'docker/**/*'
+    - 'bin/scripts/**/*'
+    - 'git/**/*'
+    - 'tmp/**/*'
+#Documentation:
+#  Enabled: false
+#Metrics/LineLength:
+#  Max: 99
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# lets start with 40, but 10 is way to small..
+Metrics/MethodLength:
+  Max: 40
+# allow arguments to be longer than 15
+Metrics/AbcSize:
+  Max: 40
+# allow nested methods and classes definition
+ClassAndModuleChildren:
+  # EnforcedStyle: compact
+  Enabled: false
+
+# some files names gets an exception
+Style/FileName:
+  Exclude: ['Gemfile',
+            'lib/forj/process/ForjProcess.rb',
+            'lib/forj/ForjCore.rb',
+            'lib/forj/ForjCli.rb',
+            'lib/forj-settings.rb' ]
+
+# this project defines these globals
+Style/GlobalVars:
+  AllowedVariables: ['$RT_GEM_BIN',
+                     '$RT_VERSION_SPEC',
+                     '$FORJ_TEMP',
+                     '$RT_VERSION',
+                     '$RT_GEM_HOME']

data/Gemfile

@@ -18,24 +18,23 @@
 source 'https://rubygems.org'
 
 gemspec
-#group(:development, :test) do
+# group(:development, :test) do
 #  gem 'rake'
 #  gem 'debugger'
 #  gem 'byebug'
 #  gem 'rspec', "~> 3.1.0", :require => false
-#end
+# 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'
-
+# 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/Rakefile

@@ -15,17 +15,25 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'rubygems'
-require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 $stdout.sync = true
 $stderr.sync = true
 Bundler::GemHelper.install_tasks
 
-task :default => [:spec]
+task :default => [:lint, :spec]
 
 desc 'Run the specs.'
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/*_spec.rb'
+  t.rspec_opts = '-f doc'
+end
+
+desc 'Run RuboCop on the project'
+RuboCop::RakeTask.new(:lint) do |task|
+  task.formatters = ['progress']
+  task.verbose = true
+  task.fail_on_error = true
 end

data/bin/forj

@@ -16,84 +16,84 @@
 #    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 'debugger' # Use to debug with Ruby < 2.0
+# require 'byebug'   # Use to debug with Ruby >= 2.0
 require 'bundler/setup'
-#require 'require_relative'
 require 'thor'
 require 'ansi'
 
-$APP_PATH = File.dirname(File.dirname(__FILE__))
-$LIB_PATH = File.expand_path(File.join($APP_PATH, 'lib'))
+APP_PATH = File.dirname(File.dirname(__FILE__))
+LIB_PATH = File.expand_path(File.join(APP_PATH, 'lib'))
 
-require 'appinit.rb' # Load generic Application level function
+require 'lorj'
+PrcLib.app_name = 'forj'
+PrcLib.app_defaults = File.join(APP_PATH, 'forj')
 
 # Initialize forj paths
-AppInit::forj_initialize()
-
-require 'lorj' # Use lorj library for Cloud agnostics feature.
-
-PrcLib.app_name = 'forj'
-PrcLib.app_defaults = File.join($APP_PATH, 'forj')
+require 'appinit.rb' # Load Application settings features
+Forj.keypairs_path = File.join(PrcLib.data_path, 'keypairs')
+Forj.build_path = File.join(PrcLib.data_path, '.build')
 
 require 'forj-settings.rb' # Settings features
-require 'ssh.rb'
-
-
-$LIB_FORJ_DEBUG = 1 # less verbose
-
 
+# This is the main Forj class
+# it helps you to create and support your forge.
+# rubocop:disable ClassLength
 class ForjThor < Thor
-
   class_option :debug,   :aliases => '-d', :desc => 'Set debug mode'
   class_option :verbose, :aliases => '-v', :desc => 'Set verbose mode'
-  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. Default is one."
-
-
-  desc "help [action]", "Describe available FORJ actions or one specific action"
+  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.'\
+    'Default is one.'
+  desc 'help [action]', 'Describe available FORJ actions or one specific action'
   def help(task = nil, subcommand = false)
     if task
-       self.class.task_help(shell, task)
+      self.class.task_help(shell, task)
     else
-       puts <<-LONGDESC
+      puts <<-LONGDESC
 Quick steps: How to create a forj?
 ----------------------------------
 
 To test a forj blueprint, you will need an account on a cloud solution.
-Currently forj cli supports only HPHelion (https://horizon.hp.com) but will be expanded to support most of known clouds supported by FOG. (http://fog.io)
+Currently forj cli supports only HPHelion (https://horizon.hp.com) but will
+  be expanded to support most of known clouds supported by FOG. (http://fog.io)
 
 1.  Setup your FORJ account.
     `$ forj setup [AccountName] [--provider Provider]`
 
-    Ex: `forj setup MyForjAccount`. In this example, you will setup 'MyForjAccount' with your HPHelion account. The first time, this account will become the default one.
+    Ex: `forj setup MyForjAccount`. In this example:
+      You will setup 'MyForjAccount' with your HPHelion account.
+      The first time, this account will become the default one.
 
-**IMPORTANT NOTE** By default, forj setup will propose you to create your forge on HPHelion (provider 'hpcloud').
-If AccountName is not set, the account name will be proposed to be name 'hpcloud' as well!
+**IMPORTANT NOTE** By default, forj setup will propose you to create your forge
+  on HPHelion (provider 'hpcloud').
+If AccountName is not set, the account name will be proposed to be name
+  'hpcloud' as well!
 
 2.  Create your forge on your default account
     `$ forj boot <blueprint> <InstanceName>`
 
-    Ex: `forj boot redstone MyForge`. In this example, forj will create a `redstone` blueprint forge named `MyForge`, using the default `MyForjAccount`
+    Ex: `forj boot redstone MyForge`. In this example:
+      Forj will create a `redstone` blueprint forge named `MyForge`,
+      using the default `MyForjAccount`.
 
 forj command line details:
 --------------------------
        LONGDESC
-       self.class.help(shell, subcommand)
+      self.class.help(shell, subcommand)
     end
   end
 
-   desc 'version', 'get GEM version of forj.'
-
-   def version()
-      if Gem.loaded_specs['forj']
-         puts Gem.loaded_specs['forj'].version.to_s
-      end
-   end
+  desc 'version', 'get GEM version of forj.'
 
+  def version
+    puts Gem.loaded_specs['forj'].version.to_s if Gem.loaded_specs['forj']
+  end
 
-################################# BOOT
-  desc 'boot <blueprint> <InstanceName> [options]', 'boot a Maestro box and instruct it to provision the blueprint'
+  ################################# BOOT
+  desc 'boot <blueprint> <InstanceName> [options]', 'boot a Maestro box and' \
+    ' instruct it to provision the blueprint'
 
   long_desc <<-LONGDESC
 This task boot a new forge with the following options
@@ -102,239 +102,147 @@ This task boot a new forge with the following options
 
     Ex: forj boot redstone maestro_test -a dev
 
-When `forj boot` starts, some variables are loaded. If you want to check/updated them, use `forj get [-a account]`
+When `forj boot` starts, some variables are loaded.
+If you want to check/updated them, use `forj get [-a account]`
 
   LONGDESC
 
-  method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file.
-
-Following options superseed your Account, config file or forj defaults."
-  method_option :maestro_repo,     :aliases => '-m',   :desc => "config: maestro_repo  : To use a different Maestro repository already cloned.
-                                           By default, Maestro is systematically cloned to ~/.forj/maestro from github."
-  method_option :infra,            :aliases => '-r',   :desc => 'config: infra_repo    : Defines your Infra directory to use while booting. You can also set FORJ_INFRA_DIR.'
-  method_option :key_name,         :aliases => '-k',   :desc => "config: keypair_name  : Keypair name to use."
-  method_option :key_path,         :aliases => '-p',   :desc => "config: keypair_path  : Private or Public key file to use."
-  method_option :security_group,   :aliases => '-s',   :desc => "config: security_group: Security group name to use and configure."
-  method_option :image_name,       :aliases => '-i',   :desc => "config: image_name    : Image name to use to build Maestro and blueprint nodes."
-  method_option :maestro_flavor,   :aliases => '-f',   :desc => "config: flavor        : Maestro flavor to use."
-  method_option :bp_flavor,        :aliases => '-b',   :desc => "config: bp_flavor     : Blueprint nodes default flavor to use.
-
-Build system options:"
-  method_option :boothook,         :aliases => '-H',   :desc => 'By default, boothook file used is build/bin/build-tools/boothook.sh. Use this option to set another one.'
-  method_option :build,            :aliases => '-B',   :desc => 'Replace the default build.sh'
-  method_option :branch,           :aliases => '-R',   :desc => "Branch name to clone for maestro.
-
-Maestro/infra bootstrap debugging:"
-  method_option :test_box,         :aliases => '-T',   :desc => "Identify a path to become your test-box repository.
-                                           Ex: if your maestro is in ~/src/forj-oss, --test_box ~/src/forj-oss/maestro build.sh and
-                                               test-box will send your local maestro repo to your box, for boot."
-
-  def boot(blueprint, on_or_name, old_accountname = nil, as = nil, old_name = nil)
-      Forj::Settings.common_options(options)
-
-      oConfig = Lorj::Config.new(options[:config])
-
-      # depreciated: <BluePrint> on <AccountName> as <InstanceName>
-      if old_accountname and as and old_name
-         msg = "The syntax `forj boot '%s' on '%s' as '%s'` is depreciated.\nUse `forj boot '%s' '%s'" % [blueprint, old_accountname, old_name, blueprint, old_name]
-         if oConfig.get('account_name') == old_accountname
-            PrcLib.warning("%s` instead." % msg)
-         else
-            PrcLib.warning("%s -a '%s'` instead." % [msg, old_accountname])
-         end
-         name = old_name
-         oConfig.set(:account_name, old_accountname)
-      else
-         name = on_or_name
-      end
-
-      PrcLib.fatal( 1, "instance name '%s' not supported. Support only lower case, numeric and dash caracters." % [name]) if not (/^[\d[[:lower:]]-]+$/ =~ name)
-
-      # Options are added if they are set. Otherwise, get will retrieve the default value.
-      oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
-      oForjAccount = Lorj::Account.new(oConfig)
-      oForjAccount.ac_load()
-
-      oConfig.set(:infra_repo,     options[:infra])
-      oConfig.set(:keypair_name,   options[:key_name])
-      oConfig.set(:keypair_path,   options[:key_path])
-      oConfig.set(:security_group, options[:security_group])
-      oConfig.set(:image_name,     options[:image_name])
-      oConfig.set(:flavor,         options[:maestro_flavor])
-      oConfig.set(:bp_flavor,      options[:bp_flavor])
-      oConfig.set(:maestro_repo ,  options[:maestro_repo])
-      oConfig.set(:branch ,        options[:branch])
-      oConfig.set(:test_box, File.expand_path(options[:test_box])) if options[:test_box] and File.directory?(File.expand_path(options[:test_box]))
-
-      PrcLib.warning("test_box is currently disabled in this version. It will be re-activated in newer version.") if options[:test_box]
-
-      if options[:key_path]
-         mFound = options[:key_path].match(/^(.*)(\.pub)?$/)
-         if mFound
-            key_path = File.expand_path(mFound[1])
-            if mFound[2] and not File.exists?(File.expand_path(mFound[1]+mFound[2]))
-               PrcLib.fatal(1, "'%s' is not a valid keypair files. At least the public key (.pub) is have to exist.")
-            end
-            oConfig.set(:keypair_path, key_path)
-         else
-            PrcLib.fatal(1, "'%s' is not a valid keypair files. At least the public key (.pub) is have to exist.")
-         end
-      end
-      aProcesses = []
-
-      # Defines how to manage Maestro and forges
-      # create a maestro box. Identify a forge instance, delete it,...
-      aProcesses << File.join($LIB_PATH, 'forj', 'ForjCore.rb')
-
-      # Defines how cli will control FORJ features
-      # boot/down/ssh/...
-      aProcesses << File.join($LIB_PATH, 'forj', 'ForjCli.rb')
-
-      #oCloud = ForjCloud.new(oForjAccount, oConfig[:account_name], aProcesses)
-      oCloud = Lorj::CloudCore.new(oForjAccount, oConfig[:account_name], aProcesses)
-
-      oConfig[:instance_name] = name
-
-      if blueprint == 'maestro'
-         PrcLib.info("Starting boot process of '%s'. No blueprint requested." % oConfig[:instance_name])
-      else
-         oConfig[:blueprint] = blueprint
-         PrcLib.info("Starting boot process of '%s' with blueprint '%s'." % [oConfig[:instance_name], oConfig[:blueprint]])
-      end
-
-      PrcLib.high_level_msg ("Preparing your forge '%s'. Please be patient. more output in '%s'\n" % [oConfig[:instance_name], File.join($FORJ_DATA_PATH, "forj.log")])
-
-      oCloud.Create(:forge)
+  method_option :account_name,     :aliases => '-a',   :desc => 'Set the forj' \
+     ' account name to use. By default, uses the default account set in'      \
+     ' your local config file.' + "\n\n" + 'Following options superseed your' \
+     ' Account, config file or forj defaults.'
+  method_option :maestro_repo,     :aliases => '-m',   :desc => 'config: '    \
+    ' maestro_repo  : To use a different Maestro repository already'    \
+    ' cloned.' + "\n" + 'By default, Maestro is systematically cloned ' \
+    ' to ~/.forj/maestro from github.'
+  method_option :infra,            :aliases => '-r',   :desc => 'config:' \
+    ' infra_repo    : Defines your Infra directory to use while'    \
+    ' booting. You can also set FORJ_INFRA_DIR.'
+  method_option :key_name,         :aliases => '-k',   :desc => 'config:' \
+    ' keypair_name  : Keypair name to use.'
+  method_option :key_path,         :aliases => '-p',   :desc => 'config:' \
+    ' keypair_path  : Private or Public key file to use.'
+  method_option :security_group,   :aliases => '-s',   :desc => 'config:' \
+    ' security_group: Security group name to use and configure.'
+  method_option :image_name,       :aliases => '-i',   :desc => 'config:' \
+    ' image_name    : Image name to use to build Maestro and blueprint nodes.'
+  method_option :maestro_flavor,   :aliases => '-f',   :desc => 'config:' \
+    ' flavor        : Maestro flavor to use.'
+  method_option :bp_flavor,        :aliases => '-b',   :desc => 'config:' \
+    ' bp_flavor     : Blueprint nodes default flavor to use.'       \
+    + "\n\n" + ' Build system options:'
+  method_option :boothook,         :aliases => '-H',   :desc => 'By default, ' \
+    ' boothook file used is build/bin/build-tools/boothook.sh. '         \
+    ' Use this option to set another one.'
+  method_option :build,            :aliases => '-B',   :desc => 'Replace' \
+    ' the default build.sh'
+  method_option :branch,           :aliases => '-R',   :desc => 'Branch' \
+    'name to clone for maestro.' \
+    + "\n\n" + 'Maestro/infra bootstrap debugging:'
+  method_option :test_box,         :aliases => '-T',   :desc => 'Identify a' \
+    ' path to become your test-box repository.' \
+    "\n                                            " \
+    'Ex: if your maestro is in ~/src/forj-oss, --test_box' \
+    ' ~/src/forj-oss/maestro build.sh and' \
+    "\n                                            " \
+    'test-box will send your local maestro repo to your box, for boot.'
+
+  def boot(blueprint, on_or_name, old_accountname = nil, as = nil,
+           old_name = nil)
+    Forj::Settings.common_options(options)
+    require 'boot.rb'
+
+    deprecated_name = [old_accountname, as, old_name]
+
+    Forj::Boot.boot(blueprint, on_or_name, deprecated_name, options)
   end
 
-################################# Show defaults
-   desc 'show <Object> [name]', 'Show Object (default valuesr, account data, etc...) values.'
+  ################################# Show defaults
   long_desc <<-LONGDESC
-This command helps to show values used by 'forj' to boot a blueprint (account data, default values, etc...)
+This command helps to show values used by 'forj' to boot a blueprint
+(account data, default values, etc...)
 
 queriable Objects:
 
-- defaults : Provide the list of predefined values, configured by forj, or by you in your ~/.forj/config.yaml (or another config file with -c)
-- account [name] : without name, forj will give you the list of account saved. Otherwise print 'name' account data.
+- defaults : Provide the list of predefined values, configured by forj,
+    or by you in your ~/.forj/config.yaml (or another config file with -c)
+- account [name] : without name, forj will give you the list of account saved.
+    Otherwise print 'name' account data.
   LONGDESC
-
-   def show(object, name = nil)
-      Settings.common_options(options)
-
-      case object
-         when 'defaults'
-            oConfig=Lorj::Config.new()
-
-            puts 'List of default values: (local refer to your config file. hash refer to your FORJ account data)'
-            puts oConfig.default_dump().to_yaml
-            puts '---'
-            puts "To change default values, use 'forj get' to check valid keys, and update with 'forj set'"
-         when 'account'
-            oConfig=Lorj::Config.new()
-            if not name
-               puts "List of FORJ accounts: Use 'forj account YourAccount' to see one account details."
-               oAccounts = ForjAccounts.new()
-               puts oAccounts.dump().to_yaml
-            else
-               oConfig.set(:account_name, name)
-               oAccount = ForjAccount.new(oConfig)
-               oAccount.ac_load()
-
-               puts "Account value for '%s':" % name
-               puts oAccount.dump().to_yaml
-               puts '---'
-               puts "To change those values, execute 'forj setup -a %s'." % options[:account_name]
-            end
-
-         else
-            PrcLib.error("object '%s' unknown." % name)
+  desc 'show <Object> [name]', 'Show Object (default valuesr, account data,' \
+    ' etc...) values.'
+  def show(object, name = nil)
+    Forj::Settings.common_options(options)
+
+    case object
+    when 'defaults'
+      o_config = Lorj::Account.new
+
+      puts 'List of default values: (local refer to your config file.' \
+        ' hash refer to your FORJ account data)'
+
+      dump = o_config.config_dump(%w(account local))
+      dump[:application] = o_config.config_dump(%w(default))[:default]
+      puts dump.to_yaml
+      puts '---'
+      puts "To change default values, use 'forj get' to check valid keys," \
+        " and update with 'forj set'"
+    when 'account'
+      unless name
+        puts "List of FORJ accounts: Use 'forj account YourAccount' " \
+          ' to see one account details.'
+        o_accounts = Lorj::Accounts.new
+        puts o_accounts.dump.to_yaml
+        return
       end
-   end
-
-################################# DESTROY
-   desc 'destroy <InstanceName> [options]', 'delete the Maestro box and all systems installed by the blueprint'
-   long_desc <<-LONGDESC
-This action destroy all servers found under the instance name and allow you to destroy all of them or just one of them.
-
-Warning! This action do not remove any network/security groups cloud object.
-   LONGDESC
-
-  method_option :force, :aliases => "-f", :desc => "force deletion of all servers for the given InstanceName"
-
-   def destroy(name)
-      Forj::Settings.common_options(options)
-
-      oConfig = Lorj::Config.new(options[:config])
-      oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
-      oForjAccount = Lorj::Account.new(oConfig)
-      oForjAccount.ac_load()
-
-      aProcesses = []
-
-      # Defines how to manage Maestro and forges
-      # create a maestro box. Identify a forge instance, delete it,...
-      aProcesses << File.join($LIB_PATH, 'forj', 'ForjCore.rb')
-
-      # Defines how cli will control FORJ features
-      # boot/down/ssh/...
-      aProcesses << File.join($LIB_PATH, 'forj', 'ForjCli.rb')
-
-      oCloud = Lorj::CloudCore.new(oForjAccount, oConfig[:account_name], aProcesses)
-
-      oForge = oCloud.Get(:forge, name)
-
-      if oForge[:servers].count > 0
+      o_config = Lorj::Account.new
+      o_config[:account_name] = name
 
-        if options[:force]
-          #Destroy all servers found
-          oCloud.Delete(:forge)
-        else
-          #Ask the user to get server(s) to destroy
-          serverList = []
-          index = 0
+      PrcLib.fatal(1, "Unable to load the account '%s'",
+                   name) unless o_config.ac_load o_config[:account_name]
 
-          oForge[:servers].each{ |server|
-            serverList[index] = server[:name]
-            index = index + 1
-          }
+      puts format("Account value for '%s':", name)
+      puts o_config.config_dump([%(account)]).to_yaml
+      puts '---'
+      puts format("To change those values, execute 'forj setup -a %s'.",
+                  options[:account_name])
 
-          serverList << "all"
-          serverList << "esc"
-
-          say("Select the index of the server you want to destroy")
-          value = choose { | q |
-            q.choices(*serverList)
-          }
-
-          oServerNumber = serverList.index(value)
-
-          if oServerNumber >= 0 and oServerNumber < oForge[:servers].count
-            #Destroy selected server
-            oConfig.set(:forge_server, oForge[:servers][oServerNumber][:id] )
-            oCloud.Delete(:forge)
-          elsif oServerNumber ==  serverList.index("all")
-            #Destroy all servers found
-            oCloud.Delete(:forge)
-          elsif oServerNumber ==  serverList.index("esc")
-            #esc
-            PrcLib.high_level_msg("No server destroyed on your demand.\n" % name )
-          end
+    else
+      PrcLib.error("object '%s' unknown.", name)
+    end
+  end
 
-        end
+  ################################# DESTROY
+  desc 'destroy <InstanceName> [options]', 'delete the Maestro box and all' \
+    ' systems installed by the blueprint'
+  long_desc <<-LONGDESC
+This action destroy all servers found under the instance name and allow you
+to destroy all of them or just one of them.
 
-      else
-        PrcLib.high_level_msg("No server(s) found on forge instance '%s'.\n" % name )
-      end
+Warning! This action do not remove any network/security groups cloud object.
+   LONGDESC
 
-   end
+  method_option :force, :aliases => '-f', :desc => 'force deletion of all' \
+    ' servers for the given InstanceName'
+  def destroy(name)
+    require 'destroy.rb'
+    Forj::Settings.common_options(options)
+    Forj::Destroy.destroy(name, options)
+  end
 
-################################# SET
-  desc 'set [key=value] [...] [options]', 'Set one or more variables in defaults or a forj account.'
+  ################################# SET
+  desc 'set [key=value] [...] [options]', 'Set one or more variables in' \
+    ' defaults or a forj account.'
   long_desc <<-LONGDESC
-You can set some variables to change 'forj' defaults or specifically some account data.
+You can set some variables to change 'forj' defaults
+or specifically some account data.
+
+Ex: By default, forj use ~/.ssh/forj-id_rsa as keypair for all forge instance.
+During setup, if this keypair doesn't exist, it proposes to create it for you,
+with ssh-keygen.
 
-Ex: By default, forj use ~/.ssh/forj-id_rsa as keypair for all forge instance. During setup, if this keypair doesn't exist, it proposes to create it for you, with ssh-keygen.
-    If you want to use a keypair that already exists, you can set it as your default, with:
+If you want to use a keypair that already exists,
+you can set it as your default, with:
 
     `forj set keypair_name=~/.ssh/id_rsa`
 
@@ -346,112 +254,112 @@ Ex: By default, forj use ~/.ssh/forj-id_rsa as keypair for all forge instance. D
 
     `forj set`
 
-    If you want to remove the key from dev, and ask for to re-use defaults (from your config or application default)
+    If you want to remove the key from dev, and ask for to re-use defaults
+    (from your config or application default)
 
     `forj set keypair_name= -a dev`
 
-    If you want to remove the key from your default, and re-use application default
+    If you want to remove the key from your default,
+    and re-use application default
 
     `forj set keypair_name=`
 
   LONGDESC
 
-  method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
-
-   def set(*p)
-      Logging.set_level(Logger::INFO) if options[:verbose]
-      Logging.set_level(Logger::DEBUG) if options[:debug]
-
-      oConfig=Lorj::Config.new()
-
-      if    p.length == 0 and not options[:account_name]
-         Forj::Settings::config_show_all(oConfig)
+  method_option :account_name,     :aliases => '-a',   :desc => 'Set the forj' \
+    ' account name to use. By default, uses the default account set in your'   \
+    ' local config file.'
 
-      elsif p.length == 0 and options[:account_name]
-         Forj::Settings::account_show_all(oConfig, options[:account_name])
+  def set(*p)
+    PrcLib.level = Logger::INFO if options[:verbose]
+    PrcLib.level = Logger::DEBUG if options[:debug]
 
-      elsif p.length != 0 and options[:account_name]
-         Forj::Settings::account_set(oConfig, options[:account_name], p)
-
-      else
-         Forj::Settings::config_set(oConfig, p)
-      end
-   end
+    if p.length == 0
+      Forj::Settings.show_settings(options)
+    else
+      Forj::Settings.set_settings(options, p)
+    end
+  end
 
-################################# GET
-   desc 'get', 'Get data from defaults or account values.'
-   long_desc <<-LONGDESC
+  ################################# GET
+  desc 'get', 'Get data from defaults or account values.'
+  long_desc <<-LONGDESC
 forj cli maintain a list of key/value at 3 Levels:
 \x5- Application defaults
 \x5- Local config defaults
 \x5- Account data
 
-This function will help you identify which value has been retrieved from which level.
+This function will help you identify which value has been retrieved from
+which level.
 
-Ex: To get the default keypair_name, from your ~/.forj/config.yaml, or if not found, from application defaults.
+Ex: To get the default keypair_name, from your ~/.forj/config.yaml,
+or if not found, from application defaults.
 
 `forj get keypair_name`
 
-Ex: To get the keypair_name defined from the account, or from your ~/.forj/config.yaml, or if not found, from application defaults.
+Ex: To get the keypair_name defined from the account,
+or from your ~/.forj/config.yaml, or if not found, from application defaults.
 
 `forj get keypair_name -a dev`
 
 
    LONGDESC
 
-   method_option :account_name,     :aliases => '-a',   :desc => "Set the forj account name to use. By default, uses the default account set in your local config file."
-
-   def get(key = nil)
-      PrcLib.set_level(Logger::INFO) if options[:verbose]
-      PrcLib.set_level(Logger::DEBUG) if options[:debug]
-
-      oConfig = Lorj::Config.new()
-      if    not options[:account_name] and not key
-         Forj::Settings::config_get_all(oConfig)
-
-      elsif     options[:account_name] and     key
-         Forj::Settings::account_get(oConfig, options[:account_name], key)
+  method_option :account_name,     :aliases => '-a',   :desc => 'Set the forj' \
+    ' account name to use. By default, uses the default account set in your'   \
+    ' local config file.'
 
-      elsif not options[:account_name] and     key
-         Forj::Settings::config_get(oConfig, key)
+  def get(key = nil)
+    PrcLib.level = Logger::INFO if options[:verbose]
+    PrcLib.level = Logger::DEBUG if options[:debug]
 
-      else
-         Forj::Settings::account_get_all(oConfig, options[:account_name])
-      end
-   end
+    require 'get.rb'
+    Forj::Get.get(options, key)
+  end
 
-################################# SSH
-   desc 'ssh <Instance> [options]', 'connect to your forge thru ssh'
-   long_desc <<-LONGDESC
+  ################################# SSH
+  desc 'ssh <Instance> [options]', 'connect to your forge thru ssh'
+  long_desc <<-LONGDESC
 Connect through ssh to a node attached to an instance
 
 ex: forj ssh myforge -n review
    LONGDESC
 
-   method_option :box_name,       :aliases => '-n',   :desc => "box name to create ssh connection"
-   method_option :identity,       :aliases => '-i',   :desc => "Private key file name."
+  method_option :box_name,       :aliases => '-n',   :desc => 'box name to' \
+    ' create ssh connection'
+  method_option :identity,       :aliases => '-i',   :desc => 'Private key' \
+    ' file name.'
+
+  def ssh(oInstanceName)
+    Forj::Settings.common_options(options)
+    require 'ssh.rb'
 
-   def ssh(oInstanceName)
-      Forj::Settings.common_options(options)
+    account = Lorj::Account.new(options[:config])
 
-      oConfig = Lorj::Config.new(options[:config])
+    # Setting account at runtime layer
+    account[:account_name] = options[:account_name] if options[:account_name]
+    # Setting account at account layer
+    account.ac_load account[:account_name]
 
-      oConfig.set(:box_ssh,   options[:box_name])  if options[:box_name]
-      oConfig.set(:identity,  options[:identity]) if options[:identity]
+    account.set(:box_ssh,   options[:box_name])  if options[:box_name]
+    account.set(:identity,  options[:identity]) if options[:identity]
 
-      Forj::Ssh.connect(oInstanceName, oConfig)
-   end
+    Forj::Ssh.connect(oInstanceName, account)
+  end
 
-################################# SETUP
+  ################################# SETUP
 
-  desc 'setup [AccountName [Provider]] [options]', "Setup FORJ cloud account credentials and information."
+  desc 'setup [AccountName [Provider]] [options]', 'Setup FORJ cloud account' \
+    ' credentials and information.'
 
   long_desc <<-LONGDESC
 This setup will configure a FORJ account used to connect to your cloud system.
 \x5It will ask for your cloud provider credentials and services.
 
-If AccountName is not set, 'hpcloud' will be used for AccountName and provider name, by default.
-\x5If AccountName is not set without provider, 'hpcloud' provider will be used, by default.
+If AccountName is not set, 'hpcloud' will be used for AccountName
+and provider name, by default.
+\x5If AccountName is not set without provider, 'hpcloud' provider
+will be used, by default.
 
 WARNING! Currently supports only hpcloud provider.
 
@@ -461,33 +369,18 @@ Several data will be requested like:
 \x5- DNS settings if you want Maestro to manage it.
 \x5- domain name to add to each boxes hostname
   LONGDESC
-  def setup(sAccountName = 'hpcloud', sProvider = "hpcloud")
-      Forj::Settings.common_options(options)
-
-      oConfig=Lorj::Config.new(options[:config])
-      oConfig.set(:provider_name, sProvider)
-      oConfig.set(:account_name, sAccountName)
-
-      aProcesses = []
-
-      # Defines how to manage Maestro and forges
-      # create a maestro box. Identify a forge instance, delete it,...
-      aProcesses << File.join($LIB_PATH, 'forj', 'ForjCore.rb')
-
-      # Defines how cli will control FORJ features
-      # boot/down/ssh/...
-      aProcesses << File.join($LIB_PATH, 'forj', 'ForjCli.rb')
+  def setup(sAccountName = 'hpcloud', sProvider = 'hpcloud')
+    Forj::Settings.common_options(options)
+    require 'cloud_connection.rb'
 
-      # Loading CloudCore embedding provider controller + its process.
-      oCloud = Lorj::CloudCore.new(oConfig, oConfig[:account_name], aProcesses)
-
-
-      oCloud.Setup(:forge, sAccountName)
-      oCloud.config.ac_save()
+    account = Lorj::Account.new(options[:config])
+    account.set(:provider_name, sProvider)
+    account.set(:account_name, sAccountName)
 
+    o_cloud = Forj::CloudConnection.connect(account)
+    o_cloud.setup(:forge, sAccountName)
+    o_cloud.config.ac_save
   end
-
 end
 
-
 ForjThor.start