yore 0.1.2 → 0.2.0

data/Rakefile

@@ -13,6 +13,8 @@ begin
     gem.rubyforge_project = "buzzware"
     gem.add_dependency('cmdparse', '>= 2.0.2')
     gem.add_dependency('buzzcore', '>= 0.2.6')
+    gem.add_dependency('nokogiri', '>= 1.3.3')
+    gem.add_dependency('buzzcore', '>= 0.2.6')
     gem.add_dependency('aws-s3', '>= 0.6.2')
     gem.add_development_dependency "thoughtbot-shoulda"
 		#gem.files.include %w(

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/bin/yore

@@ -3,6 +3,9 @@
 require 'fileutils'
 
 require 'rubygems'
+
+require File.expand_path('../../buzzcore/lib/buzzcore_dev',File.dirname(__FILE__))
+
 gem 'buzzcore'; require 'buzzcore';
 gem 'cmdparse'; require 'cmdparse'
 

data/lib/yore/yore_core.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 gem 'buzzcore'; require 'buzzcore';
+require 'buzzcore/extra/xml_utils2'
 
 require 'fileutils'
 require 'net/smtp'
@@ -232,7 +233,9 @@ module YoreCore
 				aConfig = File.expand_path(aConfig)
 				logger.info "Job file: #{aConfig}"
 				op = {:basepath => File.dirname(aConfig)}
-				xml = XmlUtils.get_file_root(aConfig)
+				xmlString = MiscUtils.string_from_file(aConfig)
+				xmlString = XmlUtils2.clean_data(xmlString)
+				xml = XmlUtils.get_xml_root(xmlString)
 				return configure(xml,aCmdOptions,op)
 			end
 
@@ -467,6 +470,7 @@ module YoreCore
       sourceFound = false
 
       if aSourcesXml
+				#aSourcesXml.elements['Source'].each do |xmlSource|
 				REXML::XPath.each(aSourcesXml,'Source') do |xmlSource|
 					case xmlSource.attributes['Type']
 						when 'File' then
@@ -537,6 +541,7 @@ module YoreCore
 		def save_internal(aFilename)
 			FileUtils.mkdir_p(files_path = File.join(temp_path,'files'))
 			filelist = collect_file_list(XmlUtils.single_node(config.xmlRoot,'/Yore/Sources'),files_path)
+			logger.info "files collected:\n  "+filelist.join("\n  ")
       compress(filelist,aFilename)
 		end
 

data/yore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yore}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["buzzware"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2010-01-15}
   s.default_executable = %q{yore}
   s.description = %q{yore (as in "days of yore") is a user data management utility for web applications.}
   s.email = %q{contact@buzzware.com.au}
@@ -65,17 +65,23 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<cmdparse>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<buzzcore>, [">= 0.2.6"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_runtime_dependency(%q<buzzcore>, [">= 0.2.6"])
       s.add_runtime_dependency(%q<aws-s3>, [">= 0.6.2"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
       s.add_dependency(%q<buzzcore>, [">= 0.2.6"])
+      s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_dependency(%q<buzzcore>, [">= 0.2.6"])
       s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<cmdparse>, [">= 2.0.2"])
     s.add_dependency(%q<buzzcore>, [">= 0.2.6"])
+    s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+    s.add_dependency(%q<buzzcore>, [">= 0.2.6"])
     s.add_dependency(%q<aws-s3>, [">= 0.6.2"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yore
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - buzzware
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +08:00
+date: 2010-01-15 00:00:00 +08:00
 default_executable: yore
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.6
     version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: buzzcore
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.6
+    version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
   type: :runtime