gaddygaddy 0.1.80 → 0.1.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767f0e97ad96d8461a9a3f521774e19399bf8cf5
-  data.tar.gz: 618ff2754c92de61e653faec2c3157ad206d4579
+  metadata.gz: 367a647eaed629131dad0763d0c8381fb689cd7a
+  data.tar.gz: b2337553aeb12cf5d6d8d7413667dbcfba5257b3
 SHA512:
-  metadata.gz: 20e9baef73bd6cbcf45342c41e475885c1e64486f367a7678ab9cba646673aca1ba3162336b1392cbc78cfdbafd4bd78e0eb936c74a09eb68a9b22d21328ce82
-  data.tar.gz: 109f8adc5b2ba370b44820720dafcbff1f229d0d2789ac8824bcaa2c90cd3274344df07b6178c4b266bb66cccd533ab4b520925ebc34356f445f0392bd2007c8
+  metadata.gz: a415556bd5d6cf6d29f6e7e38573c134807733c4e09fcd064e03e6d889c6029d5b0a5e8fc345f604bc8467f67af9ae48fc76bb0e2b0617dcfbef6f79018f0d83
+  data.tar.gz: faa5106548067148b5efe4aaa7380b8bcb15b1f54f6d7570d603c55fd9d5c96d64695b27a1de5a84a84824cfad440a378c35e4b456cefc5163648b8dade1356a

data/lib/gaddygaddy-client/diagnose_data.rb

@@ -0,0 +1,61 @@
+#
+# Name:
+#   diagnose_data.rb  
+#
+# Created by: mansson
+#
+# Description:
+#   
+#
+#
+# Copyright (c) 2013 Recorded Future
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'mixlib/shellout'
+
+class DiagnoseData
+
+  def self.get_all_diag_info
+    diagnose_data ={}
+    diagnose_data['resolvconf'] = get_file_data('/etc/resolv.conf')
+    diagnose_data['ifconfig'] = get_cmd_output('ifconfig')
+    diagnose_data
+  end
+
+  def self.get_file_data(file_name)
+    begin
+      file_data = {:file_name => file_name}
+      data_file = File.open(file_name,'r')
+      file_data[:file_content => data_file.read]
+      data_file.close
+      file_data[:file_time_stamp] = File.mtime(file_name)
+    rescue Exception => e
+      file_data['error'] = e.inspect
+    end
+    file_data
+  end
+
+  def self.get_cmd_output(cmd)
+    cmd_data = {:cmd => cmd}
+    cmd = Mixlib::ShellOut.new(cmd)
+    cmd.run_command
+    if cmd.error?
+      cmd_data[:error] = cmd.stderr
+    else
+      cmd_data[:result] = cmd.stdout
+    end
+    cmd_data
+  end
+
+end

data/lib/gaddygaddy-client/log_data.rb

@@ -13,6 +13,8 @@
 # All rights reserved.
 # 
 
+VALID_FILE_NAMES = ['log','resolv']
+
 class LogData
 
   #
@@ -24,6 +26,7 @@ class LogData
       log_file_name = "/opt/log/#{log_file_name[0..-5]}/#{log_file_name}"
     end
     raise "File #{log_file_name} does not exist" unless File.exist?(log_file_name)
+    raise "File name must have log" if VALID_FILE_NAMES.select{|f| log_file_name.index f}.empty?
     cmd = "tail -n #{lines} #{log_file_name}"
     exit_code, stdout = systemu cmd
     if exit_code.success?

data/lib/gaddygaddy-client.rb

@@ -23,6 +23,7 @@ require 'utils/hash_monkeypatch'
 require 'json'
 require 'subcommand'
 require 'gaddygaddy-client/chef_files'
+require 'gaddygaddy-client/diagnose_data'
 require 'gaddygaddy-client/notification'
 require 'gaddygaddy-client/log_data'
 require 'logging/logging'
@@ -145,9 +146,14 @@ class GaddyGaddy_Client
       opts.description = "Will send information about the gaddy to gaddygaddy.com"
     end
 
+    command :upload_diagnose_data do |opts|
+      opts.banner = "Usage: upload_diagnose_data[options]"
+      opts.description = "Will upload diagnose data"
+    end
+
     command :upload_log_file do |opts|
-      opts.banner = "Usage: verify_installation[options]"
-      opts.description = "Will verify the installation and check for gaddy file and network configuration"
+      opts.banner = "Usage: upload_log_file[options]"
+      opts.description = "Will upload log files"
       @options[:lines] = 100
       opts.on("-i", "--lines lines", "Number of lines to upload, count from end of file") do |lines|
         @options[:lines] = lines
@@ -277,6 +283,17 @@ class GaddyGaddy_Client
     @device_info.post
   end
 
+  def upload_diagnose_data
+    url = Request.get_base_url(get_host) + "/device/upload_diagnose_data/1/#{gg_config.user_id_salt}/#{gg_config.device_id}/#{gg_config.token}"
+    diagnose_data = DiagnoseData.get_all_diag_info
+    params = {:diagnose_data => diagnose_data,
+              :diagnose_time_stamp => Time.now
+    }
+    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 upload_log_file
     raise "Missing option upload_log_file" unless @options[:upload_log_file]
     log_file_name = @options[:upload_log_file].split('/').last
@@ -379,6 +396,8 @@ class GaddyGaddy_Client
           notification = Notification::Send.new(:speech_enabled => settings['speech_enabled'])
           notification.event = @options[:event]
           notification.notify gg_config.device_id
+        when 'upload_diagnose_data'
+          upload_diagnose_data
         when 'upload_log_file'
           upload_log_file
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gaddygaddy
 version: !ruby/object:Gem::Version
-  version: 0.1.80
+  version: 0.1.82
 platform: ruby
 authors:
 - GaddyGaddy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -115,6 +115,7 @@ files:
 - lib/gaddygaddy-client.rb~
 - lib/gaddygaddy-client/chef_files.rb
 - lib/gaddygaddy-client/device_config.rb
+- lib/gaddygaddy-client/diagnose_data.rb
 - lib/gaddygaddy-client/espeak.rb
 - lib/gaddygaddy-client/log_data.rb
 - lib/gaddygaddy-client/notification.rb