forj 0.0.44 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1aeb1a399ecfab67138cf2cb50b12deff71212
-  data.tar.gz: 9c46f0ccaeaaca2775b4d897065b10f1d4aea93e
+  metadata.gz: a158eb6d8db91610bf6d6b64ccf3454fc5ad4c8a
+  data.tar.gz: 86f77c9bac06ba4e14a8e8040fe48da673b428e9
 SHA512:
-  metadata.gz: dd00c4f1f397736bf1f3b6cb0fce7c65a1545c927544afafb42cad52271632dcbded52531d643e5a674d3fe39f106e5e1139eae43cd082124555e5da0c9b7ccd
-  data.tar.gz: b840b30588d58ed512bb1890688aeb50596675d3376cbcaf9bbeb51ab2677723d1c0cef819b2cd5a18ce97755a7cb29d19dced034a8c38e66e8b8a702454583c
+  metadata.gz: 961aaf4d7e623dc4a2f6ce7077c9067345d024fce67937bf570e09c5418b1d347ed38b190f526e776a6687f7bec4fe2fecbaf60826d7bdf5f111373b316840d1
+  data.tar.gz: 3ee7247de4d5483777eb07f972dac20cd81f1796f37cdfa3fe48700ccf8ef958ee353e6beed692c28d90e7d35057d5300568fd98494804d5e919b7a23c60aa0e

data/Gemfile

@@ -19,7 +19,7 @@ source 'https://rubygems.org'
 group(:development, :test) do
   gem 'rake'
   gem 'debugger'
-  gem 'rspec', "~> 2.10.0", :require => false
+  gem 'rspec', "~> 3.1.0", :require => false
 end
 
 gem 'mime-types','1.25.1'

data/bin/forj

@@ -16,6 +16,7 @@
 #    limitations under the License.
 
 require 'rubygems'
+require 'bundler/setup'
 require 'require_relative'
 require 'thor'
 require 'ansi'
@@ -93,7 +94,7 @@ forj command line details:
   end
 
    desc 'version', 'get GEM version of forj.'
-  
+
    def version()
       if Gem.loaded_specs['forj']
          puts Gem.loaded_specs['forj'].version.to_s
@@ -111,7 +112,7 @@ 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
 
@@ -124,7 +125,7 @@ Following options superseed your Account, config file or forj defaults."
   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,            :aliases => '-i',   :desc => "config: image         : Image name to use to build Maestro and blueprint nodes."
+  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.
 
@@ -166,12 +167,12 @@ Maestro/infra bootstrap debugging:"
       oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
       oForjAccount = ForjAccount.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,          options[:image])
+      oConfig.set(:image_name,     options[:image])
       oConfig.set(:flavor,         options[:maestro_flavor])
       oConfig.set(:bp_flavor,      options[:bp_flavor])
       oConfig.set(:maestro_repo ,  options[:maestro_repo])
@@ -252,7 +253,7 @@ Warning! This action don't removed any network/security groups cloud object.
       oConfig = ForjConfig.new(options[:config])
       oConfig.set(:account_name,   options[:account_name]) if options[:account_name]
       oForjAccount = ForjAccount.new(oConfig)
-      oForjAccount.ac_load() 
+      oForjAccount.ac_load()
 
       Down.down(oForjAccount, name)
    end
@@ -297,7 +298,7 @@ Ex: By default, forj use ~/.ssh/forj-id_rsa as keypair for all forge instance. D
          Forj::Settings::config_show_all(oConfig)
 
       elsif p.length == 0 and options[:account_name]
-         Forj::Settings::account_show_all(oConfig, options[:account_name]) 
+         Forj::Settings::account_show_all(oConfig, options[:account_name])
 
       elsif p.length != 0 and options[:account_name]
          Forj::Settings::account_set(oConfig, options[:account_name], p)
@@ -337,13 +338,13 @@ Ex: To get the keypair_name defined from the account, or from your ~/.forj/confi
       oConfig = ForjConfig.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)
-         
+
       elsif not options[:account_name] and     key
          Forj::Settings::config_get(oConfig, key)
-         
+
       else
          Forj::Settings::account_get_all(oConfig, options[:account_name])
       end

data/lib/boot.rb

@@ -54,20 +54,29 @@ module Boot
 
       infra_dir = File.expand_path(oConfig.get(:infra_repo))
 
-
-      # Check about infra repo compatibility with forj cli
-      bBuildInfra = Repositories.infra_rebuild_required?(oConfig, infra_dir)
-
       # Ask information if needed.
       if not Dir.exist?(File.expand_path(infra_dir))
-         sAsk = 'Your \'%s\' infra directory doesn\'t exist. Do you want to create a new one from Maestro(repo github)/templates/infra (yes/no)?' % [infra_dir]
+         Logging.warning(<<-END
+Your infra workspace directory is missing.
+
+Forj uses an infra workspace directory to store any kind of data that are private to you.
+We provides ways to send those data securily to your new Forge instance, as metadata.
+In production case, we suggest you to keep it safe in your SCM preferred database.
+
+If you already have an existing infra workspace, use 'forj set infra_repo=<PathToYourRepo>' to set it and restart.
+
+Otherwise, we will build a new one with some predefined data, you can review and update later.
+         END
+         )
+         sAsk = "Do you want to create a new one from Maestro (yes/no)?" % [infra_dir]
          bBuildInfra=agree(sAsk)
+         if not bBuildInfra
+            puts 'Process aborted on your demand.'
+            exit 0
+         end
       else
-         Logging.info('Re-using your infra... in \'%s\'' % [infra_dir]) if not bBuildInfra
-      end
-      if not Dir.exist?(File.expand_path(infra_dir)) and not bBuildInfra
-         Logging.info('Exiting.')
-         return
+         # Check about infra repo compatibility with forj cli
+         bBuildInfra = Repositories.infra_rebuild_required?(oConfig, infra_dir)
       end
 
       # Get FORJ DNS setting
@@ -78,22 +87,41 @@ module Boot
 
       # Step Maestro Clone
       if not oConfig.get(:maestro_repo)
-         Logging.info('cloning maestro repo from \'%s\'...' % maestro_url)
-         Repositories.clone_repo(maestro_url)
+         Logging.state("cloning maestro repo from '%s' - branch '%s'" % [maestro_url, branch])
+         Repositories.clone_repo(maestro_url, oConfig)
          maestro_repo=File.expand_path('~/.forj/maestro')
       else
          maestro_repo=File.expand_path(oConfig.get(:maestro_repo))
-         if not File.exists?('%s/templates/infra/maestro.box.%s.env' % [maestro_repo, branch])
-            Logging.fatal(1, "'%s' is not a recognized Maestro repository. forj cli searched for templates/infra/maestro.box.%s.env" % [maestro_repo, branch])
+         if not File.exists?('%s/templates/infra/maestro.box.master.env' % [maestro_repo])
+            msg = <<-END
+'#{maestro_repo}' is not a recognized Maestro repository or is too old. forj cli searched for templates/infra/maestro.box.master.env
+
+Suggestion:
+1. Clone #{maestro_url} to a different location.
+   $ mkdir -p ~/src/forj-oss
+   $ cd ~/src/forj-oss
+   $ git clone #{maestro_url}
+2. Use this master branch of maestro repository with forj
+   $ forj set maestro_repo=~/src/forj-oss/maestro
+
+then retry your boot.
+END
+            Logging.fatal(1, msg)
          end
-         Logging.info('Using your maestro cloned repo \'%s\'...' % maestro_repo)
+         Logging.info("Using your maestro cloned repo '%s'" % maestro_repo)
       end
 
+      bBuildInfra = Repositories.infra_rebuild(oConfig, infra_dir) unless bBuildInfra
+
       if bBuildInfra
-         Logging.info('Building your infra... in \'%s\'' % [infra_dir])
+         Logging.info("Building your infra... in '%s'" % [infra_dir])
          Repositories.create_infra(maestro_repo, branch)
+      else
+         Logging.info("Re-using your infra... in '%s'" % [infra_dir]) if not bBuildInfra
       end
 
+      Repositories.ensure_build_env_file(maestro_url, maestro_repo, branch)
+
       # Connect to services
       oFC=ForjConnection.new(oConfig)
 
@@ -135,8 +163,8 @@ module Boot
       oBuildEnv.set('FORJ_SECURITY_GROUP',  oConfig.get('security_group'))
       oBuildEnv.set('FORJ_KEYPAIR',         oConfig.get('keypair_name'))
       oBuildEnv.set('FORJ_HPC_NOVA_KEYPUB', oConfig.get('keypair_path') + '.pub')
-      oBuildEnv.set('FORJ_BASE_IMG',        oConfig.get('image'))
-      oBuildEnv.set('FORJ_FLAVOR',          oConfig.get('flavor'))
+      oBuildEnv.set('FORJ_BASE_IMG',        oConfig.get('image_name'))
+      oBuildEnv.set('FORJ_FLAVOR',          oConfig.get('flavor_name'))
       oBuildEnv.set('FORJ_BP_FLAVOR',       oConfig.get('bp_flavor'))
       oBuildEnv.set('FORJ_TENANT_NAME',     oConfig.get(:tenant_name))
       oBuildEnv.set('FORJ_HPC_COMPUTE',     rhGet(oConfig.oConfig.ExtraGet(:hpc_accounts,  oFC.sAccountName, :regions), :compute))

data/lib/defaults.yaml

@@ -19,12 +19,12 @@
   :infra_repo: ~/.forj/infra
 
   # You can set proto2b in your ~/.forj/config.yaml if you built it from maestro/build. Read the maestro/README.md to create it.
-  :image: Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)
+  :image_name: Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)
 
   # Flavor to use for Maestro
-  :flavor: standard.medium
+  :flavor: medium
   # Default flavor to use for all Blueprint nodes.
-  :bp_flavor: standard.small
+  :bp_flavor: small
 
   # Ports to open for Maestro, added to the security group
   :security_group: forj
@@ -164,9 +164,10 @@
       :desc:       "forj cli use 'build.sh' to create Maestro. See build_config option on build.sh to get more information. By default 'box'"
     :bp_flavor:
       :desc:       "Blueprint nodes default flavor. Usually, blueprint node are smaller than Maestro."
-    :flavor:
+    :flavor_name:
       :desc:       "Maestro Flavor name. This flavor is for Maestro only. Your blueprint layout defines each node flavors on needs."
-    :image:
+      :default:    :flavor
+    :image_name:
       :desc:       "Image used to create Maestro and all forge boxes. By default, it is 'Ubuntu Precise 12.04.4 LTS Server 64-bit 20140414 (Rescue Image)'"
     :ports:
       :desc:       "List of security group rules (1 port or range of ports) to open to the external network."

data/lib/forj-account.rb

@@ -132,6 +132,10 @@ class ForjAccount
       @oConfig.get(default_key , default )
    end
 
+   def [](key, default = nil)
+      get(key, default)
+   end
+
    def exist?(key)
       return nil if not key
 
@@ -232,6 +236,10 @@ class ForjAccount
       _set(section, key, value)
    end
 
+   def []=(key, value)
+      set(key, value)
+   end
+
    def del(key)
       return nil if not key
 

data/lib/forj-config.rb

@@ -372,6 +372,10 @@ class ForjConfig
       true
    end
 
+   def []=(key, value)
+      set(key, value)
+   end
+
    def runtimeExist?(key)
       (rhExist?(@yRuntime, key) == 1)
    end
@@ -419,6 +423,10 @@ class ForjConfig
       default
    end
 
+   def [](key, default = nil)
+      get(key, default)
+   end
+
    def getAppDefault(section, key = nil)
 
       key = key.to_sym if key.class == String

data/lib/log.rb

@@ -35,12 +35,12 @@ module Logging
 
   class ForjLog
      # Class used to create 2 log object, in order to keep track of error in a log file and change log output to OUTPUT on needs (option flags).
-     
+
      attr_reader :level
 
      def initialize(sLogFile = 'forj.log', level = Logger::WARN)
-        
-        if not $FORJ_DATA_PATH 
+
+        if not $FORJ_DATA_PATH
            raise "Internal Error: Unable to initialize ForjLog - global FORJ_DATA_PATH not set"
         end
 
@@ -50,16 +50,16 @@ module Logging
 
         @oFileLogger = Logger.new(File.join($FORJ_DATA_PATH, sLogFile), 'weekly')
         @oFileLogger.level = Logger::DEBUG
-        @oFileLogger.formatter = proc do |severity, datetime, progname, msg| 
+        @oFileLogger.formatter = proc do |severity, datetime, progname, msg|
             "#{progname} : #{datetime}: #{severity}: #{msg} \n"
-         end   
-        
+         end
+
         @oOutLogger = Logger.new(STDOUT)
         @level = level
         @oOutLogger.level = @level
-        @oOutLogger.formatter = proc do |severity, datetime, progname, msg| 
+        @oOutLogger.formatter = proc do |severity, datetime, progname, msg|
             severity == 'ANY'?"#{msg} \n":"#{severity}: #{msg} \n"
-         end   
+         end
      end
 
      def info?
@@ -74,7 +74,7 @@ module Logging
      def fatal?
         return(@oOutLogger.fatal?)
      end
-     
+
      def info(message)
         @oOutLogger.info(message + ANSI.clear_line)
         @oFileLogger.info(message)
@@ -90,7 +90,7 @@ module Logging
      def fatal(message, e)
         @oOutLogger.fatal(message + ANSI.clear_line)
         @oFileLogger.fatal("%s\n%s\n%s" % [message, e.message, e.backtrace.join("\n")]) if e
-		@oFileLogger.fatal(message)
+      @oFileLogger.fatal(message)
      end
 
      def warn(message)
@@ -106,21 +106,21 @@ module Logging
      def unknown(message)
         @oOutLogger.unknown(message + ANSI.clear_line)
      end
-     
+
   end
-       
+
   def message(message)
     $FORJ_LOGGER.unknown(message)
   end
-     
+
   def info(message)
     $FORJ_LOGGER.info(message)
   end
-  
+
   def debug(message)
     $FORJ_LOGGER.debug(message)
   end
-  
+
   def warning(message)
     $FORJ_LOGGER.warn(message)
   end
@@ -128,7 +128,7 @@ module Logging
   def error(message)
     $FORJ_LOGGER.error(message)
   end
-  
+
   def fatal(rc, message, e = nil)
     $FORJ_LOGGER.fatal(message, e)
     puts 'Issues found. Please fix it and retry. Process aborted.'
@@ -138,11 +138,11 @@ module Logging
   def set_level(level)
     $FORJ_LOGGER.set_level(level)
   end
-  
+
   def state(message)
-     print("%s ...%s\r" % [message, ANSI.clear_line]) if $FORJ_LOGGER.level == Logger::INFO
+     print("%s ...%s\r" % [message, ANSI.clear_line]) if $FORJ_LOGGER.level <= Logger::INFO
   end
-  
+
   def high_level_msg(message)
      # Not DEBUG and not INFO. Just printed to the output.
      puts ("%s" % [message]) if $FORJ_LOGGER.level > 1

data/lib/repositories.rb

@@ -30,10 +30,10 @@ include YamlParse
 #
 
 # Current version of the infra. Compatible with forj version or higher.
-INFRA_VERSION = "37"
+$INFRA_VERSION = "0.0.37"
 
 module Repositories
-  def clone_repo(maestro_url)
+  def clone_repo(maestro_url, oConfig)
       current_dir = Dir.pwd
 
       home = File.expand_path('~')
@@ -44,7 +44,9 @@ module Repositories
           if File.directory?(path + 'maestro')
             FileUtils.rm_r path + 'maestro'
           end
-          Git.clone(maestro_url, 'maestro', :path => path)
+          git = Git.clone(maestro_url, 'maestro', :path => path)
+          git.checkout(oConfig[:branch]) if oConfig[:branch] != 'master'
+          Logging.info("Maestro repo '%s' cloned on branch '%s'" % [path, oConfig[:branch]])
         end
       rescue => e
         Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
@@ -54,7 +56,35 @@ module Repositories
       Dir.chdir(current_dir)
   end
 
+   def ensure_build_env_file(maestro_url, maestro_repo, branch)
+      infra = File.join($FORJ_DATA_PATH, 'infra')
+      template = File.join(maestro_repo, 'templates', 'infra')
+
+      template_file = 'maestro.box.master.env'
+      env_file = 'maestro.box.' + branch + '.env'
+
+      source_build_env = File.join(template, template_file)
+      dest_build_env = File.join(infra, env_file)
+
+      if not File.exist?(source_build_env)
+         raise <<-END
+Your Maestro repository branch is too old.
+Suggestion:
+1. Clone #{maestro_url} to a different location.
+   $ mkdir -p ~/src/forj-oss
+   $ cd ~/src/forj-oss
+   $ git clone #{maestro_url}
+2. Use this master branch of maestro repository with forj
+   $ forj set maestro_repo=~/src/forj-oss/maestro
+
+then retry your boot.
+END
+      end
+      return if File.exist?(dest_build_env)
 
+      Logging.info("Creating '%s' to '%s'" % [source_build_env, dest_build_env])
+      FileUtils.copy(source_build_env, dest_build_env)
+   end
 
    def create_infra(maestro_repo, branch)
       # Build our own infra from maestro infra templates.
@@ -68,26 +98,39 @@ module Repositories
          FileUtils.rm_r(infra)
       end
       AppInit.ensure_dir_exists(dest_cloud_init)
+      if not File.exist?(cloud_init)
+         raise <<-END
+Your Maestro repository branch is too old.
+Suggestion:
+1. Clone %s to a different location.
+   $ mkdir -p ~/src/forj-oss
+   $ cd ~/src/forj-oss
+   $ git clone %s
+2. Use this master branch of maestro repository with forj
+   $ forj set maestro_repo=~/src/forj-oss/maestro
+
+then retry your boot.
+END
+      end
       Logging.debug("Copying recursively '%s' to '%s'" % [cloud_init, infra])
       FileUtils.copy_entry(cloud_init, dest_cloud_init)
 
-      template_file = 'maestro.box.' + branch + '.env'
-      build_env = File.join(template,template_file)
-      Logging.debug("Copying '%s' to '%s'" % [build_env, infra])
-      FileUtils.copy(build_env, infra)
-      
       file_ver = File.join(infra, 'forj-cli.ver')
       File.write(file_ver, $INFRA_VERSION)
    end
-  
+
+   # Infra repository compatibility
+   # <  0.0.37 - Use a template file of build env file.
+   #              => Migration required.
+   # >= 0.0.37 - Using a generic version of build env file, fully managed by forj cli.
+   #              => No migration
+
    def infra_rebuild_required?(oConfig, infra_dir)
       # This function check if the current infra is compatible with current gem version.
-      
-      # prior 0.0.37 - Use a template file of build env file.
-      # 0.0.37 - Using a generic version of build env file, fully managed by forj cli.
+
       return false if not File.exists?(infra_dir)
-      
-      if infra_dir != File.join($FORJ_DATA_PATH, 'infra') 
+
+      if infra_dir != File.join($FORJ_DATA_PATH, 'infra')
          # Do not take care. We do not manage it, ourself.
          return false
       end
@@ -97,23 +140,33 @@ module Repositories
       forj_infra_version = File.read(file_ver) if File.exist?(file_ver)
 
       if forj_infra_version
-         case forj_infra_version
-            when $INFRA_VERSION
-               return false
-            else
-               old_infra_data_update(oConfig, forj_infra_version, infra_dir)
-         end
-      else # Prior version 37
-         old_infra_data_update(oConfig, 36, infra_dir)
-      end   
+         return false if Gem::Version.new(forj_infra_version) == Gem::Version.new($INFRA_VERSION)
+         return true if Gem::Version.new(forj_infra_version) < Gem::Version.new($INFRA_VERSION)
+      end
+      # Before version 0.0.37, version file did not exist. So return true
       true
    end
-   
+
+   def infra_rebuild(oConfig, infra_dir)
+      return false if not File.exists?(infra_dir)
+
+      file_ver = File.join(infra_dir, 'forj-cli.ver')
+      forj_infra_version = nil
+      forj_infra_version = File.read(file_ver) if File.exist?(file_ver)
+
+      if forj_infra_version.nil? or forj_infra_version == ""
+         # Prior version 37
+         return(old_infra_data_update(oConfig, '0.0.36', infra_dir))
+      elsif Gem::Version.new(forj_infra_version) < Gem::Version.new($INFRA_VERSION)
+         return(old_infra_data_update(oConfig, forj_infra_version, infra_dir))
+      end
+   end
+
    def old_infra_data_update(oConfig, version, infra_dir)
-      Logging.info("Migrating your local infra repo to the latest version.")
-   # Supporting old version.
+      Logging.info("Migrating your local infra repo (%s) to the latest version." % version)
+      bRebuild = false # Be default migration is successful. No need to rebuild it.
       case version
-         when 36
+         when '0.0.36'
             # Moving from 0.0.36 or less to 0.0.37 or higher.
             # SET_COMPUTE="{SET_COMPUTE!}" => Setting for Compute. ignored. Coming from HPC
             # SET_TENANT_NAME="{SET_TENANT_NAME!}" => Setting for Compute. ignored. Need to query HPC from current Tenant ID
@@ -124,46 +177,52 @@ module Repositories
             # SET_DNS_ZONE="{SET_DNS_ZONE!}" => Setting for DNS. meta = dns_zone
             # ==> :forj_accounts, sAccountName, :dns, :service
 
-            # SET_DOMAIN="{SET_DOMAIN!}" => Setting for Maestro (required) and DNS if enabled. 
+            # SET_DOMAIN="{SET_DOMAIN!}" => Setting for Maestro (required) and DNS if enabled.
             # ==> :forj_accounts, sAccountName, :dns, :domain_name
             sAccountName = oConfig.get(:account_name)
 
             yDns = {}
             yDns = oConfig.oConfig.ExtraGet(:forj_accounts, sAccountName, :dns) if oConfig.oConfig.ExtraExist?(:forj_accounts, sAccountName, :dns)
-            build_env = File.join(infra_dir, 'maestro.box.master.env')
-            Logging.debug("Reading data from '%s'" % build_env)
-            tags = {'SET_DNS_TENANTID' => :tenant_id,
-                    'SET_DNS_ZONE' => :service,
-                    'SET_DOMAIN' => :domain_name
-                   }
-            begin
-               bUpdate = nil
-
-               File.open(build_env) do |f|
-                  f.each_line do |line|
-                     mObj = line.match(/^(SET_[A-Z_]+)=["'](.*)["'].*$/)
-                     if mObj
-                        Logging.debug("Reviewing detected '%s' tag" % [mObj[1]])
-                        tag = (tags[mObj[1]]? tags[mObj[1]] : nil)
-                        if tag and mObj[2]
-                           if bUpdate == nil and rhGet(yDns, tag) and rhGet(yDns, tag) != mObj[2]
-                              Logging.message("Your account setup is different than build env.")
-                              Logging.message("We suggest you to update your account setup with data from your build env.")
-                              bUpdate = agree("Do you want to update your setup with those build environment data?")
-                           end
-                           if bUpdate != nil and bUpdate
-                              Logging.debug("Saved: '%s' = '%s'" % [mObj[1],mObj[2]])
-                              rhSet(yDns, mObj[2], tag)
+            Dir.foreach(infra_dir) do | file |
+               next if not /^maestro\.box\..*\.env$/ =~ file
+               build_env = File.join(infra_dir, file)
+               Logging.debug("Reading data from '%s'" % build_env)
+               tags = {'SET_DNS_TENANTID' => :tenant_id,
+                       'SET_DNS_ZONE' => :service,
+                       'SET_DOMAIN' => :domain_name
+                      }
+               begin
+                  bUpdate = nil
+
+                  File.open(build_env) do |f|
+                     f.each_line do |line|
+                        mObj = line.match(/^(SET_[A-Z_]+)=["'](.*)["'].*$/)
+                        if mObj
+                           Logging.debug("Reviewing detected '%s' tag" % [mObj[1]])
+                           tag = (tags[mObj[1]]? tags[mObj[1]] : nil)
+                           if tag and mObj[2]
+                              if bUpdate == nil and rhGet(yDns, tag) and rhGet(yDns, tag) != mObj[2]
+                                 Logging.message("Your account setup is different than build env.")
+                                 Logging.message("We suggest you to update your account setup with data from your build env.")
+                                 bUpdate = agree("Do you want to update your setup with those build environment data?")
+                              end
+                              if bUpdate != nil and bUpdate
+                                 Logging.debug("Saved: '%s' = '%s'" % [mObj[1],mObj[2]])
+                                 rhSet(yDns, mObj[2], tag)
+                              end
                            end
                         end
                      end
                   end
+               rescue => e
+                  Logging.fatal(1, "Failed to open the build environment file '%s'" % build_env, e)
                end
-            rescue => e
-               Logging.fatal(1, "Unable to open the build environment file to migrate it", e)
             end
-            oConfig.ExtraSet(:forj_accounts, sAccountName, :dns, yDns)
-            oConfig.ExtraSave(File.join($FORJ_ACCOUNTS_PATH, sAccountName), :forj_accounts, sAccountName)
+            file_ver = File.join(infra_dir, 'forj-cli.ver')
+            File.write(file_ver, $INFRA_VERSION)
+            oConfig.oConfig.ExtraSet(:forj_accounts, sAccountName, :dns, yDns)
+            oConfig.oConfig.ExtraSave(File.join($FORJ_ACCOUNTS_PATH, sAccountName), :forj_accounts, sAccountName)
+            return bRebuild
       end
    end
 end

data/spec/connection_spec.rb

@@ -16,6 +16,7 @@
 #    limitations under the License.
 
 require 'rubygems'
+require 'bundler/setup'
 require 'spec_helper'
 
 require 'fog'

data/spec/forj-config_spec.rb

@@ -15,6 +15,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'rubygems'
+require 'bundler/setup'
+
 $APP_PATH = File.dirname(__FILE__)
 $LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
 $FORJ_DATA_PATH= File.expand_path('~/.forj')

data/spec/repositories_spec.rb

@@ -16,11 +16,23 @@
 #    limitations under the License.
 
 require 'rubygems'
+require 'bundler/setup'
 require 'spec_helper'
 
 require 'ansi'
 require 'fog'
 
+$APP_PATH = File.dirname(__FILE__)
+$LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
+$FORJ_DATA_PATH= File.expand_path('~/.forj')
+
+$LOAD_PATH << './lib'
+
+require 'forj-config.rb' # Load class ForjConfig
+require 'log.rb' # Load default loggers
+include Logging
+$FORJ_LOGGER=ForjLog.new('forj-rspec.log', Logger::FATAL)
+
 require_relative '../lib/repositories.rb'
 include Repositories
 
@@ -31,8 +43,8 @@ describe 'repositories' do
   it 'should clone the repo' do
     @test_class = TestClass.new
     @test_class.extend(Repositories)
-
-    repo = @test_class.clone_repo('https://github.com/forj-oss/cli')
+    oConfig = ForjConfig.new
+    repo = @test_class.clone_repo('https://github.com/forj-oss/cli', oConfig)
     expect(repo).to be
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.47
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor