slack-utils 0.7.3 → 0.7.4

data/bin/slf

@@ -55,7 +55,7 @@ elsif (ARGV.count == 0)
 end
 
 begin
-  print_package_searched_files(build_packages(options, []), ARGV)
+  print_package_searched_files(ARGV)
 rescue Interrupt
   exit 0
 rescue Exception => e

data/lib/slackware/package.rb

@@ -37,7 +37,8 @@ module Slackware
 
     FMT_UPGRADE_TIME = "%F %H:%M:%S"
 
-    attr_accessor :time, :path, :file, :name, :version, :arch, :build, :tag, :tag_sep, :upgrade_time, :owned_files
+    attr_accessor :path, :file, :name, :version, :arch, :build, :tag, :tag_sep, :upgrade_time
+    #attr_accessor :time, :owned_files
     def initialize(name = nil)
       self.name = name
     end
@@ -89,19 +90,17 @@ module Slackware
 
     # Accessor for the PACKAGE DESCRIPTION from the package file
     def package_description
-      if not(@package_description.nil?)
-        return @package_description
-      end
+      return @package_description unless @package_description.nil?
 
-      f = File.open(self.path + '/' + self.fullname)
-      while true
+      f = File.open(path() + '/' + self.fullname)
+      loop do
         if (f.readline =~ RE_PACKAGE_DESCRIPTION)
-          desc = f.take_while {|l|
-                                                not(l =~ RE_FILE_LIST)
-                                        }.map {|l|
-                                                l.sub(/^#{self.name}:\s?/, '').chomp
-                                        }
-          return desc
+          @package_description = f.take_while {|l|
+            not(l =~ RE_FILE_LIST)
+          }.map {|l|
+            l.sub(/^#{self.name}:\s?/, '').chomp
+          }
+          return @package_description
         end
       end
     end
@@ -113,14 +112,12 @@ module Slackware
 
     # Accessor for the PACKAGE LOCATION from the package file
     def package_location
-      if not(@package_location.nil?)
-        return @package_location
-      end
+      return @package_location unless @package_location.nil?
 
       f = File.open(self.path + '/' + self.fullname)
-      while true
+      loop do
         if (f.readline =~ RE_PACKAGE_LOCATION)
-          return $1
+          return @package_location = $1
         end
       end
     end
@@ -132,14 +129,12 @@ module Slackware
 
     # Accessor for the UNCOMPRESSED PACKAGE SIZE from the package file
     def uncompressed_size
-      if not(@uncompressed_size.nil?)
-        return @uncompressed_size
-      end
+      return @uncompressed_size unless @uncompressed_size.nil?
 
       f = File.open(self.path + '/' + self.fullname)
-      while true
+      loop do
         if (f.readline =~ RE_UNCOMPRESSED_PACKAGE_SIZE)
-          return $1
+          return @uncompressed_size = $1
         end
       end
     end
@@ -151,14 +146,12 @@ module Slackware
 
     # Accessor for the COMPRESSED PACKAGE SIZE from the package file
     def compressed_size
-      if not(@compressed_size.nil?)
-        return @compressed_size
-      end
+      return @compressed_size unless @compressed_size.nil?
 
       f = File.open(self.path + '/' + self.fullname)
-      while true
+      loop do
         if (f.readline =~ RE_COMPRESSED_PACKAGE_SIZE)
-          return $1
+          return @compressed_size = $1
         end
       end
     end
@@ -168,70 +161,75 @@ module Slackware
       @compressed_size = size
     end
 
+    # Set the file list in the package object in memory
+    def owned_files
+      @owned_files ||= _owned_files()
+    end
+
     # Accessor for the FILE LIST from the package file
     # unless the :owned_files symbol is populated
-    def get_owned_files
-      unless self.owned_files.nil?
-        return self.owned_files
-      else
-        files = []
-        File.open(self.path + '/' + self.fullname) do |f|
-          while true
-            break if f.eof?
-            line = f.readline()
-            begin
-              if line.force_encoding("US-ASCII") =~ RE_FILE_LIST
-                f.seek(2, IO::SEEK_CUR)
-                break
-              end
-            rescue ArgumentError
-              # ArgumentError: invalid byte sequence in US-ASCII
-              # so dumb, i wish i could determine a better solution for this
-              true
+    def _owned_files
+      files = []
+      File.open(self.path + '/' + self.fullname) do |f|
+        loop do
+          break if f.eof?
+          line = f.readline()
+        begin
+            if line.force_encoding("US-ASCII") =~ RE_FILE_LIST
+              f.seek(2, IO::SEEK_CUR)
+              break
             end
-          end
-          begin
-            files = f.readlines().map {|line| line.rstrip.force_encoding("US-ASCII") }
           rescue ArgumentError
-            Log.instance.debug("Slackware::Package") {
-	      "encoding in : " + self.path + '/' + self.fullname
-	    }
+            # ArgumentError: invalid byte sequence in US-ASCII
+            # so dumb, i wish i could determine a better solution for this
+            true
           end
         end
-        return files
-      end
-    end
-
-    # Set the file list in the package object in memory
-    def set_owned_files
-      if self.owned_files.nil?
-        self.owned_files = get_owned_files()
-        return true
-      else
-        return false
+        begin
+          files = f.readlines().map {|line| line.rstrip.force_encoding("US-ASCII") }
+        rescue ArgumentError
+          Log.instance.debug("Slackware::Package") {
+            "encoding in : " + self.path + '/' + self.fullname
+          }
+        end
       end
+      return files
     end
 
     # populates and returns self.time
-    def get_time
-      if (self.time.nil? && self.path)
+    def time
+      if (@time.nil? && self.path)
         if (File.exist?(self.path + "/" + self.fullname))
-          self.time = File.mtime(self.path + "/" + self.fullname)
+          @time = File.mtime(self.path + "/" + self.fullname)
         end
-      elsif (not(self.path) && (self.time.nil?))
+      elsif (not(self.path) && (@time.nil?))
         if (File.exist?(Paths::installed_packages() + "/" + self.fullname))
-          self.time = File.mtime(Paths::installed_packages() + "/" + self.fullname)
+          @time = File.mtime(Paths::installed_packages() + "/" + self.fullname)
         end
       end
-      return self.time
+      return @time
     end
 
     # Fill in the path information
-    def get_path
-      if (self.path.nil? && File.exist?(Paths::installed_packages() + "/" + self.name))
-        self.path = Paths::installed_packages()
-        return Paths::installed_packages()
-      end
+    def path
+      @path ||= Paths::installed_packages()
+    end
+
+    def to_h
+      {
+        "name" => @name,
+        "version" => @version,
+        "arch" => @arch,
+        "build" => @build,
+        "tag" => @tag,
+        "tag_sep" => @tag_sep,
+        "upgrade_time" => @upgrade_time,
+        "compressed_size" => compressed_size(),
+        "uncompressed_size" => uncompressed_size(),
+        "path" => path(),
+        "time" => time(),
+        "owned_files" => owned_files(),
+      }
     end
 
     def inspect
@@ -248,6 +246,7 @@ module Slackware
 
   end
 
+
   class Script < Package
     attr_accessor :script
 

data/lib/slackware/system.rb

@@ -174,7 +174,7 @@ module Slackware
       debug('owns_file(): pkgs.count => %d' % pkgs.count)
       found_files = []
       file = file.sub(/^\//, "") # clean off the leading '/'
-      re = /#{file}/
+      re = /#{Regexp.escape(file)}/
       debug('owns_file(): file Regexp => %s' % re.inspect)
       pkgs.each {|pkg|
         pkg.get_owned_files().select {|f|

data/lib/slackware/utils.rb

@@ -217,7 +217,7 @@ end
 
 # search Array of Slackware::Package's for files
 # and print the items found
-def print_package_searched_files(pkgs, files)
+def print_package_searched_files(files)
   found_files = []
   files.each {|file|
     found_files += Slackware::System.owns_file(file)

data/lib/slackware/version.rb

@@ -28,7 +28,7 @@ module Slackware
                       rescue
                         nil
                       end
-  UTILS_VERSION = "0.7.3"
+  UTILS_VERSION = "0.7.4"
 end
 
 # vim : set sw=2 sts=2 et :

metadata

@@ -1,21 +1,20 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slack-utils
-version: !ruby/object:Gem::Version 
-  version: 0.7.3
+version: !ruby/object:Gem::Version
+  version: 0.7.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Vincent Batts
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-09 00:00:00 -05:00
-default_executable: 
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies: []
-
-description: slack-utils is a means by which to access  package information on the Slackware Linux OS.  See the examples/ for more information.
+description: ! " slack-utils is a means by which to access \npackage information on
+  the Slackware Linux OS. \nSee the examples/ for more information.\n  "
 email: vbatts@hashbangbash.com
-executables: 
+executables:
 - sli
 - slf
 - slo
@@ -25,10 +24,9 @@ executables:
 - slu
 - slfindlinked
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - README.rdoc
 - bin/slf
 - bin/slt
@@ -54,34 +52,32 @@ files:
 - lib/slackware/repo.rb
 - lib/slackware/version.rb
 - lib/slackware/system.rb
-has_rdoc: true
 homepage: https://github.com/vbatts/slack-utils/
+licenses: []
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main=README.rdoc
 - --line-numbers
 - --inline-source
-- --title=Slackware utils (slack-utils) 0.7.3 Documentation
-require_paths: 
+- --title=Slackware utils (slack-utils) 0.7.4 Documentation
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Accessing information for the Slackware Linux distribution
 test_files: []
-