slack-utils 0.7 → 0.7.1

data/README.rdoc

@@ -26,17 +26,24 @@ or for each arg it will search the package names.
 <b>slo</b> - find files in /etc/, that have been orphaned and left behind
 by unistalled/upgraded packages
 
-<b>sli</b> - display the package information, for matching packages
+<b>sli</b> - display the package information for matching packages
+
+<b>slu</b> - display the upgrade history for matching packages
 
 <b>slfindlinked</b> - finds what is linked to your argument, and it's package
 expects 1 argument passed. 
 
 
+== Release Notes
+
+See https://github.com/vbatts/slack-utils/wiki/Release-Notes
+
 == Installation
 
 === From git
 
  >> git clone git://github.com/vbatts/slack-utils.git
+ >> cd slack-utils
  >> make slackpkg
  >> sudo upgradepkg --install-new pkg/slack-utils-0.6.2-$ARCH-1_vb.tgz
 
@@ -47,9 +54,16 @@ expects 1 argument passed.
  >> ruby setup.rb config --prefix=/usr --mandir=/usr/man
  >> ruby setup.rb install 
 
+=== From the rubygems repo
+
+ >> sudo gem install slack-utils
+
 === From the gem
 
- >> sudo gem install pkg/slack-utils-0.6.2.gem
+ >> git clone git://github.com/vbatts/slack-utils.git
+ >> cd slack-utils/src
+ >> rake gem
+ >> sudo gem install pkg/slack-utils-$VERSION.gem
 
 
 == Quick Start

data/bin/slu

@@ -0,0 +1,69 @@
+#! /usr/bin/ruby
+# Copyright 2010,2011,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.
+
+$PROGRAM_NAME = File.basename(__FILE__)
+
+require 'rubygems'
+require 'slackware/log'
+require 'slackware/utils'
+require 'slackware/args'
+
+option_banner = <<-EOS
+List upgrades for specifed Slackware packages.
+Usage:
+  #{$PROGRAM_NAME} [options] [search flags] [list of pkg names]
+
+EOS
+# This is all the flags we want to use, from Slackware::Args
+option_flags = [:case_insensitive, :pkg_name, :debug, :pkg_tag, :force_all]
+
+slog = Slackware::Log.instance
+slog.level = Slackware::Log::WARN
+
+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) {"options: %s" % options}
+
+if ((ARGV.count == 0) && 
+    (options[:pkg].nil?) &&
+    (options[:tag].nil?) && 
+    not(options[:force]) )
+  $stderr.write("WARNING: If you really want to see *ALL* files, use the --force flag\n")
+  exit(2)
+end
+
+if (ARGV.count > 0)
+  options[:all] = true
+end
+
+begin
+  print_upgrades(build_packages(options, ARGV))
+rescue Interrupt
+  exit 0
+rescue Exception => e
+  slog.warn($PROGRAM_NAME) { e.message }
+  slog.debug($PROGRAM_NAME) { e.class.to_s + "\n" + e.backtrace.join("\n") }
+  exit 1
+end
+
+# vim:sw=2:sts=2:et:

data/lib/slackware/package.rb

@@ -176,9 +176,15 @@ module Slackware
           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
+            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
             end
           end
           begin

data/lib/slackware/system.rb

@@ -101,7 +101,7 @@ module Slackware
     #   Slackware::System.upgrades("fart")
     #   => []
     def self::upgrades(pkg)
-      find_removed(pkg).select {|p| (p.name == pkg) }
+      find_removed(pkg).select {|p| (p.name == pkg) }.sort {|a,b| a.upgrade_time <=> b.upgrade_time }
     end
 
     # Return an Array of packages, that were installed after provided +time+

data/lib/slackware/utils.rb

@@ -144,6 +144,34 @@ def build_packages(opts = {}, args = [])
   return pkgs
 end
 
+def print_upgrades(pkgs)
+  count = 1
+  p_count = pkgs.count
+  pkgs.each do |pkg|
+    if (Slackware::System.is_upgraded?(pkg.name))
+      puts '"%s" (current version %s build %s%s) has been upgraded before' % [pkg.name,
+                                                                        pkg.version,
+                                                                        pkg.build,
+                                                                        pkg.tag]
+      Slackware::System.upgrades(pkg.name).each do |up|
+        puts "  %s build %s%s upgraded on  %s" % [up.version,
+                                            up.build,
+                                            up.tag,
+                                            up.upgrade_time]
+      end
+    else
+      puts '"%s" (current version %s build %s%s) has not been upgraded' % [pkg.name,
+                                                                     pkg.version,
+                                                                     pkg.build,
+                                                                     pkg.tag]
+    end
+    if count < p_count
+      puts
+    end
+    count += 1
+  end
+end
+
 def print_packages(pkgs)
   if (pkgs.count > 0 && pkgs.first.class == Slackware::Package)
     pkgs.each {|pkg|

data/lib/slackware/version.rb

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

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: slack-utils
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
 - Vincent Batts
-autorequire: slack-utils
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2012-01-31 00:00:00.000000000 Z
@@ -21,6 +21,7 @@ executables:
 - sll
 - slp
 - slt
+- slu
 - slfindlinked
 extensions: []
 extra_rdoc_files:
@@ -33,6 +34,7 @@ files:
 - bin/slo
 - bin/sll
 - bin/sli
+- bin/slu
 - bin/slfindlinked
 - examples/list_packages.rb
 - examples/repo_difference.rb
@@ -57,7 +59,7 @@ rdoc_options:
 - --main=README.rdoc
 - --line-numbers
 - --inline-source
-- --title=Slackware utils (slack-utils) 0.7 Documentation
+- --title=Slackware utils (slack-utils) 0.7.1 Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement