lib/cifrado/cli/setup.rb in cifrado-0.1.3 vs lib/cifrado/cli/setup.rb in cifrado-0.2.0

@@ -1,12 +1,13 @@
 module Cifrado
   class CLI
     desc "setup", "Initial Cifrado configuration"
     def setup
-      config_file = File.join(ENV['HOME'], '.config/cifrado/cifradorc')
-      unless File.directory?('.config/cifrado')
-        FileUtils.mkdir_p '.config/cifrado'
+      config_instance = Cifrado::Config.instance
+      config_file = File.join(config_instance.config_dir, 'cifradorc')
+      unless File.directory?(config_instance.config_dir)
+        FileUtils.mkdir_p config_instance.config_dir
       end
       if File.exist?(config_file)
         Log.warn "Config file #{set_color config_file, :bold} already exist."
         Log.warn "IMPORTANT: Make sure you backup the current config"
         Log.warn "before saving a new configuration."
@@ -18,12 +19,12 @@
         config = {}
       end
 
 
       puts "Running cifrado setup..."
-      puts "Please provide OpenStack/Rackspace credentials."
+      puts "Please provide OpenStack/Rackspace/HPCloud credentials."
       puts
-      puts "Cifrado can save this settings in #{config_file}"
+      puts "Cifrado can save these settings in #{config_file}"
       puts "for later use."
       puts "The settings (password included) are saved unencrypted."
       puts
       config[:username] = ask(set_color('Username:', :bold))
       system 'stty -echo'