lib/dply/pkgs.rb in dply-0.2.19 vs lib/dply/pkgs.rb in dply-0.3.0

@@ -1,29 +1,29 @@
 require 'yaml'
-require 'dply/helper'
+require_relative 'helper'
 require_relative 'yum'
 
 module Dply
   class Pkgs
 
     include Helper
 
     attr_reader :runtime, :build, :all
 
-    def initialize(pkgs_yml = nil)
-      @pkgs_yml = pkgs_yml || "pkgs.yml"
+    def initialize(pkgs_yml)
+      @pkgs_yml = pkgs_yml
       read_config
     end
 
-    def install(build_mode: false, sudo: false)
+    def install(build_mode: false)
       pkgs = build_mode ? @all : @runtime
-      Yum.new(pkgs, sudo: sudo).install
+      Yum.install pkgs
     end
 
     def installed?(build_mode: false)
       pkgs = build_mode ? @all : @runtime
-      Yum.new(pkgs).installed?
+      Yum.installed? pkgs
     end
 
     private
 
     def read_config
@@ -42,20 +42,18 @@
       if not File.readable? @pkgs_yml
         logger.debug "skipping yum pkgs"
         return {}
       end
       YAML.safe_load(File.read(@pkgs_yml)) || {}
-    rescue => e
-      error "error loading pkgs list" 
+    rescue
+      error "error loading pkgs list"
     end
 
     def validate!(pkg)
       msg = "invalid pkg name #{pkg}"
       error msg if pkg =~ /\.rpm\z/i
-      error msg if pkg =~/\A[A-Za-z_0-9\.\-]\z/
+      error msg if not pkg =~ /\A[A-Za-z_0-9\.\-]+\z/
       return true
     end
 
   end
 end
-
-