Merge branch 'master' of github.com:vbatts/slack-utils

.gitignore

@@ -2,3 +2,7 @@
 src/.config
 slack-utils*.tar.gz
 *~
+tags
+.bundle
+.project
+pkg/

bundle.sh

@@ -3,14 +3,43 @@
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 
+function check_versions() {
+	exp_vers=$1
+
+	found_vers=$(grep -e '^[[:space:]]*s.version' src/Rakefile | awk '{ print $3 }' | tr -d '"' | tr -d "'")
+	if [ "$exp_vers" != "$found_vers" ] ; then
+		echo "ERROR: src/Rakefile version ($found_vers) does not match $exp_vers"
+		exit 1
+	fi
+
+	found_vers=$(grep -e '^[[:space:]]*UTILS_VERSION' src/lib/slackware/version.rb | awk '{ print $3 }' | tr -d '"' | tr -d "'")
+	if [ "$exp_vers" != "$found_vers" ] ; then
+		echo "ERROR: src/lib/slackware/version.rb version ($found_vers) does not match $exp_vers"
+		exit 1
+	fi
+}
+
 if [ -r $CWD/local.conf ] ;then
 	. $CWD/local.conf
 else
 	echo "ERROR: local.conf not found"
 	exit 1
 fi
 
+if [ "$(git status --short | grep '^??' | wc -l)" -gt 0 ] ; then
+	echo "ERROR: you have untracked files to address!"
+	git status --short -uall | grep '^??'
+	exit 1
+fi
+
+check_versions $VERSION
+
 rm -rf $TMP/${PRGNAM}-${VERSION}
-cp -a $CWD/src $TMP/${PRGNAM}-${VERSION}
+mkdir -p $TMP/${PRGNAM}-${VERSION}
+cd  src/
+git ls-files | while read line ; do
+	echo "$line" | cpio -dump $TMP/${PRGNAM}-${VERSION}
+done
+cd ..
 (cd $TMP && tar zcvf $CWD/${PRGNAM}-${VERSION}.tar.gz ${PRGNAM}-${VERSION})
 

local.conf

@@ -1,5 +1,5 @@
 PRGNAM=slack-utils
-VERSION=0.6.2
+VERSION=0.7.1
 BUILD=1
 TAG=_vb
 if [ -z "$ARCH" ]; then

slack-utils.SlackBuild

@@ -24,8 +24,8 @@
 
 set -e
 
-PRGNAM=slack-utils
-VERSION=${VERSION:-0.6.2}
+PKGNAM=slack-utils
+VERSION=$(ls -rt $PKGNAM-*.tar.?z* | tail -1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 BUILD=${BUILD:-1}
 TAG=${TAG:-_vb}
 
@@ -40,15 +40,15 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/${TAG}}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.gz
+cd $PKGNAM-$VERSION
 
 ruby setup.rb config \
 	--prefix=/usr \
@@ -57,9 +57,9 @@ ruby setup.rb config \
 ruby setup.rb install \
 	--prefix=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rdoc examples $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a README.rdoc examples $PKG/usr/doc/$PKGNAM-$VERSION/
+cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -68,4 +68,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -p -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n ${OUTPUT}/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}

src/README.rdoc

@@ -26,41 +26,44 @@ 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. 
 
 
-TODO: 
-* 2010-08-20 09:16 <bailey> which is that I need to run a query to show
-me what packages I'm running are different than the slack-current
-versions, since I make local ones and forget about it
-* enable `slf` to a relative path, and it determine the absolute path
+== Release Notes
+
+See https://github.com/vbatts/slack-utils/wiki/Release-Notes
 
 == Installation
 
 === From git
 
-	git clone git://github.com/vbatts/slack-utils.git
-
-	make slackpkg
-
-	sudo upgradepkg --install-new pkg/slack-utils-0.6.2-$ARCH-1_vb.tgz
+ >> 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
 
 === From tar ball
 
-	tar xfz slack-utils-0.6.2.tar.gz
-
-	cd slack-utils-0.6.2
+ >> tar xfz slack-utils-0.6.2.tar.gz
+ >> cd slack-utils-0.6.2
+ >> ruby setup.rb config --prefix=/usr --mandir=/usr/man
+ >> ruby setup.rb install 
 
-	ruby setup.rb config --prefix=/usr --mandir=/usr/man
+=== From the rubygems repo
 
-	ruby setup.rb install 
+ >> 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
@@ -78,7 +81,7 @@ See the system manual page slack-utils(8)
  >> pkg.name = "hello-kitty"
  >> pkg.version = "1.0"
 
- or 
+or 
  >> require 'rubygems'
  >> require 'slackware'
  >> tags = Slackware::System.tags_used

src/Rakefile

@@ -2,13 +2,13 @@
 # rake gem
 
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 spec = Gem::Specification.new do |s|
   s.name = %q{slack-utils}
-  s.version = "0.6.2"
+  s.version = "0.7.1"
   s.authors = ["Vincent Batts"]
-  s.date = %q{2011-11-19}
+  s.date = %q{2012-01-31}
   s.email = %q{vbatts@hashbangbash.com}
   s.homepage = %q{https://github.com/vbatts/slack-utils/}
   s.platform = Gem::Platform::RUBY
@@ -25,31 +25,34 @@ See the examples/ for more information.
     bin/slo
     bin/sll
     bin/sli
+    bin/slu
     bin/slfindlinked
     examples/list_packages.rb
     examples/repo_difference.rb
     examples/before_then.rb
     examples/repo.rb
     lib/slackware.rb
     lib/slackware/utils.rb
+    lib/slackware/args.rb
     lib/slackware/changelog.rb
     lib/slackware/changelog/rss.rb
+    lib/slackware/log.rb
     lib/slackware/package.rb
     lib/slackware/package_bundle.rb
+    lib/slackware/paths.rb
     lib/slackware/repo.rb
     lib/slackware/version.rb
     lib/slackware/system.rb
   }
-  s.executables = ["sli","slf","slo","sll","slp","slt","slfindlinked"]
-  s.require_paths = ["lib"]
-  s.autorequire = "slack-utils"
+  s.executables = %w{ sli slf slo sll slp slt slu slfindlinked }
+  s.require_paths = %w{ lib }
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc"]
-  s.rdoc_options = ["--main=README.rdoc", "--line-numbers", "--inline-source", "--title=Slackware utils (slack-utils) #{s.version} Documentation"]
+  s.extra_rdoc_files = %w{ README.rdoc }
+  s.rdoc_options = ["--main=README.rdoc", "--line-numbers", "--inline-source", "--title=Slackware utils (#{s.name}) #{s.version} Documentation"]
   #s.add_dependency("")
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 

src/bin/slf

@@ -49,16 +49,19 @@ slog.debug($PROGRAM_NAME) {"options: %s" % options}
 
 if (ARGV.count > 0)
   options[:all] = true
+elsif (ARGV.count == 0)
+  slog.warn($PROGRAM_NAME) { "no files provided" }
+  exit 1
 end
 
 begin
   print_package_searched_files(build_packages(options, []), ARGV)
 rescue Interrupt
   exit 0
 rescue Exception => e
-  slog.info($PROGRAM_NAME) { e.message }
-  slog.debug($PROGRAM_NAME) { e.backtrace.join("\n") }
+  slog.warn($PROGRAM_NAME) { e.message }
+  slog.debug($PROGRAM_NAME) { e.class.to_s + "\n" + e.backtrace.join("\n") }
   exit 1
 end
 
-# vim : set sw=2 sts=2 noet :
+# vim:sw=2:sts=2:et:

src/bin/sli

@@ -57,9 +57,9 @@ begin
 rescue Interrupt
   exit 0
 rescue Exception => e
-  slog.info($PROGRAM_NAME) { e.message }
-  slog.debug($PROGRAM_NAME) { e.backtrace.join("\n") }
+  slog.warn($PROGRAM_NAME) { e.message }
+  slog.debug($PROGRAM_NAME) { e.class.to_s + "\n" + e.backtrace.join("\n") }
   exit 1
 end
 
-# vim : set sw=2 sts=2 noet :
+# vim:sw=2:sts=2:et:

src/bin/sll

@@ -67,9 +67,9 @@ begin
 rescue Interrupt
   exit 0
 rescue Exception => e
-  slog.info($PROGRAM_NAME) { e.message }
-  slog.debug($PROGRAM_NAME) { e.backtrace.join("\n") }
+  slog.warn($PROGRAM_NAME) { e.message }
+  slog.debug($PROGRAM_NAME) { e.class.to_s + "\n" + e.backtrace.join("\n") }
   exit 1
 end
 
-# vim : set sw=2 sts=2 noet :
+# vim:sw=2:sts=2:et:

src/bin/slo

@@ -40,9 +40,9 @@ begin
 rescue Interrupt
   exit 0
 rescue Exception => e
-  slog.info($PROGRAM_NAME) { e.message }
-  slog.debug($PROGRAM_NAME) { e.backtrace.join("\n") }
+  slog.warn($PROGRAM_NAME) { e.message }
+  slog.debug($PROGRAM_NAME) { e.class.to_s + "\n" + e.backtrace.join("\n") }
   exit 1
 end
 
-# vim : set sw=2 sts=2 noet :
+# vim:sw=2:sts=2:et:

src/bin/slp

@@ -57,9 +57,9 @@ begin
 rescue Interrupt
   exit 0
 rescue Exception => e
-  puts "ERROR: #{e.message}"
-  puts e.backtrace.join("\n") if options[:debug]
+  slog.warn($PROGRAM_NAME) { e.message }
+  slog.debug($PROGRAM_NAME) { e.class.to_s + "\n" + e.backtrace.join("\n") }
   exit 1
 end
 
-# vim : set sw=2 sts=2 noet :
+# vim:sw=2:sts=2:et:

src/bin/slt

@@ -60,9 +60,9 @@ begin
 rescue Interrupt
   exit 0
 rescue Exception => e
-  puts "ERROR: #{e.message}"
-  puts e.backtrace.join("\n") if options[:debug]
+  slog.warn($PROGRAM_NAME) { e.message }
+  slog.debug($PROGRAM_NAME) { e.class.to_s + "\n" + e.backtrace.join("\n") }
   exit 1
 end
 
-# vim : set sw=2 sts=2 noet :
+# vim:sw=2:sts=2:et:

src/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: