slack-utils 0.5.3 → 0.6.0

data/README.rdoc

@@ -38,7 +38,7 @@ TODO:
 == Installation
 
 To install the gem 
- sudo gem install pkg/slack-utils-0.5.3.gem
+ sudo gem install pkg/slack-utils-0.6.0.gem
 
 == Quick Start
 

data/lib/slackware.rb

@@ -2,4 +2,5 @@
 require 'slackware/version'
 require 'slackware/package'
 require 'slackware/system'
+require 'slackware/changelog'
 require 'slackware/repo'

data/lib/slackware/changelog.rb

@@ -0,0 +1,238 @@
+
+require 'slackware/package'
+require 'date'
+require 'time'
+
+module Slackware
+  # The class for parsing a Slackware standard ChangeLog.txt
+  class ChangeLog
+
+    # yanked from +Date+
+    ABBR_DAYNAMES = %w(Sun Mon Tue Wed Thu Fri Sat)
+    ABBR_MONTHNAMES = %w(Jan Feb Mar Apr May Jun
+                         Jul Aug Sep Oct Nov Dec)
+
+    # Compiling a fat regex to find the date entries
+    re_daynames = Regexp.new(ABBR_DAYNAMES.join('|'))
+    re_monthnames = Regexp.new(ABBR_MONTHNAMES.join('|'))
+    RE_DATE = Regexp.new(/^(#{re_daynames}\s+#{re_monthnames}\s+\d+\s+\d{2}:\d{2}:\d{2}\s\w+\s+\d+)$/)
+ 
+    # This break has been the same as long as I can find
+    RE_CHANGELOG_BREAK = Regexp.new(/^\+--------------------------\+$/)
+
+    # The regular entry, accounting for usb-and-pxe-installers directory,
+    # and notes after the action
+    re_package_entry0 = Regexp.new(/^(([\w+-]+).*\/.*):\s+(\w+).*\.?$/)
+    # Some didn't have an action after the name
+    re_package_entry1 = Regexp.new(/^(([\w+-]+).*\/.*):/)
+    # and some didn't have the ':' or an action
+    re_package_entry2 = Regexp.new(/^(([\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)
+
+    # for hacks sake, make these usbable elsewhere
+    def self::re_date ; RE_DATE ; end
+    def self::re_changelog_break ; RE_CHANGELOG_BREAK ; end
+    def self::re_package_entry ; RE_PACKAGE_ENTRY ; end
+    def self::re_security_fix ; RE_SECURITY_FIX ; end
+
+    # A changeset, which should consist of entries of changes and/or notes
+    # regarding the updates
+    class Update
+      # FIXME this class needs more proper value setting
+      def initialize(date = nil, notes = "", entries = Array.new)
+        @date = date
+        @notes = notes
+        @entries = entries
+      end
+      def date; @date; end
+      def notes; @notes; end
+      def entries; @entries; end
+
+      def date=(timestamp)
+        if (timestamp.is_a?(Time))
+          @date = timestamp
+        elsif (timestamp.is_a?(Date))
+          @date = timestamp.to_time
+        else
+          @date = Time.parse(timestamp)
+        end
+      end
+      def notes=(text); @notes = text; end
+    end
+
+    # The class for each item in a change set
+    class Entry
+      def initialize(package = nil, section = nil, action = nil, notes = "", security = false)
+        @package  = package
+        @section  = section
+        @action   = action
+        notes.is_a?(String) ? @notes = notes : @notes = ""
+        security == true ? @security = security : @security = false
+      end
+
+      def package; @package; end
+      def section; @section; end
+      def action; @action; end
+      def notes; @notes; end
+      def security; @security; end
+
+      def package=(package_name); @package = package_name ; end
+      def section=(section_name); @section = section_name ; end
+      def action=(action_name); @action = action_name ; end
+      def notes=(notes_txt)
+        notes_txt.is_a?(String) ? @notes = notes_txt : @notes = ""
+      end
+      def security=(bool)
+        bool == true ? @security = bool : @security = false
+      end
+    end
+
+    # +file+ can be a path to a file, or a +File+ object
+    # +opts+ can include
+    #  * :arch    - basically '64' or '32'
+    #  * :version - 13.1, 13.2, current, etc.
+    #  * :url     - the URL web link to the ChangeLog.txt
+    def initialize(file = nil, opts = {})
+      @file     = file
+      @opts     = opts
+      @updates  = Array.new
+    end
+
+    def file; @file; end
+    def opts; @opts; end
+    def updates; @updates; end
+    def entries
+      @updates.map {|update| update.entries.map {|entry| {:date => update.date, :entry => entry } } }.flatten
+    end
+    def security
+      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.security } }.flatten.compact
+    end
+    def opts=(hash)
+      if hash.is_a?(Hash)
+        @opts = hash
+      end
+    end
+
+    def parse
+	    unless @file.nil?
+		    @updates = parse_this_file(@file).updates
+	    end
+	    return self
+    end
+
+    # Class method
+    def self::parse(file)
+	    return parse_this_file(file)
+    end
+
+    def self::open(file)
+	    return parse_this_file(file)
+    end
+
+    def inspect
+      "#<%s:0x%x @file=%s, %d @updates, %d @entries>" % [self.class.name, self.object_id.abs, self.file || '""', self.updates.count || 0, self.entries.count || 0]
+    end
+
+    private
+    # Parse order is something like:
+    # * if its' a date match, store the date
+    # * take change notes until
+    # * package match on name and action
+    # * set @security if present
+    # * take packge notes until
+    # * next package or entry separator
+    # * separator creates next change entry
+    def parse_this_file(file)
+      f_handle = ""
+      if file.is_a?(File)
+        f_handle = file
+      elsif file.is_a?(String)
+        if File.exist?(File.expand_path(file))
+          f_handle = File.open(File.expand_path(file))
+        else
+          raise StandardError.new("file not found\n")
+        end
+      else
+        raise StandardError.new("file not found\n")
+      end
+
+      # Start our changelog
+      changelog = ChangeLog.new(f_handle)
+      f_handle.each do |line|
+        if (line =~ RE_DATE)
+          u = Update.new(Time.parse($1))
+          while true
+            if (f_handle.eof?)
+              break
+            end
+
+            # take the next line
+            u_line = f_handle.readline
+            if (u_line =~ RE_CHANGELOG_BREAK)
+              break
+            end
+
+            # the intimate iteration
+            # +Match+ is more expensive than =~,
+            # but ruby-1.8.x is lossing the matched values down below
+            # so this works on both ...
+            if (match = RE_PACKAGE_ENTRY.match(u_line))
+              u_entry = Entry.new()
+              # This silly iteration catches the different cases of 
+              # which package line, matches which Regexp. WIN
+              if match[1].nil?
+                if match[4].nil?
+                  u_entry.package = match[6] unless match[6].nil?
+                else
+                  u_entry.package = match[4]
+                end
+              else
+                u_entry.package = match[1]
+              end
+              if u_entry.package.include?("/")
+                u_entry.package = u_entry.package.split("/")[-1]
+              end
+              if match[2].nil?
+                if match[5].nil?
+                  u_entry.section = match[7] unless match[7].nil?
+                else
+                  u_entry.section = match[5]
+                end
+              else
+                u_entry.section = match[2]
+              end
+              # set the action for the item, if it's present
+              u_entry.action = match[3] unless match[3].nil?
+
+              # Add this entry to the stack
+              u.entries << u_entry
+            else
+              # if u.entries is empty, then this text is notes 
+              # for the upate, else it is notes, for the entry
+              if (u.entries.empty?)
+                u.notes = u.notes + u_line
+              else
+                # if this line of the entry security fix, toggle the bool
+                if (u_line =~ RE_SECURITY_FIX)
+                  u.entries[-1].security = true
+                end
+                u.entries[-1].notes = u.entries[-1].notes + u_line
+              end
+            end
+          end
+
+          # Add this update to the stack
+          changelog.updates << u
+        end
+      end
+
+      # Give them their change set
+      return changelog
+    end
+
+  end
+end

data/lib/slackware/changelog/rss.rb

@@ -0,0 +1,87 @@
+require 'rss/maker'
+require 'slackware/changelog'
+
+module Slackware
+  class ChangeLog
+    def to_rss
+      version = "2.0" # ["0.9", "1.0", "2.0"]
+      content = RSS::Maker.make(version) do |m|
+        added_title = ""
+        if @opts[:arch]
+          added_title = added_title + "slackware#{@opts[:arch]}"
+        end
+        if @opts[:version]
+          added_title = added_title + "-#{@opts[:version]}"
+        end
+
+        if added_title.empty?
+          m.channel.title = "Slackware ChangeLog.txt feed"
+        else
+          m.channel.title = "Slackware ChangeLog.txt feed for #{added_title}"
+        end
+        if @opts[:url]
+          m.channel.link = "%s#slackagg" % [@opts[:url]]
+        else
+          m.channel.link = "http://www.slackware.com/#slackagg"
+        end
+        #m.channel.logo = "http://connie.slackware.com/~msimons/slackware/grfx/shared/bluepiSW.jpg"
+        m.channel.logo = "http://connie.slackware.com/~msimons/slackware/grfx/shared/dobbslack1.jpg"
+        m.channel.description = "a parsed ChangeLog.txt, is an extendable ChangeLog.txt"
+        m.items.do_sort = true # sort items by date
+
+        @updates.each {|update|
+          i = m.items.new_item
+          # Add a plug to the title of the update, if it includes a security fix
+          # set this here, so we don't have to .map again down below
+          security = update.entries.map {|e| 1 if e.security }.compact.count
+          if (security > 0)
+            i.title = "%s (* Security fix *)" % [update.date.utc.to_s]
+          else
+            i.title = update.date.utc.to_s
+          end
+          if @opts[:url]
+            i.link = "%s#%s" % [@opts[:url], update.date.to_i]
+          else
+            i.link = "http://slackware.com/#slackagg#%s" % [update.date.to_i]
+          end
+          i.date = update.date
+
+          i.description = ""
+          if (update.entries.count > 0)
+            if (security > 0)
+              i.description = "%d new update(s), %d security update(s)\n\n" % [update.entries.count, security]
+            else
+              i.description = "%d new update(s)\n\n" % [update.entries.count]
+            end
+          end
+          i.description = i.description + "<pre><blockquote>\n"
+          unless (update.notes.empty?)
+              i.description = i.description + update.notes + "\n\n"
+          end
+          if (update.entries.count > 0)
+            update.entries.each {|entry|
+              if (entry.notes.empty?)
+                i.description = i.description + sprintf("%s/%s:\s%s\n",
+                                                        entry.section,
+                                                        entry.package,
+                                                        entry.action)
+              else
+                i.description = i.description + sprintf("%s/%s:\s%s\n\s\s%s\n",
+                                                        entry.section,
+                                                        entry.package,
+                                                        entry.action,
+                                                        entry.notes)
+              end
+            }
+          end
+          i.description = i.description + "</blockquote></pre>\n"
+          i.description.gsub!(/\n/, "<br/>\n")
+        }
+      end
+      return content
+    end
+  end
+end
+
+
+

data/lib/slackware/package.rb

@@ -18,8 +18,8 @@ module Slackware
 				name = $1
 				self.upgrade_time = Time.strptime($2 + ' ' + $3, fmt='%F %H:%M:%S')
 			end
-			arr = name.split('-').reverse
-			build = arr.shift
+			arr = name.split('-')
+			build = arr.pop
 			if (build.include?("_"))
 				self.tag_sep = "_"
 				self.build = build.split(self.tag_sep)[0]
@@ -29,10 +29,11 @@ module Slackware
 				self.tag = $2
 			else
 				self.build = build
+				self.tag = ""
 			end
-			self.arch = arr.shift
-			self.version = arr.shift
-			self.name = arr.reverse.join('-')
+			self.arch = arr.pop
+			self.version = arr.pop
+			self.name = arr.join('-')
 		end
 
 		# Package.parse class method
@@ -54,8 +55,8 @@ module Slackware
 
 		# Accessor for the PACKAGE DESCRIPTION from the package file
 		def package_description
-			if not(self.package_description.nil?)
-				return self.package_description
+			if not(@package_description.nil?)
+				return @package_description
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -69,13 +70,13 @@ module Slackware
 
 		# Setter for the PACKAGE DESCRIPTION, in the event you are parsing a repo file
 		def package_description=(desc)
-			self.package_description = desc
+			@package_description = desc
 		end
 
 		# Accessor for the PACKAGE LOCATION from the package file
 		def package_location
-			if not(self.package_location.nil?)
-				return self.package_location
+			if not(@package_location.nil?)
+				return @package_location
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -88,13 +89,13 @@ module Slackware
 
 		# Setter for the PACKAGE LOCATION, in the event you are parsing a repo file
 		def package_location=(path)
-			self.package_location = path
+			@package_location = path
 		end
 
 		# Accessor for the UNCOMPRESSED PACKAGE SIZE from the package file
 		def uncompressed_size
-			if not(self.uncompressed_size.nil?)
-				return self.uncompressed_size
+			if not(@uncompressed_size.nil?)
+				return @uncompressed_size
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -107,13 +108,13 @@ module Slackware
 
 		# Setter for the UNCOMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
 		def uncompressed_size=(size)
-			self.uncompressed_size = size
+			@uncompressed_size = size
 		end
 
 		# Accessor for the COMPRESSED PACKAGE SIZE from the package file
 		def compressed_size
-			if not(self.compressed_size.nil?)
-				return self.compressed_size
+			if not(@compressed_size.nil?)
+				return @compressed_size
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -126,14 +127,14 @@ module Slackware
 
 		# Setter for the COMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
 		def compressed_size=(size)
-			self.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
-			if not(self.owned_files.nil?)
-				return self.owned_files
+			if not(@owned_files.nil?)
+				return @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 }
@@ -144,8 +145,8 @@ module Slackware
 
 		# Set the file list in the package object in memory
 		def set_owned_files
-			if self.owned_files.nil?
-				self.owned_files = self.get_owned_files
+			if @owned_files.nil?
+				@owned_files = @get_owned_files
 				return true
 			else
 				return false
@@ -158,7 +159,7 @@ module Slackware
 				if (File.exist?(self.path + "/" + self.fullname))
 					self.time = File.mtime(self.path + "/" + self.fullname)
 				end
-			elsif (self.time.nil? && not(self.path))
+			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
@@ -174,6 +175,18 @@ module Slackware
 			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

data/lib/slackware/repo.rb

@@ -1,5 +1,6 @@
 
 require 'slackware/package'
+require 'slackware/changelog'
 require 'slackware/system'
 require 'net/http'
 require 'net/ftp'
@@ -38,15 +39,17 @@ module Slackware
 							  end
 							  a
 						  end
+			else
+				## do some hot parsing of repo
 			end
 		end
 
 		def fetch(file = nil)
-			if file.nil?
-				url = URI.parse(self.proto + self.mirror + self.path)
-			else
-				url = URI.parse(self.proto + self.mirror + self.path + file)
-			end
+			#if file.nil?
+				#url = URI.parse(self.proto + self.mirror + self.path)
+			#else
+				#url = URI.parse(self.proto + self.mirror + self.path + file)
+			#end
 			if self.proto =~ /ftp/
 				ftp = Net::FTP.open(self.mirror)
 				ftp.login
@@ -63,6 +66,12 @@ module Slackware
 				req = Net::HTTP::Get.new(url.path)
 				res = Net::HTTP.start(url.host, url.port) {|http| http.request(req) }
 				return res
+			elsif self.proto =~ /file/
+				if (file.nil?)
+					return Dir.glob(self.path + "slackware" + self.arch + "-" + self.version + "/*")
+				else
+					return File.read(self.path + "slackware" + self.arch + "-" + self.version + "/" + file)
+				end
 			else
 				return nil
 			end
@@ -81,8 +90,22 @@ module Slackware
 				actions = %w{removed added upgraded rebuilt}
 				actions.each {|action|
 					changelog[:"#{action}"] = changelog_date.map {|line|
-						if line =~ /^\w+\/(.*)\.t[gx]z:\s+#{action}\.?$/i
-							Slackware::Package.parse($1)
+						if line =~ /^(\w+)\/(.*)\.t[gx]z:\s+#{action}\.?$/i
+							s = Slackware::Package.parse($2)
+							s.path = $1
+							if (self.mirror.nil?)
+								base_path= self.path
+							else
+								base_path= self.mirror + self.path
+							end
+							s.package_location = self.proto +
+								base_path +
+								"slackware" +
+								self.arch +
+								"-" +
+								self.version +
+								"/" 
+							s
 						end
 					}.compact
 				}

data/lib/slackware/system.rb

@@ -33,7 +33,15 @@ module Slackware
 		end
 
 		def self::tags_used
-			return installed_packages.map {|p| p.tag }.uniq.compact
+			pkgs = installed_packages
+			set = []
+			pkgs.map {|p| p.tag }.uniq.each {|tag|
+				m_set = {}
+				m_set[:tag] = tag
+				m_set[:count] = pkgs.map {|p| p if p.tag == tag }.compact.count
+				set << m_set
+			}
+			return set
 		end
 
 		def self::with_tag(tag)

data/lib/slackware/utils.rb

@@ -142,7 +142,11 @@ def find_orphaned_config_files
 	# build a list of config files currently installed
 	installed_config_files = Slackware::System.installed_packages.map {|pkg|
 		pkg.get_owned_files.map {|file|
-			file if (file =~ /^etc\// && not(file =~ /\/$/))
+			if not(file =~ /\/$/)
+				if (file =~ /^etc\//)
+					file
+				end
+			end
 		}
 	}.flatten.compact
 
@@ -155,8 +159,10 @@ def find_orphaned_config_files
 		if (config.count > 0)
 			# remove config files that are owned by a currently installed package
 			config = config.map {|file|
-				if (not(installed_config_files.include?(file)) && not(installed_config_files.include?(file + ".new")))
-					file
+				if not(installed_config_files.include?(file))
+					if not(installed_config_files.include?(file + ".new"))
+						file
+					end
 				end
 			}.compact
 			# check again, and continue if there are no config files left

data/lib/slackware/version.rb

@@ -7,6 +7,6 @@ module Slackware
 		  rescue
 			  nil
 		  end
-	UTILS_VERSION = "0.5.3"
+	UTILS_VERSION = "0.6.0"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slack-utils
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Vincent Batts
@@ -48,6 +48,8 @@ files:
 - examples/repo.rb
 - lib/slackware.rb
 - lib/slackware/utils.rb
+- lib/slackware/changelog.rb
+- lib/slackware/changelog/rss.rb
 - lib/slackware/package.rb
 - lib/slackware/repo.rb
 - lib/slackware/version.rb
@@ -61,7 +63,7 @@ rdoc_options:
 - --main=README.rdoc
 - --line-numbers
 - --inline-source
-- --title=Slackware utils (slack-utils) 0.5.3 Documentation
+- --title=Slackware utils (slack-utils) 0.6.0 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement