@@ -8077,7 +8077,7 @@ maybe_utc write_event write_events1 write_events -install_prev +install_pre '-wait_nodes/2-fun-0-' sync_nodes_optional get_sync_optional_nodes @@ -8616,7 +8616,7 @@ log_terms '-table/2-lc$^0/1-0-' '-table/2-fun-9-' '-qlc_next/2-fun-0-' -'-qlc_prev/2-fun-0-' +'-qlc_pre/2-fun-0-' '-qlc_select/1-fun-0-' '-i/0-fun-0-' '-hform/6-lc$^0/1-0-' @@ -8650,7 +8650,7 @@ default n_objects traverse qlc_select -qlc_prev +qlc_pre qlc_next is_unique_objects is_sorted_key @@ -8661,7 +8661,7 @@ post_fun info_fun lookup_fun first_next -last_prev +last_pre tabfile_info cannot_create_table create_tab @@ -11470,7 +11470,7 @@ safe_fixtable rename insert_new insert -prev +pre is_key member match_object lib/erlang/messenger/ebin/erl_crash.dump @@ -15,8 +15,8 @@ class Array def nice_runnable(quiet=true) self.flatten.reject{|e| (e.nil? || e.empty?) }.join(" \n ").chomp.nice_runnable(quiet) end - def to_string(prev="") - map {|a| a.to_string(prev)}.join("\n") + def to_string(pre="") + map {|a| a.to_string(pre)}.join("\n") end def get_named(str="") map {|a| a.name == str ? a : nil }.reject {|a| a.nil? } lib/poolparty/core/array.rb @@ -12,14 +12,28 @@ class Hash o.keys.each {|k| self.delete(k) } o end + def append(other_hash) + returning Hash.new do |h| + h.merge!(self) + other_hash.each do |k,v| + h[k] = has_key?(k) ? [self[k], v].flatten : v + end + end + end + def append!(other_hash) + other_hash.each do |k,v| + self[k] = has_key?(k) ? [self[k], v].flatten : v + end + self + end def safe_merge(other_hash) merge(other_hash.delete_if {|k,v| has_key?(k) }) end def safe_merge!(other_hash) merge!(other_hash.delete_if {|k,v| has_key?(k) && !v.nil? }) end - def flush_out(prev="", post="") - map {|k,v| "#{prev}#{k} => #{v.to_option_string}#{post}"} + def flush_out(pre="", post="") + map {|k,v| "#{pre}#{k} => #{v.to_option_string}#{post}"} end def to_os m={} lib/poolparty/core/hash.rb @@ -1,6 +1,6 @@ class Symbol - def to_string(prev="") - "#{prev}#{self.to_s}" + def to_string(pre="") + "#{pre}#{self.to_s}" end def sanitize self.to_s.sanitize lib/poolparty/core/symbol.rb @@ -7,10 +7,10 @@ module PoolParty print v.pretty_print end else - prev = "\t" + pre = "\t" clouds.each do |name, cl| - puts cl.pretty_name(prev*2, cl) - puts cl.pretty_options(prev*2, cl) #cl.pretty_print("#{prev}\t") + puts cl.pretty_name(pre*2, cl) + puts cl.pretty_options(pre*2, cl) #cl.pretty_print("#{pre}\t") end end lib/poolparty/helpers/display.rb @@ -1,20 +1,20 @@ module PoolParty module PrettyPrinter - def pretty_print(prev="\t") + def pretty_print(pre="\t") returning Array.new do |out| - out << pretty_name(prev, self) - out << pretty_options(prev, self) + out << pretty_name(pre, self) + out << pretty_options(pre, self) if self.respond_to?(:clouds) clouds.each do |name, cl| - out << pretty_name(prev*2, cl) - out << pretty_options(prev*2, cl) #cl.pretty_print("#{prev}\t") + out << pretty_name(pre*2, cl) + out << pretty_options(pre*2, cl) #cl.pretty_print("#{pre}\t") end end if self.respond_to?(:plugins) - out << "#{prev}\t\tPlugins" - out << "#{prev}\t\t" + plugins.map {|a| a}.join("\n") + out << "#{pre}\t\tPlugins" + out << "#{pre}\t\t" + plugins.map {|a| a}.join("\n") end end.join("\n") end @@ -22,17 +22,17 @@ module PoolParty # Gather options on the object # Do not print if the option is nil or empty. # Also, don't show the option if the option is empty or the default option on the cloud - def pretty_options(prev, o) + def pretty_options(pre, o) return "" unless o.respond_to?(:options) print_options = (o.respond_to?(:parent) && o.parent && o.parent.respond_to?(:options)) ? (o.options.delete_if {|k,v| o.parent.options.has_key?(k) && o.parent.options[k] == o.options[k] && !o.options[k].nil? } ) : o.options print_options = print_options.map {|k,v| [k, o.send(k.to_sym).to_s] }.inject({}) { |r,e| r[e[0]] = e[1] unless o.class.default_options[e[0]] == e[1] || e[1].nil? || e[1].empty?; r } - print_options.flush_out("#{prev}\t") + print_options.flush_out("#{pre}\t") end - def pretty_name(prev, o) - "#{prev}#{o.class.to_s.top_level_class.capitalize}: #{o.name if o.respond_to?(:name)}" + def pretty_name(pre, o) + "#{pre}#{o.class.to_s.top_level_class.capitalize}: #{o.name if o.respond_to?(:name)}" end end lib/poolparty/modules/pretty_printer.rb @@ -6,13 +6,13 @@ module PoolParty options[:require] end def requires(str="") - options.merge!(:require => str) + options.append!(:require => str) end def ensures(str="running") if %w(absent running).map {|a| self.send a.to_sym}.include?(str) str == "absent" ? is_absent : is_present else - options.merge!(:ensure => str) + options.append!(:ensure => str) end str end lib/poolparty/modules/resourcing_dsl.rb @@ -22,11 +22,11 @@ module PoolParty class CallFunction < Resource def initialize(str="", opts={}, parent=self, &block) @str = str - super(opts, parent, &block) + # super(opts, parent, &block) end - def to_string(prev="") + def to_string(pre="") returning Array.new do |arr| - arr << "#{prev}#{@str}" + arr << "#{pre}#{@str}" end.join("\n") end end @@ -42,10 +42,10 @@ module PoolParty super(subclass) end - def to_string(prev="") + def to_string(pre="") returning Array.new do |output| - output << "#{prev} # Custom Functions\n" - output << self.class.custom_functions_to_string(prev) + output << "#{pre} # Custom Functions\n" + output << self.class.custom_functions_to_string(pre) end.join("\n") end end lib/poolparty/pool/custom_resource.rb @@ -17,13 +17,13 @@ module PoolParty resources[type] ||= [] end - def add_resource(type, opts={}, parent=self, &block) - resource = get_resource(type, opts[:name]) + def add_resource(type, opts={}, parent=self, &block) + resource = parent.get_resource(type, opts[:name]) if resource return resource else returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o| - resource(type) << o + parent.resource(type) << o end end end @@ -37,7 +37,7 @@ module PoolParty @resources = nil end - def resources_string(prev="") + def resources_string(pre="") returning Array.new do |output| output << resources_string_from_resources(resources) end.join("\n") @@ -53,7 +53,7 @@ module PoolParty include CloudResourcer include Configurable - extend PoolParty::Resources + # extend PoolParty::Resources include PoolParty::Resources def self.inherited(subclass) @@ -90,12 +90,19 @@ module PoolParty # Finally, it uses the parent's options as the lowest priority def initialize(opts={}, parent=self, &block) # Take the options of the parents - @parent = parent + set_resource_parent(parent) set_vars_from_options(opts) unless opts.empty? self.instance_eval &block if block loaded(opts) end + def set_resource_parent(parent=nil) + if parent + @parent = parent + requires parent.to_s if parent.is_a?(PoolParty::Resources::Resource) && parent != self + end + end + # Stub, so you can create virtual resources # This is called after the resource is initialized # with the options given to it in the init-block @@ -123,11 +130,11 @@ module PoolParty self.class.custom_functions << str end - def self.custom_functions_to_string(prev="") + def self.custom_functions_to_string(pre="") returning Array.new do |output| PoolParty::Resources.available_custom_resources.each do |resource| resource.custom_functions.each do |func| - output << "#{prev*2}#{func}" + output << "#{pre*2}#{func}" end end end.join("\n") @@ -163,7 +170,7 @@ module PoolParty # Generic to_s # Most Resources won't need to extend this - def to_string(prev="") + def to_string(pre="") opts = get_modified_options returning Array.new do |output| unless cancelled? @@ -176,10 +183,10 @@ module PoolParty end unless virtual_resource? - output << "#{prev}#{class_type_name} {" - output << "#{prev}\"#{self.key}\":" - output << opts.flush_out("#{prev*2}").join(",\n") - output << "#{prev}}" + output << "#{pre}#{class_type_name} {" + output << "#{pre}\"#{self.key}\":" + output << opts.flush_out("#{pre*2}").join(",\n") + output << "#{pre}}" end output << @poststring || "" lib/poolparty/pool/resource.rb @@ -43,19 +43,19 @@ module PoolParty end - def resources_string_from_resources(resources, prev="\t") + def resources_string_from_resources(resources, pre="\t") @variables = resources.extract! {|name,resource| name == :variable} returning Array.new do |str| unless @variables.empty? str << "\n# Variables \n" @variables.each do |name, variable| - str << variable.to_string("#{prev}") + str << variable.to_string("#{pre}") end end resources.each do |type, resource| - str << "\n#{prev*2}# #{type}\n" - str << resource.to_string("#{prev*2}") + str << "\n#{pre*2}# #{type}\n" + str << resource.to_string("#{pre*2}") end end.join("\n") end lib/poolparty/pool/resources/class_package.rb @@ -25,7 +25,7 @@ module PoolParty true end - def to_string(prev="") + def to_string(pre="") returning Array.new do |output| output << "# #{name.sanitize}" output << "case #{attribute} {" lib/poolparty/pool/resources/conditional.rb @@ -8,7 +8,7 @@ module PoolParty :value => "" }) - def to_string(prev="\t") + def to_string(pre="\t") "$#{name} = #{value_string}" end lib/poolparty/pool/resources/variable.rb @@ -1363,7 +1363,7 @@ class Installer def install_dir_conf(rel) # FIXME: should not remove current config files - # (rename previous file to .old/.org) + # (rename preious file to .old/.org) install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644 end @@ -1542,12 +1542,12 @@ class Installer dir = File.basename(rel) Dir.mkdir dir unless File.dir?(dir) - prevdir = Dir.pwd + predir = Dir.pwd Dir.chdir dir $stderr.puts '---> ' + rel if verbose? @currdir = rel yield - Dir.chdir prevdir + Dir.chdir predir $stderr.puts '<--- ' + rel if verbose? @currdir = File.dirname(rel) end setup.rb @@ -30,7 +30,7 @@ describe "Hash" do it "should be able to flush out into a string into an array" do @a.flush_out.should == ["a => '10'","b => '20'","c => '30'"] end - it "should be able to flush out with prev and posts" do + it "should be able to flush out with pre and posts" do @a.flush_out("hi", "ho").should == ["hia => '10'ho","hib => '20'ho","hic => '30'ho"] end describe "select" do @@ -60,4 +60,22 @@ describe "Hash" do }.should_not raise_error end end + describe "append" do + before(:each) do + @hash = {:game => "token", :required => "for_play"} + end + it "should not destroy an option salready on the hash" do + @hash.append(:required => "to_play")[:game].should == "token" + end + it "should change the entry to an array if it already exists" do + @hash.append(:game => "coin")[:game].class.should == Array + end + it "should append the other hash's key to the end of the array" do + @hash.append(:game => "coin")[:game][-1].should == "coin" + end + it "should change the hash with the append(bang) option" do + @hash.append!(:game => "coin") + @hash[:game][-1].should == "coin" + end + end end \ No newline at end of file spec/poolparty/core/hash_spec.rb @@ -80,11 +80,11 @@ describe "Custom Resource" do end it "should create a new CallFunction instance when calling call_function with a string" do PoolParty::Resources::CallFunction.should_receive(:new).and_return "bunk" - add_resource(:call_function, "line") + add_resource(:call_function, :name => "line") end it "should create a call function in the function call array" do - add_resource(:call_function, @cloud, "heyyohey") - resource(:call_function).size.should == 1 + add_resource(:call_function, {:name => "custom_function"}, @cloud) + @cloud.resource(:call_function).size.should == 1 end describe "defining" do it "should add the methods to the class through module_eval" do spec/poolparty/pool/custom_resource_spec.rb @@ -131,6 +131,13 @@ describe "Resource" do include PoolParty::Resources before(:each) do reset_resources! + @cloud = cloud :command_cloud do; end + end + it "should call add_resource when creating using the command: file" do + @cloud.should_receive(:add_resource).with(:file, {:name => "frank"}, @cloud) + @cloud.instance_eval do + file(:name => "frank") + end end it "should create the new 'resource' as a resource" do resource(:file).class.should == Array @@ -220,6 +227,29 @@ describe "Resource" do @file.parent.tangerine.should == "orange" end end + describe "appending to resource" do + before(:each) do + @cloud1 = cloud :apples do + directory(:name => "/var/www") do + file(:name => "/var/www/file.html") + end + end + @dir = @cloud1.get_resource(:directory, "/var/www") + @file = @dir.get_resource(:file, "/var/www/file.html") + end + it "should say there is 1 resource because the lower-level resources should be contained on the parenting resource" do + @cloud1.resources.size.should == 1 + end + it "should say there is one resource on the outer resource" do + @dir.resources.size.should == 1 + end + it "should contain the file as a resource" do + @dir.resource(:file)[0].to_s.should == @file.to_s + end + it "should set the parent as the parenting resource" do + @file.parent.to_s.should == @dir.to_s + end + end describe "fetching" do before(:each) do @file = file(:name => "pancakes") @@ -228,7 +258,7 @@ describe "Resource" do PoolParty::Resources::File.should_not_receive(:new) file(:name => "pancakes") end - it "should return the file previously created" do + it "should return the file preiously created" do get_resource(:file, "pancakes").should == @file end it "should be able to use the helper to grab the file" do spec/poolparty/pool/resource_spec.rb f50be85554986fe9043fb031ecbad8447be8d171 Ari Lerner ari.lerner@citrusbyte.com http://github.com/auser/poolparty/commit/a9661ff27d74c774629fb399e3559e1a2141f713 a9661ff27d74c774629fb399e3559e1a2141f713 2008-10-19T15:47:21-07:00 2008-10-19T15:47:21-07:00 Updating resourcing DSL fd16d0a9e13b3cc5b5f9b9e86933c81e778f1ccb Ari Lerner ari.lerner@citrusbyte.com