gaddygaddy 0.1.91 → 0.1.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6599fc52c3742b6cc72e5c065d711c393fdde981
-  data.tar.gz: c6bd8701483ce61903442a341e1474889679ba71
+  metadata.gz: 7e6782e2bf303d99fae32b38e8db4d562551e5cc
+  data.tar.gz: 704427a3b6d16fd477a715b96e75dd70e46095aa
 SHA512:
-  metadata.gz: b534d188dc6ddd668fd9953c473c6e8a7abfb98d10f57b1c719cf7c93d46f00d39a31ed601d77065e2bfe8bb62992acf9f1d676a1dfa59c9dcaa3d0655372d00
-  data.tar.gz: 5e7527bf8c2330e314d039a74e89ed513ee19d7e4e3a3b393605e06b7e409ed08579004a365045acf9e655b1b7e9ee00126357dce2140e54ae5a40aec118e9b4
+  metadata.gz: 46d81cef9ed49f4b342160a24ac3e51dc606bd11243688f35355e518bd94935f5b446a8fd31125aebafb7b1074a2e354e5fbb1d9d63af1d5d759010e4f351fbf
+  data.tar.gz: 6ab4d3f7305f6ddf06a84785d65b634207a04103b1931fdb40d021da87e7c64487ef5089b66ea0e479eda7aea8b6e4228b557de054e41a1cdfa3211b852a75b4

data/lib/gaddygaddy-client.rb

@@ -292,6 +292,21 @@ class GaddyGaddy_Client
     conf_content
   end
 
+  # Create a new user
+  def create_user(user_name, password)
+    url = Request.get_base_url(get_host) + "/user/1"
+    params = {
+      :model =>
+        {
+          :user_email => URI.encode(user_name),
+          :user_password => password
+        }
+    }.to_json
+    response = Request.client_service_post url, params
+    logger.debug "The response for the request is #{response} #{response.class}"
+    raise JCouldNotPostClientDataException.new({:message=> "Could not post data to the gaddygaddy service, error code is #{response.body}"}) unless response[:status].to_i == 0
+  end
+
   def create_gaddy(gaddy_name, user_name, password)
     url = Request.get_base_url(get_host) + "/installation/device/1"
     params = {:device_name => gaddy_name,
@@ -303,10 +318,10 @@ class GaddyGaddy_Client
     raise JCouldNotPostClientDataException.new({:message=> "Could not post data to the gaddygaddy service, error code is #{response.body}"}) unless response[:status].to_i == 0
   end
 
-  def create_new(name)
+  def create_new?(name, type)
     inp = ''
     unless @options[:create]
-      puts "Gaddy #{name} doesn't exist, would you like to create it (Y/N)"
+      puts "#{type} #{name} doesn't exist, would you like to create it (Y/N)"
       answer = nil
       while answer.nil?
         inp = gets.chomp.upcase
@@ -314,7 +329,7 @@ class GaddyGaddy_Client
           answer = ['Y','N'].index(inp[0]) ? inp : nil
         else
           puts
-          puts "Gaddy #{name} doesn't exist, would you like to create it (Y/N)"
+          puts "#{type} #{name} doesn't exist, would you like to create it (Y/N)"
         end
       end
     end
@@ -329,8 +344,18 @@ class GaddyGaddy_Client
     rescue Exception => e
       raise e.inspect
     end
-    if get_conf_file['status'] == 12
-      if create_new(gaddy_name)
+    puts "1"
+    begin
+      status_gaddy = get_conf_file['status']
+    rescue RestClient::Unauthorized => e
+      if create_new?(user_name, 'User')
+        logger.info "Will create a new user #{user_name}"
+        create_user(user_name, password)
+      end
+      status_gaddy = get_conf_file['status']
+    end
+    if status_gaddy == 12 || status_gaddy == 4
+      if create_new?(gaddy_name, 'Gaddy')
         logger.info "Will create a new gaddy named #{gaddy_name}"
         create_gaddy(gaddy_name, user_name, password)
         if get_conf_file['status'] == 12
@@ -341,7 +366,6 @@ class GaddyGaddy_Client
         puts 'If you would like to create it add parameter --create to the command'
       end
     end
-
   end
 
   # Check that the config file exist and has valid content, this will also be validated toward the server

data/lib/utils/request.rb

@@ -34,18 +34,18 @@ class Request
   # path will be evaluated so there could be parameters in that one and then use ''  for the string
   # to have the parameters evaluated in this function
   #
-  def self.client_service_get(host, path)
+  def self.client_service_get(host, path, retries = 1)
     url = get_base_url(host) + path
     logger.debug "Will request url #{url}"
-    result = with_retries(:limit => 10, :sleep=> 5) { RestClient.get url }
+    result = with_retries(:limit => retries, :sleep=> 5) { RestClient.get url }
     result_json = JSON.parse(result)
     logger.debug "The result of the request is #{result.inspect}"
     result_json
   end
 
-  def self.client_service_post(url, param)
+  def self.client_service_post(url, param, retries = 1)
     logger.debug "Will request url #{url}"
-    result = with_retries(:limit => 10, :sleep=> 5) { RestClient.post url, param }
+    result = with_retries(:limit => retries, :sleep=> 5) { RestClient.post url, param }
     JSON.parse(result)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaddygaddy
 version: !ruby/object:Gem::Version
-  version: 0.1.91
+  version: 0.1.92
 platform: ruby
 authors:
 - GaddyGaddy