xqcoretools 0.0.3 → 0.0.4

data/bin/xqcoretools

@@ -38,38 +38,37 @@ class XQCoreTools < Thor
 	
 	desc "bundle [OUTPUT] [PATHS]", "Adds files to an existing bundle"
 	def bundle(output, paths)
-		if Dir.exists? output
-			puts "Output must point to an existing bundle"
-			return;
-		end
+		contentDirectory = "#{output}/content"
 		
-		contentDirectory = "${output}/content"
+		FileUtils.rm_r(contentDirectory, :force=>true)
 		
-		FileUtils.rm(contentDirectory, :force=>true)
-
-		pathList = paths.split(';')
+		FileUtils.mkdir(contentDirectory)
 		
-		puts "BUNDLE: #{output}"
+		pathList = paths.split(';')
+		packagesList = []
 		
 		pathList.each do |path|
-			FileUtils.copy path contentDirectory
-			
-			XQCoreTools::logFilesRecursive(path)
-		end
-	end
-	
-	def self.logFilesRecursive(path, base = '')
-		Dir.foreach(path) do |item|
-			subPath = "#{path}/#{item}"
-			relPath = base == '' ? item : "#{base}/#{item}"
-			if File.file? subPath
-				puts "COPYING:  #{relPath}"
-			else
-				if item != '.' && item != '..'
-					XQCoreTools::logFilesRecursive(subPath, relPath)
+			Dir.foreach(path) do |item|
+				subPath = "#{path}/#{item}"
+				if File.file? subPath
+					if item != '.DS_Store'
+						packagesList.push subPath
+					end
+				else
+					if item != '.' && item != '..'
+						packagesList.push subPath
+					end
 				end
 			end
 		end
+		
+		puts "BUNDLE: #{output}"
+		
+		packagesList.each do |package|
+			FileUtils.cp_r(package, contentDirectory)
+			
+			puts "COPYING:  #{package}"
+		end
 	end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mark Wong