evaryont-arson 2.0.2 → 2.1.1

data/PKGBUILD

@@ -1,6 +1,6 @@
 # Contributor: Colin 'Evaryont' Shea <evaryont@saphrix.com>
 pkgname=arson
-pkgver=2.0.2
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="The HOT AUR search helper!"
 arch=(any)
@@ -11,7 +11,7 @@ makedepends=(rubygems)
 filename="evaryont-$pkgname-$pkgver.gem"
 source=(http://gems.github.com/gems/$filename)
 noextract=($filename)
-md5sums=('978da401438c6d18b78ad0e89254111a')
+md5sums=('f509e388af796c211e53266a5fb34114')
 
 build() {
   cd $srcdir

data/README.mkd

@@ -1,6 +1,6 @@
 # This is arson 2.0, the hot AUR search helper!
 
-There is 3 primary (and only, ever) functions of arson:
+There is 3 functions of arson:
 
 * Searching
 * Downloading
@@ -27,25 +27,24 @@ results to you, in color.
 
 ### Downloading
 
-If you pass arson the parameter "aur/foo" (however many spaces between) it will
-attempt to download the package. Or, if the search results only have 1 result,
-arson will download that package instead of displaying only 1. If you pass the
-category (i.e. "aur-system/arson") arson will understand that as well.
-
+To download a package, pass "-d" to arson. Any other arguments will be converted
+into a single string (space separated) and arson will try to download a package
+with that exact name. e.g.:
+	arson -d arson # Downloads the package "arson"
+	arson -d pacman color # Downloads the package "pacman color"
+arson won't perform any clean up on the passed parameters, so (using the 2nd
+example) arson will try to find the 'pacman color' package while you probably
+meant the 'pacman-color' package.
 
 -----
 
 ### Updating
 
-If you pass "?" as the only parameter, arson will search through the locally
-installed foreign packages (as reported by `pacman -Qm') and return a list
-of possible updates available in the AUR.
+If you pass -u to arson, it will search through the locally installed foreign
+packages (as reported by `pacman -Qm') and return a list of possible updates
+available in the AUR.
 
 -----
 
-You can not pass anything to arson to get a quick summary of these options.
-
-
-(ps: Yes, I did report arson as dead, and within the hour restart development
-on it. I'm crazy like that, I guess. Also, Daenyth and rson wanted me to
-continue. Yay having people who actually like my software!)
+You can not pass anything or pass -h or --help to arson to get a quick summary of
+these options.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
 :major: 2
-:minor: 0
+:minor: 1
+:patch: 1

data/arson.gemspec

@@ -2,26 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arson}
-  s.version = "2.0.2"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Colin 'Evaryont' Shea"]
-  s.date = %q{2009-05-07}
+  s.date = %q{2009-06-16}
   s.default_executable = %q{arson}
   s.description = %q{The HOT AUR search helper}
   s.email = %q{evaryont@saphrix.com}
   s.executables = ["arson"]
-  s.files = ["PKGBUILD", "README.mkd", "Rakefile", "VERSION.yml", "arson.gemspec", "bin/arson", "lib/arson.rb", "lib/arson/colorful.rb", "lib/arson/download.rb", "lib/arson/search.rb", "lib/arson/upgrade.rb", "lib/arson/version.rb"]
-  s.has_rdoc = true
+  s.files = ["PKGBUILD", "README.mkd", "Rakefile", "VERSION.yml", "arson.gemspec", "bin/arson", "lib/arson.rb", "lib/arson/colorful.rb", "lib/arson/config.rb", "lib/arson/download.rb", "lib/arson/search.rb", "lib/arson/upgrade.rb", "lib/arson/version.rb"]
   s.homepage = %q{http://evaryont.github.com/arson/}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{The HOT AUR search helper}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.1.3"])

data/bin/arson

@@ -4,34 +4,43 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'arson'
 require 'arson/colorful'
+require 'optparse'
 
+Arson::Config.write unless File.exists? Arson::Config::FILE_PATH
 
-if ARGV.to_s == ""
-	puts "arson #{Arson::VERSION.join('.')} [Colin 'Evaryont' Shea <evaryont@saphrix.com>]"
-	puts "Please specifiy what to search for as the parameters to this script:"
-	puts Arson.colorful(:italic, "  #{Arson::PROGRAM} pacman")
-	puts ""
-	puts "If you want to download a package, run #{Arson::PROGRAM} as such:"
-	puts Arson.colorful(:italic, "  #{Arson::PROGRAM} aur/arson")
-	puts "(note: you can include the -category bit if you wish)"
-	puts ""
-	puts "Passing '?' to arson will cause it to check for any upgrades"
-	exit 1
-end
+options = {:download => 0}
+opts = OptionParser.new do |opts|
+	opts.banner = "Usage: arson [options]"
 
-# Old regexp /^aur(?:-.*)\/(.*)$/
-if pkg = ARGV.to_s.scan(/aur(-.*?)?\/(.*)/i).flatten[1]
-	if pkg = Arson.find_exact(pkg)
-		puts "Downloading #{pkg['Name']}..."
-		Arson.download(pkg)
+	opts.on("-d", "--download", "Download the exact package name", "Repeating this will download other depenedencies in AUR") do
+		options[:download] += 1
+	end
+
+	opts.on("-u", "--upgrade", "Check for upgrades") do
+		options[:upgrade] = true
+	end
+
+	opts.on_tail("-h", "--help", "Show this message") do
+		puts opts
 		exit 0
-	else
-		warn "I think you attempted to download a package, but I couldn't find it"
+	end
+
+	opts.on_tail("--version", "Show version") do
+		puts "arson v#{Arson::VERSION.join('.')}"
+		puts "Copyright (C) 2008 Colin Shea <colin@evaryont.me>"
+		puts "Licensed under the GPLv3, all rights reserved"
 		exit 0
 	end
+
 end
+ARGV.empty? ? opts.parse!(["-h"]) : opts.parse!(ARGV)
 
-if ARGV.to_s =~ /\?/
+if options[:download] > 0 and ARGV.empty?
+	warn "Missing names of packages to download!"
+	exit 1
+end
+
+if options[:upgrade]
 	print "Checking for upgrades..."
 	$stdout.flush
 	upgrades = Arson.check_upgrades
@@ -39,12 +48,24 @@ if ARGV.to_s =~ /\?/
 		print "\n"
 		$stdout.flush
 		upgrades.each do |line, new_version|
-			puts "#{line.strip} #{Arson::ASCII_CHECK} #{Arson.colorful("Green", new_version)}"
+			puts "#{line.strip} #{Arson.colorful("Green", new_version)}"
 		end
 	else
 		puts "Nothing to update"
 	end
 	exit 0
+elsif options[:download] > 0
+	exit_code = 0
+	ARGV.each do |pkg|
+		if pkg = Arson.find_exact(pkg)
+			puts "Downloading #{pkg['Name']}..."
+			Arson.download(pkg)
+		else
+			warn "No such package '#{pkg}'"
+			exit_code = 1
+		end
+	end
+	exit exit_code
 end
 
 packages = Arson.search(ARGV)
@@ -70,8 +91,10 @@ elsif packages.length == 1
 	exit 0
 end
 
-if File.exists? "/usr/bin/pacman-color"
-	exec "/usr/bin/pacman-color -Ss #{ARGV.join(' ')}"
-else
-	exec "/usr/bin/pacman -Ss #{ARGV.join(' ')}"
+if Arson::Config["run-pacman"]
+	if File.exists? "/usr/bin/pacman-color" and Arson::Config["color"]
+		exec "/usr/bin/pacman-color -Ss #{ARGV.join(' ')}"
+	else
+		exec "/usr/bin/pacman -Ss #{ARGV.join(' ')}"
+	end
 end

data/lib/arson/colorful.rb

@@ -1,7 +1,7 @@
 class Arson
 	class << self
 		def colorful(color, string)
-			return string unless $stdout.tty?
+			return string unless $stdout.tty? and Arson::Config["color"]
 			colored = ""
 			if color.is_a? String
 				Colors[color].each do |effect|

data/lib/arson/config.rb

@@ -0,0 +1,27 @@
+require 'yaml'
+
+class Arson
+	module Config
+
+		# The location of the configuration file (hard coded for now)
+		FILE_PATH = File.expand_path(File.join("~", ".arson.yaml"))
+		# The loaded configuration
+		LOADED_YAML = File.exists?(FILE_PATH) ? open(FILE_PATH) {|f| YAML::load(f) } : {}
+		# Default configuration values
+		DEFAULTS = {"dir" => File.expand_path("~"), "pacman" => true, "color" => true}
+		# Merged values representing a combination of the user's choices
+		# and the defaults
+		MERGED = LOADED_YAML ? DEFAULTS.merge(LOADED_YAML) : DEFAULTS
+
+		# Returns the value for that configuration option (as a string)
+		def self.[](option)
+			MERGED[option.to_s]
+		end
+
+		def self.write
+			open(FILE_PATH, "w") do |file|
+				file.write(DEFAULTS.to_yaml)
+			end
+		end
+	end
+end

data/lib/arson/download.rb

@@ -20,16 +20,18 @@ class Arson
 		# After the file is downloaded, it is attempted to be unpacked using
 		# tar and gunzip formats.
 		def real_download(url)
-			open(url) do |tar|
-				# Write the stream to a file, b is JIC
-				File.open(File.basename(url), "wb") do |file|
-					file.write(tar.read)
+			Dir.chdir(Arson::Config["dir"]) do
+				open(url) do |tar|
+					# Write the stream to a file, b (binary) is JIC
+					File.open(File.basename(url), "wb") do |file|
+						file.write(tar.read)
+					end
 				end
+				tgz = Zlib::GzipReader.new(File.open(File.basename(url), 'rb'))
+				# Extract pkg.tar.gz to `pwd`, instead of `pwd`/pkg
+				Archive::Tar::Minitar.unpack(tgz, Dir.pwd)
+				FileUtils.mv File.basename(url), File.join(Dir.pwd, File.basename(url)[0..-8])
 			end
-			tgz = Zlib::GzipReader.new(File.open(File.basename(url), 'rb'))
-			# Extract pkg.tar.gz to `pwd`, instead of `pwd`/pkg
-			Archive::Tar::Minitar.unpack(tgz, Dir.pwd)
-			FileUtils.mv File.basename(url), File.join(Dir.pwd, File.basename(url)[0..-8])
 		end
 	end
 end

data/lib/arson/version.rb

@@ -1,5 +1,5 @@
 # Automattically generated by `rake version:write' - use version:bump to change
 # this, do not edit this directly, as it will be overwritten!
 class Arson
-	VERSION = [2, 0, 2]
+	VERSION = [2, 1, 1]
 end

data/lib/arson.rb

@@ -7,6 +7,7 @@ require 'facets/minitar'
 require 'facets/version'
 
 require 'arson/version'
+require 'arson/config'
 require 'arson/search'
 require 'arson/download'
 require 'arson/upgrade'
@@ -18,6 +19,7 @@ class Arson
 	Categories = %w{nil nil daemons devel editors emulators games gnome
 			i18n kde lib modules multimedia network office
 			science system x11 xfce kernels}
+
 	# Defaults from pacman-color
 	Colors = {"Magenta" => [:bold, :magenta],
 		  "White" => [:bold],
@@ -29,14 +31,11 @@ class Arson
 	# And support for user modifications. Note that inline comments (ie 
 	# "White = gray # blah blah") aren't supported and cause this to crash
 	Colors.merge!( Hash[ open("/etc/pacman.d/color.conf").readlines.map(&:strip).reject do |line|
-		line=~ /^#/||line=~ /^$/
+		line=~ /^#/ || line=~ /^$/
 	end.map do |line|
-		a=line.split("=").map(&:strip); [a[0], a[1].sub(/intensive/, "bold").split.map(&:to_sym)]
+		array = line.split("=").map(&:strip)
+		[a[0], a[1].sub(/intensive/, "bold").split.map(&:to_sym)]
 	end ] ) if File.exists? "/etc/pacman.d/color.conf"
 
 	PROGRAM = File.basename($0)
-
-	# These will possibly be redefined later.
-	ASCII_X = '✘'
-       	ASCII_CHECK = '✔'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evaryont-arson
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.1.1
 platform: ruby
 authors: 
 - Colin 'Evaryont' Shea
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: arson
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,11 +49,12 @@ files:
 - bin/arson
 - lib/arson.rb
 - lib/arson/colorful.rb
+- lib/arson/config.rb
 - lib/arson/download.rb
 - lib/arson/search.rb
 - lib/arson/upgrade.rb
 - lib/arson/version.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://evaryont.github.com/arson/
 post_install_message: 
 rdoc_options: 
@@ -78,7 +79,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: The HOT AUR search helper
 test_files: []