gogetit 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0890aeef5f381b7a754be4830c3cb9e4ac68505a
-  data.tar.gz: 3d984331c7ea4ddd357544e6e82161167d054333
+  metadata.gz: e0f13b5df25763b6b37fa24f18706e2f58579806
+  data.tar.gz: cb56da342f4477e93a731039d6fe3e0a18922a22
 SHA512:
-  metadata.gz: 066366221ebb84db77e72387836b0ae08221caa25d6c8698773e3bfe82c0038bdf4e2742dcb9fea2df65985bea01e3cb1938f913c2a8eb9acb34efb81e6e4fa9
-  data.tar.gz: f549b6db39ab79199e082ba7cef1b237cfaac796404cebf1029a7580363d1c8dd51cdb520d355b50a933f94d84f2ac2530f206dede2a0d490bbc2f8af59e1a2b
+  metadata.gz: 47a396841a95400ee9996411ae3a2306dd3224e2fcf5a0c1ce4c5d7ff0a2eb0f71a5266c26d0753c22863a4414e24d416258d86f023e86bbd72620b7b1dd58ea
+  data.tar.gz: 14e411b2ce7f3cfc39ac0372283742b0770a9ab677164c4860f4e815b5bb0d4ae545f18d6aaffe8383d2b20700c910a5cde93b31afd39ed5b5f3bb5d8b8dbdd8

data/lib/gogetit.rb

@@ -16,16 +16,4 @@ module Gogetit
   @lxd = Gogetit::GogetLXD.new(config, maas, logger)
   @libvirt = Gogetit::GogetLibvirt.new(config, maas, logger)
 
-  def self.get_provider_of(name)
-    if lxd.container_exists?(name)
-      logger.info("Calling <#{__method__.to_s}>, It is a LXD container.")
-      return 'lxd'
-    elsif libvirt.domain_exists?(name)
-      logger.info("Calling <#{__method__.to_s}>, It is a KVM domain.")
-      return 'libvirt'
-    else
-      puts "#{name} is not found"
-      return nil
-    end
-  end
 end

data/lib/gogetit/cli.rb

@@ -4,34 +4,36 @@ require 'gogetit/util'
 
 module Gogetit
 
-  @@result = nil
-
-  def self.set_result(x)
-    @@result = x
-  end
-
-  def self.get_result
-    @@result
-  end
-
   class CLI < Thor
     include Gogetit::Util
     package_name 'Gogetit'
 
-    # attr_accessor :result
+    @result = nil
+    class << self
+      attr_accessor :result
+    end
 
-    # def initialize(*args)
-    #   super
-    #   @result = nil
-    # end
+    attr_reader :config, :logger, :lxd, :libvirt, :providers
+
+    def initialize(*args)
+      super
+      @config = Gogetit.config
+      @logger = Gogetit.logger
+      @lxd = Gogetit.lxd
+      @libvirt = Gogetit.libvirt
+      @providers = {
+        lxd: lxd,
+        libvirt: libvirt
+      }
+    end
 
     desc 'list', 'List containers and instances, running currently.'
     def list
-      puts "Listing LXD containers on #{Gogetit.config[:lxd][:nodes][0][:url]}.."
-      system("lxc list #{Gogetit.config[:lxd][:nodes][0][:name]}:")
+      puts "Listing LXD containers on #{config[:lxd][:nodes][0][:url]}.."
+      system("lxc list #{config[:lxd][:nodes][0][:name]}:")
       puts ''
-      puts "Listing KVM domains on #{Gogetit.config[:libvirt][:nodes][0][:url]}.."
-      system("virsh -c #{Gogetit.config[:libvirt][:nodes][0][:url]} list --all")
+      puts "Listing KVM domains on #{config[:libvirt][:nodes][0][:url]}.."
+      system("virsh -c #{config[:libvirt][:nodes][0][:url]} list --all")
     end
 
     desc 'create NAME', 'Create either a container or KVM domain.'
@@ -69,43 +71,38 @@ module Gogetit
 
       case options['provider']
       when 'lxd'
-        result = Gogetit.lxd.create(name, options.to_hash)
-        Gogetit.set_result(result)
+        Gogetit::CLI.result = lxd.create(name, options.to_hash)
       when 'libvirt'
-        result = Gogetit.libvirt.create(name, options.to_hash)
-        Gogetit.set_result(result)
+        Gogetit::CLI.result = libvirt.create(name, options.to_hash)
       else
         abort('Invalid argument entered.')
       end
 
       # post-tasks
       if options['chef']
-        knife_bootstrap(name, options[:provider], Gogetit.config, Gogetit.logger)
-        update_databags(Gogetit.config, Gogetit.logger)
+        knife_bootstrap(name, options[:provider], config, logger)
+        update_databags(config, logger)
       end
     end
 
     desc 'destroy NAME', 'Destroy either a container or KVM instance.'
     method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
     def destroy(name)
-      # Let Gogetit recognize the provider.
-      provider = Gogetit.get_provider_of(name)
+      provider = get_provider_of(name, providers)
       if provider
         case provider
         when 'lxd'
-          result = Gogetit.lxd.destroy(name)
-          Gogetit.set_result(result)
+          Gogetit::CLI.result = lxd.destroy(name)
         when 'libvirt'
-          result = Gogetit.libvirt.destroy(name)
-          Gogetit.set_result(result)
+          Gogetit::CLI.result = libvirt.destroy(name)
         else
           abort('Invalid argument entered.')
         end
       end
       # post-tasks
       if options['chef']
-        knife_remove(name, Gogetit.logger) if options[:chef]
-        update_databags(Gogetit.config, Gogetit.logger)
+        knife_remove(name) if options[:chef]
+        update_databags(config)
       end
     end
 
@@ -115,25 +112,24 @@ module Gogetit
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
     def deploy(name)
-      Gogetit.set_result(Gogetit.libvirt.deploy(name, options.to_hash))
+      Gogetit::CLI.result = libvirt.deploy(name, options.to_hash)
 
       # post-tasks
       if options['chef']
-        knife_bootstrap(name, options[:provider], Gogetit.config, Gogetit.logger)
-        update_databags(Gogetit.config, Gogetit.logger)
+        knife_bootstrap(name, options[:provider], config, logger)
+        update_databags(config, logger)
       end
     end
 
     desc 'release NAME', 'Release a node in MAAS'
     method_option :chef, :type => :boolean, :desc => "Enable chef awareness."
     def release(name)
-      result = Gogetit.libvirt.release(name)
-      Gogetit.set_result(result)
+      Gogetit::CLI.result = libvirt.release(name)
 
       # post-tasks
       if options['chef']
-        knife_remove(name, Gogetit.logger) if options[:chef]
-        update_databags(Gogetit.config, Gogetit.logger)
+        knife_remove(name) if options[:chef]
+        update_databags(config)
       end
     end
 
@@ -142,19 +138,22 @@ module Gogetit
     method_option :chef, :aliases => '-c', :type => :boolean, \
       :default => false, :desc => 'Chef awareness'
     def rebuild(name)
-      # Let Gogetit recognize the provider.
-      provider = Gogetit.get_provider_of(name)
+      provider = get_provider_of(name, providers)
       if provider
         case provider
         when 'lxd'
+          1.upto(100) { print '_' }; puts
+          puts "Destroying #{name}.."
           invoke :destroy, [name]
           alias_name = YAML.load(
-            Gogetit.get_result[:info][:config][:"user.user-data"]
+            Gogetit::CLI.result[:info][:config][:"user.user-data"]
           )['source_image_alias']
+          1.upto(100) { print '_' }; puts
+          puts "Creating #{name}.."
           invoke :create, [name], :alias => alias_name
         when 'libvirt'
           invoke :release, [name]
-          distro_name = Gogetit.get_result[:info][:machine]['distro_series']
+          distro_name = Gogetit::CLI.result[:info][:machine]['distro_series']
           invoke :deploy, [name], :distro => distro_name
         else
           abort('Invalid argument entered.')
@@ -162,8 +161,8 @@ module Gogetit
       end
       # post-tasks
       if options['chef']
-        knife_remove(name, Gogetit.logger) if options[:chef]
-        update_databags(Gogetit.config, Gogetit.logger)
+        knife_remove(name, logger) if options[:chef]
+        update_databags(config, logger)
       end
     end
   end

data/lib/gogetit/config.rb

@@ -14,50 +14,50 @@ module Gogetit
     # TODO: It might be needed to disable one of logging devices according to satiation.
     STDOUT.sync = true
     log_to_stdout = Logger.new(STDOUT)
+    # Instantiate main objects
     @logger = Gogetit::MultiLogger.new(:loggers => log_to_stdout)
-    logger.debug('Instantiate main objects..')
 
     @config = {}
 
-    logger.debug('Defining home directory..')
+    # Define home directory
     user_gogetit_home = Dir.home + '/.gogetit'
     config[:user_gogetit_home] = user_gogetit_home
     if not File.directory?(user_gogetit_home)
-      logger.debug('Creating home directory..')
+      logger.info('Creating home directory..')
       FileUtils.mkdir(user_gogetit_home)
     end
 
     # TODO: It can be used to provide different behavior according to consumer.
-    logger.debug('Defining default consumer..')
+    # Define default consumer
     config[:consumer] = 'gogetit_cli'
 
-    logger.debug('Defining log directory..')
+    # Define log directory
     log_dir = user_gogetit_home + '/log'
     config[:log_dir] = log_dir
     if not File.directory?(log_dir)
-      logger.debug('Creating log directory..')
+      logger.info('Creating log directory..')
       FileUtils.mkdir(log_dir)
     end
 
-    logger.debug('Define file log devices..')
+    # Define file log devices
     log_file = File.open(log_dir + '/debug.log', 'a')
     log_file.sync = true
     log_to_file = Logger.new(log_file)
     logger.add_logger(log_to_file)
 
-    logger.debug('Defining logger..')
+    # Define logger
     # logger.datetime_format = "%Y-%m-%d %H:%M:%S"
     logger.progname = 'GoGetIt'
 
     lib_dir = Gem::Specification.find_by_name('gogetit').gem_dir + '/lib'
 
     config[:lib_dir] = lib_dir
-    logger.debug('Loading GoGetIt default configuration..')
+    # Load GoGetIt default configuration
     conf_file = user_gogetit_home + '/gogetit.yml'
     if not File.exists?(conf_file)
       src = File.new(lib_dir + '/sample_conf/gogetit.yml')
       dst = Dir.new(user_gogetit_home)
-      logger.debug('Copying GoGetIt default configuration..')
+      logger.info('Copying GoGetIt default configuration..')
       FileUtils.cp(src, dst)
       abort('Please define default configuration for GoGetIt at ~/.gogetit/gogetit.yml.')
     end

data/lib/gogetit/multilogger.rb

@@ -45,7 +45,11 @@ module Gogetit
 
     Logger::Severity.constants.each do |level|
       define_method(level.downcase) do |*args|
-        @loggers.each { |logger| logger.send(level.downcase, args) }
+        if level == :ERROR
+          @loggers.each { |logger| logger.send(level.downcase, "\e[31m#{args}\e[0m") }
+        else
+          @loggers.each { |logger| logger.send(level.downcase, "\e[36m#{args}\e[0m") }
+        end
       end
 
       define_method("#{ level.downcase }?".to_sym) do

data/lib/gogetit/util.rb

@@ -9,10 +9,23 @@ require 'timeout'
 module Gogetit
   module Util
     def run_command(cmd)
-      logger.info("Calling <#{__method__.to_s}> to run #{cmd}")
+      logger.info("Calling <#{__method__.to_s}> to run '#{cmd}'")
       system(cmd)
     end
 
+    def get_provider_of(name, providers)
+      if providers[:lxd].container_exists?(name)
+        logger.info("Calling <#{__method__.to_s}>, It is a LXD container.")
+        return 'lxd'
+      elsif providers[:libvirt].domain_exists?(name)
+        logger.info("Calling <#{__method__.to_s}>, It is a KVM domain.")
+        return 'libvirt'
+      else
+        puts "#{name} is not found"
+        return nil
+      end
+    end
+
     def is_port_open?(ip, port)
       logger.info("Calling <#{__method__.to_s}> to check #{ip}:#{port}")
       begin
@@ -42,11 +55,11 @@ module Gogetit
         if res.code == "200"
           res.body
         else
-          logger.info("Unable to reach the content of #{url}.")
+          logger.error("Unable to reach the content of #{url}.")
           false
         end
       else
-        logger.info("Unable to reach the server: #{uri.host} or port: #{uri.port}.")
+        logger.error("Unable to reach the server: #{uri.host} or port: #{uri.port}.")
         false
       end
     end
@@ -144,19 +157,6 @@ module Gogetit
       end
     end
 
-    def recognize_env
-      thedir = 'lib/env'
-      gateway = get_gateway(4)
-      Dir.foreach(thedir) do |item|
-        if item.match(/\.json$/)
-          env_data = JSON.parse(File.read(thedir+'/'+item))
-          if gateway =~ Regexp.new(env_data['regexp_pattern'])
-            return env_data['name']
-          end
-        end
-      end
-    end
-
     def get_gateway(version)
       IO.popen("ip -#{version.to_s} route").read.each_line do |route|
         if route.include? 'default'

data/lib/gogetit/version.rb

@@ -1,3 +1,3 @@
 module Gogetit
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gogetit
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,7 +218,6 @@ files:
 - bin/gogetit
 - bin/setup
 - gogetit.gemspec
-- lib/etcd.rb
 - lib/executionhooks.rb
 - lib/gogetit.rb
 - lib/gogetit/cli.rb
@@ -257,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Libraries with a CLI tool for dealing with things like MAAS, LXD and Libvirt.

data/lib/etcd.rb

@@ -1,37 +0,0 @@
-require 'json'
-require 'etcd'
-
-module Etcd
-  class Etcd
-    attr_reader :etcd_conn
-
-    include Gogetit::Util
-
-    def initialize(config)
-      @etcd_conn = Etcd::Client.connect(uris: config[:etcd_url]).connect
-    end
-
-    def env_name
-      if etcd_conn.get('env_name') == nil or etcd_conn.get('env_name') == ''
-        etcd_conn.set('env_name', recognize_env)
-        etcd_conn.get('env_name')
-      else
-        etcd_conn.get('env_name')
-      end
-    end
-
-    def import_env
-      file = File.read('lib/env/'+env_name+'.json')
-      env_data = JSON.parse(file)
-      etcd_conn.set('env', env_data.to_json)
-    end
-
-    def env
-      if ! etcd_conn.get('env')
-        import_env
-      else
-        JSON.parse(etcd_conn.get('env'))
-      end
-    end
-  end
-end