andparcel 0.2.1 → 0.3.0

data/TODO

@@ -1,46 +1,5 @@
-Wednesday
----------
-developer guide (appendix of AdvAndroid)
-ABJ work
-
-Thursday
---------
-wrap developer guide
-	deploy
-	point cwac-colormixer README to this
-ABJ work
-
-Friday
-------
-standards: parcel.json / catalog.json
-ABJ work
-
-Over Next Few Weeks
--------------------
-get other key cwac- components parcel'd up
-	task
-		sample code into separate project
-		Ant builds
-			main
-			sample -- do replace
-		parcel.json
-		parcel & add to catalog
-		put CW logo/links on CWAC README's, add links to CWAC blog posts, other updates
-	wakefulintentservice
-		sample code into separate project
-		Ant builds
-			main
-			sample -- do replace
-		parcel.json
-		parcel & add to catalog
-		put CW logo/links on CWAC README's, add links to CWAC blog posts, other updates
-	endlessadapter
-		Ant builds
-		parcel.json
-		parcel & add to catalog
-		put CW logo/links on CWAC README's, add links to CWAC blog posts, other updates
-	mergeadapter
-		Ant builds
-		parcel.json
-		parcel & add to catalog
-		put CW logo/links on CWAC README's, add links to CWAC blog posts, other updates
+generate gem, confirm gem works in a VBox image
+push gem; commit, tag as v0.3.0
+update docs & republish
+blog; comment/close issues
+add issue: integrate -v/--version with git tags

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/andparcel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{andparcel}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Murphy"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-31}
   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}
@@ -42,6 +42,8 @@ Gem::Specification.new do |s|
      "test/ParcelReceiver/res/values/strings.xml",
      "test/ParcelReceiver/src/com/commonsware/android/pr/ParcelReceiver.java",
      "test/ParcelToPackage/AndroidManifest.xml",
+     "test/ParcelToPackage/assets/andParcel_test_foo.txt",
+     "test/ParcelToPackage/assets/bar/andParcel_test_goo.txt",
      "test/ParcelToPackage/build.properties",
      "test/ParcelToPackage/build.xml",
      "test/ParcelToPackage/default.properties",
@@ -52,7 +54,7 @@ Gem::Specification.new do |s|
      "test/ParcelToPackage/local.properties",
      "test/ParcelToPackage/parcel.json",
      "test/ParcelToPackage/res/layout/andParcel_test_row.xml",
-     "test/ParcelToPackage/res/values/strings.xml",
+     "test/ParcelToPackage/res/values/andParcel_test_strings.xml",
      "test/ParcelToPackage/src/com/commonsware/android/p2pkg/ParcelToPackage.java",
      "test/ParcelToPackage/tmp/andParcel-test_0.1.0.zip",
      "test/test_init.rb",

data/bin/parcel

@@ -14,7 +14,13 @@ require 'rubygems'
 require 'trollop'
 require 'andparcel'
 
+
+
 module AndParcel
+	def self.version
+		"0.3.0"
+	end
+	
 	def self.commands
 		@commands||={}
 	end
@@ -45,6 +51,7 @@ module AndParcel
 				opt :manifest, "manifest containing components to package (defaults to AndroidManifest.xml in project)", :type=>:string, :short=>'m'
 #				opt :dependencies, "names of parcels this parcel depends on", :type=>:strings
 				opt :res, "files/directories of resources to package (defaults to res/ in project)", :type=>:strings, :short=>'r'
+				opt :assets, "files/directories of assets to package (defaults to assets/ in project)", :type=>:strings, :short=>'a'
 			end
 			
 			pkg_info=ARGV.shift || "package.json"
@@ -60,6 +67,10 @@ module AndParcel
 				opts[:res]=['res']
 			end
 			
+			if !opts[:assets]
+				opts[:assets]=['assets']
+			end
+			
 			if !opts[:manifest]
 				opts[:manifest]='AndroidManifest.xml'
 			end
@@ -127,6 +138,8 @@ module AndParcel
 				opt :project, "path to Android project (defaults to parcel.json directory)", :short=>'p'
 				opt :repair, "tells parcel to repair problems", :short=>'r', :default=>false
 				opt :quiet, "whether it should print output on success", :short=>'q', :default=>false
+				opt :res, "files/directories of resources to package (defaults to res/ in project)", :type=>:strings, :short=>'r'
+				opt :assets, "files/directories of assets to package (defaults to assets/ in project)", :type=>:strings, :short=>'a'
 			end
 
 			Trollop::die "parcel not provided" if ARGV.size==0
@@ -140,12 +153,25 @@ module AndParcel
 				pkg_info=File.basename(pkg_info)
 			end
 			
+			if !opts[:res]
+				opts[:res]=['res']
+			end
+			
+			if !opts[:assets]
+				opts[:assets]=['assets']
+			end
+			
 			AndParcel::Parcel.lint(pkg_info, opts)
 		end
 	end
 end
 
 if ARGV.size>0
+	if ARGV.include?('--version') || ARGV.include?('-v')
+		$stderr.puts "parcel: an Android Parcel Project client\nVersion #{AndParcel.version}"
+		exit(0)
+	end
+	
 	name=ARGV.shift
 	cls=AndParcel.commands[name]
 	

data/lib/andparcel/parcel.rb

@@ -110,9 +110,10 @@ module AndParcel
 				Zip::ZipFile.open(target, Zip::ZipFile::CREATE) do |zf|
 					save_config(zf) if
 						manifest(zf) if
-							resources(zf) if
-								docs(zf) if
-									libs(zf)
+							assets(zf) if
+								resources(zf) if
+									docs(zf) if
+										libs(zf)
 				end
 				
 				target
@@ -171,6 +172,19 @@ module AndParcel
 			true
 		end
 		
+		# For each asset to go into the ZIP file, add it
+		def assets(zf)
+			if opts[:assets]
+				files=AndParcel.glob(opts[:assets], opts[:project])
+					
+				files.each do |fr|
+					zf.add(File.join('assets', fr.relative), fr.local)
+				end
+			end
+			
+			true
+		end
+		
 		# Scan the manifest template and grab all children of
 		# the <application> element
 		def manifest(zf)
@@ -256,10 +270,11 @@ module AndParcel
 				begin
 					dependencies if
 						manifest(zf) if
-							resources(zf) if
-								docs(zf) if
-									libs(zf) if
-										load_config(zf)
+							assets(zf) if
+								resources(zf) if
+									docs(zf) if
+										libs(zf) if
+											load_config(zf)
 			
 					FileUtils.mv dest, @parcel_root
 				ensure
@@ -346,6 +361,22 @@ module AndParcel
 			true
 		end
 		
+		def assets(zf)
+			dir=File.join(@root, 'assets')
+		
+			zf.entries.each do |entry|
+				if (/^assets\/(.+)$/.match entry.name)
+					name=$1
+					dest=File.join(dir, File.dirname(name), File.basename(name))
+					FileUtils.mkdir_p File.dirname(dest)
+					File.unlink(dest) if File.exists?(dest)
+					entry.extract dest
+				end
+			end
+			
+			true
+		end
+		
 		# If the parcel has a +ManifestMerge.xml+ file, back up and
 		# then open the project's +AndroidManifest.xml+ file,
 		# and merge in anything with a distinct name.
@@ -410,8 +441,9 @@ module AndParcel
 				if dest
 					Zip::ZipFile.open(dest) do |zf|
 						manifest(zf) if
-							resources(zf) if
-								libs(zf)
+							assets(zf) if
+								resources(zf) if
+									libs(zf)
 					end
 					
 					FileUtils.rm_rf @parcel_root
@@ -446,6 +478,20 @@ module AndParcel
 			true
 		end
 		
+		def assets(zf)
+			dir=File.join(@root, 'assets')
+		
+			zf.entries.each do |entry|
+				if (/^assets\/(.+)$/.match entry.name)
+					name=$1
+					dest=File.join(dir, File.dirname(name), File.basename(name))
+					File.unlink(dest) if File.exists?(dest)
+				end
+			end
+			
+			true
+		end
+		
 		def manifest(zf)
 		end
 	end
@@ -465,7 +511,7 @@ module AndParcel
 			@prefix_regexp=Regexp.compile(@prefix+'.*')
 			@issues=0
 			
-			resources=AndParcel.glob('res', opts[:project])
+			resources=AndParcel.glob(opts[:res], opts[:project])
 			
 			resources.each do |fr|
 				if fr.local.split('').last!='~'	
@@ -481,6 +527,12 @@ module AndParcel
 				end
 			end
 			
+			AndParcel.glob(opts[:assets], opts[:project]).each do |fr|
+				if fr.local.split('').last!='~'	
+					do_simple_resource(fr)
+				end
+			end
+			
 			if @issues>0
 				out.puts "#{@issues} issues reported #{'and fixed' if opts[:repair]}"
 			end

data/test/ParcelToPackage/assets/andParcel_test_foo.txt

@@ -0,0 +1 @@
+Hello, world

data/test/ParcelToPackage/assets/bar/andParcel_test_goo.txt

@@ -0,0 +1 @@
+Hello, world

data/test/test_install.rb

@@ -62,13 +62,22 @@ Protest.context("when installing a parcel into a project") do
 									:res=>'res')
 	end
 
+	test "should support a parcel with assets" do
+		install_test(['tmp2/assets/andParcel_test_foo.txt',
+									'tmp2/assets/bar/andParcel_test_goo.txt'],
+									:assets=>'assets')
+	end
+
 	test "should support a parcel with all sorts of stuff" do
 		install_test(['tmp2/res/layout/andParcel_test_row.xml',
 									'tmp2/res/values/strings.xml',
 									'tmp2/libs/one.jar',
 									'tmp2/libs/two.jar',
+									'tmp2/assets/andParcel_test_foo.txt',
+									'tmp2/assets/bar/andParcel_test_goo.txt',
 									'tmp2/parcels/andParcel-test/docs/README'],
 									:res=>'res',
+									:assets=>'assets',
 									:jars=>'libs',
 									:docs=>['docs/README', 'docs/SomeOtherFile'])
 	end

data/test/test_package.rb

@@ -98,7 +98,34 @@ Protest.context("when packaging a parcel") do
 			Zip::ZipFile.open(target) do |zf|
 				zf.entries.each do |entry|
 					if ('res/layout/andParcel_test_row.xml'==entry.name ||
-							'res/values/strings.xml'==entry.name)
+							'res/values/andParcel_test_strings.xml'==entry.name)
+						matches+=1
+					end
+				end
+			end
+			assert matches==2
+		ensure
+			FileUtils.rm_rf 'tmp'
+		end
+	end
+	
+	test "should support a parcel with assets" do
+		begin
+			FileUtils.mkdir 'tmp'
+			target=AndParcel::Parcel.package('test/ParcelToPackage/parcel.json',
+																			 :dir=>'tmp',
+																			 :assets=>'assets')
+			assert target=='tmp/andParcel-test_0.1.0.zip'
+			assert File.exists?(target)
+			config=load_config(target)
+			config_assert(config)
+			
+			matches=0
+			
+			Zip::ZipFile.open(target) do |zf|
+				zf.entries.each do |entry|
+					if ('assets/andParcel_test_foo.txt'==entry.name ||
+							'assets/bar/andParcel_test_goo.txt'==entry.name)
 						matches+=1
 					end
 				end
@@ -116,7 +143,8 @@ Protest.context("when packaging a parcel") do
 																			 :dir=>'tmp',
 																			 :jars=>'libs',
 																			 :manifest=>'AndroidManifest.xml',
-																			 :docs=>'docs')
+																			 :docs=>'docs',
+																			 :assets=>'assets')
 			assert target=='tmp/andParcel-test_0.1.0.zip'
 			assert File.exists?(target)
 			config=load_config(target)
@@ -142,6 +170,18 @@ Protest.context("when packaging a parcel") do
 				end
 			end
 			assert matches==1
+			
+			matches=0
+			
+			Zip::ZipFile.open(target) do |zf|
+				zf.entries.each do |entry|
+					if ('assets/andParcel_test_foo.txt'==entry.name ||
+							'assets/bar/andParcel_test_goo.txt'==entry.name)
+						matches+=1
+					end
+				end
+			end
+			assert matches==2
 		ensure
 			FileUtils.rm_rf 'tmp'
 		end

data/test/test_remove.rb

@@ -56,17 +56,26 @@ Protest.context("when removing a parcel from a project") do
 	
 	test "should support a parcel with resources" do
 		remove_test(['tmp2/res/layout/andParcel_test_row.xml',
-									'tmp2/res/values/strings.xml'],
+									'tmp2/res/values/andParcel_test_strings.xml'],
 								:res=>'res')
 	end
 	
+	test "should support a parcel with assets" do
+		remove_test(['tmp2/assets/andParcel_test_foo.txt',
+									'tmp2/assets/bar/andParcel_test_goo.txt'],
+								:assets=>'assets')
+	end
+	
 	test "should support a parcel with all sorts of stuff" do
 		remove_test(['tmp2/libs/one.jar',
 									'tmp2/libs/two.jar',
+									'tmp2/assets/andParcel_test_foo.txt',
+									'tmp2/assets/bar/andParcel_test_goo.txt',
 									'tmp2/res/layout/andParcel_test_row.xml',
-									'tmp2/res/values/strings.xml'],
+									'tmp2/res/values/andParcel_test_strings.xml'],
 								:docs=>'docs',
 								:jars=>'libs',
+								:assets=>'assets',
 								:res=>'res')
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andparcel
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mark Murphy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -04:00
+date: 2010-05-31 00:00:00 -04:00
 default_executable: parcel
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,8 @@ files:
 - test/ParcelReceiver/res/values/strings.xml
 - test/ParcelReceiver/src/com/commonsware/android/pr/ParcelReceiver.java
 - test/ParcelToPackage/AndroidManifest.xml
+- test/ParcelToPackage/assets/andParcel_test_foo.txt
+- test/ParcelToPackage/assets/bar/andParcel_test_goo.txt
 - test/ParcelToPackage/build.properties
 - test/ParcelToPackage/build.xml
 - test/ParcelToPackage/default.properties
@@ -115,7 +117,7 @@ files:
 - test/ParcelToPackage/local.properties
 - test/ParcelToPackage/parcel.json
 - test/ParcelToPackage/res/layout/andParcel_test_row.xml
-- test/ParcelToPackage/res/values/strings.xml
+- test/ParcelToPackage/res/values/andParcel_test_strings.xml
 - test/ParcelToPackage/src/com/commonsware/android/p2pkg/ParcelToPackage.java
 - test/ParcelToPackage/tmp/andParcel-test_0.1.0.zip
 - test/test_init.rb