slack-utils 0.6.2 → 0.7

data/examples/repo_difference.rb

@@ -15,3 +15,4 @@ printf("%d should be removed\n", (pkgs & c[:removed].map {|p| p.name }).count)
 #p pkgs & c[:removed].map {|p| p.name }
 ca = c[:added].map {|p| p.name }
 printf("%d should be added\n", (ca.count - (pkgs & ca).count))
+# vim : set sw=2 sts=2 et :

data/lib/slackware/args.rb

@@ -1,4 +1,6 @@
-# Copyright 2010,2011  Vincent Batts, Vienna, VA
+# encoding: UTF-8
+
+# Copyright 2010,2011,2012  Vincent Batts, Vienna, VA
 # All rights reserved.
 #
 # Redistribution and use of this source, with or without modification, is
@@ -21,79 +23,84 @@
 require 'optparse'
 
 module Slackware
-        class Args
-		def self.parse(args,flags = nil, banner = nil)
-			flags = [] unless flags.is_a?(Array)
-			options = {}
-
-			opts = OptionParser.new do |opts|
-				if banner
-					opts.banner = banner
-				end
-				if flags.include?(:color)
-					opts.on("-c", "--color", "Colorize output") do |o|
-						options[:color] = o
-					end
-				end
-				if flags.include?(:epoch)
-					opts.on("-e", "--epoch", "Print the time stamp in seconds since 1970-01-01 00:00:00 UTC ") do |o|
-						options[:epoch] = o
-					end
-				end
-				if flags.include?(:pkg_name)
-					opts.on("-p", "--pkg [NAME]", "Package PKGNAME (loose match)") do |o|
-						options[:pkg] = o
-					end
-				end
-				if flags.include?(:pkg_version)
-					opts.on("-V", "--Version [VERSION]", "Package VERSION (loose match)") do |o|
-						options[:version] = o
-					end
-				end
-				if flags.include?(:pkg_arch)
-					opts.on("-a", "--arch [ARCH]", "Package ARCH (exact match)") do |o|
-						options[:arch] = o
-					end
-				end
-				if flags.include?(:pkg_build)
-					opts.on("-b", "--build [BUILD]", "Package BUILD (exact match)") do |o|
-						options[:build] = o
-					end
-				end
-				if flags.include?(:pkg_tag)
-					opts.on("-t", "--tag [TAG]", "Package TAG (loose match)") do |o|
-						options[:tag] = o
-					end
-				end
-				if flags.include?(:case_insensitive)
-					opts.on("-i", "When searching, do a case insensitive match") do |o|
-						options[:case_insensitive] = o
-					end
-				end
-				if flags.include?(:force_all)
-					opts.on("-f", "--force", "force me to show all files") do |o|
-						options[:force] = o
-					end
-				end
-
-				opts.on("-v", "--version", "Display version of this software") do |o|
-					printf("slack-utils version: %s, Slackware version: %s\n",
-			       			Slackware::UTILS_VERSION,
-			       			Slackware::System.version
-			      		)
-					exit(0)
-				end
-			end
-
-			begin
+  # Args is the unified arguement parser for the slack-utils utilities.
+  class Args
+    def self.parse(args,flags = nil, banner = nil)
+      flags = [] unless flags.is_a?(Array)
+      options = {}
 
-				opts.parse!
-				return options
+      opts = OptionParser.new do |opts|
+        if banner
+          opts.banner = banner
+        end
+        if flags.include?(:color)
+          opts.on("-c", "--color", "Colorize output") do |o|
+            options[:color] = o
+          end
+        end
+        if flags.include?(:epoch)
+          opts.on("-e", "--epoch", "Print the time stamp in seconds since 1970-01-01 00:00:00 UTC ") do |o|
+            options[:epoch] = o
+          end
+        end
+        if flags.include?(:pkg_name)
+          opts.on("-p", "--pkg [NAME]", "Package PKGNAME (loose match)") do |o|
+            options[:pkg] = o
+          end
+        end
+        if flags.include?(:pkg_version)
+          opts.on("-V", "--Version [VERSION]", "Package VERSION (loose match)") do |o|
+            options[:version] = o
+          end
+        end
+        if flags.include?(:pkg_arch)
+          opts.on("-a", "--arch [ARCH]", "Package ARCH (exact match)") do |o|
+            options[:arch] = o
+          end
+        end
+        if flags.include?(:pkg_build)
+          opts.on("-b", "--build [BUILD]", "Package BUILD (exact match)") do |o|
+            options[:build] = o
+          end
+        end
+        if flags.include?(:pkg_tag)
+          opts.on("-t", "--tag [TAG]", "Package TAG (loose match)") do |o|
+            options[:tag] = o
+          end
+        end
+        if flags.include?(:case_insensitive)
+          opts.on("-i", "When searching, do a case insensitive match") do |o|
+            options[:case_insensitive] = o
+          end
+        end
+        if flags.include?(:force_all)
+          opts.on("-f", "--force", "force me to show all files") do |o|
+            options[:force] = o
+          end
+        end
+        if flags.include?(:debug)
+          opts.on("-D", "--debug", "show debugging output") do |o|
+            options[:debug] = o
+          end
+        end
 
-			rescue OptionParser::InvalidOption => ex
-				$stderr.write("ERROR: #{e.message}, see --help\n")
-				exit(1)
-			end
-		end
+        opts.on("-v", "--version", "Display version of this software") do |o|
+          printf("slack-utils version: %s, Slackware version: %s\n",
+                   Slackware::UTILS_VERSION,
+                   Slackware::System.version
+                )
+          exit(0)
         end
+      end
+
+      begin
+        opts.parse!
+        return options
+      rescue OptionParser::InvalidOption => ex
+        $stderr.write("ERROR: #{e.message}, see --help\n")
+        exit(1)
+      end
+    end
+  end
 end
+# vim : set sw=2 sts=2 et :

data/lib/slackware/changelog/rss.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # Copyright 2010,2011  Vincent Batts, Vienna, VA
 # All rights reserved.
 #
@@ -139,3 +141,4 @@ end
 
 
 
+# vim : set sw=2 sts=2 et :

data/lib/slackware/changelog.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # Copyright 2010,2011  Vincent Batts, Vienna, VA
 # All rights reserved.
 #
@@ -41,16 +43,16 @@ module Slackware
 
     # The regular entry, accounting for usb-and-pxe-installers directory,
     # and notes after the action
-    re_package_entry0 = Regexp.new(/^(([\w+-]+).*\/.*):\s+(\w+).*\.?$/)
+    re_package_entry0 = /^(([\w+-]+).*\/.*):\s+(\w+).*\.?$/
     # Some didn't have an action after the name
-    re_package_entry1 = Regexp.new(/^(([\w+-]+).*\/.*):/)
+    re_package_entry1 = /^(([\w+-]+).*\/.*):/
     # and some didn't have the ':' or an action
-    re_package_entry2 = Regexp.new(/^(([\w+-]+).*\/.*\.t[gbx]z)/)
+    re_package_entry2 = /^(([\w+-]+).*\/.*\.t[gbx]z)/
     # combine them
     RE_PACKAGE_ENTRY = Regexp.union(re_package_entry0, re_package_entry1, re_package_entry2)
 
     # (* Security fix *)
-    RE_SECURITY_FIX = Regexp.new(/\(\*\s+security\s+fix\s+\*\)/i)
+    RE_SECURITY_FIX = /\(\*\s+security\s+fix\s+\*\)/i
 
     # for hacks sake, make these usbable elsewhere
     def self::re_date ; RE_DATE ; end
@@ -150,21 +152,21 @@ module Slackware
     end
 
     def parse(opts = {:file => nil, :data => nil})
-	    if not(opts[:file].nil?)
-		    @updates = parse_this_file(opts[:file]).updates
+      if not(opts[:file].nil?)
+        @updates = parse_this_file(opts[:file]).updates
       elsif not(@file.nil?)
-		    @updates = parse_this_file(@file).updates
-	    end
-	    return self
+        @updates = parse_this_file(@file).updates
+      end
+      return self
     end
 
     # Class method
     def self::parse(file)
-	    return parse_this_file(file)
+      return parse_this_file(file)
     end
 
     def self::open(file)
-	    return parse_this_file(file)
+      return parse_this_file(file)
     end
 
     def inspect
@@ -180,7 +182,7 @@ module Slackware
     # * take packge notes until
     # * next package or entry separator
     # * separator creates next change entry
-    def parse_this_file(file)
+    def self::parse_this_file(file)
       f_handle = ""
       if file.is_a?(File)
         f_handle = file
@@ -270,3 +272,4 @@ module Slackware
 
   end
 end
+# vim : set sw=2 sts=2 et :

data/lib/slackware/log.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+
+# Copyright 2012  Vincent Batts, Vienna, VA
+# All rights reserved.
+#
+# Redistribution and use of this source, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this source must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+require 'logger'
+require 'singleton'
+
+module Slackware
+
+  # Log is a subclass of Logger, but is implemented as a singleton,
+  # so it can be used across library in a somewhat unified manner.
+  # Example:
+  #   require 'slackware/log'
+  #   
+  #   slog = Slackware::Log.instance
+  #   slog.info("LOG ALL THE THINGS!")
+  #   slog.debug('my_app') { ex.backtrace }
+  #
+  class Log < Logger
+    include Singleton
+
+    # Since Singleton does a lazy loader, this will not get initialized
+    # until it is first used. So it'll be nil, or you can set $logdev early on.
+    # It defaults to WARN level and STDERR
+    def initialize(*args)
+      if $logdev
+	super($logdev, args)
+      else
+	super(STDERR, args)
+      end
+    end
+  end # class Log
+end # module Slackware
+
+# vim : set sw=2 sts=2 et :

data/lib/slackware/package.rb

@@ -1,4 +1,6 @@
-# Copyright 2010,2011  Vincent Batts, Vienna, VA
+# encoding: UTF-8
+
+# Copyright 2010,2011,2012  Vincent Batts, Vienna, VA
 # All rights reserved.
 #
 # Redistribution and use of this source, with or without modification, is
@@ -19,211 +21,238 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 require 'time'
+require 'slackware/log'
+require 'slackware/paths'
 
 module Slackware
-	class Package
-		attr_accessor :time, :path, :file, :name, :version, :arch, :build, :tag, :tag_sep, :upgrade_time, :owned_files
-		def initialize(name = nil)
-			self.name = name
-		end
-
-		# pkg.parse instance method for parsing the package information
-		def parse(name)
-			if name.include?("/")
-				self.path = File.dirname(name)
-				name = File.basename(name)
-			end
-			if (name =~ RE_REMOVED_NAMES)
-				name = $1
-				self.upgrade_time = Time.strptime($2 + ' ' + $3, fmt='%F %H:%M:%S')
-			end
-			arr = name.split('-')
-			build = arr.pop
-			if (build.include?("_"))
-				self.tag_sep = "_"
-				self.build = build.split(self.tag_sep)[0]
-				self.tag = build.split(self.tag_sep)[1..-1].join(self.tag_sep)
-			elsif (build =~ RE_BUILD_TAG)
-				self.build = $1
-				self.tag = $2
-			else
-				self.build = build
-				self.tag = ""
-			end
-			self.arch = arr.pop
-			self.version = arr.pop
-			self.name = arr.join('-')
-		end
-
-		# Package.parse class method
-		def self::parse(name)
-			p = self.new()
-			p.parse(name)
-			return p
-		end
-		
-		# Reassemble the package name as it would be in file form
-		def fullname
-			if (self.upgrade_time)
-				time = self.upgrade_time.strftime("%F,%H:%M:%S")
-				return [self.name, self.version, self.arch, [self.build, self.tag].join(self.tag_sep), "upgraded", time].join("-")
-			else
-				return [self.name, self.version, self.arch, [self.build, self.tag].join(self.tag_sep)].join("-")
-			end
-		end
-
-		# Accessor for the PACKAGE DESCRIPTION from the package file
-		def package_description
-			if not(@package_description.nil?)
-				return @package_description
-			end
-
-			f = File.open(self.path + '/' + self.fullname)
-			while true
-				if (f.readline =~ /^PACKAGE DESCRIPTION:\s+(.*)$/)
-					desc = f.take_while {|l|
-                                                not(l =~ /FILE LIST:/)
+  class Package
+    RE_FILE_LIST = /^FILE LIST:/
+    RE_COMPRESSED_PACKAGE_SIZE = /^COMPRESSED PACKAGE SIZE:\s+(.*)$/
+    RE_UNCOMPRESSED_PACKAGE_SIZE = /^UNCOMPRESSED PACKAGE SIZE:\s+(.*)$/
+    RE_PACKAGE_LOCATION = /^PACKAGE LOCATION:\s+(.*)$/
+    RE_PACKAGE_DESCRIPTION = /^PACKAGE DESCRIPTION:\s+(.*)$/
+
+    FMT_UPGRADE_TIME = "%F %H:%M:%S"
+
+    attr_accessor :time, :path, :file, :name, :version, :arch, :build, :tag, :tag_sep, :upgrade_time, :owned_files
+    def initialize(name = nil)
+      self.name = name
+    end
+
+    # pkg.parse instance method for parsing the package information
+    def parse(name)
+      if name.include?("/")
+        self.path = File.dirname(name)
+        name = File.basename(name)
+      end
+      if (name =~ RE_REMOVED_NAMES)
+        name = $1
+        self.upgrade_time = Time.strptime($2 + ' ' + $3, fmt=FMT_UPGRADE_TIME)
+      end
+      arr = name.split('-')
+      build = arr.pop
+      if (build.include?("_"))
+        self.tag_sep = "_"
+        self.build = build.split(self.tag_sep)[0]
+        self.tag = build.split(self.tag_sep)[1..-1].join(self.tag_sep)
+      elsif (build =~ RE_BUILD_TAG)
+        self.build = $1
+        self.tag = $2
+      else
+        self.build = build
+        self.tag = ""
+      end
+      self.arch = arr.pop
+      self.version = arr.pop
+      self.name = arr.join('-')
+    end
+
+    # Package.parse class method
+    def self::parse(name)
+      p = self.new()
+      p.parse(name)
+      return p
+    end
+    
+    # Reassemble the package name as it would be in file form
+    def fullname
+      if (self.upgrade_time)
+        time = self.upgrade_time.strftime("%F,%H:%M:%S")
+        return [self.name, self.version, self.arch, [self.build, self.tag].join(self.tag_sep), "upgraded", time].join("-")
+      else
+        return [self.name, self.version, self.arch, [self.build, self.tag].join(self.tag_sep)].join("-")
+      end
+    end
+
+    # Accessor for the PACKAGE DESCRIPTION from the package file
+    def package_description
+      if not(@package_description.nil?)
+        return @package_description
+      end
+
+      f = File.open(self.path + '/' + self.fullname)
+      while true
+        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
-				end
-			end
-		end
-
-		# Setter for the PACKAGE DESCRIPTION, in the event you are parsing a repo file
-		def package_description=(desc)
-			@package_description = desc
-		end
-
-		# Accessor for the PACKAGE LOCATION from the package file
-		def package_location
-			if not(@package_location.nil?)
-				return @package_location
-			end
-
-			f = File.open(self.path + '/' + self.fullname)
-			while true
-				if (f.readline =~ /^PACKAGE LOCATION:\s+(.*)$/)
-					return $1
-				end
-			end
-		end
-
-		# Setter for the PACKAGE LOCATION, in the event you are parsing a repo file
-		def package_location=(path)
-			@package_location = path
-		end
-
-		# Accessor for the UNCOMPRESSED PACKAGE SIZE from the package file
-		def uncompressed_size
-			if not(@uncompressed_size.nil?)
-				return @uncompressed_size
-			end
-
-			f = File.open(self.path + '/' + self.fullname)
-			while true
-				if (f.readline =~ /^UNCOMPRESSED PACKAGE SIZE:\s+(.*)$/)
-					return $1
-				end
-			end
-		end
-
-		# Setter for the UNCOMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
-		def uncompressed_size=(size)
-			@uncompressed_size = size
-		end
-
-		# Accessor for the COMPRESSED PACKAGE SIZE from the package file
-		def compressed_size
-			if not(@compressed_size.nil?)
-				return @compressed_size
-			end
-
-			f = File.open(self.path + '/' + self.fullname)
-			while true
-				if (f.readline =~ /^COMPRESSED PACKAGE SIZE:\s+(.*)$/)
-					return $1
-				end
-			end
-		end
-
-		# Setter for the COMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
-		def compressed_size=(size)
-			@compressed_size = size
-		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
-				f = File.open(self.path + '/' + self.fullname)
-				files = f.drop_while {|l| not( l =~ /^FILE LIST:/) }[2..-1].map {|l| l.chomp }
-				f.close
-				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
-			end
-		end
-
-		# populates and returns self.time
-		def get_time
-			if (self.time.nil? && self.path)
-				if (File.exist?(self.path + "/" + self.fullname))
-					self.time = File.mtime(self.path + "/" + self.fullname)
-				end
-			elsif (not(self.path) && (self.time.nil?))
-				if (File.exist?(DIR_INSTALLED_PACKAGES + "/" + self.fullname))
-					self.time = File.mtime(DIR_INSTALLED_PACKAGES + "/" + self.fullname)
-				end
-			end
-			return self.time
-		end
-
-		# Fill in the path information
-		def get_path
-			if (self.path.nil? && File.exist?(DIR_INSTALLED_PACKAGES + "/" + self.name))
-				self.path = DIR_INSTALLED_PACKAGE
-				return DIR_INSTALLED_PACKAGE
-			end
-		end
-
-		def inspect
-			"#<%s:0x%x name=\"%s\" version=\"%s\" arch=\"%s\" build=%s tag=\"%s\">" % [
-				self.class.name,
-				self.object_id,
-				self.name,
-				self.version,
-				self.arch,
-				self.build,
-				self.tag
-			]
-		end
-
-	end
-
-	class Script < Package
-		attr_accessor :script
-
-		def initialize(name = nil)
-			self.script = true
-			super
-		end
-
-		def parse(name)
-			super
-			self.script = true
-		end
-
-	end
+          return desc
+        end
+      end
+    end
+
+    # Setter for the PACKAGE DESCRIPTION, in the event you are parsing a repo file
+    def package_description=(desc)
+      @package_description = desc
+    end
+
+    # Accessor for the PACKAGE LOCATION from the package file
+    def package_location
+      if not(@package_location.nil?)
+        return @package_location
+      end
+
+      f = File.open(self.path + '/' + self.fullname)
+      while true
+        if (f.readline =~ RE_PACKAGE_LOCATION)
+          return $1
+        end
+      end
+    end
+
+    # Setter for the PACKAGE LOCATION, in the event you are parsing a repo file
+    def package_location=(path)
+      @package_location = path
+    end
+
+    # Accessor for the UNCOMPRESSED PACKAGE SIZE from the package file
+    def uncompressed_size
+      if not(@uncompressed_size.nil?)
+        return @uncompressed_size
+      end
+
+      f = File.open(self.path + '/' + self.fullname)
+      while true
+        if (f.readline =~ RE_UNCOMPRESSED_PACKAGE_SIZE)
+          return $1
+        end
+      end
+    end
+
+    # Setter for the UNCOMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
+    def uncompressed_size=(size)
+      @uncompressed_size = size
+    end
+
+    # Accessor for the COMPRESSED PACKAGE SIZE from the package file
+    def compressed_size
+      if not(@compressed_size.nil?)
+        return @compressed_size
+      end
+
+      f = File.open(self.path + '/' + self.fullname)
+      while true
+        if (f.readline =~ RE_COMPRESSED_PACKAGE_SIZE)
+          return $1
+        end
+      end
+    end
+
+    # Setter for the COMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
+    def compressed_size=(size)
+      @compressed_size = size
+    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()
+            if line.force_encoding("US-ASCII") =~ RE_FILE_LIST # FIXME ArgumentError: invalid byte sequence in US-ASCII
+              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
+	    }
+          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
+      end
+    end
+
+    # populates and returns self.time
+    def get_time
+      if (self.time.nil? && self.path)
+        if (File.exist?(self.path + "/" + self.fullname))
+          self.time = File.mtime(self.path + "/" + self.fullname)
+        end
+      elsif (not(self.path) && (self.time.nil?))
+        if (File.exist?(Paths::installed_packages() + "/" + self.fullname))
+          self.time = File.mtime(Paths::installed_packages() + "/" + self.fullname)
+        end
+      end
+      return self.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
+    end
+
+    def inspect
+      "#<%s:0x%x name=\"%s\" version=\"%s\" arch=\"%s\" build=%s tag=\"%s\">" % [
+        self.class.name,
+        self.object_id,
+        self.name,
+        self.version,
+        self.arch,
+        self.build,
+        self.tag
+      ]
+    end
+
+  end
+
+  class Script < Package
+    attr_accessor :script
+
+    def initialize(name = nil)
+      self.script = true
+      super
+    end
+
+    def parse(name)
+      super
+      self.script = true
+    end
+
+  end
 end
+
+# vim:sw=2:sts=2:et: