yore 0.0.1 → 0.0.2

data/Manifest.txt

@@ -14,9 +14,6 @@ README.rdoc
 script/console
 script/destroy
 script/generate
-spec/rewind_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/test_job_a.xml
-spec/yore_spec.rb
-tasks/rspec.rake
+test/test_job_a.xml
+test/test_job_b.xml
+test/yore_test.rb

data/README.rdoc

@@ -1,32 +1,43 @@
 = yore
 
-* FIX (url)
+* RubyForge Project : http://rubyforge.org/projects/buzzware
+* Author : http://www.buzzware.com.au
 
 == DESCRIPTION:
 
-FIX (describe your package)
+yore (as in "days of yore") is hands-off scheduled backup utility designed for web servers.
+It does backups of files and databases (MySQL only at present) to Amazon S3.
 
 == FEATURES/PROBLEMS:
 
-* FIX (list of features or problems)
+* Compressed, encrypted, single file backups of folders and mysql databases
+* Designed to be called regularly
+* Backups are uploaded to Amazon S3
+* will later remove old files that don't match the configurable scheme for backup history
 
 == SYNOPSIS:
 
-  FIX (code sample of usage)
+yore backup yore_config.xml
 
 == REQUIREMENTS:
 
-* FIX (list of requirements)
+* s3sync (http://rubyforge.org/projects/s3sync/)
+* RequirePaths (http://rubyforge.org/projects/blackwhitelogin)
+* cmdparse (http://cmdparse.rubyforge.org)
+* shairontoledo-popen4 (http://github.com/shairontoledo/popen4)
+* tar, bzip2, openssl, mysql
+* tested on MacOS and Linux
 
 == INSTALL:
 
-* FIX (sudo gem install, anything else)
+ sudo gem sources -a http://gems.github.com
+ sudo gem install yore
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2009 FIXME full name
+Copyright (c) 2009 Gary McGhee, Buzzware Solutions
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,12 +1,11 @@
 require 'rubygems'
 require 'rake/rdoctask'
 require 'rake/testtask'
-require 'spec/rake/spectask'
 %w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/yore.orig'
 
 # built following http://newgem.rubyforge.org/
-# using RSpec option
+# using RSpec option (later converted to shoulda)
 # and had to add processor_ids from dr nic :
 # http://groups.google.com/group/new-gem-generator/browse_thread/thread/648f70da782e607a/928ea0fe8319d886?lnk=raot
 
@@ -20,7 +19,8 @@ $hoe = Hoe.new('yore', Yore::VERSION) do |p|
   p.extra_deps         = [
     ['RequirePaths','>= 1.0.1'],
     ['cmdparse', '>= 2.0.2'],
-    ['s3sync', '>= 1.2.5']
+    ['s3sync', '>= 1.2.5'],
+    ['shairontoledo-popen4', '>= 0.1.2']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]
@@ -51,7 +51,7 @@ Dir['tasks/**/*.rake'].each { |t| load t }
 #   t.test_files = FileList['test/**/*.rb']
 # end
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-end
+#Spec::Rake::SpecTask.new do |t|
+#  t.spec_files = FileList['spec/**/*.rb']
+#end
 

data/lib/yore.orig.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Yore
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/yore/yore_core.rb

@@ -2,6 +2,9 @@ require 'rubygems'
 gem 'RequirePaths'; require 'require_paths'
 require_paths '.','..'
 
+gem 'Platform'; require 'platform'
+gem 'shairontoledo-popen4'; require 'popen4'
+
 require 'fileutils'
 require 'net/smtp'
 
@@ -13,6 +16,66 @@ require 'ihl_ruby/extend_base_classes'
 THIS_FILE = __FILE__
 THIS_DIR = File.dirname(THIS_FILE)
 
+module POpen4
+
+	class ExecuteError < StandardError
+
+		attr_reader :result #,:stderr,:stdout,:exitcode,:pid
+
+    def initialize(aArg)
+      if aArg.is_a? Hash
+        super(aArg[:stdout] || '')
+        @result = aArg
+#        @stderr = aArg[:stderr]
+#        @stdout = aArg[:stdout]
+#        @exitcode = aArg[:exitcode]
+#        @pid = aArg[:pid]
+      else
+        super(aArg)
+      end
+    end
+
+	end
+
+	# Usage :
+	# result = POpen4::shell('somebinary') do |r|   # block gives opportunity to adjust result, and avoid exception raised from non-zero exit codes
+	# 	if r[:exitcode]==254		# eg. say this binary returns 254 to mean something special but not an error
+	#     r[:stdout] = 'some correct output'
+	#     r[:stderr] = ''
+	#     r[:exitcode] = 0
+	#   end
+	# end
+  #
+  # OR
+  #
+  # result = POpen4::shell('somebinary');
+  # puts result[:stdout]
+	def self.shell(aCommand,aWorkingDir=nil,aTimeout=nil)
+		raise ExecuteError.new('aWorkingDir doesnt exist') unless !aWorkingDir || File.exists?(aWorkingDir)
+		orig_wd = Dir.getwd
+		result = {:command => aCommand, :dir => (aWorkingDir || orig_wd)}
+    status = nil
+		begin
+			Dir.chdir(aWorkingDir) if aWorkingDir
+			Timeout.timeout(aTimeout,ExecuteError) do	# nil aTimeout will not time out
+				status = POpen4::popen4(aCommand) do |stdout, stderr, stdin, pid|
+					result[:stdout] = stdout.read
+					result[:stderr] = stderr.read
+					result[:pid] = pid
+				end
+			end
+		ensure
+			Dir.chdir(orig_wd)
+		end
+		result[:exitcode] = (status && status.exitstatus) || 1
+		yield(result) if block_given?
+		raise ExecuteError.new(result) if result[:exitcode] != 0
+		return result
+	end
+
+end
+
+
 module YoreCore
 
   class KeepDaily
@@ -163,8 +226,8 @@ module YoreCore
       :keep_daily => 14,
       :keep_weekly => 12,
       :keep_monthly => 12,
-      :crypto_iv => "3A63775C1E3F291B0925578165EB917E",
-      :crypto_key => "07692FC8656F04AE5518B80D38681E038A3C12050DF6CC97CEEC33D800D5E2FE",
+      :crypto_iv => "3A63775C1E3F291B0925578165EB917E",    # apparently a string of up to 32 random hex digits
+      :crypto_key => "07692FC8656F04AE5518B80D38681E038A3C12050DF6CC97CEEC33D800D5E2FE",   # apparently a string of up to 64 random hex digits
       :first_hour => 4,
       :prefix => 'backup',
       :log_level => 'DEBUG',
@@ -190,7 +253,7 @@ module YoreCore
     attr_reader :basepath
 
     def initialize(aConfig=nil)
-      DEFAULT_CONFIG[:email_report] = true  # fixes some bug where this was nil
+      DEFAULT_CONFIG[:email_report] = false  # fixes some bug where this was nil
       configure(aConfig || DEFAULT_CONFIG)
     end
 
@@ -242,10 +305,11 @@ module YoreCore
       #@filelist =
     end
 
-		def shell(aCommandline)
-			reporter.debug aCommandline
-			reporter.debug response = `#{aCommandline}`
-			response
+		def shell(aCommandline,&aBlock)
+			reporter.debug "To shell: " + aCommandline
+      result = block_given? ? POpen4::shell(aCommandline,nil,nil,&aBlock) : POpen4::shell(aCommandline)
+      reporter.debug "From shell: '#{result[:stdout]}'"
+      return result[:stdout]
 		end
 
     def get_log
@@ -303,8 +367,14 @@ module YoreCore
        shell "openssl enc -d -aes-256-cbc -K #{config[:crypto_key]} -iv #{config[:crypto_iv]} -in #{aFileIn} -out #{aFileOut}"
     end
 
+    def ensure_bucket(aBucket=nil)
+      aBucket ||= config[:bucket]
+      shell "s3cmd createbucket #{aBucket}"
+    end
+
     # uploads the given file to the current bucket as its basename
     def upload(aFile)
+      ensure_bucket()
       shell "s3cmd put #{config[:bucket]}:#{File.basename(aFile)} #{aFile}"
     end
 
@@ -323,7 +393,7 @@ module YoreCore
     #   :first_hour
     #   :
     def encode_file_name(aTimeNow=Time.now)
-      "#{config[:prefix]}-#{backup_date(aTimeNow).date_numeric}.rew"
+      "#{config[:prefix]}-#{backup_date(aTimeNow).date_numeric}.yor"
     end
 
     # return date based on filename
@@ -337,6 +407,7 @@ module YoreCore
     #end
 
     def backup_process(aSourceFiles,aTimeNow=Time.now,aTempDir=nil)
+      #require 'ruby-debug'; debugger
       aTempDir ||= MiscUtils.make_temp_dir('yore_')
       temp_file = File.expand_path('backup.tar',aTempDir)
       collect(aSourceFiles,temp_file)
@@ -411,12 +482,14 @@ module YoreCore
       xmlRoot = XmlUtils.get_file_root(job)
 
       filelist = []
+      sourceFound = false
 
       REXML::XPath.each(xmlRoot, '/Yore/Sources/Source') do |xmlSource|
-				case xmlSource['Type']
+        case xmlSource.attributes['Type']
 					when 'File' then 
 						REXML::XPath.each(xmlSource, 'IncludePath') do |xmlPath|
-							filelist += MiscUtils::recursive_file_list(File.expand_path(xmlPath.text,config[:basepath]))
+							filelist += MiscUtils::recursive_file_list(MiscUtils::path_combine(config[:basepath],xmlPath.text))
+              sourceFound = true
 						end
 					when 'MySql' then
 						#<Source Type="MySql" >
@@ -431,11 +504,14 @@ module YoreCore
 								raise Error.new("Invalid or missing parameter")
 							end
 							db_to_file(args,file)
-							filelist += file						
+							filelist += file
+              sourceFound = true
 						end
 				end
       end
 
+      raise Error.new("Backup source found but file list empty") if sourceFound && filelist.empty?
+
       filelist.uniq!
       filelist.sort!
 

data/test/test_job_b.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Yore>
+  <SimpleItems>
+		<Item Name="keep_daily">14</Item>
+		<Item Name="keep_weekly">12</Item>
+		<Item Name="keep_monthly">12</Item>
+		<Item Name="crypto_iv">56FD29B5CE3F291B0925577435EBEE7E</Item>
+		<Item Name="crypto_key">07692FC3456A345055B45A37560A85390A3565A0436E035E35636A603A5A2FE</Item>
+		<Item Name="bucket">yoretest</Item>
+		<Item Name="first_hour">4</Item>
+		<Item Name="prefix">yoretest</Item>
+		<Item Name="log_level">DEBUG</Item>
+		<Item Name="email_report">false</Item>
+
+		<Item Name="mail_host">mail.authsmtp.com</Item>
+		<Item Name="mail_port">25</Item>
+		<Item Name="mail_helodomain">finwa.org.au</Item>
+		<Item Name="mail_user">ac37391</Item>
+		<Item Name="mail_password">mbju7wwzv</Item>
+		<Item Name="mail_from">noreply@buzzware.com.au</Item>
+		<Item Name="mail_from_alias">FINWA Web Server</Item>
+		<Item Name="mail_to">familyincnet@gmail.com</Item>
+		<Item Name="mail_to_alias">FINWA</Item>
+		<Item Name="mail_auth">login</Item>
+		
+		<Item Name="mysqldump">/usr/local/mysql/bin/mysqldump</Item>
+		
+		</SimpleItems>
+	<Sources>
+		<Source Type="File">
+			<IncludePath>/tmp/yoretest</IncludePath>
+			<!-- <ExcludePath></ExcludePath> -->
+		</Source>
+<!--<Source Type="MySql" >																														 -->
+<!--	<Database Name="joomla_db" Host="localhost" User="root" Password="prot123ection">-->
+<!--		<ToFile>/Users/gary/temp/test.sql</ToFile>																		 -->
+<!--	</Database>																																			 -->
+<!--</Source>																																					 -->
+  </Sources>
+</Yore>
+

data/{spec/yore_spec.rb → test/yore_test.rb}

@@ -1,18 +1,10 @@
 require 'rubygems'
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
 gem 'RequirePaths'; require 'require_paths'
 require_paths '../lib','../../..'
 
+require 'test/unit'
+gem 'Shoulda'; require 'shoulda'
 
-## Time to add your specs!
-# http://rspec.info/
-#describe "Place your specs here" do
-#  
-#  it "find this spec in spec directory" do
-#    violated "Be sure to write your specs"
-#	end
-#end
 	
 require 'ihl_ruby/misc_utils'
 
@@ -25,14 +17,15 @@ def ensure_clean_bucket(aName)
   `s3cmd deleteall #{aName}`
 end
 
-describe YoreCore::Yore do
-  before(:each) do
+class YoreTest < Test::Unit::TestCase
+
+	def setup
     @yore = YoreCore::Yore.new
   end
 
-  it "should collect a list of files into a single file with a .contents file" do
+  should "collect a list of files into a single file with a .contents file" do
     # create a temp dir
-    temp_dir = MiscUtils::make_temp_dir('yore_spec')
+    temp_dir = MiscUtils::make_temp_dir('yore_test')
     # create source and dest subfolders
     source_dir = File.expand_path('source',temp_dir)
     dest_dir = File.expand_path('dest',temp_dir)
@@ -55,14 +48,14 @@ describe YoreCore::Yore do
     i = 0
     filelist_out.each_line {|line|
       next if line==".contents\n"
-      i.should < filelist.length
-      line.chomp("\n").should == MiscUtils.path_debase(filelist[i],source_dir) # .bite('/')
+      assert i < filelist.length
+      assert_equal line.chomp("\n"), MiscUtils.path_debase(filelist[i],source_dir) # .bite('/')
       i += 1
     }
     # could also check .contents file against actual contents
   end
 
-  it "should encrypt and unencrypt a file with a standard iv but a supplied key" do
+  should "encrypt and unencrypt a file with a standard iv but a supplied key" do
     orig_content = 'abcdef123456'
     temp_file1 = MiscUtils.make_temp_file(nil,nil,orig_content)
     temp_file2 = temp_file1+'.enc'
@@ -72,23 +65,23 @@ describe YoreCore::Yore do
     @yore.unpack(temp_file2,temp_file3)
 
     file3_content = MiscUtils.string_from_file(temp_file3)
-    file3_content.should == orig_content
+    assert_equal file3_content, orig_content
   end
 
-  it "should create a backup filename combining a prefix, date, day and standard extension, and be able to decode the filename back to a date" do
+  should "create a backup filename combining a prefix, date, day and standard extension, and be able to decode the filename back to a date" do
     @yore.configure({
-      :prefix => 'spec',
+      :prefix => 'test',
       :first_hour => 4
     })
     now = Time.local(2009, 1, 1, 0, 0, 0, 0)
-    exp_filename = "spec-20081231.rew"
+    exp_filename = "test-20081231.yor"
     calc_filename = @yore.encode_file_name(now)
-    calc_filename.should == exp_filename
-    @yore.decode_file_name(calc_filename).should == Time.local(2008, 12, 31)
+    assert_equal calc_filename, exp_filename
+    assert_equal Time.local(2008, 12, 31), @yore.decode_file_name(calc_filename)
   end
 
-  it "should upload and download files intact" do
-    bucket = 'yore_spec'
+  should "upload and download files intact" do
+    bucket = 'yore_test'
     ensure_clean_bucket(bucket)
     @yore.configure({
       :bucket => bucket
@@ -101,19 +94,19 @@ describe YoreCore::Yore do
     File.rename(temp_file, orig_file)
     puts @yore.download(temp_file)
     down_file_content = MiscUtils.string_from_file(temp_file)
-    down_file_content.should == content
+    assert_equal content, down_file_content
   end
 
-  it "should backup and restore multiple directories of file" do
+  should "backup and restore multiple directories of file" do
     # create a temp dir
-    temp_dir = MiscUtils::make_temp_dir('yore_spec')
+    temp_dir = MiscUtils::make_temp_dir('yore_test')
     # create source and dest subfolders
     source_dir = File.expand_path('source',temp_dir)
     source1 = File.join(source_dir,'source1')
     source2 = File.join(source_dir,'source2')
     dest_dir = File.expand_path('dest',temp_dir)
-    bucket = 'yore_spec'
-    
+    bucket = 'yore_test'
+
     FileUtils.mkdir_p([source1,source2,dest_dir])
     # create some dirs and files in source
     ['a','a/1','b','c'].each {|p| FileUtils.mkdir_p(File.expand_path(p,source1))}
@@ -137,7 +130,7 @@ job_template = <<EOF
         <Item Name="bucket">${BUCKET}</Item>
     </SimpleItems>
 	<Sources>
-        <Source>
+        <Source Type="File">
             <IncludePath>${SOURCE1}</IncludePath>
             <IncludePath>${SOURCE2}</IncludePath>
         </Source>
@@ -158,8 +151,13 @@ EOF
     })
 
     # call yore script with ruby from the command line, then download result and check contents
-    puts cmd = "ruby #{File.expand_path('../bin/yore.rb',THIS_DIR)} backup #{job_file}"
-    puts result = `#{cmd}`
+    begin
+      result = @yore.shell("ruby #{File.expand_path('../../bin/yore',THIS_DIR)} backup #{job_file}")
+    rescue ::StandardError => e
+      flunk e.inspect
+    end
+
+    puts result
 
     retrieved_fname = File.expand_path(@yore.encode_file_name(), dest_dir)
     collection_fname = MiscUtils::temp_file
@@ -171,9 +169,9 @@ EOF
 
     # check contains filelist files ignoring .contents
     cmd = "tar --list --file=#{collection_fname}"
-    filelist_out = `#{cmd}`
+    filelist_out = @yore.shell(cmd)
     filelist_out = filelist_out.split("\n").sort
-    filelist_out.should == filelist
+    assert_equal filelist, filelist_out
 #    i = 0
 #    filelist_out.each {|line|
 #      next if line==".contents\n"
@@ -184,16 +182,15 @@ EOF
     # could also check .contents file against actual contents
   end
 
-  it "should assign proper boolean values" do
-    class Blah
-      SOMECONSTANT = {:a => 'AAA', :b => true, :c => false}
-    end
-
-    puts Blah::SOMECONSTANT.inspect
-  end
-  
+  should "handle test_file_b" do
+		aController = YoreCore::Yore.new      # main program object
+    job = File.expand_path('../../test/test_job_b.xml',THIS_DIR)
+    xmlRoot = XmlUtils.get_file_root(job)
+    aController.configure(xmlRoot,nil,{:basepath => File.dirname(File.expand_path(job))})
+    aController.backup(job)
+	end
 
-  it "should provide configurable criteria for keeping old files"
+  should "provide configurable criteria for keeping old files"
 
-  it "should clean a folder full of files, removing files that don't match configurable criteria for keeping old files"
+  should "clean a folder full of files, removing files that don't match configurable criteria for keeping old files"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yore
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Gary McGhee
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 +09:00
+date: 2009-02-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.5
     version: 
+- !ruby/object:Gem::Dependency 
+  name: shairontoledo-popen4
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -62,7 +72,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: FIX (describe your package)
+description: yore (as in "days of yore") is hands-off scheduled backup utility designed for web servers. It does backups of files and databases (MySQL only at present) to Amazon S3.
 email: 
 - contact@buzz@ware@com@au
 executables: 
@@ -91,14 +101,11 @@ files:
 - script/console
 - script/destroy
 - script/generate
-- spec/rewind_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/test_job_a.xml
-- spec/yore_spec.rb
-- tasks/rspec.rake
+- test/test_job_a.xml
+- test/test_job_b.xml
+- test/yore_test.rb
 has_rdoc: true
-homepage: FIX (url)
+homepage: "RubyForge Project : http://rubyforge.org/projects/buzzware"
 post_install_message: 
 rdoc_options: 
 - --main
@@ -123,6 +130,6 @@ rubyforge_project: buzzware
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: FIX (describe your package)
+summary: yore (as in "days of yore") is hands-off scheduled backup utility designed for web servers
 test_files: []
 

data/spec/rewind_spec.rb

@@ -1,187 +0,0 @@
-require 'rubygems'
-gem 'RequirePaths'; require 'require_paths'
-require_paths '../../..'
-
-require 'ihl_ruby/misc_utils'
-
-require 'fileutils'
-
-require 'yore_core'
-
-def ensure_clean_bucket(aName)
-  `s3cmd createbucket #{aName}`
-  `s3cmd deleteall #{aName}`
-end
-
-describe YoreCore::Yore do
-  before(:each) do
-    @yore = YoreCore::Yore.new
-  end
-
-  it "should collect a list of files into a single file with a .contents file" do
-    # create a temp dir
-    temp_dir = MiscUtils::make_temp_dir('yore_spec')
-    # create source and dest subfolders
-    source_dir = File.expand_path('source',temp_dir)
-    dest_dir = File.expand_path('dest',temp_dir)
-    FileUtils.mkdir_p([source_dir,dest_dir])
-    # create some dirs and files in source
-    ['a','a/1','b','c'].each {|p| FileUtils.mkdir_p(File.expand_path(p,source_dir))}
-    %w(a/blah.txt a/1/blahblah.txt b/apples.txt c/carrots.txt).each do |f|
-      MiscUtils::make_temp_file(f,source_dir)
-    end
-    # collect into dest file
-    # get recursive file list, without carrots
-    filelist = MiscUtils::recursive_file_list(source_dir) {|p| not p =~ /carrots.txt/}
-    dest_file = File.join(dest_dir,'destfile.bzb')
-
-    @yore.collect(filelist,dest_file)
-
-    # check contains filelist files ignoring .contents
-    cmd = "tar --list --file=#{dest_file}"
-    filelist_out = `#{cmd}`
-    i = 0
-    filelist_out.each_line {|line|
-      next if line==".contents\n"
-      i.should < filelist.length
-      line.chomp("\n").should == MiscUtils.path_debase(filelist[i],source_dir) # .bite('/')
-      i += 1
-    }
-    # could also check .contents file against actual contents
-  end
-
-  it "should encrypt and unencrypt a file with a standard iv but a supplied key" do
-    orig_content = 'abcdef123456'
-    temp_file1 = MiscUtils.make_temp_file(nil,nil,orig_content)
-    temp_file2 = temp_file1+'.enc'
-    temp_file3 = temp_file1+'.dec'
-
-    @yore.pack(temp_file1,temp_file2)
-    @yore.unpack(temp_file2,temp_file3)
-
-    file3_content = MiscUtils.string_from_file(temp_file3)
-    file3_content.should == orig_content
-  end
-
-  it "should create a backup filename combining a prefix, date, day and standard extension, and be able to decode the filename back to a date" do
-    @yore.configure({
-      :prefix => 'spec',
-      :first_hour => 4
-    })
-    now = Time.local(2009, 1, 1, 0, 0, 0, 0)
-    exp_filename = "spec-20081231.rew"
-    calc_filename = @yore.encode_file_name(now)
-    calc_filename.should == exp_filename
-    @yore.decode_file_name(calc_filename).should == Time.local(2008, 12, 31)
-  end
-
-  it "should upload and download files intact" do
-    bucket = 'yore_spec'
-    ensure_clean_bucket(bucket)
-    @yore.configure({
-      :bucket => bucket
-    })
-    content = 'this is my test content'
-    temp_dir = MiscUtils.make_temp_dir()
-    temp_file = MiscUtils.make_temp_file(nil, temp_dir, content)
-    puts @yore.upload(temp_file)
-    orig_file = temp_file+'.orig'
-    File.rename(temp_file, orig_file)
-    puts @yore.download(temp_file)
-    down_file_content = MiscUtils.string_from_file(temp_file)
-    down_file_content.should == content
-  end
-
-  it "should backup and restore multiple directories of file" do
-    # create a temp dir
-    temp_dir = MiscUtils::make_temp_dir('yore_spec')
-    # create source and dest subfolders
-    source_dir = File.expand_path('source',temp_dir)
-    source1 = File.join(source_dir,'source1')
-    source2 = File.join(source_dir,'source2')
-    dest_dir = File.expand_path('dest',temp_dir)
-    bucket = 'yore_spec'
-    
-    FileUtils.mkdir_p([source1,source2,dest_dir])
-    # create some dirs and files in source
-    ['a','a/1','b','c'].each {|p| FileUtils.mkdir_p(File.expand_path(p,source1))}
-    %w(a/blah.txt a/1/blahblah.txt b/apples.txt c/carrots.txt).each do |f|
-      MiscUtils::make_temp_file(f,source1)
-    end
-    ['w','x/1','y/2','z'].each {|p| FileUtils.mkdir_p(File.expand_path(p,source2))}
-    %w(w/zonk.txt x/1/eggs.txt y/2/bloop.txt z/zax.txt).each do |f|
-      MiscUtils::make_temp_file(f,source2)
-    end
-
-    # create job file
-job_template = <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<Yore>
-    <SimpleItems>
-        <Item Name="crypto_iv">3A63775C1E3F291B0925578165EB917E</Item>
-        <Item Name="crypto_key">07692FC8656F04AE5518B80D38681E038A3C12050DF6CC97CEEC33D800D5E2FE</Item>
-        <Item Name="prefix">backup</Item>
-        <Item Name="log_level">DEBUG</Item>
-        <Item Name="bucket">${BUCKET}</Item>
-    </SimpleItems>
-	<Sources>
-        <Source>
-            <IncludePath>${SOURCE1}</IncludePath>
-            <IncludePath>${SOURCE2}</IncludePath>
-        </Source>
-    </Sources>
-</Yore>
-EOF
-
-    job_content = StringUtils::render_template(job_template,{
-      'SOURCE1' => source1,
-      'SOURCE2' => source2,
-      'BUCKET' => bucket
-    })
-  MiscUtils::string_to_file(job_content,job_file = MiscUtils::temp_file)
-
-    ensure_clean_bucket(bucket)
-    @yore.configure({
-      :bucket => bucket
-    })
-
-    # call yore script with ruby from the command line, then download result and check contents
-    puts cmd = "#{File.expand_path('../lib/yore',THIS_DIR)} backup #{job_file}"
-    puts result = `#{cmd}`
-
-    retrieved_fname = File.expand_path(@yore.encode_file_name(), dest_dir)
-    collection_fname = MiscUtils::temp_file
-
-    puts @yore.download(retrieved_fname)
-    puts @yore.unpack(retrieved_fname,collection_fname)
-
-    filelist = MiscUtils::recursive_file_list(source_dir,false)
-
-    # check contains filelist files ignoring .contents
-    cmd = "tar --list --file=#{collection_fname}"
-    filelist_out = `#{cmd}`
-    filelist_out = filelist_out.split("\n").sort
-    filelist_out.should == filelist
-#    i = 0
-#    filelist_out.each {|line|
-#      next if line==".contents\n"
-#      i.should < filelist.length
-#      line.chomp("\n").should == MiscUtils.path_debase(filelist[i],source_dir) # .bite('/')
-#      i += 1
-#    }
-    # could also check .contents file against actual contents
-  end
-
-  it "should assign proper boolean values" do
-    class Blah
-      SOMECONSTANT = {:a => 'AAA', :b => true, :c => false}
-    end
-
-    puts Blah::SOMECONSTANT.inspect
-  end
-
-  it "should provide configurable criteria for keeping old files"
-
-  it "should clean a folder full of files, removing files that don't match configurable criteria for keeping old files"
-end
-

data/spec/spec.opts

@@ -1 +0,0 @@
---colour

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'yore'

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end