lib/repositories.rb in forj-0.0.34 vs lib/repositories.rb in forj-0.0.35

@@ -20,12 +20,12 @@
 require 'fileutils'
 require 'require_relative'
 
 require_relative 'yaml_parse.rb'
 include YamlParse
-require_relative 'log.rb'
-include Logging
+#require_relative 'log.rb'
+#include Logging
 
 #
 # Repositories module
 #
 module Repositories
@@ -38,22 +38,21 @@
       begin
         if File.directory?(path)
           if File.directory?(path + 'maestro')
             FileUtils.rm_r path + 'maestro'
           end
-          Logging.info('cloning the maestro repo')
           Git.clone(maestro_url, 'maestro', :path => path)
         end
       rescue => e
+        Logging.error("%s\n%s" % [e.message, e.backtrace.join("\n")])
         puts 'Error while cloning the repo from %s' % [maestro_url]
         puts 'If this error persist you could clone the repo manually in ~/.forj/'
-        Logging.error(e.message)
       end
       Dir.chdir(current_dir)
   end
-  
-  def create_infra
+
+  def create_infra(maestro_repo)
     home = File.expand_path('~')
     path = home + '/.forj/'
     infra = path + 'infra/'
 
     if File.directory?(infra)
@@ -62,11 +61,9 @@
     Dir.mkdir(infra)
 
     command = 'cp -rp ~/.forj/maestro/templates/infra/cloud-init ~/.forj/infra/'
     Kernel.system(command)
 
-    Dir.chdir('build_tmpl')
-
-    fill_template = 'python build-env.py -p ~/.forj/infra --maestro-path ~/.forj/maestro'
+    fill_template = 'python %s/build_tmpl/build-env.py -p ~/.forj/infra --maestro-path %s' % [$LIB_PATH, maestro_repo]
     Kernel.system(fill_template)
   end
 end