anamo 1.0.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 670d08b29eee4b40b207e12f12ef45f60c374d3ddc25f957d9db811c0dcb03de
-  data.tar.gz: 6ccb4825a4975a3828fb84dcac2df79eefc09f3cf1b1393846ec233b19e84765
+  metadata.gz: b248375e60e38489f546fd888ad95d8ca1e8cd55ca297121ee8b61713f7cb49d
+  data.tar.gz: a972b4a46d6ba2bcaf52246d7a7127e99464cadf90e9bfd23832055c9cae8c72
 SHA512:
-  metadata.gz: 3f6b94577eb085ecbda0d3078c82a5262291c5783f2b77d1ae3bcf671dd77637678ec61477c241c98e0b09739c42b34fe2f889df96a34b8eed8e885549db6485
-  data.tar.gz: 4ece3fe0185556a0d41d624fc4726746bf6b9c1a5bb4d4bbbfd9d3a8ecac1986a9f54fac4a57a907b60f22662b062dfeb7e069855c990ef8bf972276fea321e8
+  metadata.gz: 1f022479534a6af3a72588f75f064153d370f5986327c7d73dc522abc29ca13f88af74316765bb1ab22e6555f859a41032372b2fb78e1c876a133b5d5bdd15b4
+  data.tar.gz: e1ac6b4ff9a71f714c45528681439bc2a3fab7a2cb2194183b5d73e95981dd4d76e4eedc1b34548f5416f85bb2dab00ffba990c67ff3dbb45f8c2d26f687c8dd

data/lib/anamo/node/start

@@ -0,0 +1,3 @@
+---
+api_key: 63ITKI8a0CrQQW06rK
+modules: {}

data/lib/anamo/node/thor.rb

@@ -3,6 +3,9 @@ require 'thor'
 require 'anamo/api'
 require 'socket'
 require 'yaml'
+require 'train'
+require 'sys/uname'
+include Sys
 
 module Anamo
   module Node
@@ -35,12 +38,25 @@ module Anamo
         ret = {}
 
         config = YAML.load_file "/etc/anamo.conf.yml"
+	train = Train.create('local')
 
         ret['api_key'] = config['api_key']
         ret['beacon_modules'] = config['modules']
         ret['node'] = {}
         ret['node']['hostname'] = Socket.gethostname
         ret['node']['ips'] = Socket.ip_address_list.map(){ |entry| entry.ip_address }.uniq
+	ret['node']['os_name'] = Train.create('local').connection.os[:name]
+	ret['node']['os_family'] = Train.create('local').connection.os[:family]
+	ret['node']['os_release'] = Train.create('local').connection.os[:release]
+        ret['node']['uname_sysname'] =  Uname.sysname 				 # => The operating system name. e.g. "SunOS"
+        ret['node']['uname_machine'] =  Uname.machine  				 # => The machine hardware type. e.g. "i686"
+        ret['node']['uname_version'] =  Uname.version  				 # => The operating system version. e.g. "5.8". Windows includes patch information.
+        ret['node']['uname_release'] =  Uname.release  				 # => The operating system release. e.g. "2.2.16-3"
+        ret['node']['uname_architecture'] = Uname.architecture       		 # => Returns the instruction set architecture. e.g. "sparc"
+        ret['node']['uname_platform'] = Uname.platform        		 	 # => The platform identifier. e.g. "SUNW,Sun-Blade-100"
+	ret['node']['uname_isa_list'] = Uname.isa_list         		 	 # => List of supported instr. sets, e.g. "amd64 pentium_pro+mmx pentium_pro"
+	ret['node']['uname_hw_provider'] = Uname.hw_provider      	 	 # => The name of the hardware manufacturer.
+	ret['node']['uname_hw_serial_number'] = Uname.hw_provider 	 	 # => Uname.hw_serial_number # => The hardware serial number
 
         puts ret if output
 
@@ -127,4 +143,4 @@ module Anamo
 
     end
   end
-end
+end

data/lib/anamo/pkgver/thor.rb

@@ -27,37 +27,54 @@ module Anamo
 
       def inspect output = true
 
+		##############################
+		### RPM
+		##############################
+		
         rpm_packages = []
-        status, stdout, stderr = systemu "rpm -qa --qf '%{NAME} %{VERSION} %{RELEASE} %{ARCH}\n'"
+        status, stdout, stderr = systemu "rpm -qa --qf '%{NAME}abyz3_%{VERSION}abyz3_%{RELEASE}abyz3_%{ARCH}abyz3_%{VENDOR}abyz3_%{RPMTAG_INSTALLTIME}abyz3_%{SIZE}\n'" # See: http://ftp.rpm.org/max-rpm/ch-rpm-query.html
         if status.success?
           stdout.split("\n").each do |package|
-            package = package.split(' ')
+            package = package.split('abyz3_')	# because vendor can have spaces, make the delimiter something unique abyz3_
             rpm_packages << {
-              'n' => package[0],
-              'v' => package[1],
-              'r' => package[2],
-              'a' => package[3]
+              'n'  => package[0],  #name
+              'v'  => package[1],  #version
+              'r'  => package[2],  #release
+              'a'  => package[3],  #architecture
+              'v2' => package[4],  #vendor,
+              'it' => package[5], #install time, or ${RPMTAG_INSTALLTIME}
+              's'  => package[6], #size, or ${SIZE}
             }
           end
         else
           rpm_packages = nil
         end
+        
 
+		##############################
+		### Debian
+		##############################
         deb_packages = []
-        status, stdout, strerr = systemu "dpkg-query -W -f='${Package} ${Version} ${Architecture}\n'"
+        status, stdout, strerr = systemu "dpkg-query -W -f='${Package}abyz3_${Version}abyz3_${Architecture}abyz3_${Installed-Size}abyz3_${Homepage}\n'" #$options here under: http://manpages.ubuntu.com/manpages/trusty/man1/dpkg-query.1.html
         if status.success?
           stdout.split("\n").each do |package|
-            package = package.split(' ')
+            package = package.split('abyz3_')
             deb_packages << {
-              'n' => package[0],
-              'v' => package[1],
-              'a' => package[2]
+              'n' 	=> package[0],	#package name, or ${Package}
+              'v' 	=> package[1],	#package version
+              'a'  	=> package[2],	#package architecture
+              's'   => package[3],	#size, or ${Installed-Size}
+              'hp'	=> package[4],	#homepage, or ${Homepage}
             }
           end
         else
           deb_packages = nil
         end
 
+		##############################
+		### Gem
+		##############################
+		
         gem_packages = []
         status, stdout, stderr = systemu "gem list -l"
         if status.success?

data/lib/anamo/version.rb

@@ -1,3 +1,3 @@
 module Anamo
-  VERSION = "1.0.1"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anamo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.3
 platform: ruby
 authors:
-- US ProTech
+- Anamo, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: train
+  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: sys-uname
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Anamo agent
+description: Linux agent for app.anamo.io
 email:
 - jp@usprotech.com
 executables:
@@ -109,6 +137,7 @@ files:
 - lib/anamo/api.rb
 - lib/anamo/fstree/thor.rb
 - lib/anamo/groups/thor.rb
+- lib/anamo/node/start
 - lib/anamo/node/thor.rb
 - lib/anamo/pkgver/thor.rb
 - lib/anamo/ports/thor.rb