rack-xapper 0.0.1 → 0.0.2

data/VERSION.yml

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

data/lib/rack/xapper.rb

@@ -22,8 +22,9 @@ module Rack
         xap_file = "#{xap_file}.xap" if xap_file !~ /\.xap$/
         
         collect_metadata(options) unless options.key?(:application_files)
-        
-        Zip::ZipFile.open(F.join(options[:root], options[:xap_path], xap_file), Zip::ZipFile::CREATE) do |zipfile|
+        pth = F.join(options[:root], options[:xap_path], xap_file)
+        FileUtils.mkdir_p(F.dirname(pth)) unless F.exist?(F.dirname(pth))
+        Zip::ZipFile.open(pth, Zip::ZipFile::CREATE) do |zipfile|
           xap_files(zipfile, options)
         end
       end
@@ -53,7 +54,7 @@ module Rack
             ele.attributes['Source'] = assembly
             doc.root.elements['Deployment.Parts'] << ele
           end
-          f.puts doc.to_s 
+          doc.write f, 1 
         end
       end
       
@@ -69,7 +70,7 @@ module Rack
             ele.attributes['external'] = language[:external]
             doc.root << ele
           end
-          f.puts doc.to_s
+          doc.write f, 1
         end
       end
       
@@ -109,7 +110,7 @@ module Rack
       def find_languages_in_use(options)
         (options[:application_files] +  options[:extra_app_files]).inject([]) do |langs, candidate|
           lang = options[:languages].find { |lang| lang[:extensions].include?(F.extname(candidate)) }
-          langs << lang if lang
+          langs << lang if lang and not langs.include?(lang)
           langs
         end
       end
@@ -126,13 +127,15 @@ module Rack
       
       def add_extra_directories(archive, options)
         options[:extra_app_files].collect do |pth|
-          archive.add F.basename(path), path if F.file?(path)
+          in_ar = F.expand_path(pth).gsub(/^#{FileUtils.pwd}/,'')
+          archive.add in_ar, pth if F.file?(pth)
         end
       end
       
       def add_application_files(archive, options)
-        options[:application_files].each do |en|
-          archive.add F.basename(en), en if F.file?(en)
+        options[:application_files].each do |path|
+          in_ar = F.expand_path(path).gsub(/^#{"#{FileUtils.pwd}/#{options[:source_path]}"}\//, '')
+          archive.add in_ar, path if F.file?(path)
         end
       end
     end
@@ -243,7 +246,7 @@ module Rack
       return forbidden  if @path_info.include? ".."
 
       if dev_env? or xap_changed?
-        FileUtils.rm(@xap_path) if F.exist?(@xap_path)
+        FileUtils.rm_f(@xap_path) if F.exist?(@xap_path)
         XapBuilder.xap_to_disk @options
       end
 

data/rack-xapper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-xapper}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["casualjim"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-xapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - casualjim