danarchy_sys 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3f76e6fb34f0feb1d9f1cf3d322682a57d7d750
-  data.tar.gz: 9ddddfb4bc3c9736987becf0a56e1f866ecc85a6
+  metadata.gz: adecf679edce8c1ee9beb96a09bb6fcc2c0aa4e5
+  data.tar.gz: c4dc4fab6af857af55e3df53ffdef2e801047135
 SHA512:
-  metadata.gz: 75cd4dbcac1d2079567ba80ebb59a22de3c9c4931440b55202c19f1165f6e2945ebae9387e9a968601a134ae50e72b676d9b3aae2429da530dd4d03040dbb024
-  data.tar.gz: d28bd7ea89a6352b892ba4e86650aae633b81551dd5c3c039fc8156f50476c298bf7be6614273555a306f2cc8843b55f7d308a601aee842eed2590d0e6757e8d
+  metadata.gz: 2ca0a7287b20ed0e6c1f471a53c059cb65369f914a7f5c2cf48d8b7ce23550f3e9a1e4085dfe3d7290c86c2a5bc0dbfad56b2af442edc3f28f8285d68cf3e49d
+  data.tar.gz: 4e35702b99b60700de00d0a1ecb87bfa77f7e566dc8e94e845aedfc0a6524e1190b065b2a3bdd78a5abcf3aa1e8e2664852e214eb9ef2868fcabeb700d1c6106

data/lib/danarchy_sys/cli.rb

@@ -7,13 +7,13 @@ module DanarchySys
   class CLI
     def initialize
       require_relative 'cli/menus'
-      require_relative 'cli/providers'
+      require_relative 'cli/accounts'
       require_relative 'cli/instance_manager'
       require_relative 'cli/keypair_manager'
 
-      provider = Providers.chooser
-      puts "OpenStack -> #{provider}"
-      @os_compute = DanarchySys::OpenStack::Compute.new provider
+      account = Accounts.chooser
+      puts "OpenStack -> #{account}"
+      @os_compute = DanarchySys::OpenStack::Compute.new account
       console
     end
 

data/lib/danarchy_sys/cli/accounts.rb

@@ -0,0 +1,34 @@
+
+class Accounts
+  def self.chooser
+    danarchysys_config = DanarchySys::ConfigManager::Config.new
+    accounts = Helpers.array_to_numhash(danarchysys_config[:accounts].keys)
+    account = 'nil'
+
+    if accounts.count == 1
+      account = accounts[1]
+      return account
+    end      
+
+    fields = PrintFormats.printf_hash(accounts)
+    printf("#{fields}\n", 'Id', 'Account')
+    accounts.each do |id, account|
+      printf("#{fields}\n", "#{id}.", account)
+    end
+
+    until accounts.values.include?(account)
+      print 'Which account should we use? (enter \'exit\' to leave): '
+      account = gets.chomp
+
+      abort('Exiting') if account == 'exit'
+
+      if account =~ /^[0-9]*$/
+        account = accounts[account.to_i]
+      else
+        account = account.to_sym
+      end
+    end
+
+    account
+  end
+end

data/lib/danarchy_sys/config_manager.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'yaml'
+require 'json'
 require_relative 'config_manager/openstack'
 
 # dAnarchy_sys config management
@@ -8,13 +8,13 @@ module DanarchySys
     class Config
       def self.new
         danarchysys_cfg_path = File.join(File.realpath(ENV['HOME']), '.danarchy_sys')
-        config_yml = File.join(danarchysys_cfg_path, 'danarchysys.yml')
+        config_json = File.join(danarchysys_cfg_path, 'danarchy_sys.json')
 
-        if File.exists?(config_yml)
-          return YAML.load_file(config_yml)
+        if File.exists?(config_json)
+          return JSON.parse(File.read(config_json), symbolize_names: true)
         else
           puts 'No existing configuration found!'
-          return new_config(danarchysys_cfg_path, config_yml)
+          return new_config(danarchysys_cfg_path, config_json)
         end
       end
       
@@ -27,11 +27,11 @@ module DanarchySys
           global_settings: {
             ssh_key_path: nil
           },
-          connections: {}
+          accounts: {}
         }
       end
 
-      def self.new_config(danarchysys_cfg_path, config_yml)
+      def self.new_config(danarchysys_cfg_path, config_json)
         config = config_template
         ssh_path = File.join(danarchysys_cfg_path, 'ssh')
 
@@ -68,8 +68,8 @@ module DanarchySys
             provider = gets.chomp
 
             if provider =~ /^[0-9]*$/
-              if num_providers.keys.include?(provider)
-                provider = num_providers[provider]
+              if num_providers.keys.include?(provider.to_i)
+                provider = num_providers[provider.to_i]
               else
                 print "#{provider} is not a valid Id. "
               end
@@ -80,28 +80,30 @@ module DanarchySys
             end
           end
         else
-          provider = providers[0]
+          provider = providers[0] # default to OpenStack
         end
 
-        if provider == 'openstack'
-          puts 'Creating a new OpenStack connection!'
-          print 'Enter a provider name for this connection: '
+        if provider == 'danarchy'
+          puts 'Need to implement setup for dAnarchy!'
+        elsif provider == 'openstack'
+          puts 'Adding a new OpenStack account!'
+          print 'Enter a provider name for this account: '
           provider = gets.chomp
-          cfg_os = DanarchySys::ConfigManager::OpenStack.new(provider, config)
-          config = cfg_os.new_connection_prompt
+          cfg_openstack = DanarchySys::ConfigManager::OpenStack.new(provider, config)
+          config = cfg_openstack.new_account_prompt
         elsif provider == 'aws'
           # Placeholder
           puts 'AWS not yet implemented!'
         end
 
-        save(config_yml, config)
-        puts "Configuration has been saved to #{config_yml}"
+        save(config_json, config)
+        puts "Configuration has been saved to #{config_json}"
         puts "Copy any existing #{provider} SSH keys to: #{ssh_path}"
         config
       end
 
       def self.save(config_file, param_hash)
-        File.write(config_file, param_hash.to_yaml)
+        File.write(config_file, JSON.pretty_generate(param_hash))
       end
 
 

data/lib/danarchy_sys/config_manager/openstack.rb

@@ -3,11 +3,10 @@ module DanarchySys::ConfigManager
   class OpenStack
     def initialize(provider, config)
       (@provider, @config) = provider, config
-      return
     end
     
-    def add_connection(provider, openstack_auth_url, openstack_username, openstack_api_key, openstack_tenant)
-      @config[:connections][provider.to_sym] = {
+    def add_account(provider, openstack_auth_url, openstack_username, openstack_api_key, openstack_tenant)
+      @config[:accounts][provider.to_sym] = {
         openstack_auth_url: openstack_auth_url,
         openstack_username: openstack_username,
         openstack_api_key: openstack_api_key,
@@ -15,14 +14,14 @@ module DanarchySys::ConfigManager
       }
     end
 
-    def delete_connection
+    def delete_account
       config = load
       config.delete(@provider)
     end
 
     def add_setting(name, value)
       config = load
-      # probably need to check if :settings exist first
+      config[@provider][:settings] = {} if !config[@provider][:settings]
       config[@provider][:settings][name.to_sym] = value
     end
 
@@ -32,11 +31,11 @@ module DanarchySys::ConfigManager
       config[@provider][:settings].delete(name.to_sym)
     end
 
-    def verify_connection
+    def verify_account
       
     end
 
-    def new_connection_prompt
+    def new_account_prompt
       print "OpenStack Auth URL\t(Example: http://openstack-host.com:5000/v2.0/tokens)\nEnter URL: "
       openstack_auth_url = gets.chomp
       print 'OpenStack Username: '
@@ -46,7 +45,7 @@ module DanarchySys::ConfigManager
       print 'OpenStack Tenant ID: '
       openstack_tenant = gets.chomp
 
-      add_connection(@provider, openstack_auth_url, openstack_username, openstack_api_key, openstack_tenant)
+      add_account(@provider, openstack_auth_url, openstack_username, openstack_api_key, openstack_tenant)
       @config
     end
   end  

data/lib/danarchy_sys/openstack/compute.rb

@@ -6,9 +6,9 @@ require_relative 'compute/flavors'
 module DanarchySys
   module OpenStack
     class Compute
-      def initialize(provider)
+      def initialize(account)
         danarchysys_config = DanarchySys::ConfigManager::Config.new
-        connection = danarchysys_config[:connections][provider.to_sym]
+        connection = danarchysys_config[:accounts][account.to_sym]
         @settings = danarchysys_config[:global_settings]
         @compute = Fog::Compute::OpenStack.new(connection)
         @instances = @compute.servers

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -94,13 +94,13 @@ files:
 - danarchy_sys.gemspec
 - lib/danarchy_sys.rb
 - lib/danarchy_sys/cli.rb
+- lib/danarchy_sys/cli/accounts.rb
 - lib/danarchy_sys/cli/instance_manager.rb
 - lib/danarchy_sys/cli/instance_manager/instance_status.rb
 - lib/danarchy_sys/cli/instance_manager/prompts_create_instance.rb
 - lib/danarchy_sys/cli/keypair_manager.rb
 - lib/danarchy_sys/cli/keypair_manager/keypair_status.rb
 - lib/danarchy_sys/cli/menus.rb
-- lib/danarchy_sys/cli/providers.rb
 - lib/danarchy_sys/config_manager.rb
 - lib/danarchy_sys/config_manager/aws.rb
 - lib/danarchy_sys/config_manager/openstack.rb

data/lib/danarchy_sys/cli/providers.rb

@@ -1,34 +0,0 @@
-
-class Providers
-  def self.chooser
-    danarchysys_config = DanarchySys::ConfigManager::Config.new
-    providers = Helpers.array_to_numhash(danarchysys_config[:connections].keys)
-    provider = 'nil'
-
-    if providers.count == 1
-      provider = providers[1]
-      return provider
-    end      
-
-    fields = PrintFormats.printf_hash(providers)
-    printf("#{fields}\n", 'Id', 'Provider')
-    providers.each do |id, provider|
-      printf("#{fields}\n", "#{id}.", provider)
-    end
-
-    until providers.values.include?(provider)
-      print 'Which provider should we use? (enter \'exit\' to leave): '
-      provider = gets.chomp
-
-      abort('Exiting') if provider == 'exit'
-
-      if provider =~ /^[0-9]*$/
-        provider = providers[provider.to_i]
-      else
-        provider = provider.to_sym
-      end
-    end
-
-    provider
-  end
-end