slack-utils 0.5.1 → 0.5.2

data/README.rdoc

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

data/bin/slf

@@ -1,29 +1,56 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'rubygems'
-require 'trollop'
 require 'slackware/utils'
 
-opts = Trollop::options do
-	banner <<-EOS
+options = {}
+begin
+	OptionParser.new do |opts|
+		opts.banner = <<-EOS
 
-search for a file within installed Slackware package's FILE LIST.
+Search for a file within installed Slackware package's FILE LIST.
 
 Usage:
-	slf [options] [pkg search flags] <one of more files>
+	#{File.basename(__FILE__)} [options] [pkg search flags] <one or more files>
 	
 	one or more files must be list
 	if no search flags, only names, then those only those matching entries are listed
 EOS
-	opt :pkg, "Package PKGNAME (loose match)", :type => :string
-	opt :Version, "Package VERSION (loose match)", :type => :string
-	opt :arch, "Package ARCH (exact match)", :type => :string
-	opt :build, "Package BUILD (exact match)", :type => :string
-	opt :tag, "Package TAG (loose match)", :type => :string
+		opts.on("-c", "--color", "Colorize output") do |o|
+			options[:color] = o
+		end
+		opts.on("-p", "--pkg [NAME]", "Package PKGNAME (loose match)") do |o|
+			options[:pkg] = o
+		end
+		opts.on("-V", "--Version [VERSION]", "Package VERSION (loose match)") do |o|
+			options[:version] = o
+		end
+		opts.on("-a", "--arch [ARCH]", "Package ARCH (exact match)") do |o|
+			options[:arch] = o
+		end
+		opts.on("-b", "--build [BUILD]", "Package BUILD (exact match)") do |o|
+			options[:build] = o
+		end
+		opts.on("-t", "--tag [TAG]", "Package TAG (loose match)") do |o|
+			options[:tag] = o
+		end
+		opts.on("-v", "--version", "Display version of this software") do |o|
+			printf("slack-utils (%s) version: %s, Slackware version: %s\n",
+			       File.basename(__FILE__),
+			       Slackware::UTILS_VERSION,
+			       Slackware::System.version
+			      )
+			exit()
+		end
+	end.parse!
+rescue OptionParser::InvalidOption => e
+	$stderr.write("ERROR: #{e.message}, see --help\n")
+	exit 1
 end
 
 if (ARGV.count > 0)
-	opts[:all] = true
+	options[:all] = true
 end
 
 if (ARGV.count == 0)
@@ -31,7 +58,7 @@ if (ARGV.count == 0)
 end
 
 begin
-	print_package_searched_files(build_packages(opts, []), ARGV)
+	print_package_searched_files(build_packages(options, []), ARGV)
 rescue Interrupt
 	exit 0
 rescue Exception => e

data/bin/sll

@@ -1,37 +1,65 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'rubygems'
-require 'trollop'
 require 'slackware/utils'
 
-opts = Trollop::options do
-	banner <<-EOS
+options = {}
+begin
+	OptionParser.new do |opts|
+		opts.banner = <<-EOS
 
-List owned files for a given Slackware package.
+List owned for files for a given Slackware package.
 
 Usage:
-	sll [options] [search flags] [list of names]
+	#{File.basename(__FILE__)} [search flags] [list of names]
 	
 	if no search flags, only names, then those only those matching entries are listed
 
 EOS
-	opt :pkg, "Package PKGNAME (loose match)", :type => :string
-	opt :Version, "Package VERSION (loose match)", :type => :string
-	opt :arch, "Package ARCH (exact match)", :type => :string
-	opt :build, "Package BUILD (exact match)", :type => :string
-	opt :tag, "Package TAG (loose match)", :type => :string
-	opt :force, "force me to show all files", :type => :boolean
+		opts.on("-p", "--pkg [NAME]", "Package PKGNAME (loose match)") do |o|
+			options[:pkg] = o
+		end
+		opts.on("-V", "--Version [VERSION]", "Package VERSION (loose match)") do |o|
+			options[:version] = o
+		end
+		opts.on("-a", "--arch [ARCH]", "Package ARCH (exact match)") do |o|
+			options[:arch] = o
+		end
+		opts.on("-b", "--build [BUILD]", "Package BUILD (exact match)") do |o|
+			options[:build] = o
+		end
+		opts.on("-t", "--tag [TAG]", "Package TAG (loose match)") do |o|
+			options[:tag] = o
+		end
+		opts.on("-f", "--force", "force me to show all files") do |o|
+			options[:force] = o
+		end
+		opts.on("-v", "--version", "Display version of this software") do |o|
+			printf("slack-utils (%s) version: %s, Slackware version: %s\n",
+			       File.basename(__FILE__),
+			       Slackware::UTILS_VERSION,
+			       Slackware::System.version
+			      )
+			exit()
+		end
+	end.parse!
+rescue OptionParser::InvalidOption => e
+	$stderr.write("ERROR: #{e.message}, see --help\n")
+	exit 1
+end
+
+if ((options.keys & %w{pkg Version arch build tag}.map {|a| :"#{a}" }).count == 0 && not(options[:force]))
+	$stderr.write("force me if you really want to see all files ...\nsee --help for more info\n")
+	exit 1
 end
 
 # handing through that we are listing owned files
-opts[:list_files] = true
+options[:list_files] = true
 
-if (opts.keys.grep(/[pkg|Version|arch|build|tag]_given$/).count == 0 && not(opts[:force]))
-	Trollop::die("force me if you really want to see all files ...")
-end
 
 begin
-	print_package_file_list(build_packages(opts, ARGV))
+	print_package_file_list(build_packages(options, ARGV))
 rescue Interrupt
 	exit 0
 end

data/bin/slp

@@ -1,36 +1,63 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'rubygems'
-require 'trollop'
 require 'slackware/utils'
 
-opts = Trollop::options do
-	banner <<-EOS
+options = {}
+begin
+	OptionParser.new do |opts|
+		opts.banner = <<-EOS
 
 List installed Slackware packages.
 
 Usage:
-	slp [options] [search flags] [list of names]
+	#{File.basename(__FILE__)} [options] [search flags] [list of names]
 	
 	if no flags are used, then all entries are listed
 	if no search flags, only names, then those only those matching entries are listed
 
 EOS
-	opt :color, "Colorize output", :type => :boolean
-	opt :pkg, "Package PKGNAME (loose match)", :type => :string
-	opt :Version, "Package VERSION (loose match)", :type => :string
-	opt :arch, "Package ARCH (exact match)", :type => :string
-	opt :build, "Package BUILD (exact match)", :type => :string
-	opt :tag, "Package TAG (loose match)", :type => :string
+		opts.on("-c", "--color", "Colorize output") do |o|
+			options[:color] = o
+		end
+		opts.on("-p", "--pkg [NAME]", "Package PKGNAME (loose match)") do |o|
+			options[:pkg] = o
+		end
+		opts.on("-V", "--Version [VERSION]", "Package VERSION (loose match)") do |o|
+			options[:version] = o
+		end
+		opts.on("-a", "--arch [ARCH]", "Package ARCH (exact match)") do |o|
+			options[:arch] = o
+		end
+		opts.on("-b", "--build [BUILD]", "Package BUILD (exact match)") do |o|
+			options[:build] = o
+		end
+		opts.on("-t", "--tag [TAG]", "Package TAG (loose match)") do |o|
+			options[:tag] = o
+		end
+		opts.on("-v", "--version", "Display version of this software") do |o|
+			printf("slack-utils (%s) version: %s, Slackware version: %s\n",
+			       File.basename(__FILE__),
+			       Slackware::UTILS_VERSION,
+			       Slackware::System.version
+			      )
+			exit()
+		end
+	end.parse!
+rescue OptionParser::InvalidOption => e
+	$stderr.write("ERROR: #{e.message}, see --help\n")
+	exit 1
 end
 
 if (ARGV.count > 0)
-	opts[:all] = true
+	options[:all] = true
 end
 
 begin
-	print_packages(build_packages(opts, ARGV))
+	print_packages(build_packages(options, ARGV))
 rescue Interrupt
 	exit 0
 end
 
+

data/bin/slt

@@ -1,40 +1,71 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'rubygems'
-require 'trollop'
 require 'slackware/utils'
 
-opts = Trollop::options do
-	banner <<-EOS
+options = {}
+begin
+	OptionParser.new do |opts|
+		opts.banner = <<-EOS
 
 List (and search) installed Slackware package's times.
 
 Usage:
-	slt [options] [search flags] [list of names]
+	#{File.basename(__FILE__)} [pkg search flags] [list of names]
 	
 	if no flags are used, then all entries are listed
 	if no search flags, only names, then those only those matching entries are listed
 
 EOS
-	opt :color, "Colorize output", :default => false, :type => :boolean
-	opt :epoch, "show time in seconds since 1970-01-01 00:00:00 UTC", :type => :boolean
-	opt :pkg, "Package PKGNAME (loose match)", :type => :string
-	opt :Version, "Package VERSION (loose match)", :type => :string
-	opt :arch, "Package ARCH (exact match)", :type => :string
-	opt :build, "Package BUILD (exact match)", :type => :string
-	opt :tag, "Package TAG (loose match)", :type => :string
+		opts.on("-c", "--color", "Colorize output") do |o|
+			options[:color] = o
+		end
+		opts.on("-e", "--epock", "") do |o|
+			options[:epoch] = o
+		end
+		opts.on("-p", "--pkg [NAME]", "Package PKGNAME (loose match)") do |o|
+			options[:pkg] = o
+		end
+		opts.on("-V", "--Version [VERSION]", "Package VERSION (loose match)") do |o|
+			options[:version] = o
+		end
+		opts.on("-a", "--arch [ARCH]", "Package ARCH (exact match)") do |o|
+			options[:arch] = o
+		end
+		opts.on("-b", "--build [BUILD]", "Package BUILD (exact match)") do |o|
+			options[:build] = o
+		end
+		opts.on("-t", "--tag [TAG]", "Package TAG (loose match)") do |o|
+			options[:tag] = o
+		end
+		opts.on("-v", "--version", "Display version of this software") do |o|
+			printf("slack-utils (%s) version: %s, Slackware version: %s\n",
+			       File.basename(__FILE__),
+			       Slackware::UTILS_VERSION,
+			       Slackware::System.version
+			      )
+			exit()
+		end
+	end.parse!
+rescue OptionParser::InvalidOption => e
+	$stderr.write("ERROR: #{e.message}, see --help\n")
+	exit 1
 end
 
 # handing through that we are gathering times too
-opts[:time] = true
+options[:time] = true
 
-if (opts.keys.grep(/[pkg|Version|arch|build|tag]_given$/).count == 0)
-	opts[:all] = true
+if (ARGV.count > 0)
+	options[:all] = true
 end
 
 begin
-	print_packages_times(build_packages(opts, ARGV), opts[:epoch])
+	print_packages_times(build_packages(options, ARGV), options[:epoch])
 rescue Interrupt
 	exit 0
+rescue Exception => e
+	puts "ERROR: #{e.message}"
+	exit 1
 end
 

data/lib/slackware.rb

@@ -1,3 +1,5 @@
+
+require 'slackware/version'
 require 'slackware/package'
 require 'slackware/system'
 require 'slackware/repo'

data/lib/slackware/system.rb

@@ -1,16 +1,8 @@
 
+require 'slackware/version'
 require 'slackware/package'
 
 module Slackware
-
-	VERSION = begin
-			  data = File.read("/etc/slackware-version")
-			  data =~ /Slackware\s(.*)/
-			  $1
-		  rescue
-			  nil
-		  end
-
 	DIR_INSTALLED_PACKAGES = "/var/log/packages"
 	DIR_REMOVED_PACKAGES = "/var/log/removed_packages"
 	DIR_INSTALLED_SCRIPTS = "/var/log/scripts"
@@ -19,7 +11,7 @@ module Slackware
 	RE_BUILD_TAG = /^([[:digit:]]+)([[:alpha:]]+)$/
 
 	def self::version
-		VERSION
+		Slackware::VERSION
 	end
 
 	class System
@@ -157,7 +149,7 @@ module Slackware
 
 		# Return the version of Slackware Linux currently installed
 		def self::version
-			VERSION
+			Slackware::VERSION
 		end
 	end
 

data/lib/slackware/utils.rb

@@ -33,7 +33,7 @@ def build_packages(opts = {}, args = [])
 			selected_pkgs = nil
 		end
 	end
-	if (opts[:pkg_given])
+	if (opts[:pkg])
 		pkgs = pkgs.map {|p|
 			re = /#{opts[:pkg]}/i
 			if p.name =~ re
@@ -44,7 +44,7 @@ def build_packages(opts = {}, args = [])
 			end
 		}.compact
 	end
-	if (opts[:Version_given])
+	if (opts[:Version])
 		pkgs = pkgs.map {|p|
 			re = Regexp.new(Regexp.escape(opts[:Version]))
 			if p.version =~ re
@@ -55,7 +55,7 @@ def build_packages(opts = {}, args = [])
 			end
 		}.compact
 	end
-	if (opts[:arch_given])
+	if (opts[:arch])
 		pkgs = pkgs.map {|p|
 			re = /#{opts[:arch]}/
 			if p.arch =~ re
@@ -66,7 +66,7 @@ def build_packages(opts = {}, args = [])
 			end
 		}.compact
 	end
-	if (opts[:build_given])
+	if (opts[:build])
 		pkgs = pkgs.map {|p|
 			re = /#{opts[:build]}/
 			if p.build =~ re
@@ -77,7 +77,7 @@ def build_packages(opts = {}, args = [])
 			end
 		}.compact
 	end
-	if (opts[:tag_given])
+	if (opts[:tag])
 		pkgs = pkgs.map {|p|
 			re = /#{opts[:tag]}/i
 			if p.tag =~ re

data/lib/slackware/version.rb

@@ -0,0 +1,12 @@
+
+module Slackware
+	VERSION = begin
+			  data = File.read("/etc/slackware-version")
+			  data =~ /Slackware\s(.*)/
+			  $1
+		  rescue
+			  nil
+		  end
+	UTILS_VERSION = "0.5.2"
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slack-utils
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Vincent Batts
@@ -17,21 +17,8 @@ cert_chain: []
 
 date: 2011-11-19 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: trollop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: " slack-utils is a means by which to access \n\
   package information on the Slackware Linux OS. \n\
   See the examples/ for more information.\n  "
@@ -63,6 +50,7 @@ files:
 - lib/slackware/utils.rb
 - lib/slackware/package.rb
 - lib/slackware/repo.rb
+- lib/slackware/version.rb
 - lib/slackware/system.rb
 has_rdoc: true
 homepage: https://github.com/vbatts/slack-utils/
@@ -73,7 +61,7 @@ rdoc_options:
 - --main=README.rdoc
 - --line-numbers
 - --inline-source
-- --title=Slackware utils (slack-utils) 0.5.1 Documentation
+- --title=Slackware utils (slack-utils) 0.5.2 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement