atk_toolbox 0.0.93 → 0.0.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d1a6a7ee343c0fba737bc6b80d56d9d0c7214dc6b0b8945d4cb7b9a90ea92ab
-  data.tar.gz: 93658102c13fd3580368df670d0be7b4c436f779fd6f99b6a35d9cf537a6e7c3
+  metadata.gz: 0ce2d5d70547d1bffd0041e5d7b9c504cf8b44fad6e77019ff69ed05c6d00ff2
+  data.tar.gz: 9804fc2f8af7ff355304ece47284da19bce9182a29e55ccbb8ab6ea73a6d8b1e
 SHA512:
-  metadata.gz: 321bf5075cd3f70911122608c0a024e58a3aa31a13de93c9de41345e368a0c3cba788327ca91272139937e08f41e651a5d3d953b2d723b91468674cbaf25f9c1
-  data.tar.gz: 4f6e0a27e8eef8920432d21e179ced5a38e9f5ed106d359c918e252869f576276698d943c2859e7d59cd36ce41651d1649916fdd38359265dac7f9e08b023e79
+  metadata.gz: 348f483690a7e3ac5b15bdb404fb7709ac4812278f66bb1a5c4432e95afbf9c72d352312b23491779068554b03e44c6d654916ecdd5becf40c83e15f0152bba2
+  data.tar.gz: 9ba6af93b93fe6ff713a6cfd6965d0dd7c482d0c6175695fc2122643d55249eefcb6f7300a507ca3c933ef458ecde069d935f4126c8d4d0aad04d0d882b51552

data/lib/atk/console.rb

@@ -51,15 +51,11 @@ class TTY::Prompt
     end
     
     def path_for(name_of_executable)
-        if OS.is?(:windows)
-            return `where '#{name_of_executable}'`.strip
-        else
-            return `which '#{name_of_executable}'`.strip
-        end
+        return OS.path_for_executable(name_of_executable)
     end
     
     def has_command(name_of_executable)
-        return Console.path_for(name_of_executable) != ''
+        return OS.has_command(name_of_executable)
     end
     
     def single_quote_escape(string)

data/lib/atk/os.rb

@@ -1,3 +1,4 @@
+require_relative './version.rb'
 # every OS version is a perfect heirarchy of versions and sub verisons that may or may not be chronological
 # every OS gets it's own custom heirarchy since there are issues like x86 support and "student edition" etc
 # the plan is to release this heirarchy on its own repo, and to get pull requests for anyone who wants to add their own OS
@@ -59,7 +60,7 @@ module OS
             # this is a function created for convenience, so it doesn't have to be perfect
             # you can use it to ask about random qualities of the current OS and get a boolean response
         # convert to string (if its a symbol)
-        adjective = adjective.to_s
+        adjective = adjective.to_s.downcase
         case adjective
             when 'windows'
                 return (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
@@ -71,6 +72,49 @@ module OS
                 return not( OS.is?(:windows))
             when 'debian'
                 return File.file?('/etc/debian_version')
+            when 'ubuntu'
+                return OS.has_command('lsb_release') && `lsb_release -a`.match(/Distributor ID: Ubuntu/)
         end
     end
+    
+    def self.version
+        # these statements need to be done in order from least to greatest
+        if OS.is?("ubuntu")
+            if OS.has_command('lsb_release')
+                version_info = `lsb_release -a`
+                version = Version.extract_from(version_info)
+                name_area = version_info.match(/Codename: *(.+)/)
+                if name_area
+                    version.codename = name_area[1].strip
+                end
+                return version
+            end
+        elsif OS.is?("debian")
+            # TODO: support debian version
+            return nil
+        elsif OS.is?('mac')
+            version = Version.extract_from(`system_profiler SPSoftwareDataType`)
+            agreement_file = `cat '/System/Library/CoreServices/Setup Assistant.app/Contents/Resources/en.lproj/OSXSoftwareLicense.rtf'`
+            codename_match = agreement_file.match(/SOFTWARE LICENSE AGREEMENT FOR *(?:macOS)? *(.+)\\\n/)
+            if codename_match
+                version.codename = codename_match[1].strip
+            end
+            return version
+        elsif OS.is?('windows')
+            # TODO: support windows version
+            return nil
+        end
+    end
+    
+    def self.path_for_executable(name_of_executable)
+        if OS.is?(:windows)
+            return `where '#{name_of_executable}'`.strip
+        else
+            return `which '#{name_of_executable}'`.strip
+        end
+    end
+    
+    def self.has_command(name_of_executable)
+        return OS.path_for_executable(name_of_executable) != ''
+    end
 end

data/lib/atk/version.rb

@@ -1,7 +1,14 @@
 # create a variable for the current ruby version
 
 class Version
-    attr_accessor :levels
+    attr_accessor :levels, :codename
+    
+    def self.extract_from(string)
+        match = string.match(/\d+\.\d+(\.\d+)*/)
+        if match != nil
+            return Version.new(match[0])
+        end
+    end
     
     def initialize(version_as_string)
         @levels = version_as_string.split('.')

data/lib/atk_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AtkToolbox
-  VERSION = '0.0.93'
+  VERSION = '0.0.94'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atk_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.93
+  version: 0.0.94
 platform: ruby
 authors:
 - Jeff Hykin