maas-client 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398dd039d11e9b0bfba7107737913aadd6bc61c4
-  data.tar.gz: 95bd91f51bdd348e029b0d6ca90f078481fbc43a
+  metadata.gz: e4909834732e25bcc549c997a8691da4e6a4d70a
+  data.tar.gz: df1a42b383a7fb990aa8b04229bb88132c35da80
 SHA512:
-  metadata.gz: d204d9c39cd47f680531005595a8db7988b7b039213a822c97e1decd0cde4925e02f383d4e072655df2a910c2987169e185bec7075a5cd0f4f27414ada18df44
-  data.tar.gz: 58b9789e46264d1957e2a5a69b382269fb8cf614f49e998f34969c9a942def0b532c31d2f1e17c4039d2adb90cb20fadaa4abbf768e373769ba912f7a0a334fd
+  metadata.gz: e955f95eda898f7ea634fdc5b843edb6be22da8e961a948853f9dddcc0e3887ac0783051d1c846e66b796dfb8866002585367ba972b65c2f0fc7e637900283b4
+  data.tar.gz: a5df8779c9a21ebb259a26dfa70870b8c562a290129a7e199e4b8dccae71f8edea23580c69e7044d1102f000af78d27192d1a2817db304d45ceaac2ad575c48d

data/lib/maas/client/cli.rb

@@ -1,16 +1,12 @@
 require 'thor'
 require 'maas/client'
-require 'maas/client/util'
-require 'pry'
-require 'yaml'
+require 'maas/client/config'
 
 module Maas
   module Client
     class CLI < Thor
       package_name 'maas-client'
       # DO NOT DUPLICATE EXISTING 'maas' COMMAND.
-      include Maas::Client::Util
-
       attr_reader :conn
 
       def initialize(*args)
@@ -20,30 +16,16 @@ module Maas
 
       no_commands do
         def init_rbmaas
-          user_rbmaas_home = Dir.home + '/.rbmaas'
-          maas_config = {}
-          maas_config[:user_rbmaas_home] = user_rbmaas_home
-          if not File.directory?(user_rbmaas_home)
-            puts 'Creating home directory..'
-            FileUtils.mkdir(user_rbmaas_home)
-          end
-
-          lib_dir = Gem::Specification.find_by_name("maas-client").gem_dir
-          maas_config[:lib_dir] = lib_dir
-          conf_file = user_rbmaas_home + '/rbmaas.yml'
-          if not File.exists?(conf_file)
-            src = File.new(lib_dir + '/lib/maas/client/template/rbmaas.yml')
-            dst = Dir.new(user_rbmaas_home)
-            puts 'Copying sample rbmaas.yml..'
-            FileUtils.cp(src, dst)
-            abort("Please define default configuration for rbmaas at #{conf_file}")
+          maas_config = Maas::Client::Config.config
+          if File.exists?(maas_config[:conf_file])
+            Maas::Client::Config.set_config
+            Maas::Client::MaasClient.new(
+              maas_config[:maas][:key],
+              maas_config[:maas][:url]
+            )
+          else
+            Maas::Client::Config.init_config
           end
-
-          maas_config.merge!(symbolize_keys(YAML.load_file(conf_file)))
-          conn = Maas::Client::MaasClient.new(
-            maas_config[:maas][:key],
-            maas_config[:maas][:url]
-          )
         end
       end
 
@@ -59,7 +41,8 @@ module Maas
           end
 
           if domains == []
-            abort("There is no dnsresource to clear.")
+            puts "There is no dnsresource to clear."
+            return nil
           end
 
           domains.each do |d|
@@ -73,6 +56,8 @@ module Maas
 
       desc 'generate', "Generate custom data."
       def generate(resource)
+        # clear dnsresources before generation
+        invoke :clear, ['dns']
         case resource
         when 'hosts'
           records = []

data/lib/maas/client/config.rb

@@ -0,0 +1,39 @@
+require 'maas/client/util'
+require 'yaml'
+
+module Maas
+  module Client
+    module Config
+      extend Maas::Client::Util
+      class << self
+        attr_reader :config
+      end
+
+      @config = {}
+
+      config[:lib_dir] = Gem::Specification.find_by_name("maas-client").gem_dir
+      config[:user_rbmaas_home] = Dir.home + '/.rbmaas'
+      config[:conf_file] = config[:user_rbmaas_home] + '/rbmaas.yml'
+
+      def self.init_config
+        if not File.directory?(config[:user_rbmaas_home])
+          puts 'Creating home directory..'
+          FileUtils.mkdir(config[:user_rbmaas_home])
+        end
+
+        if not File.exists?(config[:conf_file])
+          src = File.new(config[:lib_dir] + '/lib/maas/client/template/rbmaas.yml')
+          dst = Dir.new(config[:user_rbmaas_home])
+          puts 'Copying sample rbmaas.yml..'
+          FileUtils.cp(src, dst)
+          abort("Please define default configuration for rbmaas at #{config[:conf_file]}")
+        end
+      end
+
+      def self.set_config
+        config.merge!(symbolize_keys(YAML.load_file(config[:conf_file])))
+      end
+    end
+  end
+end
+

data/lib/maas/client/version.rb

@@ -2,6 +2,6 @@
 
 module Maas
   module Client
-    VERSION = '0.1.23'
+    VERSION = '0.1.24'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maas-client
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -173,6 +173,7 @@ files:
 - bin/rbmaas
 - lib/maas/client.rb
 - lib/maas/client/cli.rb
+- lib/maas/client/config.rb
 - lib/maas/client/template/rbmaas.yml
 - lib/maas/client/util.rb
 - lib/maas/client/version.rb
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A client library for MAAS