slack-utils 0.6.0 → 0.6.1

data/README.rdoc

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

data/bin/slf

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$PROGRAM_NAME = File.basename(__FILE__)
+
 require 'optparse'
 require 'rubygems'
 require 'slackware/utils'

data/bin/slfindlinked

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
+$PROGRAM_NAME = File.basename(__FILE__)
+
 require 'rubygems'
 require 'slackware/utils'
 
+# XXX needs better boilerplating
 print_find_linked(ARGV[0])
 

data/bin/sli

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+$PROGRAM_NAME = File.basename(__FILE__)
+
+require 'optparse'
+require 'rubygems'
+require 'slackware/utils'
+
+options = {}
+begin
+	OptionParser.new do |opts|
+		opts.banner = <<-EOS
+
+List installed Slackware package's information.
+
+Usage:
+	#{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
+		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)
+	options[:all] = true
+end
+
+begin
+	print_packages_description(build_packages(options, ARGV))
+rescue Interrupt
+	exit 0
+end
+
+

data/bin/sll

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$PROGRAM_NAME = File.basename(__FILE__)
+
 require 'optparse'
 require 'rubygems'
 require 'slackware/utils'
@@ -46,11 +48,6 @@ EOS
 
 		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")
@@ -58,8 +55,12 @@ rescue OptionParser::InvalidOption => e
 end
 
 # handing through that we are listing owned files
+# XXX this is not even jeing used
 options[:list_files] = true
 
+if ARGV.count > 0
+  options[:all] = true
+end
 
 begin
 	print_package_file_list(build_packages(options, ARGV))

data/bin/slo

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$PROGRAM_NAME = File.basename(__FILE__)
+
 require 'rubygems'
 require 'slackware/utils'
 

data/bin/slp

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$PROGRAM_NAME = File.basename(__FILE__)
+
 require 'optparse'
 require 'rubygems'
 require 'slackware/utils'

data/bin/slt

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$PROGRAM_NAME = File.basename(__FILE__)
+
 require 'optparse'
 require 'rubygems'
 require 'slackware/utils'

data/lib/slackware/changelog.rb

@@ -93,9 +93,10 @@ module Slackware
 
     # +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
+    #  * :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 = {})
       @file     = file
       @opts     = opts
@@ -111,14 +112,28 @@ module Slackware
     def security
       @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.security } }.flatten.compact
     end
+    def pkgs_removed
+      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.action == "Removed" } }.flatten.compact
+    end
+    def pkgs_added
+      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.action == "Added" } }.flatten.compact
+    end
+    def pkgs_upgraded
+      @updates.map {|u| u.entries.map {|e| {:date => u.date, :entry => e } if e.action == "Upgraded" } }.flatten.compact
+    end
+    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
     end
 
-    def parse
-	    unless @file.nil?
+    def parse(opts = {:file => nil, :data => nil})
+	    if not(opts[:file].nil?)
+		    @updates = parse_this_file(opts[:file]).updates
+      elsif not(@file.nil?)
 		    @updates = parse_this_file(@file).updates
 	    end
 	    return self
@@ -137,7 +152,7 @@ module Slackware
       "#<%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
 
-    private
+    #protected
     # Parse order is something like:
     # * if its' a date match, store the date
     # * take change notes until

data/lib/slackware/changelog/rss.rb

@@ -3,30 +3,64 @@ require 'slackware/changelog'
 
 module Slackware
   class ChangeLog
-    def to_rss
+    # or maybe "http://connie.slackware.com/~msimons/slackware/grfx/shared/dobbslack1.jpg"
+    IMAGE_URL = "http://connie.slackware.com/~msimons/slackware/grfx/shared/bluepiSW.jpg"
+    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|
-        added_title = ""
-        if @opts[:arch]
-          added_title = added_title + "slackware#{@opts[:arch]}"
+        if (opts[:title])
+          m.channel.title = opts[:title]
+        else
+          added_title = ""
+          if opts[:arch]
+            added_title = added_title + "slackware#{opts[:arch]}"
+          end
+          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"
+          end
         end
-        if @opts[:version]
-          added_title = added_title + "-#{@opts[:version]}"
+
+        if (opts[:url])
+          m.channel.link = "%s#slackagg" % [opts[:url]]
+        else
+          m.channel.link = "http://www.slackware.com/#slackagg"
         end
 
-        if added_title.empty?
-          m.channel.title = "Slackware ChangeLog.txt feed"
+        if (opts[:description])
+          m.channel.description = opts[:description]
         else
-          m.channel.title = "Slackware ChangeLog.txt feed for #{added_title}"
+          m.channel.description = "a parsed ChangeLog.txt, is an extendable ChangeLog.txt"
         end
-        if @opts[:url]
-          m.channel.link = "%s#slackagg" % [@opts[:url]]
+
+        if opts[:image_url]
+          m.channel.logo = opts[:image_url]
         else
-          m.channel.link = "http://www.slackware.com/#slackagg"
+          m.channel.logo = IMAGE_URL
+        end
+
+        if (opts[:noimage])
+        else
+          image = m.image
+          if opts[:image_url]
+            image.url = opts[:image_url]
+          else
+            image.url = IMAGE_URL
+          end
+          image.title = "Slackware Linux"
+          image.width = "144"
+          image.height = "144"
         end
-        #m.channel.logo = "http://connie.slackware.com/~msimons/slackware/grfx/shared/bluepiSW.jpg"
-        m.channel.logo = "http://connie.slackware.com/~msimons/slackware/grfx/shared/dobbslack1.jpg"
-        m.channel.description = "a parsed ChangeLog.txt, is an extendable ChangeLog.txt"
+
         m.items.do_sort = true # sort items by date
 
         @updates.each {|update|
@@ -39,8 +73,8 @@ module Slackware
           else
             i.title = update.date.utc.to_s
           end
-          if @opts[:url]
-            i.link = "%s#%s" % [@opts[:url], update.date.to_i]
+          if opts[:url]
+            i.link = "%s#%s" % [opts[:url], update.date.to_i]
           else
             i.link = "http://slackware.com/#slackagg#%s" % [update.date.to_i]
           end
@@ -49,9 +83,9 @@ module Slackware
           i.description = ""
           if (update.entries.count > 0)
             if (security > 0)
-              i.description = "%d new update(s), %d security update(s)\n\n" % [update.entries.count, security]
+              i.description = i.description + "%d new update(s), %d security update(s)\n\n" % [update.entries.count, security]
             else
-              i.description = "%d new update(s)\n\n" % [update.entries.count]
+              i.description = i.description + "%d new update(s)\n\n" % [update.entries.count]
             end
           end
           i.description = i.description + "<pre><blockquote>\n"

data/lib/slackware/package.rb

@@ -1,4 +1,3 @@
-
 require 'time'
 
 module Slackware
@@ -133,8 +132,8 @@ module Slackware
 		# 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
+			unless 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 }
@@ -145,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 = @get_owned_files
+			if self.owned_files.nil?
+				self.owned_files = get_owned_files()
 				return true
 			else
 				return false
@@ -176,7 +175,7 @@ module Slackware
 		end
 
 		def inspect
-			"#<%s:0x%x name=%s version=%s arch=%s build=%s tag=%s>" % [
+			"#<%s:0x%x name=\"%s\" version=\"%s\" arch=\"%s\" build=%s tag=\"%s\">" % [
 				self.class.name,
 				self.object_id,
 				self.name,

data/lib/slackware/package_bundle.rb

@@ -0,0 +1,42 @@
+module Slackware
+	class PackageBundle < Package
+    attr_accessor :archive
+
+		def initialize(name = nil)
+			super
+		end
+
+    def parse(name)
+      super(name)
+      if self.build =~ /^(\d+.*)\.(t[gx]z)$/
+        self.build = $1
+        self.archive = $2
+      end
+    end
+
+		def self::get_file_list(pkg)
+			e_flag = ""
+			if pkg =~ /txz$/
+				e_flag = "J"
+			elsif pkg =~ /tgz$/
+				e_flag = "z"
+			elsif pkg =~ /tbz$/
+				e_flag = "j"
+			end
+			IO.popen("tar #{e_flag}wtf #{pkg}") {|f|
+				f.readlines.map {|l| l.chomp }
+			} 
+		end
+		def get_slack_desc(pkg,file)
+			e_flag = ""
+			if pkg =~ /txz$/
+				e_flag = "J"
+			elsif pkg =~ /tgz$/
+				e_flag = "z"
+			elsif pkg =~ /tbz$/
+				e_flag = "j"
+			end
+			IO.popen("tar #{e_flag}xOf #{pkg} #{file}") {|f| f.readlines.map {|l| l.chomp } }
+		end
+	end
+end

data/lib/slackware/repo.rb

@@ -40,7 +40,7 @@ module Slackware
 							  a
 						  end
 			else
-				## do some hot parsing of repo
+				## TODO do some hot parsing of 'repo'
 			end
 		end
 
@@ -57,7 +57,7 @@ module Slackware
 				if (file.nil?)
 					data = ftp.list('*')
 				else
-					data = ftp.gettextfile(file, nil)
+					data = ftp.get(file, nil)
 				end
 				ftp.close
 				return data
@@ -86,29 +86,7 @@ module Slackware
 		def get_changelog
 			if (@changelog.nil?)
 				changelog = {}
-				changelog_date = fetch("ChangeLog.txt").split(/\n/)
-				actions = %w{removed added upgraded rebuilt}
-				actions.each {|action|
-					changelog[:"#{action}"] = changelog_date.map {|line|
-						if line =~ /^(\w+)\/(.*)\.t[gx]z:\s+#{action}\.?$/i
-							s = Slackware::Package.parse($2)
-							s.path = $1
-							if (self.mirror.nil?)
-								base_path= self.path
-							else
-								base_path= self.mirror + self.path
-							end
-							s.package_location = self.proto +
-								base_path +
-								"slackware" +
-								self.arch +
-								"-" +
-								self.version +
-								"/" 
-							s
-						end
-					}.compact
-				}
+				changelog_data = fetch("ChangeLog.txt")
 				return changelog
 			else
 				return @changelog
@@ -155,7 +133,7 @@ module Slackware
 
 		def set_packages
 			@packages = get_packages
-			return nil
+			return @packages.count
 		end
 
 	end

data/lib/slackware/system.rb

@@ -10,12 +10,7 @@ module Slackware
 	RE_REMOVED_NAMES = /^(.*)-upgraded-(\d{4}-\d{2}-\d{2}),(\d{2}:\d{2}:\d{2})$/
 	RE_BUILD_TAG = /^([[:digit:]]+)([[:alpha:]]+)$/
 
-	def self::version
-		Slackware::VERSION
-	end
-
 	class System
-
 		def self::installed_packages
 			return Dir.glob(DIR_INSTALLED_PACKAGES + "/*").sort.map {|p| Slackware::Package.parse(p) }
 		end
@@ -157,7 +152,7 @@ module Slackware
 
 		# Return the version of Slackware Linux currently installed
 		def self::version
-			Slackware::VERSION
+			SLACKWARE_VERSION
 		end
 	end
 

data/lib/slackware/utils.rb

@@ -108,6 +108,18 @@ def print_packages_times(pkgs, epoch = false)
 	end
 end
 
+def print_packages_description(pkgs)
+	if (pkgs.count > 0 && pkgs.first.class == Slackware::Package)
+		pkgs.each {|pkg|
+			printf("%s: COMPRESSED SIZE: %s\n", pkg.fullname, pkg.compressed_size )
+			printf("%s: UNCOMPRESSED SIZE: %s\n", pkg.fullname, pkg.uncompressed_size )
+			pkg.package_description.each {|line|
+				printf("%s: %s\n", pkg.fullname, line )
+			}
+		}
+	end
+end
+
 # package file listing
 def print_package_file_list(pkgs)
 	if (pkgs.count > 1)

data/lib/slackware/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slack-utils
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Vincent Batts
@@ -24,6 +24,7 @@ description: " slack-utils is a means by which to access \n\
   See the examples/ for more information.\n  "
 email: vbatts@hashbangbash.com
 executables: 
+- sli
 - slf
 - slo
 - sll
@@ -41,6 +42,7 @@ files:
 - bin/slp
 - bin/slo
 - bin/sll
+- bin/sli
 - bin/slfindlinked
 - examples/list_packages.rb
 - examples/repo_difference.rb
@@ -51,6 +53,7 @@ files:
 - lib/slackware/changelog.rb
 - lib/slackware/changelog/rss.rb
 - lib/slackware/package.rb
+- lib/slackware/package_bundle.rb
 - lib/slackware/repo.rb
 - lib/slackware/version.rb
 - lib/slackware/system.rb
@@ -63,7 +66,7 @@ rdoc_options:
 - --main=README.rdoc
 - --line-numbers
 - --inline-source
-- --title=Slackware utils (slack-utils) 0.6.0 Documentation
+- --title=Slackware utils (slack-utils) 0.6.1 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement