rcmd 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80c6c434947313790ac40baa6f5907edc3f2558d
-  data.tar.gz: bf1058baa67bf2508732a6df6342b891a86c8ee2
+  metadata.gz: ef2d6e4a0f3903338259d59c44d9b28ef9d3a2c6
+  data.tar.gz: f2fb6ce8e638474cec958d9b04f7043110d93524
 SHA512:
-  metadata.gz: d7cf46fcecfd98d8d7fc9335d388d6d9e4a90a49519867e13626cd7b7ac3a36a27451f6f0265f85dd5f892b873c2638f5674e8aed601e5a688812e2b1f7e3ac9
-  data.tar.gz: c185669cbd098bb165efc7b425679c82417592ae5d0378d61f6641df92de26dd7f011c8fc71b523f74c3bf50dc922cce6b3c5b70798a5a815791870bb768f159
+  metadata.gz: 57bf0fb42a1c513a49626d4415e57f0afd9a9834a90bd4c5a2a6a522bf4abbfadabbda77604abf4f1c6aed21f43e600e3ff0406f5986cebb3e40a0fe14f2f739
+  data.tar.gz: 5ff7aa09debaa9ad74ba5eadf733d79f543c8ebcbe212c8997d7a851cf11147268f5d64c6764b16f536affe05e2471373075fde65154f7d9f909d9a3a779bfd0

data/.gitignore

@@ -1 +1,3 @@
 pkg/*
+testdb
+.rspec_status

data/.rspec_status

@@ -1,9 +1,13 @@
-example_id               | status | run_time        |
------------------------- | ------ | --------------- |
-./spec/rcmd_spec.rb[1:1] | passed | 0.00078 seconds |
-./spec/rcmd_spec.rb[1:2] | passed | 0.00116 seconds |
-./spec/rcmd_spec.rb[1:3] | passed | 0.00099 seconds |
-./spec/rcmd_spec.rb[1:4] | passed | 0.00018 seconds |
-./spec/rcmd_spec.rb[1:5] | passed | 0.00019 seconds |
-./spec/rcmd_spec.rb[1:6] | passed | 0.00133 seconds |
-./spec/rcmd_spec.rb[1:7] | passed | 0.00011 seconds |
+example_id                | status | run_time        |
+------------------------- | ------ | --------------- |
+./spec/rcmd_spec.rb[1:1]  | passed | 0.00067 seconds |
+./spec/rcmd_spec.rb[1:2]  | passed | 0.00093 seconds |
+./spec/rcmd_spec.rb[1:3]  | passed | 0.00077 seconds |
+./spec/rcmd_spec.rb[1:4]  | passed | 0.00016 seconds |
+./spec/rcmd_spec.rb[1:5]  | passed | 0.00014 seconds |
+./spec/rcmd_spec.rb[1:6]  | passed | 0.00104 seconds |
+./spec/rcmd_spec.rb[1:7]  | passed | 0.00011 seconds |
+./spec/rcmd_spec.rb[1:8]  | passed | 0.01113 seconds |
+./spec/rcmd_spec.rb[1:9]  | passed | 0.02283 seconds |
+./spec/rcmd_spec.rb[1:10] | passed | 0.00779 seconds |
+./spec/rcmd_spec.rb[1:11] | passed | 0.00637 seconds |

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rcmd (1.6.2)
+    rcmd (1.6.4)
       activerecord
       activesupport
       io-console
@@ -52,6 +52,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    sqlite3 (1.3.13)
     thread (0.2.2)
     thread_safe (0.3.6)
     timers (4.1.2)
@@ -78,6 +79,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rcmd!
   rspec (~> 3.0, >= 2.0.0)
+  sqlite3
 
 BUNDLED WITH
    1.15.4

data/README.md

@@ -11,6 +11,8 @@ thread and creating the ssh sessions in those threads.
 - Username can be specified.  (Default is root.  Requires valid ssh-key in ~/.ssh)
 - Output shows which host the output is from
 - Stdout can be suppressed, only allowing for stderr to be shown
+- Usage of Regex for generating the host list
+- Support for SQLite3, MySql/MariaDB and PostgreSQL queries for generating host list
 
 ## Installation
 rcmd is available as a gem and kan be installed with `gem install rcmd`
@@ -163,18 +165,20 @@ If you are wanting to modify the code by all means do so.  If you clone this rep
 Available Rake tasks are:
 
 ```bash
-rake build            # Build rcmd-1.5.5.gem into the pkg directory
+rake build            # Build rcmd-1.6.4.gem into the pkg directory
 rake clean            # Remove any temporary products
 rake clobber          # Remove any generated files
 rake clobber_rdoc     # Remove RDoc HTML files
 rake console          # Open an IRB console with this gem loaded
-rake install          # Build and install rcmd-1.5.5.gem into system gems
-rake install:local    # Build and install rcmd-1.5.5.gem into system gems without network access
+rake install          # Build and install rcmd-1.6.4.gem into system gems
+rake install:local    # Build and install rcmd-1.6.4.gem into system gems without network access
 rake rdoc             # Build RDoc HTML files
 rake reinstall        # Remove, build, and install gem
-rake release[remote]  # Create tag v1.5.5 and build and push rcmd-1.5.5.gem to Rubygems
+rake release[remote]  # Create tag v1.6.4 and build and push rcmd-1.6.4.gem to Rubygems
 rake rerdoc           # Rebuild RDoc HTML files
-rake spec             # Run RSpec code examples
+rake test:all         # Run all RSpec tests
+rake test:db          # Test Database functionality (sqlite3 required)
+rake test:mainlib     # Test main rcmd lib
 ```
 
 

data/Rakefile

@@ -1,11 +1,8 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
 require 'rdoc/task'
-# require 'sqlite3'
 
-RSpec::Core::RakeTask.new(:spec)
+task :default => ['test:all']
 
-task :default => :spec
 
 desc "Open an IRB console with this gem loaded"
 task :console do
@@ -16,6 +13,7 @@ task :console do
   IRB.start
 end
 
+
 desc "Remove, build, and install gem"
 task :reinstall do
   puts "Uninstalling #{`gem list rcmd`}"
@@ -24,8 +22,8 @@ task :reinstall do
   Rake::Task["install"].invoke
 end
 
-desc 'generate API documentation to doc/rdocs/index.html'
 
+desc 'generate API documentation to doc/rdocs/index.html'
 Rake::RDocTask.new do |rd|
   rd.rdoc_dir = 'doc/rdocs'
   rd.main = 'README.md'
@@ -35,36 +33,38 @@ Rake::RDocTask.new do |rd|
   rd.options << '--all'
 end
 
-# desc 'generate and populate a test sqlite database'
-# task :testdb do
-#   begin  
-#     db = SQLite3::Database.new "testdb"
-#     db.execute "create table servers(id integer primary key autoincrement, hostname text not null, stype text not null, os_type text not null)"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node1', 'dev', 'rhel6')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node2', 'dev', 'rhel6')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node3', 'dev', 'rhel6')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node4', 'dev', 'rhel7')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node5', 'dev', 'rhel6')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node6', 'web', 'rhel6')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node7', 'web', 'rhel6')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node8', 'web', 'rhel7')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node9', 'web', 'rhel7')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node10', 'admin', 'ubuntu-LTS')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node11', 'admin', 'ubuntu-LTS')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node12', 'admin', 'ubuntu')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node13', 'admin', 'ubuntu')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node14', 'compute', 'debiuan')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node15', 'compute', 'debiuan')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node16', 'compute', 'debiuan')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node17', 'compute', 'debiuan')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node18', 'db', 'slackware')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node19', 'db', 'slackware')"
-#     db.execute "INSERT INTO servers (hostname, stype, os_type) VALUES ( 'node20', 'db', 'slackware')"
+#
+# RSpec tasks
+# 
+begin
+  namespace :test do
+    require "rspec/core/rake_task"
+    require 'sqlite3'
     
-#   rescue SQLite3::Exception => e 
-#     puts "Exception occurred"
-#     puts e
-#   ensure
-#     db.close if db
-#   end
-# end
+    desc 'Test Database functionality (sqlite3 required)'
+    RSpec::Core::RakeTask.new(:db) do |t|
+      t.rspec_opts = "--tag db"
+    end
+  end
+
+  namespace :test do
+    desc 'Test main rcmd lib'
+    RSpec::Core::RakeTask.new(:mainlib) do |t|
+      t.rspec_opts = "--tag mainlib"
+    end
+  end
+  
+  namespace :test do
+    desc "Run all RSpec tests"
+    RSpec::Core::RakeTask.new(:all) do |t|
+      t.rspec_opts = "--tag mainlib --tag db"
+    end
+  end
+rescue LoadError
+  desc 'RSpec rake task not available'
+  task :spec do
+    abort 'RSpec rake tasl is not available.  Ensure rspec-core is installed'
+  end
+ensure
+  File.delete("testdb") if File.exist?("testdb")
+end

data/doc/rdocs/README_md.html

@@ -109,6 +109,11 @@ the node list.</p>
 <p>Output shows which host the output is from</p>
 </li><li>
 <p>Stdout can be suppressed, only allowing for stderr to be shown</p>
+</li><li>
+<p>Usage of Regex for generating the host list</p>
+</li><li>
+<p>Support for SQLite3, MySql/MariaDB and PostgreSQL queries for generating
+host list</p>
 </li></ul>
 
 <h2 id="label-Installation">Installation<span><a href="#label-Installation">&para;</a> <a href="#top">&uarr;</a></span></h2>

data/doc/rdocs/created.rid

@@ -1,5 +1,5 @@
-Sat, 07 Oct 2017 11:32:53 +0000
-README.md	Sat, 07 Oct 2017 11:31:11 +0000
+Tue, 10 Oct 2017 19:34:36 +0000
+README.md	Mon, 09 Oct 2017 13:39:20 +0000
 lib/rcmd.rb	Fri, 06 Oct 2017 20:23:25 +0000
 lib/rcmd/db.rb	Sat, 07 Oct 2017 11:16:26 +0000
 lib/rcmd/version.rb	Sat, 07 Oct 2017 11:20:01 +0000

data/doc/rdocs/index.html

@@ -104,6 +104,11 @@ the node list.</p>
 <p>Output shows which host the output is from</p>
 </li><li>
 <p>Stdout can be suppressed, only allowing for stderr to be shown</p>
+</li><li>
+<p>Usage of Regex for generating the host list</p>
+</li><li>
+<p>Support for SQLite3, MySql/MariaDB and PostgreSQL queries for generating
+host list</p>
 </li></ul>
 
 <h2 id="label-Installation">Installation<span><a href="#label-Installation">&para;</a> <a href="#top">&uarr;</a></span></h2>

data/lib/rcmd/db.rb

@@ -70,14 +70,13 @@ not implemented.
     @db_os_queries = true
 
     # Method for overiding the location and name of the default config
-    # file
+    # file (Used by RSpec tests)
     def DB.override_config_file(path)
       @config_file = path
     end
     
     # Create a base config file
     def DB.create_config
-      puts "Function: #{@config_dir}"
       unless File.directory?(@config_dir)
         FileUtils.mkdir_p(@config_dir)
       end
@@ -90,7 +89,7 @@ not implemented.
     end
 
     # Performs "LIKE" queries on the host_field (hostname)
-    def DB.query_by_hostname(term)
+    def DB.query_by_hostname(term) 
       return where("#{@conf[:host_field]} LIKE ?", term ).map { |r| r[@conf[:host_field]] }
     end
 
@@ -156,20 +155,24 @@ not implemented.
     # adapter and set the table_name variable of the class.
     def DB.db_connect
       self.load_config
-              
-      if @conf[:adapter].downcase == "sqlite3"
-        ActiveRecord::Base.establish_connection(:adapter => @conf[:adapter].downcase,
-                                                :database => @conf[:database])
-      else
-        ActiveRecord::Base.establish_connection(
-                                                :adapter => @conf[:adapter].downcase,
-                                                :host => @conf[:host],
-                                                :username => @conf[:username],
-                                                :password => @conf[:password],
-                                                :database => @conf[:database] )
-      end
 
-      @table_name = @conf[:table]
+      begin
+        if @conf[:adapter].downcase == "sqlite3"
+          ActiveRecord::Base.establish_connection(:adapter => @conf[:adapter].downcase,
+                                                  :database => @conf[:database])
+        else
+          ActiveRecord::Base.establish_connection(
+                                                  :adapter => @conf[:adapter].downcase,
+                                                  :host => @conf[:host],
+                                                  :username => @conf[:username],
+                                                  :password => @conf[:password],
+                                                  :database => @conf[:database] )
+        end
+        
+        @table_name = @conf[:table]
+      rescue RuntimeError, AdapterNotFound, ArgumentError => e
+        raise RuntimeError, "DB Error when configuring connection: #{e}"
+      end
     end
   end
 end

data/lib/rcmd/version.rb

@@ -1,4 +1,4 @@
 module Rcmd # :notnew:
   # +VERSION+ - Version number string
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

data/rcmd.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency('activesupport')
   spec.add_runtime_dependency('activerecord')
   spec.add_runtime_dependency('regexp-examples')
+  spec.add_development_dependency('sqlite3')
   spec.add_development_dependency('rspec', '~> 3.0', '>= 2.0.0')
   spec.add_development_dependency "bundler", ">= 1.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcmd
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - David Rose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement