andparcel 0.3.2 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/andparcel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{andparcel}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Murphy"]
-  s.date = %q{2010-06-01}
+  s.date = %q{2010-06-11}
   s.default_executable = %q{parcel}
   s.description = %q{Supplies the parcel command for packaging, installing, and removing parcels from an Android project}
   s.email = %q{mmurphy@commonsware.com}

data/bin/parcel

@@ -18,7 +18,7 @@ require 'andparcel'
 
 module AndParcel
 	def self.version
-		"0.3.0"
+		"0.4.0"
 	end
 	
 	def self.commands
@@ -112,7 +112,10 @@ module AndParcel
 	
 	class CatalogCommand < Command
 		def run
-			Trollop::die "add/remove not provided" if ARGV.size==0
+			if ARGV.size==0
+				$stderr.puts "add/remove not provided"
+				exit(-1)
+			end
 			
 			op=ARGV.shift.downcase
 			

data/lib/andparcel/parcel.rb

@@ -245,13 +245,21 @@ module AndParcel
 				inject(dest)
 			elsif /(http|https):\/\/.+/.match(target)
 				install_from_url(target, dir)
-			else				
-				url=AndParcel.catalogs.find(target)
-				
-				if url
-					install_from_url(url, dir)
+			else
+				candidate=Dir[target].sort.reverse.first
+															 
+				if candidate && File.exists?(candidate)
+					dest=File.join(dir, File.basename(candidate))
+					FileUtils.cp candidate, dest
+					inject(dest)
 				else
-					raise "Could not find parcel #{target}"
+					url=AndParcel.catalogs.find(target)
+					
+					if url
+						install_from_url(url, dir)
+					else
+						raise "Could not find parcel #{target}"
+					end
 				end
 			end
 		end

data/test/test_install.rb

@@ -98,6 +98,22 @@ Protest.context("when installing a parcel into a project") do
 		end
 	end
 	
+	test "should install a parcel via a wildcard" do
+		begin
+			clone_receiver
+			FileUtils.mkdir 'tmp'
+			target=AndParcel::Parcel.package('test/ParcelToPackage/parcel.json',
+																			 :dir=>'tmp')
+			assert target=='tmp/andParcel-test_0.1.0.zip'
+			AndParcel::Parcel.install('tmp/andParcel-test*',
+																:dir=>'tmp2')
+			assert_exists('tmp2/parcels/andParcel-test/andParcel-test_0.1.0.zip')
+		ensure
+			FileUtils.rm_rf 'tmp'
+			FileUtils.rm_rf 'tmp2'
+		end
+	end
+	
 	test "should replace a parcel with all sorts of stuff" do
 		begin
 			opts={:res=>'res',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andparcel
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Mark Murphy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -04:00
+date: 2010-06-11 00:00:00 -04:00
 default_executable: parcel
 dependencies: 
 - !ruby/object:Gem::Dependency