os 1.0.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc56c95ef4834741ffeced9727a5750f13fafe33
-  data.tar.gz: a2844070c1b7e6abcc8ed1d121f9b7d47e360be3
+SHA256:
+  metadata.gz: 8ceda108b09b3210f4cab0b411d8fe76bb69c74b3054a86e15ba533074086ffe
+  data.tar.gz: c59bede2a6e772a83b13543951b7824a1811c376c1e313e16ec20e96a37f7986
 SHA512:
-  metadata.gz: 9defce3f1298173d446d40af5d7c1b99c945f8daf02159874cc90ad39ba7148327bc004a5891c864ed7df5bfe480280546aa01f2160d9924a4fd7c7a899842b7
-  data.tar.gz: e554eef3d21a36fbf876f6230050d43837ba9f4eb8a77c40c9d11ec5966d77839742cad6b621d5320ba362771e6089600a7d9c16d7a5099c8271806bb7cd75a3
+  metadata.gz: b574706218e68b4ce5d9d9c82abb967032ec5fa1d4363c268cbd89e3261955de0d8e0c56834d6e813c06b23900cade81087b86ff52f166418ab339d03ced7197
+  data.tar.gz: 6a692f3db11e912c795a66450a1e2ae70e9819c2f079b956584339f0be0b7241204cacf10153dd8e57e2b9ab4eb9730603d323ddfa801509774f24279435733c

data/ChangeLog

@@ -1,3 +1,21 @@
+1.1.4
+  Fix circular dependency
+
+1.1.2
+  Make rss_bytes return bytes in linux/OS X, like it always should have
+
+1.1.1
+  fix skip blank lines in OS#parse_os_release
+
+1.1.0
+  Add app_config_path method
+  Cleans up dev dependency specs
+  Detect underlying Docker containers method
+  Add Linux-specific OS#parse_os_release method
+
+1.0.1
+  add within docker method
+
 0.10.0
   freebsd? also some cleanup
 

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
 
-#gem 'rspec', ">= 2"
+gemspec

data/Gemfile.lock

@@ -1,29 +1,25 @@
 PATH
   remote: .
+  specs:
+    os (1.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    diff-lcs (1.1.3)
+    power_assert (1.0.2)
+    rake (0.9.6)
+    test-unit (3.2.3)
+      power_assert
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
-  jeweler
-  rspec (>= 2.0)
+  rake (~> 0.8)
+  rspec (~> 2.5.0)
+  test-unit (~> 3)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -0,0 +1,104 @@
+The OS gem allows for some easy telling if you're on windows or not. 
+
+```ruby
+require 'os'
+
+>> OS.windows?
+=> true   # or OS.doze?
+
+>> OS.bits
+=> 32
+
+>> OS.java?
+=> true # if you're running in jruby.  Also OS.jruby?
+
+>> OS.ruby_bin
+=> "c:\ruby18\bin\ruby.exe" # or "/usr/local/bin/ruby" or what not
+
+>> OS.posix?
+=> false # true for linux, os x, cygwin
+
+>> OS.mac? # or OS.osx? or OS.x?
+=> false
+
+>> OS.dev_null
+=> "NUL" # or "/dev/null" depending on which platform
+
+>> OS.rss_bytes
+=> 12300033 # number of rss bytes this process is using currently.  Basically "total in memory footprint" (doesn't include RAM used by the process that's in swap/page file)
+
+>> puts OS.report
+==> # a yaml report of helpful values
+--- 
+arch: x86_64-darwin10.6.0
+target_os: darwin10.6.0
+target_vendor: apple
+target_cpu: x86_64
+target: x86_64-apple-darwin10.6.0
+host_os: darwin10.6.0
+host_vendor: apple
+host_cpu: i386
+host: i386-apple-darwin10.6.0
+RUBY_PLATFORM: x86_64-darwin10.6.0
+
+>> OS.cpu_count  
+=> 2 # number of cores, doesn't include hyper-threaded cores.
+
+>> OS.open_file_command
+=> "start" # or open on mac, or xdg-open on linux (all designed to open a file)
+
+>> OS::Underlying.windows?
+=> true # true for cygwin or MRI, whereas OS.windows? is false for cygwin
+
+>> OS::Underlying.bsd?
+=> true # true for OS X
+
+>> OS::Underlying.docker?
+=> false # true if running inside a Docker container
+
+>> pp OS.parse_os_release
+==> # A hash of details on the current Linux distro (or an exception if not Linux)
+{:NAME=>"Ubuntu",
+ :VERSION=>"18.04.4 LTS (Bionic Beaver)",
+ :ID=>"ubuntu",
+ :ID_LIKE=>"debian",
+ :PRETTY_NAME=>"Ubuntu 18.04.4 LTS",
+ :VERSION_ID=>"18.04",
+ :HOME_URL=>"https://www.ubuntu.com/",
+ :SUPPORT_URL=>"https://help.ubuntu.com/",
+ :BUG_REPORT_URL=>"https://bugs.launchpad.net/ubuntu/",
+ :PRIVACY_POLICY_URL=>
+  "https://www.ubuntu.com/legal/terms-and-policies/privacy-policy",
+ :VERSION_CODENAME=>"bionic",
+ :UBUNTU_CODENAME=>"bionic"}
+```
+  
+If there are any other features you'd like, let me know, I'll do what I can to add them :)
+
+http://github.com/rdp/os for feedback et al
+
+Related projects:
+
+rubygems:
+
+```ruby
+Gem::Platform.local
+Gem.ruby
+```
+
+  The reason Gem::Platform.local felt wrong to me is that it treated cygwin as windows--which for most build environments, is wrong.  Hence the creation of this gem.
+
+the facets gem (has a class similar to rubygems, above)
+
+```ruby
+require 'facets/platform'
+Platform.local
+```
+
+the ["platform" gem](http://rubydoc.info/github/ffi/ffi/master/FFI/Platform), itself (a different gem)
+
+```ruby
+FFI::Platform::OS
+```
+
+License: MIT (see LICENSE file)

data/Rakefile

@@ -1,6 +1,14 @@
 require 'rubygems' if RUBY_VERSION < '1.9.0'
 
+# HOW TO DEPLOY
+# bump VERSION file manually
+# rake release seems all messed up, doesn't publish it anyway...
 # Don't forget to run rake gemspec with each release! ... I think...
+# then manually edit os.gemspec remove duplicatee rspecs, circular dependency on os? HUH?
+# # then  gem build os.gemspec
+# rake build doesn't work???
+# sooo...
+# ...gem push os-1.1.2.gem
 
 begin
   require 'jeweler'
@@ -11,12 +19,13 @@ begin
     gem.email = "rogerpack2005@gmail.com"
     gem.homepage = "http://github.com/rdp/os"
     gem.authors = ["rdp", "David McCullars"]
+    gem.license = "MIT"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     # gem.add_development_dependency "fast_require"
-    gem.add_development_dependency "rspec", ">= 2.0"
+    # gem.add_development_dependency "rspec", ">= 2.0"
   end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+rescue LoadError => e
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler #{e}"
 end
 
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.4

data/lib/os.rb

@@ -155,15 +155,15 @@ class OS
         end
         processes = wmi.ExecQuery("select * from win32_process where ProcessId = #{Process.pid}")
         memory_used = nil
-        # only allow for one...
+        # only allow for one process...
         for process in processes
-          raise if memory_used
+          raise "multiple processes same pid?" if memory_used
           memory_used = process.WorkingSetSize.to_i
         end
         memory_used
       end
     elsif OS.posix? # linux [though I've heard it works in OS X]
-      `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+      `ps -o rss= -p #{Process.pid}`.to_i * 1024 # in kiloBytes
     else
       raise 'unknown rss for this platform'
     end
@@ -183,6 +183,10 @@ class OS
       OS.host_os =~ /linux/ ? true : false
     end
 
+    def self.docker?
+      system('grep -q docker /proc/self/cgroup') if OS.linux?
+    end
+
   end
 
   def self.cygwin?
@@ -260,6 +264,39 @@ class OS
 
   end
 
+  def self.app_config_path(name)
+    if OS.doze?
+      if ENV['LOCALAPPDATA']
+        return File.join(ENV['LOCALAPPDATA'], name)
+      end
+
+      File.join ENV['USERPROFILE'], 'Local Settings', 'Application Data', name
+    elsif OS.mac?
+      File.join ENV['HOME'], 'Library', 'Application Support', name
+    else
+      if ENV['XDG_CONFIG_HOME']
+        return File.join(ENV['XDG_CONFIG_HOME'], name)
+      end
+
+      File.join ENV['HOME'], '.config', name
+    end
+  end
+
+  def self.parse_os_release
+    if OS.linux? && File.exist?('/etc/os-release')
+      output = {}
+
+      File.read('/etc/os-release').each_line do |line|
+        parsed_line = line.chomp.tr('"', '').split('=')
+        next if parsed_line.empty?
+        output[parsed_line[0].to_sym] = parsed_line[1]
+      end
+      output
+    else
+      raise "File /etc/os-release doesn't exists or not Linux"
+    end
+  end
+
   class << self
     alias :doze? :windows? # a joke name but I use it and like it :P
     alias :jruby? :java?

data/os.gemspec

@@ -2,22 +2,22 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: os 1.0.0 ruby lib
+# stub: os 1.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "os".freeze
-  s.version = "1.0.0"
+  s.version = "1.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["rdp".freeze, "David McCullars".freeze]
-  s.date = "2017-02-20"
+  s.date = "2021-11-07"
   s.description = "The OS gem allows for some useful and easy functions, like OS.windows? (=> true or false) OS.bits ( => 32 or 64) etc\"".freeze
   s.email = "rogerpack2005@gmail.com".freeze
   s.extra_rdoc_files = [
     "ChangeLog",
     "LICENSE",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".autotest",
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "autotest/discover.rb",
@@ -38,18 +38,25 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/rdp/os".freeze
-  s.rubygems_version = "2.5.2".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.7.6".freeze
   s.summary = "Simple and easy way to know if you're on windows or not (reliably), as well as how many bits the OS is, etc.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>.freeze, ["~> 0.8"])
+      s.add_development_dependency(%q<test-unit>.freeze, ["~> 3"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 2.0"])
     else
+      s.add_dependency(%q<rake>.freeze, ["~> 0.8"])
+      s.add_dependency(%q<test-unit>.freeze, ["~> 3"])
       s.add_dependency(%q<rspec>.freeze, [">= 2.0"])
     end
   else
+    s.add_dependency(%q<rake>.freeze, ["~> 0.8"])
+    s.add_dependency(%q<test-unit>.freeze, ["~> 3"])
     s.add_dependency(%q<rspec>.freeze, [">= 2.0"])
   end
 end

data/spec/os_spec.rb

@@ -119,10 +119,9 @@ describe "OS" do
   end
 
   it "has working cpu count method" do
-    assert OS.cpu_count >= 1
-    if OS.mac?
-      assert OS.cpu_count == 2 # my own developer box :P
-    end
+    cpu_count = OS.cpu_count
+    assert cpu_count >= 1
+    assert (cpu_count & (cpu_count - 1)) == 0 # CPU count is normally a power of 2
   end
 
   it "has working cpu count method with no env. variable" do
@@ -143,6 +142,23 @@ describe "OS" do
     end
   end
 
+  it "should provide a path to directory for application config" do
+    ENV.stub(:[])
+
+    if OS.mac?
+      ENV.stub(:[]).with('HOME').and_return('/home/user')
+      assert OS.app_config_path('appname') == '/home/xdg/Library/Application Support/appname'
+    elsif OS.doze?
+      # TODO
+    else
+      ENV.stub(:[]).with('HOME').and_return('/home/user')
+      assert OS.app_config_path('appname') == '/home/user/.config/appname'
+
+      ENV.stub(:[]).with('XDG_CONFIG_HOME').and_return('/home/xdg/.config')
+      assert OS.app_config_path('appname') == '/home/xdg/.config/appname'
+    end
+  end
+
   it "should have a freebsd? method" do
     if OS.host_os =~ /freebsd/
       assert OS.freebsd? == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: os
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.4
 platform: ruby
 authors:
 - rdp
@@ -9,8 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +61,7 @@ extensions: []
 extra_rdoc_files:
 - ChangeLog
 - LICENSE
-- README.rdoc
+- README.md
 files:
 - ".autotest"
 - ".document"
@@ -41,7 +69,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - autotest/discover.rb
@@ -52,7 +80,8 @@ files:
 - spec/osx_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rdp/os
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -70,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple and easy way to know if you're on windows or not (reliably), as well

data/README.rdoc

@@ -1,75 +0,0 @@
-The OS gem allows for some easy telling if you're on windows or not. 
-
-    require 'os'
-    
-    >> OS.windows?
-    => true   # or OS.doze?
-    
-    >> OS.bits
-    => 32
-    
-    >> OS.java?
-    => true # if you're running in jruby.  Also OS.jruby?
-    
-    >> OS.ruby_bin
-    => "c:\ruby18\bin\ruby.exe" # or "/usr/local/bin/ruby" or what not
-    
-    >> OS.posix?
-    => false # true for linux, os x, cygwin
-    
-    >> OS.mac? # or OS.osx? or OS.x?
-    => false
-    
-    >> OS.dev_null
-    => "NUL" # or "/dev/null" depending on which platform
-    
-    >> OS.rss_bytes
-    => 12300033 # number of rss bytes this process is using currently.  Basically "total in memory footprint" (doesn't include RAM used by the process that's in swap/page file)
-    
-    >> puts OS.report
-    ==> # a yaml report of helpful values
-    --- 
-    arch: x86_64-darwin10.6.0
-    target_os: darwin10.6.0
-    target_vendor: apple
-    target_cpu: x86_64
-    target: x86_64-apple-darwin10.6.0
-    host_os: darwin10.6.0
-    host_vendor: apple
-    host_cpu: i386
-    host: i386-apple-darwin10.6.0
-    RUBY_PLATFORM: x86_64-darwin10.6.0
-
-   >> OS.cpu_count  
-   => 2 # number of cores, doesn't include hyper-threaded cores.
-  
-  >> OS.open_file_command
-  => "start" # or open on mac, or xdg-open on linux (all designed to open a file)
-  
-  >> OS::Underlying.windows?
-  => true # true for cygwin or MRI, whereas OS.windows? is false for cygwin
-  
-  >> OS::Underlying.bsd?
-  => true # true for OS X
-  
-If there are any other features you'd like, let me know, I'll do what I can to add them :)
-
-http://github.com/rdp/os for feedback et al
-
-Related projects:
-
-rubygems:
-  Gem::Platform.local
-  Gem.ruby
-  The reason Gem::Platform.local felt wrong to me is that it treated cygwin as windows--which for most build environments, is wrong.  Hence the creation of this gem.
-
-the facets gem (has a class similar to rubygems, above)
-  require 'facets/platform'
-  Platform.local
-
-the "platform" gem, itself (a different gem)
-
-FFI::Platform::OS
-  http://rubydoc.info/github/ffi/ffi/master/FFI/Platform
-
-License: MIT (see LICENSE file)