slack-utils 0.7.2 → 0.7.3

data/bin/slt

@@ -37,7 +37,7 @@ Usage:
 EOS
 # This is all the flags we want to use, from Slackware::Args
 option_flags = [:color, :epoch, :case_insensitive, :pkg_name, :pkg_version,
-    :debug, :pkg_arch, :pkg_build, :pkg_tag]
+    :reverse, :debug, :pkg_arch, :pkg_build, :pkg_tag]
 
 slog = Slackware::Log.instance
 slog.level = Slackware::Log::WARN
@@ -46,6 +46,7 @@ options = Slackware::Args.parse(ARGV, option_flags, option_banner)
 
 # update level if specified
 slog.level = Slackware::Log::DEBUG if options[:debug]
+slog.debug($PROGRAM_NAME) { "option_flags: #{option_flags} " }
 slog.debug($PROGRAM_NAME) {"options: %s" % options}
 
 # handing through that we are gathering times
@@ -56,7 +57,7 @@ if (ARGV.count > 0)
 end
 
 begin
-  print_packages_times(build_packages(options, ARGV), options[:epoch])
+  print_packages_times(build_packages(options, ARGV), options[:epoch], options[:reverse])
 rescue Interrupt
   exit 0
 rescue Exception => e

data/lib/slackware/args.rb

@@ -38,6 +38,11 @@ module Slackware
             options[:color] = o
           end
         end
+        if flags.include?(:reverse)
+          opts.on("-r", "--reverse", "Reverse the output") do |o|
+            options[:reverse] = 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

data/lib/slackware/changelog.rb

@@ -23,6 +23,7 @@
 require 'slackware/package'
 require 'date'
 require 'time'
+require 'stringio'
 
 module Slackware
   # The class for parsing a Slackware standard ChangeLog.txt
@@ -36,10 +37,10 @@ module Slackware
     # 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+)$/)
+    RE_DATE = /^(#{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(/^\+--------------------------\+$/)
+    RE_CHANGELOG_BREAK = /^\+--------------------------\+$/
 
     # The regular entry, accounting for usb-and-pxe-installers directory,
     # and notes after the action
@@ -64,14 +65,20 @@ module Slackware
     # regarding the updates
     class Update
       # FIXME this class needs more proper value setting
-      def initialize(date = nil, notes = "", entries = Array.new)
+      def initialize(date = nil,
+                     notes = "",
+                     entries = Array.new,
+                     changelog = nil )
         @date = date
         @notes = notes
         @entries = entries
+        @changelog = changelog
       end
       def date; @date; end
       def notes; @notes; end
       def entries; @entries; end
+      def security; @entries.select {|e| e if e.security }; end
+      def security?; @entries.select {|e| e.security }.first; end
 
       def date=(timestamp)
         if (timestamp.is_a?(Time))
@@ -83,16 +90,23 @@ module Slackware
         end
       end
       def notes=(text); @notes = text; end
+      def changelog=(changelog); @changelog = changelog if changelog.is_a?(Slackware::ChangeLog); end
     end
 
     # The class for each item in a change set
     class Entry
-      def initialize(package = nil, section = nil, action = nil, notes = "", security = false)
+      def initialize(package = nil,
+                     section = nil,
+                     action = nil,
+                     notes = "",
+                     security = false,
+                     update = nil)
         @package  = package
         @section  = section
         @action   = action
-        notes.is_a?(String) ? @notes = notes : @notes = ""
-        security == true ? @security = security : @security = false
+        @notes = notes.is_a?(String) ? notes : ""
+        @security = security == true
+        @update = update
       end
 
       def package; @package; end
@@ -100,57 +114,78 @@ module Slackware
       def action; @action; end
       def notes; @notes; end
       def security; @security; end
+      def date; @update ? @update.date: nil;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 update=(update); @update = update if update.is_a?(Slackware::ChangeLog::Update) ; end
       def notes=(notes_txt)
-        notes_txt.is_a?(String) ? @notes = notes_txt : @notes = ""
+        @notes = notes_txt.is_a?(String) ? notes_txt : ""
       end
       def security=(bool)
-        bool == true ? @security = bool : @security = false
+        @security = bool == true
       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
-    #  * :image_url - the URL for the loge used in the RSS feed
-    def initialize(file = nil, opts = {})
+    def initialize(file = nil)
       @file     = file
-      @opts     = opts
+      @strio    = StringIO.new
       @updates  = Array.new
     end
 
     def file; @file; end
-    def opts; @opts; end
     def updates; @updates; end
+
+    # Returns the latest update in the set
+    def latest 
+      sort().last
+    end
+    def sort 
+      @updates.sort {|x,y| x.date <=> y.date }
+    end
+
+    # All entries in this Slackware::ChangeLog
+    #
+    # Returns an Array of Slackware::ChangeLog::Entry
     def entries
-      @updates.map {|update| update.entries.map {|entry| {:date => update.date, :entry => entry } } }.flatten
+      @updates.map {|u| u.entries.map {|e| e } }.flatten
     end
+
+    # All security in this Slackware::ChangeLog
+    #
+    # Returns an Array of Slackware::ChangeLog::Entry
     def security
-      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.security } }.flatten.compact
+      @updates.map {|u| u.entries.select {|e| e if e.security } }.flatten
     end
+
+    # All packages removed in this Slackware::ChangeLog
+    #
+    # Returns an Array of Slackware::ChangeLog::Entry
     def pkgs_removed
-      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.action == "Removed" } }.flatten.compact
+      @updates.map {|u| u.entries.select {|e| e  if e.action == "Removed" } }.flatten
     end
+
+    # All packages added in this Slackware::ChangeLog
+    #
+    # Returns an Array of Slackware::ChangeLog::Entry
     def pkgs_added
-      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.action == "Added" } }.flatten.compact
+      @updates.map {|u| u.entries.select {|e| e if e.action == "Added" } }.flatten
     end
+
+    # All packages upgraded in this Slackware::ChangeLog
+    #
+    # Returns an Array of Slackware::ChangeLog::Entry
     def pkgs_upgraded
-      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.action == "Upgraded" } }.flatten.compact
+      @updates.map {|u| u.entries.select {|e| e if e.action == "Upgraded" } }.flatten
     end
+
+    # All packages rebuilt in this Slackware::ChangeLog
+    #
+    # Returns an Array of Slackware::ChangeLog::Entry
     def pkgs_rebuilt
-      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.action == "Rebuilt" } }.flatten.compact
-    end
-    def opts=(hash)
-      if hash.is_a?(Hash)
-        @opts = hash
-      end
+      @updates.map {|u| u.entries.select {|e| e if e.action == "Rebuilt" } }.flatten
     end
-
     def parse(opts = {:file => nil, :data => nil})
       if not(opts[:file].nil?)
         @updates = parse_this_file(opts[:file]).updates
@@ -161,19 +196,19 @@ module Slackware
     end
 
     # Class method
-    def self::parse(file)
-      return parse_this_file(file)
-    end
-
-    def self::open(file)
-      return parse_this_file(file)
+    class << self
+      def parse(file)
+        cl = ChangeLog.new(file)
+        return cl.parse()
+      end
+      alias_method :open, :parse
     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
 
-    #protected
+    protected
     # Parse order is something like:
     # * if its' a date match, store the date
     # * take change notes until
@@ -182,7 +217,7 @@ module Slackware
     # * take packge notes until
     # * next package or entry separator
     # * separator creates next change entry
-    def self::parse_this_file(file)
+    def parse_this_file(file)
       f_handle = ""
       if file.is_a?(File)
         f_handle = file
@@ -200,7 +235,10 @@ module Slackware
       changelog = ChangeLog.new(f_handle)
       f_handle.each do |line|
         if (line =~ RE_DATE)
-          u = Update.new(Time.parse($1))
+          update = Update.new(Time.parse($1))
+
+          # Tying this Slackware::ChangeLog::Update to it's Slackware::ChangeLog parent
+          update.changelog = changelog
           while true
             if (f_handle.eof?)
               break
@@ -213,11 +251,15 @@ module Slackware
             end
 
             # the intimate iteration
-            # +Match+ is more expensive than =~,
+            # 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()
+
+              # tying this entry to it's Slackware::ChangeLog::Update parent
+              u_entry.update = update
+
               # This silly iteration catches the different cases of 
               # which package line, matches which Regexp. WIN
               if match[1].nil?
@@ -245,31 +287,32 @@ module Slackware
               u_entry.action = match[3] unless match[3].nil?
 
               # Add this entry to the stack
-              u.entries << u_entry
+              update.entries << u_entry
             else
-              # if u.entries is empty, then this text is notes 
+              # if update.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
+              if (update.entries.empty?)
+                update.notes = update.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
+                  update.entries[-1].security = true
                 end
-                u.entries[-1].notes = u.entries[-1].notes + u_line
+                update.entries[-1].notes = update.entries[-1].notes + u_line
               end
             end
           end
 
           # Add this update to the stack
-          changelog.updates << u
+          changelog.updates << update
         end
       end
 
       # Give them their change set
       return changelog
-    end
+    end # def self::parse_this_file
+
+  end # class ChangeLog
+end # module Slackware
 
-  end
-end
 # vim : set sw=2 sts=2 et :

data/lib/slackware/changelog/rss.rb

@@ -27,29 +27,22 @@ module Slackware
   class ChangeLog
     # or maybe "http://connie.slackware.com/~msimons/slackware/grfx/shared/dobbslack1.jpg"
     IMAGE_URL = "http://connie.slackware.com/~msimons/slackware/grfx/shared/bluepiSW.jpg"
+    # +opts+ can include
+    #  * :arch      - basically '64' or '32'
+    #  * :version   - 13.1, 13.2, current, etc.
+    #  * :url       - the URL web link to the ChangeLog.txt
+    #  * :image_url - the URL for the loge used in the RSS feed
     def to_rss(opts = {})
-      # this way we can use the opts from super,
-      # or override for this methods
-      opts = @opts.merge(opts)
-
       version = "2.0" # ["0.9", "1.0", "2.0"]
       content = RSS::Maker.make(version) do |m|
         if (opts[:title])
           m.channel.title = opts[:title]
         else
-          added_title = ""
-          if opts[:arch]
-            added_title = added_title + "slackware#{opts[:arch]}"
-          end
+          added_title = "slackware#{opts[:arch]}"
           if opts[:version]
-            added_title = added_title + "-#{opts[:version]}"
-          end
-  
-          if added_title.empty?
-            m.channel.title = "Slackware ChangeLog.txt"
-          else
-            m.channel.title = "#{added_title} ChangeLog.txt"
+            added_title += "-#{opts[:version]}"
           end
+          m.channel.title = "#{added_title} ChangeLog.txt"
         end
 
         if (opts[:url])
@@ -89,8 +82,8 @@ module Slackware
           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)
+          security_count = update.security.length
+          if (security_count > 0)
             i.title = "%s (* Security fix *)" % [update.date.utc.to_s]
           else
             i.title = update.date.utc.to_s
@@ -104,8 +97,8 @@ module Slackware
 
           i.description = ""
           if (update.entries.count > 0)
-            if (security > 0)
-              i.description = i.description + "%d new update(s), %d security update(s)\n\n" % [update.entries.count, security]
+            if (security_count > 0)
+              i.description = i.description + "%d new update(s), %d security update(s)\n\n" % [update.entries.count, security_count]
             else
               i.description = i.description + "%d new update(s)\n\n" % [update.entries.count]
             end

data/lib/slackware/log.rb

@@ -24,7 +24,6 @@ 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:
@@ -42,10 +41,11 @@ module Slackware
     # It defaults to WARN level and STDERR
     def initialize(*args)
       if $logdev
-	super($logdev, args)
+        super($logdev, args)
       else
-	super(STDERR, args)
+        super(STDERR, args)
       end
+      self.level = Logger::ERROR
     end
   end # class Log
 end # module Slackware

data/lib/slackware/package.rb

@@ -24,6 +24,9 @@ require 'time'
 require 'slackware/log'
 require 'slackware/paths'
 
+MyTime = RUBY_VERSION < '1.9'? DateTime : Time
+
+
 module Slackware
   class Package
     RE_FILE_LIST = /^FILE LIST:/
@@ -47,7 +50,7 @@ module Slackware
       end
       if (name =~ RE_REMOVED_NAMES)
         name = $1
-        self.upgrade_time = Time.strptime($2 + ' ' + $3, fmt=FMT_UPGRADE_TIME)
+        self.upgrade_time = MyTime.strptime($2 + ' ' + $3, fmt=FMT_UPGRADE_TIME)
       end
       arr = name.split('-')
       build = arr.pop

data/lib/slackware/repo.rb

@@ -38,7 +38,7 @@ module Slackware
     RE_COMPRESSED_SIZE  = /^PACKAGE SIZE \(compressed\):\s+(.*)$/
     RE_UNCOMPRESSED_SIZE  = /^PACKAGE SIZE \(uncompressed\):\s+(.*)$/
 
-    attr_accessor :proto, :mirror, :path, :version, :arch, :changelog, :packages
+    attr_accessor :proto, :mirror, :path, :version, :arch, :changelog, :packages, :uri
 
     def initialize(repo = nil)
       @packages = nil
@@ -53,20 +53,25 @@ module Slackware
                 end
                 v
               end
-        self.arch  = begin
-                a = RbConfig::CONFIG["arch"]
-                if a =~ /x86_64/
-                  a = "64"
-                else
-                  a = ""
-                end
-                a
-              end
+        self.arch = RbConfig::CONFIG["arch"] =~ /x86_64/ ? "64" : ""
       else
         ## TODO do some hot parsing of 'repo'
+        self.uri = URI.parse(repo)
       end
     end
 
+    def url
+      "%s%s%sslackware%s-%s/" % [self.proto,
+                                 self.mirror,
+                                 self.path,
+                                 self.arch,
+                                 self.version]
+    end
+
+    def url=(thisurl)
+      self.uri = URI.parse(thisurl)
+    end
+
     def fetch(file = nil)
       #if file.nil?
         #url = URI.parse(self.proto + self.mirror + self.path)

data/lib/slackware/system.rb

@@ -195,7 +195,6 @@ module Slackware
 
     # Return the version of Slackware Linux currently installed
     def self::version
-      debug(SLACKWARE_VERSION)
       SLACKWARE_VERSION
     end
   end

data/lib/slackware/utils.rb

@@ -1,6 +1,8 @@
 # encoding: UTF-8
 
-# Copyright 2010,2011  Vincent Batts, Vienna, VA
+# Copyright 2009,2010  Vincent Batts, http://hashbangbash.com/
+# Copyright 2010,2011  Vincent Batts, Vienna, VA, USA
+# Copyright 2012  Vincent Batts, Raleigh, NC, USA
 # All rights reserved.
 #
 # Redistribution and use of this source, with or without modification, is
@@ -22,18 +24,13 @@
 
 # started - Fri Oct  9 15:48:43 CDT 2009
 # updated for args - Tue Mar 23 14:54:19 CDT 2010
-# Copyright 2009, 2010 Vincent Batts, http://hashbangbash.com/
 
 require 'slackware'
 
 # Variables
 @st = "\033[31;1m"
 @en = "\033[0m"
-
-# Classes
-
-
-# Functions
+@slog = Slackware::Log.instance
 
 # This is base builder of the packe list
 def build_packages(opts = {}, args = [])
@@ -180,12 +177,17 @@ def print_packages(pkgs)
   end
 end
 
-def print_packages_times(pkgs, epoch = false)
-  if (epoch == true)
-    pkgs.each {|pkg| printf("%s : %s\n", pkg.fullname, pkg.time.to_i) }
-  else
-    pkgs.each {|pkg| printf("%s : %s\n", pkg.fullname, pkg.time.to_s) }
-  end
+def print_packages_times(pkgs, epoch = false, reverse = false)
+  @slog.debug('print_packages_times') { "epoch: #{epoch} ; reverse: #{reverse}" }
+  begin
+    if reverse
+        pkgs.sort_by {|x| x.time }
+    else
+        pkgs.sort_by {|x| x.time }.reverse
+    end
+  end.each {|pkg|
+    printf("%s : %s\n", pkg.fullname, epoch ? pkg.time.to_i : pkg.time.to_s )
+  }
 end
 
 def print_packages_description(pkgs)

data/lib/slackware/version.rb

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

metadata

@@ -1,20 +1,21 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: slack-utils
-version: !ruby/object:Gem::Version
-  version: 0.7.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.7.3
 platform: ruby
-authors:
+authors: 
 - Vincent Batts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+
+date: 2012-03-09 00:00:00 -05:00
+default_executable: 
 dependencies: []
-description: ! " slack-utils is a means by which to access \npackage information on
-  the Slackware Linux OS. \nSee the examples/ for more information.\n  "
+
+description: slack-utils is a means by which to access  package information on the Slackware Linux OS.  See the examples/ for more information.
 email: vbatts@hashbangbash.com
-executables:
+executables: 
 - sli
 - slf
 - slo
@@ -24,9 +25,10 @@ executables:
 - slu
 - slfindlinked
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - README.rdoc
 - bin/slf
 - bin/slt
@@ -52,32 +54,34 @@ 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.2 Documentation
-require_paths:
+- --title=Slackware utils (slack-utils) 0.7.3 Documentation
+require_paths: 
 - lib
-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'
+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: 
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Accessing information for the Slackware Linux distribution
 test_files: []
+