lib/setup.rb in forj-0.0.32 vs lib/setup.rb in forj-0.0.33

@@ -34,21 +34,20 @@
     #Kernel.system('hpcloud keypairs:add nova')
   end
 end
 
 def setup_credentials
-  puts 'Enter hpcloud username: '
   hpcloud_os_user = ask('Enter hpcloud username: ')
   hpcloud_os_key = ask('Enter hpcloud password: ') { |q| q.echo = '*'}
 
   home = File.expand_path('~')
   creds = '%s/.cache/forj/creds' % [home]
-  File.open(creds, 'w') {|file|
-    file.write('HPCLOUD_OS_USER=%s' % [hpcloud_os_user])
-    file.write("\n")
-    file.write('HPCLOUD_OS_KEY=%s' % [hpcloud_os_key])
-  }
+
+  values = {:credentials => {:hpcloud_os_user=> hpcloud_os_user, :hpcloud_os_key=> hpcloud_os_key}}
+
+  YamlParse.dump_values(values, creds)
+
 end
 
 
 def save_cloud_fog
   home = File.expand_path('~')
@@ -62,16 +61,19 @@
 
 
   access_key = template[:credentials][:account_id]
   secret_key = template[:credentials][:secret_key]
 
-  os_user = local_template['HPCLOUD_OS_USER']
-  os_key = local_template['HPCLOUD_OS_KEY']
+  os_user = local_template[:credentials][:hpcloud_os_user]
+  os_key = local_template[:credentials][:hpcloud_os_key]
 
   File.open(cloud_fog, 'w') {|file|
     file.write('HPCLOUD_OS_USER=%s' % [os_user])
+    file.write("\n")
     file.write('HPCLOUD_OS_KEY=%s' % [os_key])
+    file.write("\n")
     file.write('DNS_KEY=%s' % [access_key])
+    file.write("\n")
     file.write('DNS_SECRET=%s' % [secret_key])
   }
 
   command = 'cat  %s | gzip -c | base64 -w0 > %s.g64' % [cloud_fog, cloud_fog]
   Kernel.system(command)
\ No newline at end of file