psm-ruby-stats 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3288e4d96c533465c3a127d74095537ac91768d13fe0766036b986616444ab72
-  data.tar.gz: 2885e7171d30d6d2ac76cfd0e5aaebaf557fc355ffc6d7d22d3a676c7708dfcb
+  metadata.gz: 5c194154e9847bb8e0dc1b7edc30b6645e00ae8c04fda690a5c02a6a461b50b1
+  data.tar.gz: 19ef70063d93106351df74a777ff9ec1ade0e1701ce2d6cd81be60d5eecd29ca
 SHA512:
-  metadata.gz: b0d51bb9aeb128a4442710159b437c84bed4e4fef46803bab463c2820d493222fef1a43d1b7168a516432dc766bee60335264925da2afaed64a69c6fc9d6e470
-  data.tar.gz: 50ae5c94926d2d6aad54aa603240b8c61c14b4081d17acb0b2d2500d06654d4bd0566f07332f273a9970231bcef6ec66fb30b2feb41b8a1d34ee13f4b9c2090b
+  metadata.gz: c5e35fcc1a23234cc29e4a49197aae8661968e3fc530c2006cd51ad22c437d1d978685622d7a1ed9f0e1e9c6518f77afdabc246e8a0af4180f50771d4862845a
+  data.tar.gz: d2f1a41fb31e5c2ec537e86052121c602061abc70f098c1094f4e7398666a9da2cdc26176e3a410638656005b7c43ab3b4cd702786434a7d3fc7f919fa26c61e

data/.github/workflows/auto-merge.yml

@@ -0,0 +1,31 @@
+name: Merge me!
+
+on:
+  workflow_run:
+    types:
+      - completed
+    workflows:
+      - 'Verify'
+
+jobs:
+  merge-me:
+    name: Merge me!
+    runs-on: ubuntu-latest
+    steps:
+      - # It is often a desired behavior to merge only when a workflow execution
+        # succeeds. This can be changed as needed.
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        name: Merge me!
+        uses: ridedott/merge-me-action@v2
+        with:
+          # Depending on branch protection rules, a  manually populated
+          # `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to
+          # a protected branch must be used. This secret can have an arbitrary
+          # name, as an example, this repository uses `DOTTBOTT_TOKEN`.
+          #
+          # When using a custom token, it is recommended to leave the following
+          # comment for other developers to be aware of the reasoning behind it:
+          #
+          # This must be used as GitHub Actions token does not support pushing
+          # to protected branches.
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

data/.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
 
       - name: Release Gem
         if: contains(github.ref, 'refs/tags/v')
-        uses: cadwallion/publish-rubygems-action@master
+        uses: personal-social-media/publish-rubygems-action@master
         env:
           GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
           RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/.github/workflows/verify.yml

@@ -49,4 +49,7 @@ jobs:
           bundle clean --force
       - name: Run tests
         run: |
-          bundle exec rspec --profile
+          bundle exec rspec --profile
+      - name: Run security checks
+        run: |
+          bundle exec bundler-audit --update

data/Gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rubocop-rails_config"
 gem "usagewatch", "~> 0.0.7"
-gem "rspec"
+
+group :development, :test do
+  gem "rspec"
+  gem "bundler-audit"
+  gem "rubocop-rails_config"
+end

data/lib/rubystats_psm/skcript_linux.rb

@@ -33,7 +33,7 @@ class RubyStatsPsm
     execute_command("grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {print usage }'").to_f
   end
 
-  def self.uw_cputop
+  def uw_cputop
     ps = `ps aux | awk '{print $11, $3}' | sort -k2nr  | head -n 10`
     array = []
     ps.each_line do |line|
@@ -44,69 +44,80 @@ class RubyStatsPsm
   end
 
   # Show the number of TCP connections used
-  def self.uw_tcpused
+  def uw_tcpused
+    tcp4count = nil
+    tcp6count = nil
+
     if File.exist?("/proc/net/sockstat")
+      sockstat = nil
       File.open("/proc/net/sockstat", "r") do |ipv4|
-        @sockstat = ipv4.read
+        sockstat = ipv4.read
       end
 
-      @tcp4data = @sockstat.split
-      @tcp4count = @tcp4data[5]
+      tcp4data = sockstat.split
+      tcp4count = tcp4data[5]
     end
 
     if  File.exist?("/proc/net/sockstat6")
+      sockstat6 = nil
       File.open("/proc/net/sockstat6", "r") do |ipv6|
-        @sockstat6 = ipv6.read
+        sockstat6 = ipv6.read
       end
 
-      @tcp6data = @sockstat6.split
-      @tcp6count = @tcp6data[2]
+      tcp6data = sockstat6.split
+      tcp6count = tcp6data[2]
     end
 
-    @totaltcpused = @tcp4count.to_i + @tcp6count.to_i
+    tcp4count.to_i + tcp6count.to_i
   end
 
   # Show the number of UDP connections used
-  def self.uw_udpused
+  def uw_udpused
+    udp4count = nil
+    udp6count = nil
+
     if File.exist?("/proc/net/sockstat")
+      sockstat = nil
       File.open("/proc/net/sockstat", "r") do |ipv4|
-        @sockstat = ipv4.read
+        sockstat = ipv4.read
       end
 
-      @udp4data = @sockstat.split
-      @udp4count = @udp4data[16]
+      udp4data = sockstat.split
+      udp4count = udp4data[16]
     end
 
     if File.exist?("/proc/net/sockstat6")
+      sockstat6 = nil
       File.open("/proc/net/sockstat6", "r") do |ipv6|
-        @sockstat6 = ipv6.read
+        sockstat6 = ipv6.read
       end
 
-      @udp6data = @sockstat6.split
-      @udp6count = @udp6data[5]
+      udp6data = sockstat6.split
+      udp6count = udp6data[5]
     end
 
-    @totaludpused = @udp4count.to_i + @udp6count.to_i
+    udp4count.to_i + udp6count.to_i
   end
 
   # Show the percentage of Active Memory used
-  def self.uw_memused
+  def uw_memused
+    result = nil
     if File.exist?("/proc/meminfo")
       File.open("/proc/meminfo", "r") do |file|
-        @result = file.read
+        result = file.read
       end
     end
 
-    @memstat = @result.split("\n").collect { |x| x.strip }
-    @memtotal = @memstat[0].gsub(/[^0-9]/, "")
-    @memactive = @memstat[5].gsub(/[^0-9]/, "")
-    @memactivecalc = (@memactive.to_f * 100) / @memtotal.to_f
-    @memusagepercentage = @memactivecalc.round
+    memstat = result.split("\n").collect { |x| x.strip }
+    memtotal = memstat[0].gsub(/[^0-9]/, "")
+    memactive = memstat[5].gsub(/[^0-9]/, "")
+    memactivecalc = (memactive.to_f * 100) / memtotal.to_f
+    memactivecalc.round
   end
 
   # return hash of top ten proccesses by mem consumption
   # example [["apache2", 12.0], ["passenger", 13.2]]
-  def self.uw_memtop
+  def uw_memtop
     ps = execute_command("ps aux | awk '{print $11, $4}' | sort -k2nr  | head -n 10")
     array = []
     ps.each_line do |line|
@@ -117,13 +128,15 @@ class RubyStatsPsm
   end
 
   # Show the average system load of the past minute
-  def self.uw_load
+  def uw_load
     if File.exist?("/proc/loadavg")
+      load_data = nil
+
       File.open("/proc/loadavg", "r") do |file|
-        @loaddata = file.read
+        load_data = file.read
       end
 
-      @load = @loaddata.split(/ /).first.to_f
+      load_data.split(/ /).first.to_f
     end
   end
 

data/lib/rubystats_psm/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class RubyStatsPsm
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
   OS = RUBY_PLATFORM
 end

data/psm-ruby-stats.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("usagewatch", "~> 0.0.7")
+  spec.add_runtime_dependency "usagewatch", "~> 0.0.7"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop-rails_config"
 end

data/readme-dev.md

@@ -0,0 +1,10 @@
+Enable push tags automatically
+```bash
+  git config --global push.followTags true
+```
+
+How to bump version:
+
+```bash
+ bump patch -m "message" --tag
+```

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psm-ruby-stats
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Personal Social Media
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/auto-merge.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/verify.yml"
 - ".gitignore"
@@ -78,6 +79,7 @@ files:
 - lib/rubystats_psm/skcript_linux.rb
 - lib/rubystats_psm/version.rb
 - psm-ruby-stats.gemspec
+- readme-dev.md
 - spec/linux_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/personal-social-media/ruby-stats
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Extended version of usagewatch_ext