danarchy_sys 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eb2359dc35e6ad315efe1e66f82c7e9341c1b72
-  data.tar.gz: 0876ad89c05d969f6768b173fe1245f22cdeaf15
+  metadata.gz: a6941e444194b1fb07c1dedb70c8aeb3ff636dd9
+  data.tar.gz: 0219493fc680ca3be83fbb3ddfc143e71e6f50d8
 SHA512:
-  metadata.gz: 2b7c28329ad67c2c1553b7d20a22eb581bdf7437675352402605abe6225b714998ca8307da3a4a9add757324abd84484eaf4cd284ff494890c045a550a2d077f
-  data.tar.gz: f2a4c861f6157f9837d4b01a154100bc77e98101fef32bb0af51941005f22742735b7905a7f34539bcefbfb4493ce6f007de312e243ee070e5cef0c84f7132a4
+  metadata.gz: 734046026bdc11d9ba8ce27b9aa7972675c4b2a2b134ecf5cb45d0220049a05e83ede80b6be5e9a264620270d11433b1a0cc5b00417de6d14be2ce794c7ba532
+  data.tar.gz: 45a347fa21e336206b66f589a923a16b50e9bb8c12c9b9a8119b23a3543be0a159fb838905edb77f505e2185719f773b4e6a5d89ce59f74e895b642ae7ecd53e

data/lib/danarchy_sys/cli/providers.rb

@@ -6,7 +6,7 @@ class Providers
     provider = 'nil'
 
     if providers.count == 1
-      provider = providers['1']
+      provider = providers[1]
       return provider
     end      
 

data/lib/danarchy_sys/config_manager.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'yaml'
 require_relative 'config_manager/openstack'
 
@@ -6,14 +7,14 @@ module DanarchySys
   module ConfigManager
     class Config
       def self.new
-        @danarchysys_path = File.realpath(File.join(File.dirname(__FILE__), '..', '..'))
-        @config_file = File.join(@danarchysys_path, 'config', 'danarchysys.yml')
+        danarchysys_cfg_path = File.join(File.realpath(ENV['HOME']), '.danarchy_sys')
+        config_yml = File.join(danarchysys_cfg_path, 'danarchysys.yml')
 
-        if File.exists?(@config_file)
-          return YAML.load_file(@config_file)
+        if File.exists?(config_yml)
+          return YAML.load_file(config_yml)
         else
           puts 'No existing configuration found!'
-          return new_config
+          return new_config(danarchysys_cfg_path, config_yml)
         end
       end
       
@@ -24,15 +25,33 @@ module DanarchySys
       def self.config_template
         config_template = {
           global_settings: {
-            ssh_key_path: "#{@danarchysys_path}/config/ssh"
+            ssh_key_path: nil
           },
           connections: {}
         }
       end
 
-      def self.new_config
+      def self.new_config(danarchysys_cfg_path, config_yml)
         config = config_template
-        
+        ssh_path = File.join(danarchysys_cfg_path, 'ssh')
+
+        puts "dAnarchy_sys config location: #{danarchysys_cfg_path}"
+        FileUtils.mkdir_p(danarchysys_cfg_path, mode: 0700) unless Dir.exist?(danarchysys_cfg_path)
+
+        print "Default ssh key location: #{ssh_path}. Is this location okay?: (Y/N) "
+        answer = gets.chomp
+
+        until answer =~ /^y(es)?$/i
+          print 'Enter a path for SSH keys: '
+          ssh_path = gets.chomp
+          print "Setting SSH key path to: #{ssh_path}. Is this location okay? (Y/N): "
+          answer = gets.chomp
+        end
+
+        puts "SSH key path set to: #{ssh_path}"
+        FileUtils.mkdir_p(ssh_path, mode: 0700) unless Dir.exist?(ssh_path)
+        global_setting_add(config, 'ssh_key_path', ssh_path)
+
         provider = nil
         if providers.count > 1
           num_providers = Helpers.array_to_numhash(providers)
@@ -75,23 +94,22 @@ module DanarchySys
           puts 'AWS not yet implemented!'
         end
 
-        save(config)
-        puts 'Configuration has been saved!'
+        save(config_yml, config)
+        puts "Configuration has been saved to #{config_yml}"
+        puts "Copy any existing #{provider} SSH keys to: #{ssh_path}"
         config
       end
 
-      def self.save(param_hash)
-        File.write(@config_file, param_hash.to_yaml)
+      def self.save(config_file, param_hash)
+        File.write(config_file, param_hash.to_yaml)
       end
 
 
-      def self.global_setting_add(name, value)
-        config = load
+      def self.global_setting_add(config, name, value)
         config[:global_settings][name.to_sym] = value
       end
 
-      def self.global_setting_delete(name)
-        config = load
+      def self.global_setting_delete(config, name)
         config[:global_settings].delete(name.to_sym)
       end
     end

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-16 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -91,7 +91,6 @@ files:
 - Rakefile
 - bin/console
 - bin/danarchy_sys
-- config/.gitignore
 - danarchy_sys.gemspec
 - lib/danarchy_sys.rb
 - lib/danarchy_sys/aws.rb

data/config/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore