gaddygaddy 0.1.89 → 0.1.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e32c90738d40c6e705afc13a1aa7b1581d7dce5
-  data.tar.gz: d76abf4aeedfae962d72e9dad9dbb1cb915b8dda
+  metadata.gz: ac28e968392ddf19b195494d719948429a4b6f9c
+  data.tar.gz: a931d37d21e00cd0cd6b9ea586f9d123d2644375
 SHA512:
-  metadata.gz: b0d18306539f899532f6c438403a823714a0c0f3617ef7f52f251cbff75c7635064226355afea42d9860f73f9500fcb790695d46e2fbd104be711eaf82edbe11
-  data.tar.gz: cdba36c95364829b9de57fe92903e212c080505e2acc1dcb22e6817b4bb4f2f8b75ed7f99e79444c2d90fbfce76c4df05a028e84fff97aee68ac43c578b68702
+  metadata.gz: 1e443b7fcd600dec082a36e2c5dfb1bd3a56107d6a3a1991839b2a3428c2e196ac8b8e42936a439831e2eaabe2c6b91bafac3f2d3bb3cfde5581900233378a18
+  data.tar.gz: 8f61f0c74f560bae3acc390978a5a7f92687a860eda2e1618c37fdb3436cdd5d8e1af46b8cf2cec0ceb22197c72ba485115fa2852050febef2e19346e5081558

data/lib/gaddygaddy-client/chef_files.rb

@@ -56,7 +56,7 @@ class ChefFiles
     if prod_version
       '/' + URI.encode("pkg/gg_chef_#{version}.tar.gz")
     else
-      '/chef/latest_cookbook'
+      '/chef/latest_cookbook/1'
     end
   end
 

data/lib/gaddygaddy-client.rb

@@ -153,6 +153,9 @@ class GaddyGaddy_Client
       opts.on("-p", "--password password", "Password") do |password|
         @options[:password] = password
       end
+      opts.on("-c", "--create", "Create new gaddy if it doesn't exist") do
+        @options[:create] = true
+      end
     end
 
     command :send_device_data do |opts|
@@ -264,25 +267,80 @@ class GaddyGaddy_Client
 
   def get_gaddy_config(name, user, password)
     path = URI.encode("/device/config_file/1/#{name}?user_name=#{user}&user_password=#{password}").gsub('+', '%2B')
-    puts path
     response = Request.client_service_get get_host, path
     logger.debug "Got config file: #{response}"
     response
   end
 
+
+  # Get the config file and return the response
+  def get_conf_file
+    name = @options[:gaddy_name]
+    conf_content = get_gaddy_config(name, @options[:user_name], @options[:password])
+    gaddy_file_name = "gaddy_#{name}.gcf"
+    conf_file_name = File.join(conf_dir, gaddy_file_name)
+    if conf_content['device_name'] && conf_content['device_name'] == name
+      begin
+        conf_file = File.open conf_file_name, "w"
+        conf_file.write conf_content.to_json
+        conf_file.close
+        logger.info "Have created the configuration file for the gaddy in #{conf_file_name}"
+      rescue
+        logger.error "Could not write configuration #{conf_file_name}"
+      end
+    end
+    conf_content
+  end
+
+  def create_gaddy(gaddy_name, user_name, password)
+    url = Request.get_base_url(get_host) + "/installation/device/1"
+    params = {:device_name => gaddy_name,
+              :user_name => user_name,
+              :user_password => password
+    }
+    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_new(name)
+    inp = ''
+    unless @options[:create]
+      puts "Gaddy #{name} doesn't exist, would you like to create it (Y/N)"
+      answer = nil
+      while answer.nil?
+        inp = gets.chomp.upcase
+        if inp
+          answer = ['Y','N'].index(inp[0]) ? inp : nil
+        else
+          puts
+          puts "Gaddy #{name} doesn't exist, would you like to create it (Y/N)"
+        end
+      end
+    end
+    @options[:create] || (inp == 'Y')
+  end
+
   # Get the gaddy configuration and place it in /conf named gaddy_NAME.gcf
-  def gaddy_config
+  def gaddy_config(gaddy_name, user_name, password)
+    raise "You need to pass name of gaddy, username and password as parameters, see gaddygaddy-client gaddy_file --help" unless gaddy_name && password && user_name
     begin
       FileUtils.mkdir_p conf_dir
     rescue Exception => e
       raise e.inspect
     end
-    name = @options[:gaddy_name]
-    conf_content = get_gaddy_config(name, @options[:user_name], @options[:password])
-    gaddy_file_name = "gaddy_#{name}.gcf"
-    conf_file = File.open File.join(conf_dir, gaddy_file_name), "w"
-    conf_file.write conf_content.to_json
-    conf_file.close
+    if get_conf_file['status'] == 12
+      if create_new(gaddy_name)
+        logger.info "Will create a new gaddy named #{gaddy_name}"
+        create_gaddy(gaddy_name, user_name, password)
+        if get_conf_file['status'] == 12
+          puts "Can't find gaddy with name #{name}"
+        end
+      else
+        puts "Can't find gaddy with name #{name}"
+        puts 'If you would like to create it add parameter --create to the command'
+      end
+    end
 
   end
 
@@ -426,7 +484,7 @@ class GaddyGaddy_Client
         when "chef_config"
           get_chef_config
         when 'gaddy_file'
-          gaddy_config
+          gaddy_config(@options[:gaddy_name], @options[:user_name], @options[:password])
         when 'send_device_data'
           send_device_data
         when "verify_installation"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaddygaddy
 version: !ruby/object:Gem::Version
-  version: 0.1.89
+  version: 0.1.90
 platform: ruby
 authors:
 - GaddyGaddy
@@ -14,84 +14,84 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subcommand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -144,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client tools used for the Gaddygaddy service