marshmallow 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 447943b36336a0873bdd0d15e51b47f488a96086
-  data.tar.gz: 8ff2a3653d9d37386721bbc25a4f0a69e5d46070
+  metadata.gz: '0933879f9a785b1d48db4fd6c9f32bfc78d6c573'
+  data.tar.gz: d88b1eabfee5ca7c998c7a836857efc4b4bc0b60
 SHA512:
-  metadata.gz: 216e331f1ac32456b5e3d6925ca05248cd0abfe85265303abe97ccb124399df0689f14ca535ad935a31edf59247924f44e1054a23ad81cc0d950199eac89fa97
-  data.tar.gz: 19af7d5042c1285aef5a77aeec6cf9511e764a9ae0cfae0a33fd5d9b9669327c1c6b528d67c3e85dd8369b9413410063dec2aa19ceaece0496b4d77b4d56593f
+  metadata.gz: 2ee48bd07c21157ad6b22531a3e8300a1c8b5a4081d9193a27d8962bda488ec9e5b0e51d1c313a5a5f5347487ce4b9b44ced24baa22e78df9485ba9dba4a1b03
+  data.tar.gz: c07ee7124d667382ac238c2722de873d7b76f6e92c616d87bc95754ff5b6174578f58f8daddbc90caa9e5a3556a2f1c023d52e7ff7a00390e77129effdccdf5e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0 (5.20.2019)
+- fixed issues with the return vaules for memory, smc, and uuid
+- provided better error messages if no vaules existed in ard info fields
+
 ## 0.1.3 (2.8.2017)
 - added options for: profiles_installed, profiles_all, domain_check, firewall_check, fastuserswitch_check, loginwindow_check, user_launchagents, userlaunchdaemons, and options
 - fixed code for ardinfo's to use 'CFPropertyList'

data/README.md

@@ -10,42 +10,42 @@ To see a list of availible options for Marshmallow, require 'Marshmallow' in fil
 
 output should be similar to this:
 ***
-	apps_installed
-	ard_info1
-	ard_info2
-	ard_info3
-	ard_info4
-	boot_rom
-	boot_volume
-	build
-	computer_name
-	cores
-	domain_check
-	fastuserswitch_check
-	firewall_check
-	free_space
-	graphics
-	hd_size
-	listoflocaladmins
-	loginwindow_check
-	memory
-	model
-	model_id
-	options
-	os_version
-	processor_name
-	processor_number
-	processor_speed
-	profiles_all
-	profiles_installed
-	serial
-	smc
-	system_launchagents
-	system_launchdaemons
-	user_launchagents
-	user_launchdaemons
-	users
-	uuid
+	- apps_installed
+	- ard_info1
+	- ard_info2
+	- ard_info3
+	- ard_info4
+	- boot_rom
+	- boot_volume
+	- build
+	- computer_name
+	- cores
+	- domain_check
+	- fastuserswitch_check
+	- firewall_check
+	- free_space
+	- graphics
+	- hd_size
+	- listoflocaladmins
+	- loginwindow_check
+	- memory
+	- model
+	- model_id
+	- options
+	- os_version
+	- processor_name
+	- processor_number
+	- processor_speed
+	- profiles_all
+	- profiles_installed
+	- serial
+	- smc
+	- system_launchagents
+	- system_launchdaemons
+	- user_launchagents
+	- user_launchdaemons
+	- users
+	- uuid
 
 ##  Examples:
 

data/lib/marshmallow.rb

@@ -83,8 +83,9 @@ module Marshmallow
 
 	def self.memory
 		memory = `system_profiler SPHardwareDataType`.split("\n")
-		memory = memory[12].split(":")
-		return memory[1].strip
+        memory = memory.grep(/Memory:/).join(":").strip.split(":")
+        memory = memory[1].strip
+        return memory
 	end
 
 	def self.boot_rom
@@ -95,16 +96,18 @@ module Marshmallow
 
 	def self.smc
 		smc = `system_profiler SPHardwareDataType`.split("\n")
-		smc = smc[14].split(":")
-		return smc[1].strip
+        smc = smc.grep(/SMC/).join(":").strip.split(":")
+        smc = smc[1].strip
+        return smc
 	end
 
 	def self.uuid
 		uuid = `system_profiler SPHardwareDataType`.split("\n")
-		uuid = uuid[16].split(":")
-		return uuid[1].strip
-	end
-
+        results =  uuid.grep(/UUID:/).join(":").strip.split(":")
+        results = results[1].strip
+        return results
+    end
+    
 	def self.graphics
 		graphics = `system_profiler SPDisplaysDataType`.split("\n")
 		graphics = graphics[2].split(":")
@@ -198,41 +201,41 @@ module Marshmallow
 	def self.ard_info1
 		plist = CFPropertyList::List.new(:file => "/Library/Preferences/com.apple.RemoteDesktop.plist")
 		results = CFPropertyList.native_types(plist.value)
-		if results['Text1'].empty?
-			return "null"
-		else
-			return results['Text1']
-		end
+		if results.key?('Text1')
+            return results['Text1']
+        else
+            return "Error: plist does not contain key for 'Text1'"
+        end
 	end
 
 	def self.ard_info2
 		plist = CFPropertyList::List.new(:file => "/Library/Preferences/com.apple.RemoteDesktop.plist")
 		results = CFPropertyList.native_types(plist.value)
-		if results['Text2'].empty?
-			return "null"
-		else
-			return results['Text2']
-		end
+		if results.key?('Text2')
+            return results['Text2']
+        else
+            return "Error: plist does not contain key for 'Text2'"
+        end
 	end
 
 	def self.ard_info3
 		plist = CFPropertyList::List.new(:file => "/Library/Preferences/com.apple.RemoteDesktop.plist")
 		results = CFPropertyList.native_types(plist.value)
-		if results['Text3'].empty?
-			return "null"
-		else
-			return results['Text3']
-		end
+		if results.key?('Text3')
+            return results['Text3']
+        else
+            return "Error: plist does not contain key for 'Text3'"
+        end
 	end
 
 	def self.ard_info4
 		plist = CFPropertyList::List.new(:file => "/Library/Preferences/com.apple.RemoteDesktop.plist")
 		results = CFPropertyList.native_types(plist.value)
-		if results['Text4'].empty?
-			return "null"
-		else
-			return results['Text4']
-		end
+		if results.key?('Text4')
+            return results['Text4']
+        else
+            return "Error: plist does not contain key for 'Text4'"
+        end
 	end
 
 	def self.profiles_installed

data/lib/marshmallow/version.rb

@@ -1,3 +1,3 @@
 module Marshmallow
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/marshmallow.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "marshmallow"
   spec.version       = Marshmallow::VERSION
   spec.authors       = ["Nic Scott"]
-  spec.email         = ["scottnl@kenyon.edu"]
+  spec.email         = ["nls.inbox@gmail.com"]
   spec.summary       = %q{A collection of macOS facts and useful information for MacAdmins}
   spec.homepage      = "https://github.com/nlscott/marshmallow"
   spec.license       = "MIT"

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: marshmallow
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nic Scott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: 
 email:
-- scottnl@kenyon.edu
+- nls.inbox@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -84,7 +84,7 @@ files:
 - bin/setup
 - lib/marshmallow.rb
 - lib/marshmallow/version.rb
-- marshmallow-0.1.2.gem
+- marshmallow-0.1.3.gem
 - marshmallow.gemspec
 homepage: https://github.com/nlscott/marshmallow
 licenses:
@@ -96,17 +96,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.0.14.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: A collection of macOS facts and useful information for MacAdmins