forj 0.0.43 → 0.0.44

data/lib/repositories.rb

@@ -56,7 +56,7 @@ module Repositories
 
 
 
-   def create_infra(maestro_repo)
+   def create_infra(maestro_repo, branch)
       # Build our own infra from maestro infra templates.
       infra = File.join($FORJ_DATA_PATH, 'infra')
       dest_cloud_init = File.join(infra, 'cloud-init')
@@ -67,11 +67,12 @@ module Repositories
          Logging.debug("Cleaning up '%s'" % [infra])
          FileUtils.rm_r(infra)
       end
-      Helpers.ensure_dir_exists(dest_cloud_init)
+      AppInit.ensure_dir_exists(dest_cloud_init)
       Logging.debug("Copying recursively '%s' to '%s'" % [cloud_init, infra])
       FileUtils.copy_entry(cloud_init, dest_cloud_init)
 
-      build_env = File.join(template,'maestro.box.master.env')
+      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)
       
@@ -128,7 +129,7 @@ module Repositories
             sAccountName = oConfig.get(:account_name)
 
             yDns = {}
-            yDns = oConfig.ExtraGet(:forj_accounts, sAccountName, :dns) if oConfig.ExtraExist?(:forj_accounts, sAccountName, :dns)
+            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,

data/spec/connection_spec.rb

@@ -22,29 +22,28 @@ 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'
+$LOAD_PATH << $LIB_PATH
 
-require 'forj-config.rb' # Load class ForjConfig
-require 'log.rb' # Load default loggers
-require 'connection.rb' # Load class ForjConnection
-require 'forj-account.rb'
+require 'appinit.rb' # Load generic Application level function
 
 # Initialize forj paths
-ensure_forj_dirs_exists()
-
-include Logging
+AppInit::forj_initialize()
 
+# Initialize global Log object
 $FORJ_LOGGER=ForjLog.new('forj-rspec.log', Logger::FATAL)
 
+require 'forj-config.rb' # Load class ForjConfig
+require 'connection.rb' # Load class ForjConnection
+require 'forj-account.rb'
+
 
 describe 'Module: forj-connection' do
 
   it 'should connect to hpcloud (smoke test)' do
 
     Fog.mock!
-    conn = ForjConnection.new(ForjConfig.new())
+    conn = ForjConnection.new(ForjAccount.new(ForjConfig.new()))
     expect(conn).to be
 
     Fog::Mock.reset

data/spec/forj-config_spec.rb

@@ -154,8 +154,8 @@ describe "class: forj-config," do
 
          it 'can get defaults if no key' do
             expect(@config.set(:test1, nil)).to equal(true)
-            expect(@config.get(:test1, nil, 'default')).to eq('default')
-            expect(@config.get(:test1, nil, nil)).to equal(nil)
+            expect(@config.get(:test1, 'default')).to eq('default')
+            expect(@config.get(:test1, nil)).to equal(nil)
             expect(@config.set(:maestro_url,nil)).to equal(true)
             expect(@config.get(:maestro_url)).to eq(@url)
          end
@@ -178,24 +178,25 @@ describe "class: forj-config," do
             @aArray4[1] = { :hash_2 => { :maestro_url => 'url4'  }}
          end
 
-         it 'can get data from one hash' do
-            expect(@config.get(:maestro_url, @yYAML1)).to eq('url1')
-            @config.set(:maestro_url, 'runtime')
-            expect(@config.get(:maestro_url, @yYAML1)).to eq('runtime')
-         end
-         
-         it 'can get data from array of hash' do
-            @config.set(:maestro_url, nil)
-            expect(@config.get(:maestro_url, @aArray1)).to eq('url2')
-            expect(@config.get(:maestro_url, @aArray2)).to eq('url1')
-         end
-         it 'can get data from array of hashes' do
-            @config.set('maestro_url', nil)
-            expect(@config.exist?(:maestro_url, @aArray3)).to eq('hash_1')
-            expect(@config.exist?(:maestro_url, @aArray4)).to eq('hash_2')
-            expect(@config.get(:maestro_url, @aArray3)).to eq('url3')
-            expect(@config.get(:maestro_url, @aArray4)).to eq('url4')
-         end
+         # Obsolete.
+         #~ it 'can get data from one hash' do
+            #~ expect(@config.get(:maestro_url, @yYAML1)).to eq('url1')
+            #~ @config.set(:maestro_url, 'runtime')
+            #~ expect(@config.get(:maestro_url, @yYAML1)).to eq('runtime')
+         #~ end
+         #~ 
+         #~ it 'can get data from array of hash' do
+            #~ @config.set(:maestro_url, nil)
+            #~ expect(@config.get(:maestro_url, @aArray1)).to eq('url2')
+            #~ expect(@config.get(:maestro_url, @aArray2)).to eq('url1')
+         #~ end
+         #~ it 'can get data from array of hashes' do
+            #~ @config.set('maestro_url', nil)
+            #~ expect(@config.exist?(:maestro_url, @aArray3)).to eq('hash_1')
+            #~ expect(@config.exist?(:maestro_url, @aArray4)).to eq('hash_2')
+            #~ expect(@config.get(:maestro_url, @aArray3)).to eq('url3')
+            #~ expect(@config.get(:maestro_url, @aArray4)).to eq('url4')
+         #~ end
       end
    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - forj team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -153,6 +153,8 @@ files:
 - lib/defaults.yaml
 - lib/down.rb
 - lib/boot.rb
+- lib/appinit.rb
+- lib/forj-settings.rb
 - lib/setup.rb
 - lib/repositories.rb
 - lib/ssh.rb