@@ -148,8 +148,8 @@ Example configuration end keep do - local 2 - s3 2 + local 20 + s3 30 end mysqldump do @@ -162,7 +162,10 @@ Example configuration database :blog database :servershape database :astrails_com - database :secret_project_com + database :secret_project_com do + skip_tables "foo" + skip_tables ["bar", "baz"] + end end @@ -189,7 +192,8 @@ Example configuration archive "blog-astrails-com" do files "/var/www/blog.astrails.com/" - exclude ["/var/www/blog.astrails.com/log", "/var/www/blog.astrails.com/tmp"] + exclude "/var/www/blog.astrails.com/log" + exclude "/var/www/blog.astrails.com/tmp" end archive "astrails-com" do README.markdown @@ -181,4 +181,33 @@ describe Astrails::Safe::Config do config.to_hash.should == expected end + + it "should make an array from multivalues" do + config = Astrails::Safe::Config::Node.new do + skip_tables "a" + skip_tables "b" + files "/foo" + files "/bar" + exclude "/foo/bar" + exclude "/foo/bar/baz" + end + + expected = { + "skip_tables" => ["a", "b"], + "files" => ["/foo", "/bar"], + "exclude" => ["/foo/bar", "/foo/bar/baz"], + } + + config.to_hash.should == expected + end + + it "should raise error on key duplication" do + proc do + Astrails::Safe::Config::Node.new do + path "foo" + path "bar" + end + end.should raise_error(ArgumentError, "duplicate value for 'path'") + end + end examples/unit/config_example.rb @@ -87,21 +87,21 @@ describe Astrails::Safe::Local do describe :cleanup do before(:each) do - @local = local @files = [4,1,3,2].to_a.map { |i| "/mysqldump~blog~NoW/qweqwe.#{i}" } - stub(Dir).[]("/mysqldump~blog~NoW/qweqwe.*") {@files} stub(File).file?(anything) {true} stub(File).size(anything) {1} stub(File).unlink end it "should check [:keep, :local]" do - @local.config[:keep][:local] = nil + @local = local(def_config.merge(:keep => {})) dont_allow(Dir).[] @local.send :cleanup end it "should delete extra files" do + @local = local + mock(Dir).[]("/mysqldump~blog~NoW/qweqwe.*") {@files} mock(File).unlink("/mysqldump~blog~NoW/qweqwe.1") mock(File).unlink("/mysqldump~blog~NoW/qweqwe.2") @local.send :cleanup examples/unit/local_example.rb @@ -44,7 +44,7 @@ describe Astrails::Safe::S3 do end it "should check [:keep, :s3]" do - @s3.config[:keep][:s3] = nil + @s3.config[:keep].data["s3"] = nil dont_allow(@s3.backup).filename @s3.send :cleanup end @@ -67,17 +67,17 @@ describe Astrails::Safe::S3 do end it "should be false if bucket is missing" do - @s3.config[:s3][:bucket] = nil + @s3.config[:s3].data["bucket"] = nil @s3.should_not be_active end it "should be false if key is missing" do - @s3.config[:s3][:key] = nil + @s3.config[:s3].data["key"] = nil @s3.should_not be_active end it "should be false if secret is missing" do - @s3.config[:s3][:secret] = nil + @s3.config[:s3].data["secret"] = nil @s3.should_not be_active end end @@ -87,7 +87,7 @@ describe Astrails::Safe::S3 do @s3 = s3 end it "should use s3/path 1st" do - @s3.config[:s3][:path] = "s3_path" + @s3.config[:s3].data["path"] = "s3_path" @s3.config[:local] = {:path => "local_path"} @s3.send(:path).should == "s3_path" end examples/unit/s3_example.rb @@ -4,6 +4,7 @@ module Astrails module Config class Node attr_reader :parent + attr_reader :data def initialize(parent = nil, data = {}, &block) @parent, @data = parent, {} data.each { |k, v| self[k] = v } @@ -26,12 +27,17 @@ module Astrails end alias :[] :find + MULTIVALUES = %w/skip_tables exclude files/ def set(key, value, &block) + if @data[key.to_s] + raise(ArgumentError, "duplicate value for '#{key}'") if value.is_a?(Hash) || !MULTIVALUES.include?(key.to_s) + end + if value.is_a?(Hash) - @data[key.to_s] = Node.new(self, value, &block) + @data[key.to_s] = Node.new(self, value, &block) else raise(ArgumentError, "#{key}: no block supported for simple values") if block - if @data[key.to_s] && value + if @data[key.to_s] @data[key.to_s] = @data[key.to_s].to_a + value.to_a else @data[key.to_s] = value lib/astrails/safe/config/node.rb @@ -74,8 +74,12 @@ safe do # gpg do # password "custom-production-pass" # end - - # skip_tables [:logger_exceptions, :request_logs] # skip those tables during backup + # # skip those tables during backup + # # you can pass an array + # skip_tables [:logger_exceptions, :request_logs] + # # or pass them all separately + # skip_tables :test1 + # skip_tables :test2 # end end @@ -99,12 +103,16 @@ safe do # archive "git-repositories" do # # files and directories to backup # files "/home/git/repositories" + # # can have more then one 'files' lines or/and use an array + # files ["/home/dev/work/foo", "/home/dev/work/bar"] # end # archive "etc-files" do # files "/etc" # # exlude those files/directories # exclude "/etc/puppet/other" + # # can have multiple 'exclude' lines or/and use an array + # exclude ["/etc/tmp/a", "/etc/tmp/b"] # end # archive "dot-configs" do templates/script.rb e9d495d2cc02ef654ead3288b80e35b43bdb5bc5 Vitaly Kushner vitaly@astrails.com http://github.com/astrails/safe/commit/d52e8bcf8f8f392a1c7a3c048b21995793b5d74d d52e8bcf8f8f392a1c7a3c048b21995793b5d74d 2009-10-20T09:23:42-07:00 2009-10-20T09:23:42-07:00 disable non-multi-value config keys overwrite multi-values: skip_tables exclude files a2a27f29acc9fff442b2bec50ea21d0c01bf9c81 Vitaly Kushner vitaly@astrails.com