knife-maas 1.1.2.pre → 1.1.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e9afc91121101a8cbfcb9f52bf25eab60ba1f4
-  data.tar.gz: d7c5c5705c11cb9be8f088b7d18411f8a7853d24
+  metadata.gz: 098cec2c19b768d4af4e30431c2c7c97dbcbd70f
+  data.tar.gz: 259d8b7646d570680352bb60cfca067c7634a68d
 SHA512:
-  metadata.gz: 134adcc440271ed7337cc9dc9314ccdb289e2a85c2d5b5294a102445db15eb80faa5ef1fabec0eee68d6f93fb2490fd1772ed61d389f361804ee6be09c297a18
-  data.tar.gz: e4ad0eded0465887acd93429caee39127cf55bba337780695a2061b8d7fbed314d0f56f6b8c04f5c39513726029707eb1dcef78d81d755967e3cdedff7fafe5d
+  metadata.gz: 737b60942323354f6a4a47a85d50c9f4b883bd2dd7042ad5c52baebca979f1fcedac6b47ec11b0ca9ff80c9c6f17769d25af49ebe3d8f5cb56379e74aa55485f
+  data.tar.gz: 42e5885b0f06d662f37f94446c702a3c20d26cc07733f75c5dc4e6fe11be9d432f0965867359b27d121b0fd937fecbe26b4d6e0a83c708a55769e55e672d576e

data/lib/chef/knife/maas/version.rb

@@ -1,7 +1,7 @@
 class Chef
   class Knife
     module Maas
-      VERSION = "1.1.2.pre"
+      VERSION = "1.1.3.pre"
     end
   end
 end

data/lib/chef/knife/maas_base.rb

@@ -50,8 +50,19 @@ class Chef
         Chef::Config[:knife][key] || config[key]
       end
 
+      def validate!(keys=[:hostname, :system_id])
+        errors = []
 
+        keys.each do |k|
+          if Chef::Config[:knife][k].nil?
+            errors << "You did not provide a valid '#{k}' value."
+          end
+        end
 
+        if errors.each{|e| ui.error(e)}.any?
+          exit 1
+        end
+      end
     end
   end
 end

data/lib/chef/knife/maas_server_acquire.rb

@@ -17,7 +17,6 @@ class Chef
         puts "Acquiring #{hostname} under your account now...."
       end
 
-
     end
   end
 end

data/lib/chef/knife/maas_server_bootstrap.rb

@@ -27,8 +27,6 @@ class Chef
       :default => []
 
       def run
-        hostname = locate_config_value(:hostname)
-        system_id = locate_config_value(:system_id)
 
         response = access_token.request(:post, "/nodes/?op=acquire")
         hostname = JSON.parse(response.body)["hostname"]

data/lib/chef/knife/maas_server_release.rb

@@ -13,19 +13,19 @@ class Chef
       option :hostname,
       :short => "-h HOSTNAME",
       :long => "--hostname HOSTNAME",
-      :description => "The HOSTNAME inside of MaaS"
+      :description => "The HOSTNAME inside of MAAS"
 
       option :system_id,
       :short => "-s SYSTEM_ID",
       :long => "--system-id SYSTEM_ID",
-      :description => "The System ID inside of MaaS"
+      :description => "The System ID inside of MAAS"
 
       option :purge,
       :short => "-P",
       :long => "--purge",
       :boolean => true,
       :default => false,
-      :description => "Destroy corresponding node and client on the Chef Server, in addition to releasing the MaaS node itself. Assumes node and client have the same name as the server."
+      :description => "Destroy corresponding node and client on the Chef Server, in addition to releasing the MAAS node itself. Assumes node and client have the same name as the server."
 
       def destroy_item(klass, name, type_name)
         begin
@@ -38,6 +38,9 @@ class Chef
       end
 
       def run
+
+        validate!
+
         system_id = locate_config_value(:system_id)
         hostname = locate_config_value(:hostname)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-maas
 version: !ruby/object:Gem::Version
-  version: 1.1.2.pre
+  version: 1.1.3.pre
 platform: ruby
 authors:
 - JJ Asghar