testlab 0.9.1 → 1.0.0

data/lib/testlab/network/status.rb

@@ -18,10 +18,30 @@ class TestLab
         }
       end
 
+      # Debian Network 'interfaces' Start Definition Tag
+      def def_tag
+        "#TESTLAB-DEF-#{self.bridge.to_s.upcase}"
+      end
+
+      # Debian Network 'interfaces' End Definition Tag
+      def end_tag
+        "#TESTLAB-END-#{self.bridge.to_s.upcase}"
+      end
+
+      # Network IP
+      #
+      # Returns the IP of the network bridge.
+      #
+      # @return [String] The network bridge IP address.
       def ip
         TestLab::Utility.ip(self.address)
       end
 
+      # Network CIDR
+      #
+      # Returns the CIDR of the network bridge.
+      #
+      # @return [Integer] The network bridge CIDR address.
       def cidr
         TestLab::Utility.cidr(self.address)
       end
@@ -43,11 +63,11 @@ class TestLab
 
       # Network Bridge State
       def state
-        exit_code = self.node.ssh.exec(%(sudo brctl show #{self.bridge} 2>&1 | grep -i 'No such device'), :silence => true, :ignore_exit_status => true).exit_code
+        exit_code = self.node.ssh.exec(%(sudo brctl show #{self.bridge} 2>&1 | grep -i 'No such device'), :ignore_exit_status => true).exit_code
         if (exit_code == 0)
           :not_created
         else
-          output = self.node.ssh.exec(%(sudo ifconfig #{self.bridge} 2>&1 | grep 'MTU'), :silence => true, :ignore_exit_status => true).output.strip
+          output = self.node.ssh.exec(%(sudo ifconfig #{self.bridge} 2>&1 | grep 'MTU'), :ignore_exit_status => true).output.strip
           if ((output =~ /UP/) || (output =~ /RUNNING/))
             :running
           else

data/lib/testlab/node/actions.rb

@@ -11,6 +11,8 @@ class TestLab
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
           @provider.create
+
+          do_provisioner_callbacks(self, :create, @ui)
         end
 
         true
@@ -24,6 +26,8 @@ class TestLab
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
           @provider.destroy
+
+          do_provisioner_callbacks(self, :destroy, @ui)
         end
 
         true
@@ -37,6 +41,8 @@ class TestLab
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
           @provider.up
+
+          do_provisioner_callbacks(self, :up, @ui)
         end
 
         true
@@ -50,6 +56,8 @@ class TestLab
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
           @provider.down
+
+          do_provisioner_callbacks(self, :down, @ui)
         end
 
         true

data/lib/testlab/node/lifecycle.rb

@@ -3,43 +3,27 @@ class TestLab
 
     module Lifecycle
 
-      # Bootstrap the node
-      def node_setup
-        node_setup_template = File.join(self.class.template_dir, 'node-setup.erb')
-        self.ssh.bootstrap(ZTK::Template.render(node_setup_template))
-      end
-
-      # Setup the node.
-      def setup
-        @ui.logger.debug { "Node Setup: #{self.id} " }
+      # Provision the node.
+      def provision
+        @ui.logger.debug { "Node Provision: #{self.id} " }
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Setup', :green)) do
-
-          self.all_provisioners.each do |provisioner|
-            @ui.logger.info { ">>>>> NODE PROVISIONER SETUP: #{provisioner} (#{self.id}) <<<<<" }
-            p = provisioner.new(self.config, @ui)
-            p.respond_to?(:on_node_setup) and p.on_node_setup(self)
-          end
+        (self.state != :running) and return false
 
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Provision', :green)) do
+          do_provisioner_callbacks(self, :provision, @ui)
         end
 
         true
       end
 
-      # Teardown the node.
-      def teardown
-        @ui.logger.debug { "Node Teardown: #{self.id} " }
-
-        (self.state == :not_created) and return false
+      # Deprovision the node.
+      def deprovision
+        @ui.logger.debug { "Node Deprovision: #{self.id} " }
 
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Teardown', :red)) do
-
-          self.all_provisioners.each do |provisioner|
-            @ui.logger.info { ">>>>> NODE PROVISIONER TEARDOWN: #{provisioner} (#{self.id}) <<<<<" }
-            p = provisioner.new(self.config, @ui)
-            p.respond_to?(:on_node_teardown) and p.on_node_teardown(self)
-          end
+        (self.state != :running) and return false
 
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Deprovision', :red)) do
+          do_provisioner_callbacks(self, :deprovision, @ui)
         end
 
         true
@@ -49,25 +33,20 @@ class TestLab
       def build
         self.create
         self.up
-        self.setup
+        self.provision
 
         true
       end
 
       # Demolish the node
       def demolish
-        self.teardown
+        self.deprovision
         self.down
         self.destroy
 
         true
       end
 
-      # Returns all defined provisioners for this node and it's networks and containers.
-      def all_provisioners
-        [self.provisioners, self.networks.map(&:provisioners), self.containers.map(&:provisioners)].flatten.compact.uniq
-      end
-
     end
   end
 end

data/lib/testlab/providers/local.rb

@@ -71,11 +71,11 @@ class TestLab
       end
 
       def user
-        ENV['USER']
+        (@config[:local][:user] || ENV['USER'])
       end
 
       def identity
-        File.join(ENV['HOME'], ".ssh", "id_rsa")
+        (@config[:local][:identity] || File.join(ENV['HOME'], ".ssh", "id_rsa"))
       end
 
       def ip

data/lib/testlab/providers/vagrant.rb

@@ -45,8 +45,6 @@ class TestLab
 
       # Create the Vagrant instance
       def create
-        self.up
-
         true
       end
 

data/lib/testlab/provisioners/apt.rb

@@ -21,12 +21,12 @@ class TestLab
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
-      # APT Provisioner Container Setup
+      # APT: Container Provision
       #
       # @param [TestLab::Container] container The container which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def on_container_setup(container)
+      def on_container_provision(container)
         @ui.logger.debug { "APT Provisioner: Container #{container.id}" }
 
         bootstrap_template = File.join(TestLab::Provisioner.template_dir, "apt", "bootstrap.erb")

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -19,15 +19,16 @@ class TestLab
         @config[:apt][:cacher_ng][:exclude_hosts] ||= Array.new
 
         @apt_conf_d_proxy_file_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "00proxy.erb")
+        @apt_cacher_ng_security_conf_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "security.conf.erb")
 
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
-      # APT-CacherNG Provisioner Node Setup
+      # APT-CacherNG: Node Provision
       #
       # @param [TestLab::Node] node The node which we want to provision.
       # @return [Boolean] True if successful.
-      def on_node_setup(node)
+      def on_node_provision(node)
         @ui.logger.debug { "APT-CacherNG Provisioner: Node #{node.id}" }
 
         bootstrap_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "bootstrap.erb")
@@ -47,15 +48,22 @@ class TestLab
           file.puts(ZTK::Template.render(@apt_conf_d_proxy_file_template, context))
         end
 
+        apt_cacher_ng_security_conf_file = %(/etc/apt-cacher-ng/security.conf)
+        node.ssh.file(:target => apt_cacher_ng_security_conf_file, :chown => "root:root", :chmod => "0644") do |file|
+          file.puts(ZTK::Template.render(@apt_cacher_ng_security_conf_template, context))
+        end
+
+        node.ssh.exec(%(sudo service apt-cacher-ng restart))
+
         true
       end
 
-      # APT-CacherNG Provisioner Container Setup
+      # APT-CacherNG: Container Provision
       #
       # @param [TestLab::Container] container The container which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def on_container_setup(container)
+      def on_container_provision(container)
         @ui.logger.debug { "APT-CacherNG Provisioner: Container #{container.id}" }
 
         # Ensure the container APT calls use apt-cacher-ng on the node

data/lib/testlab/provisioners/bind.rb

@@ -20,14 +20,26 @@ class TestLab
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
-      # Bind Provisioner Node Setup
+      # Bind: Node Provision
       #
-      # @param [TestLab::Node] node The node which we want to provision.
+      # @param [TestLab::Node] node The node that is being provisioned.
       # @return [Boolean] True if successful.
-      def on_node_setup(node)
+      def on_node_provision(node)
         @ui.logger.debug { "BIND Provisioner: Node #{node.id}" }
 
-        bind_setup(node.ssh)
+        bind_provision(node)
+
+        true
+      end
+
+      # Bind: Network Up
+      #
+      # @param [TestLab::Network] network The network that is being onlined.
+      # @return [Boolean] True if successful.
+      def on_network_up(network)
+        @ui.logger.debug { "BIND Provisioner: Network #{network.id}" }
+
+        bind_reload(network.node)
 
         true
       end
@@ -112,15 +124,15 @@ class TestLab
         ssh.exec(%(sudo rm -fv /etc/bind/{*.arpa,*.zone,*.conf*}))
       end
 
-      def bind_reload(ssh)
-        ssh.exec(%(sudo chown -Rv bind:bind /etc/bind))
-        ssh.exec(%(sudo rndc reload))
+      def bind_reload(node)
+        node.ssh.exec(%(sudo chown -Rv bind:bind /etc/bind))
+        node.ssh.exec(%(sudo rndc reload))
       end
 
-      def bind_setup(ssh)
-        bind_install(ssh)
-        build_bind_conf(ssh)
-        bind_reload(ssh)
+      def bind_provision(node)
+        bind_install(node.ssh)
+        build_bind_conf(node.ssh)
+        bind_reload(node)
       end
 
     end

data/lib/testlab/provisioners/chef/omni_bus.rb

@@ -26,7 +26,7 @@ class TestLab
           @ui.logger.debug { "config(#{@config.inspect})" }
         end
 
-        # OmniBus Provisioner Container Setup
+        # OmniBus: Container Provision
         #
         # Renders the defined script to a temporary file on the target container
         # and proceeds to execute said script as root via *lxc-attach*.
@@ -34,7 +34,7 @@ class TestLab
         # @param [TestLab::Container] container The container which we want to
         #   provision.
         # @return [Boolean] True if successful.
-        def on_container_setup(container)
+        def on_container_provision(container)
           @config[:chef][:client][:node_name] ||= container.id
 
           omnibus_template = File.join(TestLab::Provisioner::Chef.template_dir, 'omni_bus.erb')
@@ -54,10 +54,10 @@ class TestLab
           true
         end
 
-        # OmniBus Provisioner Container Teardown
+        # OmniBus: Container Deprovision
         #
         # @return [Boolean] True if successful.
-        def on_container_teardown(container)
+        def on_container_deprovision(container)
           if @chef_server.state == :running
             @chef_server.ssh.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
             @chef_server.ssh.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)

data/lib/testlab/provisioners/chef/omni_truck.rb

@@ -25,7 +25,7 @@ class TestLab
           @ui.logger.debug { "config(#{@config.inspect})" }
         end
 
-        # OmniTruck Provisioner Container Setup
+        # OmniTruck: Container Provision
         #
         # Renders the defined script to a temporary file on the target container
         # and proceeds to execute said script as root via *lxc-attach*.
@@ -33,7 +33,7 @@ class TestLab
         # @param [TestLab::Container] container The container which we want to
         #   provision.
         # @return [Boolean] True if successful.
-        def on_container_setup(container)
+        def on_container_provision(container)
           omnitruck_template = File.join(TestLab::Provisioner::Chef.template_dir, 'omni_truck.erb')
 
           config = {}.merge!({

data/lib/testlab/provisioners/chef/ruby_gem_client.rb

@@ -27,7 +27,7 @@ class TestLab
           @ui.logger.debug { "config(#{@config.inspect})" }
         end
 
-        # RubyGemClient Provisioner Container Setup
+        # RubyGemClient: Container Provision
         #
         # Renders the defined script to a temporary file on the target container
         # and proceeds to execute said script as root via *lxc-attach*.
@@ -35,7 +35,7 @@ class TestLab
         # @param [TestLab::Container] container The container which we want to
         #   provision.
         # @return [Boolean] True if successful.
-        def on_container_setup(container)
+        def on_container_provision(container)
           @config[:chef][:client][:node_name] ||= container.id
 
           rubygem_client_template = File.join(TestLab::Provisioner::Chef.template_dir, 'ruby_gem_client.erb')
@@ -55,10 +55,10 @@ class TestLab
           true
         end
 
-        # RubyGemClient Provisioner Container Teardown
+        # RubyGemClient: Container Deprovision
         #
         # @return [Boolean] True if successful.
-        def on_container_teardown(container)
+        def on_container_deprovision(container)
           if @chef_server.state == :running
             @chef_server.ssh.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
             @chef_server.ssh.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)

data/lib/testlab/provisioners/chef/ruby_gem_server.rb

@@ -23,7 +23,7 @@ class TestLab
           @ui.logger.debug { "config(#{@config.inspect})" }
         end
 
-        # RubyGemServer Provisioner Container Setup
+        # RubyGemServer: Container Provision
         #
         # Renders the defined script to a temporary file on the target container
         # and proceeds to execute said script as root via *lxc-attach*.
@@ -31,7 +31,7 @@ class TestLab
         # @param [TestLab::Container] container The container which we want to
         #   provision.
         # @return [Boolean] True if successful.
-        def on_container_setup(container)
+        def on_container_provision(container)
           rubygemserver_template = File.join(TestLab::Provisioner.template_dir, 'chef', 'ruby_gem_server.erb')
 
           config = {}.merge!({

data/lib/testlab/provisioners/raring.rb

@@ -19,12 +19,12 @@ class TestLab
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
-      # Ubuntu Raring Provisioner Node Setup
+      # Ubuntu Raring: Node Provision
       #
       # @param [TestLab::Node] node The node which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def on_node_setup(node)
+      def on_node_provision(node)
         @ui.logger.debug { "Ubuntu Raring Provisioner: Node #{node.id}" }
 
         bootstrap_template = File.join(TestLab::Provisioner.template_dir, "raring", "bootstrap.erb")

data/lib/testlab/provisioners/resolv.rb

@@ -15,30 +15,32 @@ class TestLab
         @ui     = (ui     || TestLab.ui)
 
         @config[:resolv] ||= Hash.new
-        @config[:resolv][:servers] ||= [TestLab::Network.ips, "8.8.8.8", "8.8.4.4" ].flatten.compact.uniq
+        @config[:resolv][:servers] ||= [TestLab::Network.ips, '8.8.8.8', '8.8.4.4'].flatten.compact.uniq
         @config[:resolv][:search]  ||= TestLab::Container.domains.join(' ')
 
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
-      # Resolv Provisioner Node Setup
+      # Resolv: Node Provision
       #
       # @param [TestLab::Node] node The node which we want to provision.
       # @return [Boolean] True if successful.
-      def on_node_setup(node)
+      def on_node_provision(node)
         @ui.logger.debug { "RESOLV Provisioner: Node #{node.id}" }
 
+        @config[:resolv][:servers] = ['127.0.0.1', '8.8.8.8', '8.8.4.4']
+
         render_resolv_conf(node)
 
         true
       end
 
-      # Resolv Provisioner Container Setup
+      # Resolv: Container Provision
       #
       # @param [TestLab::Container] container The container which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def on_container_setup(container)
+      def on_container_provision(container)
         @ui.logger.debug { "RESOLV Provisioner: Container #{container.id}" }
 
         render_resolv_conf(container)

data/lib/testlab/provisioners/route.rb

@@ -19,15 +19,15 @@ class TestLab
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
-      # Route Provisioner Network Setup
-      def on_network_setup(network)
+      # Route: Network Provision
+      def on_network_provision(network)
         manage_route(:add, network)
 
         true
       end
 
-      # Route Provisioner Network Teardown
-      def on_network_teardown(network)
+      # Route: Network Deprovision
+      def on_network_deprovision(network)
         manage_route(:del, network)
 
         true

data/lib/testlab/provisioners/shell.rb

@@ -16,7 +16,7 @@ class TestLab
         @config = (config || Hash.new)
       end
 
-      # Shell Provisioner Container Setup
+      # Shell: Container Provision
       #
       # Renders the defined script to a temporary file on the target container
       # and proceeds to execute said script as root via *lxc-attach*.
@@ -24,7 +24,7 @@ class TestLab
       # @param [TestLab::Container] container The container which we want to
       #   provision.
       # @return [Boolean] True if successful.
-      def on_container_setup(container)
+      def on_container_provision(container)
         @config[:script].nil? and raise ShellError, "You must supply a script to bootstrap!"
 
         container.bootstrap(@config[:script])

data/lib/testlab/provisioners/templates/apt/bootstrap.erb

@@ -1,7 +1,7 @@
 set -x
 set -e
 
-[[ -f /.testlab-apt-bootstrap ]] && exit 0
+[[ -f /.testlab-apt-provision ]] && exit 0
 
 export DEBIAN_FRONTEND="noninteractive"
 
@@ -13,4 +13,4 @@ apt-get -y install <%= @apt[:install].flatten.compact.join(' ') %>
 apt-get -y remove <%= @apt[:remove].flatten.compact.join(' ') %>
 <% end -%>
 
-touch /.testlab-apt-bootstrap
+touch /.testlab-apt-provision

data/lib/testlab/provisioners/templates/apt_cacher_ng/bootstrap.erb

@@ -6,5 +6,3 @@ export DEBIAN_FRONTEND="noninteractive"
 apt-get -y install apt-cacher-ng
 service apt-cacher-ng restart || service apt-cacher-ng start
 grep "^MIRROR" /etc/default/lxc || echo 'MIRROR="http://127.0.0.1:3142/archive.ubuntu.com/ubuntu"' | tee -a /etc/default/lxc
-
-# && service lxc restart || service lxc start

data/lib/testlab/provisioners/templates/apt_cacher_ng/security.conf.erb

@@ -0,0 +1 @@
+AdminAuth: admin:admin

data/lib/testlab/provisioners/templates/bind/bind-db.erb

@@ -1,6 +1,6 @@
 $TTL 1d
 @ IN  SOA localhost. root.localhost. (
-   <%= Time.now.to_i %>   ; Serial
+   <%= Time.now.utc.to_i %>   ; Serial
            1w   ; Refresh
            1d   ; Retry
            4w   ; Expire

data/lib/testlab/provisioners/templates/chef/omni_bus.erb

@@ -33,4 +33,4 @@ EOF
 
 <%= @chef_client_cli %>
 
-touch /.omni-bus-bootstrap
+touch /.omni-bus-provision

data/lib/testlab/provisioners/templates/chef/omni_truck.erb

@@ -78,4 +78,4 @@ chmod -v +x ${KNIFE_CONFIG_EXP_FILE}
 
 chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}
 
-touch /.omni-truck-bootstrap
+touch /.omni-truck-provision

data/lib/testlab/provisioners/templates/chef/ruby_gem_client.erb

@@ -43,4 +43,4 @@ EOF
 
 <%= @chef_client_cli %>
 
-touch /.ruby-gem-client-bootstrap
+touch /.ruby-gem-client-provision

data/lib/testlab/provisioners/templates/chef/ruby_gem_server.erb

@@ -76,4 +76,4 @@ cp -v <%= @chef_validator %> <%= @chef_webui %> ~/.chef
 
 chown -Rv ${SUDO_USER}:${SUDO_USER} ${HOME}
 
-touch /.ruby-gem-server-bootstrap
+touch /.ruby-gem-server-provision

data/lib/testlab/provisioners/templates/raring/bootstrap.erb

@@ -3,12 +3,12 @@ set -e
 
 export DEBIAN_FRONTEND="noninteractive"
 
-if [ ! -f /.testlab-raring-bootstrap ]; then
+if [ ! -f /.testlab-raring-provision ]; then
   # Update APT and ensure our required packages are installed
   apt-get -y update
   apt-get -y install lxc bridge-utils debootstrap yum iptables ntpdate ntp pbzip2
 
-  touch /.testlab-raring-bootstrap
+  touch /.testlab-raring-provision
 fi
 
 # Ensure the default lxc networking services are off

data/lib/testlab/user/lifecycle.rb

@@ -3,10 +3,10 @@ class TestLab
 
     module Lifecycle
 
-      # Setup the user
+      # Provision the user
       #
       # @return [Boolean] True if successful.
-      def setup
+      def provision
         @ui.logger.debug { "User Create: #{self.username} " }
 
         node_home_dir = ((self.container.node.user == "root") ? %(/root) : %(/home/#{self.container.node.user}))

data/lib/testlab/utility/gli.rb

@@ -7,28 +7,28 @@ class TestLab
     module GLI
       require 'ztk'
 
-      LAB_ACTION_ORDER = %W(create destroy up down setup teardown build demolish).map(&:to_sym)
+      LAB_ACTION_ORDER = %W(create destroy up down provision deprovision build demolish).map(&:to_sym)
 
       LAB_ACTIONS = {
-        :create   => ["Construct %s",    "Attempts to create the <%= @component %>."],
-        :destroy  => ["Destruct %s",     "Attempts to destroy the <%= @component %>."],
-        :up       => ["On-line %s",      "Attempts to online the <%= @component %>."],
-        :down     => ["Off-line %s",     "Attempts to offline the <%= @component %>."],
-        :setup    => ["Provision %s",    "Attempts to provision the <%= @component %>."],
-        :teardown => ["De-provision %s", "Attempts to deprovision the <%= @component %>."],
-        :build    => ["Build %s", <<-EOF],
+        :create      => ["Construct %s",    "Attempts to create the <%= @component %>."],
+        :destroy     => ["Destruct %s",     "Attempts to destroy the <%= @component %>."],
+        :up          => ["On-line %s",      "Attempts to online the <%= @component %>."],
+        :down        => ["Off-line %s",     "Attempts to offline the <%= @component %>."],
+        :provision   => ["Provision %s",    "Attempts to provision the <%= @component %>."],
+        :deprovision => ["De-provision %s", "Attempts to deprovision the <%= @component %>."],
+        :build       => ["Build %s", <<-EOF],
           Attempts to build the <%= @component %>.  TestLab will attempt to create, online and provision the <%= @component %>.
 
           The <%= @component %> are taken through the following states:
 
-          Create -> Up -> Setup
+          Create -> Up -> Provision
           EOF
         :demolish => ["Demolish %s", <<-EOF]
           Attempts to demolish the <%= @component %>.  TestLab will attempt to deprovision, offline and destroy the <%= @component %>.
 
           The <%= @component %> are taken through the following states:
 
-          Teardown -> Down -> Destroy
+          Deprovision -> Down -> Destroy
           EOF
       }
 

data/lib/testlab/utility/misc.rb

@@ -44,6 +44,17 @@ class TestLab
         end
       end
 
+      def do_provisioner_callbacks(object, action, ui)
+        klass       = object.class.to_s.split('::').last
+        method_name = %(on_#{klass.downcase}_#{action.to_s.downcase}).to_sym
+
+        object.provisioners.each do |provisioner|
+          ui.logger.info { ">>>>> #{object.id.to_s.upcase} #{klass.upcase} #{action.to_s.upcase} [#{method_name}] (#{provisioner}) <<<<<" }
+          p = provisioner.new(object.config, ui)
+          p.respond_to?(method_name) and p.send(method_name, object)
+        end
+      end
+
     end
 
   end