sysutil 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2597c873a67e046107efaca3fb70770fd443b0f
-  data.tar.gz: 1c73413186de1faef98e595ed47bfabc6d4b3523
+  metadata.gz: 2d81e1c128b1f874507dc9d3eeec6bf1995226a1
+  data.tar.gz: 9f8eb69342f660e32e1b3e02b951755dbdb59658
 SHA512:
-  metadata.gz: 9c37d39a062c3b4dfb44e89b9186ccfc67b243be518ab1c4116d814b8e42737b697beff5a8c18421d9c4681a6973d08b058e051353442b05b10dedd52df5103e
-  data.tar.gz: 4267f0c9f78447567fc147df90faca7dd0bcfcaa8b3d9b55ae4668378f0803cd5cdd3a4f12f23b2dbcac822a2872827ca374860b63ef9d4b9623f50742cc35e7
+  metadata.gz: 480017b1281b61f29baa67d363200921cddb203148dc14b96bbcb0f85c3da087732d3e316b213658373dc438d19d7afe283b64eeb7eb4916391dc51c4e08e89a
+  data.tar.gz: 177e750809b127c72ccb9abcbcbef7f59fa1c5750cc5b5de9c98fe492a052801fb889e1bcbe5b16e06c63e34927f30041aebbc543d313e3de2f3ab7363a413c2

data/lib/sysutil.rb

@@ -1,13 +1,12 @@
 require "sysutil/version/version"
-require "sysutil/functions"
 require "sysutil/config"
 
 module Sysutil
-  include Config
+    
 end
 
-require "sysutil/user"
-require "sysutil/package"
+require "sysutil/functions"
+require "sysutil/users"
 
 
 

data/lib/sysutil/config.rb

@@ -1,8 +1,8 @@
-module Config
+module Sysutil
   # Configuration defaults
   @config = {
     log_level: 'verbose', # print all the things
-    root_password: '', # not necessary if your running this as root
+    root_password: '' # not necessary if your running this as root
   }
 
   @valid_config_keys = @config.keys

data/lib/sysutil/functions.rb

@@ -1,29 +0,0 @@
-def conditional_sudo
-  if `echo -n $USER` != "root"
-    "echo #{Config.config[:root_password]} | sudo -S "
-  else
-    ""
-  end
-end
-
-def linux_variant
-  r = { :distro => nil, :family => nil }
-
-  if File.exists?('/etc/lsb-release')
-    File.open('/etc/lsb-release', 'r').read.each_line do |line|
-      r = { :distro => $1 } if line =~ /^DISTRIB_ID=(.*)/
-    end
-  end
-
-  if File.exists?('/etc/debian_version')
-    r[:distro] = 'Debian' if r[:distro].nil?
-    r[:family] = 'Debian' if r[:variant].nil?
-  elsif File.exists?('/etc/redhat-release') or File.exists?('/etc/centos-release')
-    r[:family] = 'RedHat' if r[:family].nil?
-    r[:distro] = 'CentOS' if File.exists?('/etc/centos-release')
-  elsif File.exists?('/etc/SuSE-release')
-    r[:distro] = 'SLES' if r[:distro].nil?
-  end
-
-  return r
-end

data/lib/sysutil/{user.rb → users.rb}

@@ -17,23 +17,23 @@ module Sysutil
       
         if status.success?
           # Split the output on the newline to make an array of users
-          {success: true, output: out.split("\n")}
+          out.split("\n")
         else
-          {success: false, message: "Error: #{err}"}
+          "Error: #{err}"
         end
         
     end
 
     def self.add!(name, opts={})
 
-      add_user_command = conditional_sudo + "adduser #{name}"
+      add_user_command = cond_sudo + "adduser #{name}"
       
       out, err, status = Open3.capture3(add_user_command)
 
       if status.success?
-        {success: true, output: out}
+        true
       else
-        {success: false, output: "Error: #{err}"}
+        "Error: #{err}"
       end
       
     end
@@ -41,26 +41,26 @@ module Sysutil
     def self.set_password!(user, password, confirmation)
 
       # TODO: Change user password in such a way that we don't need chpasswd
-      set_password_command = conditional_sudo + "echo \"#{user}:#{password}\" | /usr/sbin/chpasswd"
+      set_password_command = cond_sudo + "echo \"#{user}:#{password}\" | /usr/sbin/chpasswd"
       puts set_password_command
 
       if password == confirmation
         out, err, status = Open3.capture3(set_password_command)
 
         if status.success?
-          {succesS: true, output: out}
+          true
         else
-          {success: false, output: "Error: #{err}"}
+          "Error: #{err}"
         end
       else
-        {success: false, output: "Error: Passwords don't match"}
+        "Error: Passwords don't match"
       end
       
     end
 
     def self.delete!(name, opts={})
       
-      delete_user_command = conditional_sudo + "userdel #{name}"
+      delete_user_command = cond_sudo + "userdel #{name}"
 
       if opts[:force]
         delete_user_command += ' --force'
@@ -73,9 +73,9 @@ module Sysutil
       out, err, status = Open3.capture3(delete_user_command)
 
       if status.success?
-        {success: true, output: out}
+        true
       else
-        {success: false, output: "Error: #{err}"}
+        "Error: #{err}"
       end
       
     end
@@ -89,9 +89,9 @@ module Sysutil
       out, err, status = Open3.capture3(add_to_group_command)
 
       if status.success?
-        {success: true, output: out}
+        true
       else
-        {success: false, output: "Error: #{err}"}
+        "Error: #{err}"
       end
     end
 
@@ -103,12 +103,23 @@ module Sysutil
 
       if status.success?
         groups = /(?<=\: )([a-z ]+)/.match(out).to_s.split(' ')
-        {success: true, output: groups}
+        return groups
       else
-        {success: true, message: "Error: #{err}"}
+        "Error: #{err}"
       end
       
     end
+
+
+    private
+
+    def self.cond_sudo
+      if current_user != "root"
+        "echo #{Sysutil::config[:root_password]} | sudo -S "
+      else
+        ""
+      end
+    end
     
   end
   

data/lib/sysutil/version/version.rb

@@ -1,3 +1,3 @@
 module Sysutil
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sysutil
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Watson
@@ -86,9 +86,8 @@ files:
 - lib/sysutil.rb
 - lib/sysutil/config.rb
 - lib/sysutil/functions.rb
-- lib/sysutil/package.rb
 - lib/sysutil/railtie.rb
-- lib/sysutil/user.rb
+- lib/sysutil/users.rb
 - lib/sysutil/version/version.rb
 - sysutil-0.1.0.gem
 - sysutil.gemspec

data/lib/sysutil/package.rb

@@ -1,78 +0,0 @@
-require 'open3'
-require_relative 'config.rb'
-
-module Sysutil
-
-  class Package
-
-    def self.install!(*packages)
-
-      packages = packages.join(' ')
-
-      install_command = case linux_variant[:family]
-                        when 'Debian'
-                          'apt-get install -y'
-                        when 'Redhat'
-                          'yum install -y'
-                        when 'Solaris'
-                          'pkg install'
-                        end
-
-      install_command = conditional_sudo + install_command
-      out, err, status = Open3.capture3(install_command)
-
-      if status.success?
-        {success: true, output: out}
-      else
-        {success: false, output: "Error: #{err}"}
-      end
-      
-    end
-
-    def self.remove!(*packages)
-
-      remove_command = case linux_variant[:family]
-                           when 'Debian'
-                             'apt-get remove -y'
-                           when 'Redhat'
-                             'yum remove -y'
-                           when 'Solaris'
-                             'pkg-delete'
-                           end
-
-      remove_command = conditional_sudo + remove_command
-      out, err, status = Open3.capture3(remove_command)
-
-      if status.success?
-        {success: true, output: out}
-      else
-        {success: false, output: "Error: #{err}"}
-      end
-      
-    end
-
-    def self.autoremove!
-
-      autoremove_command = case linux_variant[:family]
-                           when 'Debian'
-                             'apt-get autoremove -y'
-                           when 'Redhat'
-                             'yum autoremove'
-                           when 'Solaris'
-                             'pkg-delete -a'
-                           end
-
-      autoremove_command = conditional_sudo + autoremove_command
-      out, err, status = Open3.capture3(autoremove_command)
-
-      if status.success?
-        {success: true, message: out}
-      else
-        {success: true, output: "Error: #{err}"}
-      end
-      
-    end
-
-  end
-  
-end