danarchy_sys 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b9f0bdc147340301c4e38a0e7a0ac6e21e460f3
-  data.tar.gz: 6a76190f6fb70a06e2b1a523e790f6b4ae98ed4d
+  metadata.gz: 8c3d93b8a4b5dc2e84ea69b279f9cfa3a1d86768
+  data.tar.gz: c8a4a4278e5f6dada0b10fb7a49731e7392594ad
 SHA512:
-  metadata.gz: 538b80212290cd02a4af1acbf27fb070c2538d455704ed3bd58e2edee7c0b0de42d4f721886f0eceb948f2fb751b94190329c03ec08900ac4ec620d0308edabf
-  data.tar.gz: c44a7faf9216d2d8051295f2bc55819f4eb205a5e6d7b86bf2cb0d2ac91e65e16ad6dca05623f1b4ec835c9d7cbea2c80bd8780b545195954f9d408a1f8bdb87
+  metadata.gz: 3f13481bf821158438c740efb0c6e36719a3bd0a8cf09d3fef172c8fcaf506a44bea1ad63daae5a4102ae0888a8c4808666d63fda5fe456ad007fc03a5179fe9
+  data.tar.gz: 78082c565241160b920d766334d9f1c01ef60265e2501074a53fbdb2a408dc736e35c4ea3506e83de99ec8b7f3dcfc4660899ad188a87a63503ba05588ab5f92

data/.gitignore

@@ -1,3 +1,9 @@
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/README.txt

@@ -4,12 +4,22 @@ Welcome to dAnarchy Systems! This gem will assist you in easing the setup of Ope
 
 ## Installation
 
-Requires bundler to be installed already: 'gem install bundler'
+# Pull the gem from RubyGems.org
+gem install danarchy_sys
 
-Download danarchy_sys, 'cd' into its directory, then run 'sh bin/setup'.
-This will run bundler and install the required gems. It will then prompt for a new OpenStack setup.
+# Run 'danarchy_sys' and a first-time setup will prompt you for your connection settings.
+ ~ $ danarchy_sys
+No existing configuration found!
+Creating a new OpenStack connection!
+OpenStack Auth URL      (Example: http://openstack-host.com:5000/v2.0/tokens)
+Enter URL: http://your_openstack_host.com:5000/v2.0/tokens
+OpenStack Username: your_openstack_username
+OpenStack API Key: your_openstack_api_key
+OpenStack Tenant ID: your_openstack_tenant_id
+Configuration has been saved!
 
-dAnarchySys config setup will be located at danarchy_sys/config/danarchysys.yml in YAML format like this:
+
+dAnarchySys config file follows a YAML format like this:
 
 :connections:
   :your_connection:
@@ -17,15 +27,14 @@ dAnarchySys config setup will be located at danarchy_sys/config/danarchysys.yml
     :openstack_username: openstack_username
     :openstack_api_key: openstack_api_key
     :openstack_tenant: openstack_tenant
-:settings:
-  :ssh_key_path: PATH_TO_SSH_KEYS
+:general_settings:
+  :ssh_key_path: PATH_TO_SSH_KEYS (this is filled in by default)
 
+# Once configuration finishes you will enter the main CLI for dAnarchy_sys.
 
 ## Usage
 
-Id Provider
-1. os_dreamcompute
-Which provider should we use? (enter 'exit' to leave): 1
+ ~ $ danarchy_sys
 OpenStack -> os_dreamcompute
 dAnarchy_sys main menu commands:
 Enter 'help' to view available commands or 'exit' to leave.

data/lib/danarchy_sys/aws/compute.rb

@@ -2,7 +2,7 @@ module DanarchySys
   module AWS
     class Compute
       def initialize(provider)
-        config = ConfigMgr.new
+        config = ConfigManager.new
         danarchysys_config = config.load
         connection = danarchysys_config[:connections][provider]
         @settings = danarchysys_config[:settings]

data/lib/danarchy_sys/cli/instance_manager.rb

@@ -4,7 +4,7 @@ require_relative 'instance_manager/instance_status'
 class InstanceManager
   def self.manager(os_compute)
     comp_inst = os_compute.compute_instances
-    puts 'Instance Manager: enter \'help\' to view available commands or \'main\' for the main menu.'
+    puts 'Instance Manager: enter \'chooser\' to select an instance, \'help\' to view available commands or \'main\' for the main menu.'
     menu = Menus.numbered_menu('instance')
     instance = false
 
@@ -43,17 +43,33 @@ class InstanceManager
         end
       elsif cmd == 'status'
         printf("%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', instance.state)
-      elsif %w(connect pause unpause suspend resume start stop).include?(cmd.to_s)
-        if cmd == 'connect'
-          if instance.state == 'ACTIVE'
-            os_compute.compute_ssh(instance.name.to_s)
-          else
-            puts "Unable to connect: #{instance.name} is not running!"
-          end
+      elsif %w(pause unpause suspend resume start stop).include?(cmd.to_s)
+        status = instance.state
+
+        if cmd =~ /e$/
+          print "#{cmd.gsub(/e$/, 'ing')} #{instance.name} ."
+        else
+          print "#{cmd}ing #{instance.name} ."
+        end
+
+        response = comp_inst.send(cmd.to_s, instance.name.to_s)
+        if response == false
+          puts "\nInvalid action for #{instance.name}'s current status!"
+          next
+        end
+        
+        until status != instance.state
+          instance = os_compute.compute_instances.get_instance(instance.name)
+          sleep(3)
+          print ' .'
+        end
+
+        printf("\n%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', instance.state)
+      elsif cmd == 'connect'
+        if instance.state == 'ACTIVE'
+          os_compute.compute_ssh(instance.name.to_s)
         else
-          response = comp_inst.send(cmd.to_s, instance.name.to_s)
-          # Need to recheck/wait for status update
-          printf("%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', instance.state)
+          puts "Unable to connect: #{instance.name} is not running!"
         end
       else
         Menus.print_menu('instance')

data/lib/danarchy_sys/cli/menus.rb

@@ -31,7 +31,7 @@ class Menus
       # print_menu(menu)
     elsif menu == 'instance'
       puts 'Instance Manager commands: '
-      puts 'Enter \'help\' to view available commands or \'back\' for the main menu.'
+      puts 'Enter \'help\' to view available commands or \'main\' for the main menu.'
       # print_menu(menu)
     elsif menu == 'keypair'
       puts 'Keypair Manager commands: '

data/lib/danarchy_sys/cli/providers.rb

@@ -1,8 +1,7 @@
 
 class Providers
   def self.chooser
-    config = ConfigMgr.new
-    danarchysys_config = config.load
+    danarchysys_config = DanarchySys::ConfigManager::Config.new
     providers = Helpers.array_to_numhash(danarchysys_config[:connections].keys)
     provider = 'nil'
 

data/lib/danarchy_sys/config_manager/aws.rb

@@ -0,0 +1,22 @@
+
+module DanarchySys::ConfigManagerNew
+  class AWS
+    def initialize(provider)
+      @provider = provider.to_sym
+    end
+
+    def add_connection(provider, aws_access_key_id, aws_secret_access_key)
+#      config = load
+
+      # config[:connections][provider.to_sym] = {
+      #   aws_access_key_id: aws_access_key_id,
+      #   aws_secret_access_key: aws_secret_access_key
+      }
+    end
+
+    def delete_connection(provider)
+#      config = load
+#      config[:connections].delete(provider.to_sym)
+    end
+  end
+end

data/lib/danarchy_sys/config_manager/openstack.rb

@@ -0,0 +1,53 @@
+
+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] = {
+        openstack_auth_url: openstack_auth_url,
+        openstack_username: openstack_username,
+        openstack_api_key: openstack_api_key,
+        openstack_tenant: openstack_tenant,
+      }
+    end
+
+    def delete_connection
+      config = load
+      config.delete(@provider)
+    end
+
+    def add_setting(name, value)
+      config = load
+      # probably need to check if :settings exist first
+      config[@provider][:settings][name.to_sym] = value
+    end
+
+    def delete_setting(name)
+      config = load
+      # check if name exists
+      config[@provider][:settings].delete(name.to_sym)
+    end
+
+    def verify_connection
+      
+    end
+
+    def new_connection_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: '
+      openstack_username = gets.chomp
+      print 'OpenStack API Key: '
+      openstack_api_key = gets.chomp
+      print 'OpenStack Tenant ID: '
+      openstack_tenant = gets.chomp
+
+      add_connection(@provider, openstack_auth_url, openstack_username, openstack_api_key, openstack_tenant)
+      @config
+    end
+  end  
+end

data/lib/danarchy_sys/config_manager.rb

@@ -0,0 +1,99 @@
+require 'yaml'
+require_relative 'config_manager/openstack'
+
+# dAnarchy_sys config management
+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')
+
+        if File.exists?(@config_file)
+          return YAML.load_file(@config_file)
+        else
+          puts 'No existing configuration found!'
+          return new_config
+        end
+      end
+      
+      def self.providers
+        ['openstack'] # , 'aws']
+      end
+
+      def self.config_template
+        config_template = {
+          global_settings: {
+            ssh_key_path: "#{@danarchysys_path}/config/ssh"
+          },
+          connections: {}
+        }
+      end
+
+      def self.new_config
+        config = config_template
+        
+        provider = nil
+        if providers.count > 1
+          num_providers = Helpers.array_to_numhash(providers)
+          fields = PrintFormats.printf_hash(num_providers)
+
+          printf("#{fields}\n", 'Id', 'Provider')
+          num_providers.each do |k, v|
+            printf("#{fields}\n", "#{k}.", v)
+          end
+
+          provider = nil
+          until providers.include?(provider)
+            print 'Please choose a provider: '
+            provider = gets.chomp
+
+            if provider =~ /^[0-9]*$/
+              if num_providers.keys.include?(provider)
+                provider = num_providers[provider]
+              else
+                print "#{provider} is not a valid Id. "
+              end
+            end
+
+            if provider.empty? || providers.include?(provider) == false
+              print 'Invalid input! '
+            end
+          end
+        else
+          provider = providers[0]
+        end
+
+        if provider == 'openstack'
+          puts 'Creating a new OpenStack connection!'
+          print 'Enter a provider name for this connection: '
+          provider = gets.chomp
+          cfg_os = DanarchySys::ConfigManager::OpenStack.new(provider, config)
+          config = cfg_os.new_connection_prompt
+        elsif provider == 'aws'
+          # Placeholder
+          puts 'AWS not yet implemented!'
+        end
+
+        save(config)
+        puts 'Configuration has been saved!'
+        config
+      end
+
+      def self.save(param_hash)
+        File.write(@config_file, param_hash.to_yaml)
+      end
+
+
+      def self.global_setting_add(name, value)
+        config = load
+        config[:global_settings][name.to_sym] = value
+      end
+
+      def self.global_setting_delete(name)
+        config = load
+        config[:global_settings].delete(name.to_sym)
+      end
+    end
+  end
+end

data/lib/danarchy_sys/openstack/compute/instances.rb

@@ -48,9 +48,15 @@ class ComputeInstances
 
   def get_addresses(instance_name)
     instance = get_instance(instance_name)
+   (ipv6, ipv4) = nil, nil
+   addresses = instance.addresses['public']
 
-    addresses = instance.addresses['public']
-    ipv6, ipv4 = addresses[0], addresses[1]
+    addresses.each do |i|
+      ipv4 = i['addr'] if i['addr'].include?('.')
+      ipv6 = i['addr'] if i['addr'].include?(':')
+    end
+
+    return ipv4, ipv6
   end
 
   def pause(instance_name)

data/lib/danarchy_sys/openstack/compute/tests/keypairs_test.rb

@@ -3,7 +3,7 @@ require 'fog/openstack'
 require_relative '../../../../danarchy_sys'
 
 provider = 'os_dreamcompute'.to_sym
-config = ConfigMgr.new
+config = ConfigManager.new
 danarchysys_config = config.load
 
 connection = danarchysys_config[:connections][provider]

data/lib/danarchy_sys/openstack/compute.rb

@@ -7,10 +7,9 @@ module DanarchySys
   module OpenStack
     class Compute
       def initialize(provider)
-        config = ConfigMgr.new
-        danarchysys_config = config.load
-        connection = danarchysys_config[:connections][provider]
-        @settings = danarchysys_config[:settings]
+        danarchysys_config = DanarchySys::ConfigManager::Config.new
+        connection = danarchysys_config[:connections][provider.to_sym]
+        @settings = danarchysys_config[:global_settings]
         @compute = Fog::Compute::OpenStack.new(connection)
       end
 
@@ -49,7 +48,7 @@ module DanarchySys
           user = image.name.downcase.split('-')[0]
         end
 
-        ipv4 = comp_inst.get_addresses(instance_name)[1]['addr']
+        ipv4, ipv6 = comp_inst.get_addresses(instance_name)
 
         ssh = "ssh #{user}@#{ipv4} -i '#{pemfile}'"
         system(ssh)

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/lib/danarchy_sys.rb

@@ -2,7 +2,7 @@
 require 'fog/openstack'
 require_relative 'danarchy_sys/version'
 require_relative 'danarchy_sys/helpers'
-require_relative 'danarchy_sys/config'
+require_relative 'danarchy_sys/config_manager'
 require_relative 'danarchy_sys/printformats'
 
 module DanarchySys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -79,8 +79,6 @@ email:
 executables:
 - console
 - danarchy_sys
-- setup
-- setup.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -93,8 +91,6 @@ files:
 - Rakefile
 - bin/console
 - bin/danarchy_sys
-- bin/setup
-- bin/setup.rb
 - config/.gitignore
 - danarchy_sys.gemspec
 - lib/danarchy_sys.rb
@@ -106,7 +102,9 @@ files:
 - lib/danarchy_sys/cli/instance_manager/prompts_create_instance.rb
 - lib/danarchy_sys/cli/menus.rb
 - lib/danarchy_sys/cli/providers.rb
-- lib/danarchy_sys/config.rb
+- lib/danarchy_sys/config_manager.rb
+- lib/danarchy_sys/config_manager/aws.rb
+- lib/danarchy_sys/config_manager/openstack.rb
 - lib/danarchy_sys/helpers.rb
 - lib/danarchy_sys/openstack.rb
 - lib/danarchy_sys/openstack/compute.rb

data/bin/setup

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
-PATH=$(pwd)
-
-if [[ $PATH =~ danarchy_sys/bin$ ]]; then
-    /usr/bin/ruby $PATH/setup.rb
-elif [[ $PATH =~ danarchy_sys$ ]]; then
-    /usr/bin/ruby $PATH/bin/setup.rb
-else
-    echo "Unable to find danarchy_sys/bin/setup.rb!"
-    echo "Please run it manually: /usr/bin/ruby danarchy_sys/bin/setup.rb"
-fi

data/bin/setup.rb

@@ -1,86 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-require_relative '../lib/danarchy_sys'
-
-# dAanarchySys config file setup
-class DanarchySysConfig
-  def initialize
-    @config_mgr = ConfigMgr.new
-  end
-
-  def load_config
-    @config_mgr.load
-  end
-
-  def ssh_key_path
-    danarchysys_config = load_config
-
-    ssh_key_path = "#{File.expand_path('..', File.dirname(__FILE__))}/config/ssh"
-    FileUtils.mkdir_p(ssh_key_path) unless Dir.exist?(ssh_key_path)
-    danarchysys_config[:settings][:ssh_key_path] = ssh_key_path
-
-    @config_mgr.save(danarchysys_config)
-  end
-
-  def new_connection
-    danarchysys_config = load_config
-
-    if danarchysys_config[:connections].count.zero?
-      puts 'Creating a new configuration.'
-    else
-      puts 'Adding a new OpenStack connection to existing configuration.'
-    end
-
-    print 'Provider name: '
-    provider_name = gets.chomp
-    print "OpenStack Auth URL\t(Example: http://openstack-host.com:5000/v2.0/tokens)\nEnter URL: "
-    openstack_auth_url = gets.chomp
-    print 'OpenStack Username: '
-    openstack_username = gets.chomp
-    print 'OpenStack API Key: '
-    openstack_api_key = gets.chomp
-    print 'OpenStack Tenant ID: '
-    openstack_tenant = gets.chomp
-
-    danarchysys_config[:connections][provider_name.to_sym] = {
-      openstack_auth_url: openstack_auth_url,
-      openstack_username: openstack_username,
-      openstack_api_key: openstack_api_key,
-      openstack_tenant: openstack_tenant
-    }
-
-    @config_mgr.save(danarchysys_config)
-  end
-end
-
-config = DanarchySysConfig.new
-danarchysys_config = config.load_config
-puts 'Beginning danarchysys configuration setup.'
-
-if danarchysys_config[:connections].count.zero?
-  config.new_connection
-else
-  puts 'Available OpenStack Connections: '
-  danarchysys_config[:connections].each_key { |k| puts k }
-end
-
-continue = false
-until continue == true
-  print 'Should we add another connection? (Y/N): '
-
-  if gets.chomp =~ /^y(es)?$/i
-    config.new_connection
-  else
-    continue = true
-  end
-end
-
-config.ssh_key_path
-
-danarchysys_config = config.load_config
-
-puts 'Available OpenStack Connections: '
-danarchysys_config[:connections].each_key { |k| puts k }
-puts "SSH key location: #{danarchysys_config[:settings][:ssh_key_path]}"
-puts "Config saved to: #{File.expand_path('..', File.dirname(__FILE__))}/config/danarchysys.yml"
-puts "dAnarchySys setup is finished. Run \'/usr/bin/ruby danarchy_sys/bin/danarchy_sys\' to begin!"

data/lib/danarchy_sys/config.rb

@@ -1,66 +0,0 @@
-
-require 'yaml'
-
-# dAnarchy_sys config management
-class ConfigMgr
-  def initialize
-    @danarchysys_path = File.realpath(File.join(File.dirname(__FILE__), '..', '..'))
-    @config_file = File.join(@danarchysys_path, 'config', 'danarchysys.yml')
-  end
-
-  def config_template
-    config_template = {
-      :connections => {},
-      :settings => {}
-    }
-  end
-
-  def load
-    if File.exists?(@config_file)
-      return YAML.load_file(@config_file)
-    else
-      return config_template
-    end
-  end
-
-  def save(param_hash)
-    File.write(@config_file, param_hash.to_yaml)
-  end
-
-  def connection_add(provider, openstack_auth_url, openstack_username, openstack_api_key, openstack_tenant)
-    danarchysys_config = load
-
-    danarchysys_config[:connections][provider.to_sym] = {
-      openstack_auth_url: openstack_auth_url,
-      openstack_username: openstack_username,
-      openstack_api_key: openstack_api_key,
-      openstack_tenant: openstack_tenant
-    }
-
-    danarchysys_config
-  end
-
-  def connection_delete(provider)
-    danarchysys_config = load
-
-    danarchysys_config[:connections].delete(provider.to_sym)
-
-    danarchysys_config
-  end
-
-  def setting_add(name, value)
-    danarchysys_config = load
-
-    danarchysys_config[:settings][name.to_sym] = value
-
-    danarchysys_config
-  end
-
-  def setting_delete(name)
-    danarchysys_config = load
-
-    danarchysys_config[:settings].delete(name.to_sym)
-
-    danarchysys_config
-  end
-end