datacenter 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2098304fc0285b30cbe84d111c637bc2f9ed0ca9
-  data.tar.gz: 81dbb70a0d7e4a17dd5f1028ebccb97da5627e02
+SHA256:
+  metadata.gz: 7df2e3acdef1d6f553a3fe126f1ddf14fad750b8487e863570290013aa581008
+  data.tar.gz: ac427c779cfa2da151e93e4a91c132c37cb84d57987a4eb2a0f8a3e6be51268a
 SHA512:
-  metadata.gz: d72ca3f494c43436f9eda558deb0f24e0bd163e03581c51ff477db681d7347d4cd62a71681ca6ffd7154d3babb4a00d9ea59878678611d7f8db5330ebefd9350
-  data.tar.gz: eabe4a509235bfb64d5dee6f2cfeeb36bac9ead2d6eeec759b11db7cedd60817f37a660c9ae509497fc0568b3ee7712b48f4b64f60efed690655c902548c2db5
+  metadata.gz: 7d7ff9313e9cc44d1c5929c37c6a834425afba664e66d5dd8289acf9800f5943845189a63b7a7b132e786ffcd711dec660ef8fb609ab02e3326cc077948834c6
+  data.tar.gz: e3c744abb248b137e6fbc8a2b46798e089e93cc37bf31f3119b5f3a32183d7a465922f293aa9cedb7a59b9deba2a587c8ba4ca39833aa17961241541538e5962

data/.ruby-version

@@ -1 +1 @@
-ruby 2.0
+ruby-2.7.0

data/.travis.yml

@@ -1,13 +1,23 @@
 language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
   - 2.2
-  - 2.3.0
-  - jruby
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby-9.2.9.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 before_install:
-  - gem install bundler
   - sudo apt-get -y install openssh-server
   - ssh-keygen -q -t rsa -N "" -f ~/.ssh/id_rsa
-  - cp $HOME/.ssh/id_rsa.pub $HOME/.ssh/authorized_keys
+  - cp $HOME/.ssh/id_rsa.pub $HOME/.ssh/authorized_keys

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in datacenter.gemspec
-gemspec
-
-gem 'coveralls', require: false
+gemspec

data/README.md

@@ -1,10 +1,9 @@
 # Datacenter
 
-[![Gem Version](https://badge.fury.io/rb/datacenter.png)](https://rubygems.org/gems/datacenter)
-[![Build Status](https://travis-ci.org/gabynaiman/datacenter.png?branch=master)](https://travis-ci.org/gabynaiman/datacenter)
-[![Coverage Status](https://coveralls.io/repos/gabynaiman/datacenter/badge.png?branch=master)](https://coveralls.io/r/gabynaiman/datacenter?branch=master)
-[![Code Climate](https://codeclimate.com/github/gabynaiman/datacenter.png)](https://codeclimate.com/github/gabynaiman/datacenter)
-[![Dependency Status](https://gemnasium.com/gabynaiman/datacenter.png)](https://gemnasium.com/gabynaiman/datacenter)
+[![Gem Version](https://badge.fury.io/rb/datacenter.svg)](https://rubygems.org/gems/datacenter)
+[![Build Status](https://travis-ci.org/gabynaiman/datacenter.svg?branch=master)](https://travis-ci.org/gabynaiman/datacenter)
+[![Coverage Status](https://coveralls.io/repos/gabynaiman/datacenter/badge.svg?branch=master)](https://coveralls.io/r/gabynaiman/datacenter?branch=master)
+[![Code Climate](https://codeclimate.com/github/gabynaiman/datacenter.svg)](https://codeclimate.com/github/gabynaiman/datacenter)
 
 Manage and monitor servers and processes
 

data/Rakefile

@@ -3,17 +3,23 @@ require 'rake/testtask'
 
 Rake::TestTask.new(:spec) do |t|
   t.libs << 'spec'
-  t.pattern = 'spec/**/*_spec.rb'
+  t.libs << 'lib'
+  t.pattern = ENV['DIR'] ? File.join(ENV['DIR'], '**', '*_spec.rb') : 'spec/**/*_spec.rb'
   t.verbose = false
   t.warning = false
+  t.loader = nil if ENV['TEST']
+  ENV['TEST'], ENV['LINE'] = ENV['TEST'].split(':') if ENV['TEST'] && !ENV['LINE']
+  t.options = ''
+  t.options << "--name=/#{ENV['NAME']}/ " if ENV['NAME']
+  t.options << "-l #{ENV['LINE']} " if ENV['LINE'] && ENV['TEST']
 end
 
-desc 'Console'
+task default: :spec
+
+desc 'Pry console'
 task :console do
-  require 'pry'
   require 'datacenter'
+  require 'pry'
   ARGV.clear
   Pry.start
 end
-
-task default: :spec

data/datacenter.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'net-ssh', '~> 2.9.2'
+  spec.add_dependency 'net-ssh', '~> 5.2'
   spec.add_dependency 'class_config'
   
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest', '~> 4.7'
-  spec.add_development_dependency 'turn', '~> 0.9'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pry-nav'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'minitest', '~> 5.0', '< 5.11'
+  spec.add_development_dependency 'minitest-colorin', '~> 0.1'
+  spec.add_development_dependency 'minitest-line', '~> 0.6'
+  spec.add_development_dependency 'simplecov', '~> 0.12'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'pry-nav', '~> 0.2'
 end

data/lib/datacenter.rb

@@ -10,4 +10,9 @@ module Datacenter
   attr_config :process_cache_expiration, 2
 end
 
-Dir.glob(File.expand_path('datacenter/**/*.rb', File.dirname(__FILE__))).sort.each { |f| require f }
+Dir.glob(File.expand_path('datacenter/**/*.rb', File.dirname(__FILE__))).sort.each { |f| require f }
+
+if RUBY_ENGINE == 'jruby'
+  Net::SSH::Transport::Algorithms::ALGORITHMS.values.each { |algs| algs.reject! { |a| a =~ /^ecd(sa|h)-sha2/ } }
+  Net::SSH::KnownHosts::SUPPORTED_TYPE.reject! { |t| t =~ /^ecd(sa|h)-sha2/ }
+end

data/lib/datacenter/machine.rb

@@ -9,8 +9,9 @@ module Datacenter
 
     def ips
       shell.run('ifconfig')
-           .scan(/inet addr:(([0-9]*\.){3}[0-9]*)/)
-           .map { |s| s[0] }
+           .split("\n")
+           .select { |l| l.strip.start_with? 'inet ' }
+           .map { |l| l.match(/(([0-9]+\.){3}[0-9]+)/).to_s }
     end
 
     def name

data/lib/datacenter/process.rb

@@ -29,7 +29,16 @@ module Datacenter
     end
 
     def alive?
-      alive = !shell.run("ps -p #{pid} | grep #{pid}").empty?
+      command = %Q{
+        if [ -d "#{proc_dir}" ]; then 
+          echo -n "true"
+        else
+          echo -n "false"
+        fi
+      }
+
+      alive = shell.run(command) == 'true'
+
       Datacenter.logger.info(self.class) { "pid: #{pid} - ALIVE: #{alive}" } if !alive
       alive
     end
@@ -62,8 +71,12 @@ module Datacenter
       end
     end
 
+    def proc_dir
+      File.join '/proc', pid.to_s
+    end
+
     def proc_file(name)
-      filename = File.join '/proc', pid.to_s, name.to_s
+      filename = File.join proc_dir, name.to_s
       shell.run "cat #{filename}"
     end
 

data/lib/datacenter/shell/local.rb

@@ -28,7 +28,7 @@ module Datacenter
           err: options[:err] || StringIO.new
         }
 
-        if RUBY_ENGINE == 'jruby'
+        if RUBY_ENGINE == 'jruby' && JRUBY_VERSION < '9.0.0.0'
           run_system command, opts
         else
           run_open3 command, opts

data/lib/datacenter/shell/remote.rb

@@ -7,7 +7,7 @@ module Datacenter
       end
 
       def open
-        @session ||= Net::SSH.start *args
+        @session ||= Net::SSH.start(*args)
       end
 
       def close
@@ -26,7 +26,7 @@ module Datacenter
       end
 
       def self.open(*args)
-        shell = new *args
+        shell = new(*args)
         shell.open
         yield shell
       ensure

data/lib/datacenter/version.rb

@@ -1,3 +1,3 @@
 module Datacenter
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
 end

data/spec/commands.yml

@@ -40,7 +40,7 @@
             RX bytes:110494415 (110.4 MB)  TX bytes:21453491 (21.4 MB)
 
   lo        Link encap:Local Loopback
-            inet addr:127.0.0.1  Mask:255.0.0.0
+            inet 127.0.0.1  Mask:255.0.0.0
             inet6 addr: ::1/128 Scope:Host
             UP LOOPBACK RUNNING  MTU:16436  Metric:1
             RX packets:24200 errors:0 dropped:0 overruns:0 frame:0
@@ -154,4 +154,10 @@
   VmLib:     27732 kB
   VmPTE:       556 kB
   VmSwap:        0 kB
-  Threads:  4
+  Threads:  4
+
+"\n        if [ -d \"/proc/-22803\" ]; then \n          echo -n \"true\"\n        else\n          echo -n \"false\"\n        fi\n      ": |
+  false
+
+"\n        if [ -d \"/proc/22803\" ]; then \n          echo -n \"true\"\n        else\n          echo -n \"false\"\n        fi\n      ": |
+  true

data/spec/coverage_helper.rb

@@ -1,8 +1,5 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
 SimpleCov.start

data/spec/minitest_helper.rb

@@ -1,16 +1,10 @@
 require 'coverage_helper'
 require 'minitest/autorun'
-require 'turn'
+require 'minitest/colorin'
 require 'yaml'
 require 'datacenter'
 require 'pry-nav'
 
-Turn.config do |c|
-  c.format = :pretty
-  c.natural = true
-  c.ansi = true
-end
-
 class Module
   include Minitest::Spec::DSL
 end

data/spec/shell_spec.rb

@@ -4,7 +4,7 @@ describe Datacenter::Shell do
   
   module SharedExpamples
 
-    let(:shell) { shell_class.new *shell_args }
+    let(:shell) { shell_class.new(*shell_args) }
     
     it 'Success' do
       filename = File.join '/tmp', Time.now.to_i.to_s

metadata

@@ -1,127 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: datacenter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: class_config
   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
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.11'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-colorin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: Manage and monitor servers and processes
 email:
 - gabynaiman@gmail.com
@@ -129,11 +149,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -166,17 +186,16 @@ 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.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Manage and monitor servers and processes