slack-utils 0.5.2 → 0.5.3

data/README.rdoc

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

data/bin/slf

@@ -43,7 +43,15 @@ EOS
 			      )
 			exit()
 		end
-	end.parse!
+
+		opts.parse!
+
+		if (ARGV.count == 0)
+			$stderr.write("ERROR: one of more file must be specified\n")
+			puts opts
+			exit 2
+		end
+	end
 rescue OptionParser::InvalidOption => e
 	$stderr.write("ERROR: #{e.message}, see --help\n")
 	exit 1
@@ -53,10 +61,6 @@ if (ARGV.count > 0)
 	options[:all] = true
 end
 
-if (ARGV.count == 0)
-	Trollop::die("one or more files must be provided")
-end
-
 begin
 	print_package_searched_files(build_packages(options, []), ARGV)
 rescue Interrupt

data/bin/sll

@@ -43,17 +43,20 @@ EOS
 			      )
 			exit()
 		end
-	end.parse!
+
+		opts.parse!
+
+		if (options[:pkg].nil? && options[:Version].nil? && options[:arch].nil? && options[:build].nil? && options[:tag].nil? && not(options[:force]))
+			$stderr.write("ERROR: force me if you really want to see all files ...\n")
+			puts opts
+			exit 2
+		end
+	end
 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
 options[:list_files] = true
 

data/lib/slackware/package.rb

@@ -54,8 +54,8 @@ module Slackware
 
 		# Accessor for the PACKAGE DESCRIPTION from the package file
 		def package_description
-			if not(@package_description.nil?)
-				return @package_description
+			if not(self.package_description.nil?)
+				return self.package_description
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -69,13 +69,13 @@ module Slackware
 
 		# Setter for the PACKAGE DESCRIPTION, in the event you are parsing a repo file
 		def package_description=(desc)
-			@package_description = desc
+			self.package_description = desc
 		end
 
 		# Accessor for the PACKAGE LOCATION from the package file
 		def package_location
-			if not(@package_location.nil?)
-				return @package_location
+			if not(self.package_location.nil?)
+				return self.package_location
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -88,13 +88,13 @@ module Slackware
 
 		# Setter for the PACKAGE LOCATION, in the event you are parsing a repo file
 		def package_location=(path)
-			@package_location = path
+			self.package_location = path
 		end
 
 		# Accessor for the UNCOMPRESSED PACKAGE SIZE from the package file
 		def uncompressed_size
-			if not(@uncompressed_size.nil?)
-				return @uncompressed_size
+			if not(self.uncompressed_size.nil?)
+				return self.uncompressed_size
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -107,13 +107,13 @@ module Slackware
 
 		# Setter for the UNCOMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
 		def uncompressed_size=(size)
-			@uncompressed_size = size
+			self.uncompressed_size = size
 		end
 
 		# Accessor for the COMPRESSED PACKAGE SIZE from the package file
 		def compressed_size
-			if not(@compressed_size.nil?)
-				return @compressed_size
+			if not(self.compressed_size.nil?)
+				return self.compressed_size
 			end
 
 			f = File.open(self.path + '/' + self.fullname)
@@ -126,14 +126,14 @@ module Slackware
 
 		# Setter for the COMPRESSED PACKAGE SIZE, in the event you are parsing a repo file
 		def compressed_size=(size)
-			@compressed_size = size
+			self.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(@owned_files.nil?)
-				return @owned_files
+			if not(self.owned_files.nil?)
+				return self.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 +144,8 @@ module Slackware
 
 		# Set the file list in the package object in memory
 		def set_owned_files
-			if @owned_files.nil?
-				@owned_files = self.get_owned_files
+			if self.owned_files.nil?
+				self.owned_files = self.get_owned_files
 				return true
 			else
 				return false

data/lib/slackware/system.rb

@@ -138,7 +138,7 @@ module Slackware
 			file = file.sub(/^\//, "") # clean off the leading '/'
 			re = Regexp::new(/#{file}/)
 			pkgs.each {|pkg|
-				if (found = pkg.owned_files.map {|f| f if f =~ re}.compact)
+				if (found = pkg.get_owned_files.map {|f| f if f =~ re}.compact)
 					found.each {|f|
 						found_files << [pkg, f]
 					}

data/lib/slackware/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slack-utils
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Vincent Batts
@@ -61,7 +61,7 @@ rdoc_options:
 - --main=README.rdoc
 - --line-numbers
 - --inline-source
-- --title=Slackware utils (slack-utils) 0.5.2 Documentation
+- --title=Slackware utils (slack-utils) 0.5.3 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement