auser-poolparty 1.2.2 → 1.2.3

data/lib/poolparty/poolparty/poolparty_base_class.rb

@@ -1,5 +1,12 @@
+$:.unshift(::File.dirname(__FILE__))
+$:.unshift("#{::File.dirname(__FILE__)}/../../../vendor/gems/*")
+$:.unshift("#{::File.dirname(__FILE__)}/../../../vendor/gems/dslify/lib")
+$:.unshift("#{::File.dirname(__FILE__)}/../../../vendor/gems/parenting/lib")
+
+require "default"
 require "dslify"
 require "parenting"
+
 module PoolParty
   
   def context_stack
@@ -7,10 +14,13 @@ module PoolParty
   end
   
   class PoolPartyBaseClass
-    include Dslify, Parenting
+    attr_reader :init_opts
+    
+    include Parenting, Dslify
     
     include PoolParty::DependencyResolverCloudExtensions
-    # attr_accessor :depth
+    # attr_accessor :depth    
+    default_options Default.dsl_options
 
     def initialize(opts={}, extra_opts={}, &block)
       add_to_parent_if_parent_exists_and_is_a_service
@@ -18,21 +28,25 @@ module PoolParty
       @init_block = block
       @base_name = get_name_from_options_and_extra_options(opts, extra_opts)
       
-      o = (opts.is_a?(Hash) ? extra_opts.merge(opts) : extra_opts).merge(:name => @base_name)
-      
-      run_in_context(o, &block)
-      super(&block)
+      @init_opts = (opts.is_a?(Hash) ? extra_opts.merge(opts) : extra_opts.merge(:name => @base_name))
+
+      run_in_context(init_opts, &block)
+      # super(init_opts, &block)
     end
     
     # Overloading the parent run_in_context
-    def run_in_context(o={}, &block)
-      if o
-        context_stack.push self
-        set_vars_from_options(o)
-        instance_eval &block if block
-        context_stack.pop
-      else
-        super
+    def run_in_context(o={}, &block)      
+      context_stack.push self        
+      set_vars_from_options(o)
+      instance_eval &block if block
+      context_stack.pop
+    end
+    
+    def run_with_callbacks(o, &block)
+      run_in_context(o) do
+        before_load(o, &block)
+        yield if block_given?
+        loaded(o, &block)
       end
     end
     
@@ -46,7 +60,7 @@ module PoolParty
     
     # Try to extract the name from the options
     def get_name_from_options_and_extra_options(opts={}, extra_opts={})
-      opts.is_a?(Hash) ? (opts.has_key?(:name) ? opts.delete(:name) : nil) : dsl_options[:name] = opts
+      opts.is_a?(Hash) ? (opts.has_key?(:name) ? opts[:name] : nil) : dsl_options[:name] = opts
     end
     
     # Add to the services pool for the manifest listing
@@ -76,7 +90,7 @@ module PoolParty
     # A word about stores, the global store stores the entire list of stored
     # resources. The local resource store is available on all clouds and plugins
     # which stores the instance variable's local resources. 
-    def add_resource(ty, opts={}, extra_opts={}, &block)    
+    def add_resource(ty, opts={}, extra_opts={}, &block)       
       temp_name = get_name_from_options_and_extra_options(opts, extra_opts)
       
       if res = get_resource(ty, temp_name, opts)        
@@ -137,24 +151,6 @@ module PoolParty
       false
     end
     
-    def method_missing(m,*a,&block)
-      if respond_to?(:this_context) && this_context != self && this_context.respond_to?(m)# && !self.is_a?(PoolParty::Resources::Resource)
-        this_context.send m, *a, &block      
-      else
-        # if dsl_options.has_key?(m)
-        #          dsl_options[m]
-        #        elsif parent && parent.respond_to?(:dsl_options) && parent.dsl_options.has_key?(m)
-        #          parent.dsl_options[m]
-        #        elsif self.class.default_options.has_key?(m)
-        #          self.class.default_options[m]
-        #        elsif parent && parent.respond_to?(:dsl_options) && parent.default_options.has_key?(m)
-        #          parent.default_options[m]
-        #        else
-          super
-        # end
-      end
-    end
-    
     # Adds two methods to the module
     # Adds the method type:
     #   has_
@@ -167,7 +163,7 @@ module PoolParty
     # TODO: Refactor nicely to include other types that don't accept ensure
     def self.add_has_and_does_not_have_methods_for(typ=:file)
       method_name = "__#{typ}"
-      PoolParty::PoolPartyBaseClass.module_eval <<-EOE
+      ev=<<-EOE
         def has_#{typ}(opts={}, extra={}, &block)
           #{method_name}({:ensures => :present}.merge(handle_option_values(opts).merge(extra)), &block)
         end
@@ -175,6 +171,16 @@ module PoolParty
           #{method_name}({:ensures => :absent}.merge(handle_option_values(opts).merge(extra)), &block)
         end
       EOE
+      PoolParty::PoolPartyBaseClass.module_eval ev, ($pool_specfile || "")
+    end
+    
+    def self.add_resource_lookup_method(lookup_type=:file)
+      ev=<<-EOE
+        def #{lookup_type}s
+          ordered_resources.select {|q| q if q.class.to_s =~ /#{lookup_type.to_s.classify}/ }
+        end
+      EOE
+      PoolParty::PoolPartyBaseClass.module_eval ev, ($pool_specfile || "")
     end
     
     def handle_option_values(o)

data/lib/poolparty/poolparty/resource.rb

@@ -61,6 +61,7 @@ module PoolParty
           EOE
           PoolParty::PoolPartyBaseClass.module_eval method
           PoolParty::PoolPartyBaseClass.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym)
+          PoolParty::PoolPartyBaseClass.add_resource_lookup_method(lowercase_class_name)
           
           available_resources << subclass
         end
@@ -72,6 +73,13 @@ module PoolParty
         @available_resources ||= []
       end
       
+      dsl_methods :action, 
+                  :not_if, 
+                  :if_not, 
+                  :only_if, 
+                  :calls,
+                  :requires
+      
       # This is set in order of descending precedence
       # The options are overwritten from the bottom up
       # and the resource will use those as the values
@@ -80,11 +88,12 @@ module PoolParty
       # Finally, it uses the parent's options as the lowest priority
       def initialize(opts={}, extra_opts={}, &block)
         super(opts, extra_opts, &block)
-                
+        
         @resource_name = @base_name
-        dsl_options[:name] = resource_name unless dsl_options.has_key?(:name)
+        # dsl_options[:name] = @init_opts[:name] unless dsl_options.has_key?(:name) && dsl_options[:name]
         
-        loaded(opts, &block)
+        # p [:name, name, dsl_options, init_opts] # methods.sort.join(", ")
+        loaded(init_opts, &block)
         
         after_create
       end
@@ -98,14 +107,14 @@ module PoolParty
       def resource_name
         @resource_name ||= nil
       end
-      
-      def name(*args)
-        resource_name
-      end
-      
+            
       # After create callback
       def after_create
       end
+      def before_load(o={}, &block)
+      end
+      def after_load(o={}, &block)
+      end
       
       # We don't want to inherit the services on a resource, as resources
       # are a base and should never have services.
@@ -129,33 +138,6 @@ module PoolParty
       def class_type_name
         self.class.to_s.top_level_class.underscore.downcase
       end
-      def self.custom_function(str)
-        custom_functions << str
-      end
-      def self.custom_functions
-        @custom_functions ||= []
-      end
-      def custom_function(str)
-        self.class.custom_functions << str
-      end
-            
-      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 << "#{pre*2}#{func}"
-            end
-          end
-        end.join("\n")
-      end
-      # Some things in puppet aren't allowed, so let's override them here
-      def disallowed_options
-        []
-      end
-
-      def key
-        name
-      end
       # def virtual_resource?
       #   false
       # end
@@ -170,14 +152,6 @@ module PoolParty
         true
       end
       
-      def method_missing(m,*a,&block)
-        if parent && parent.dsl_options.has_key?(m) && is_in_plugin?
-          parent.send m, *a, &block
-        else
-          super
-        end
-      end
-      
       # Private method just for resource retrievling purposes
       def class_name_sym
         self.class.to_s.top_level_class.downcase.to_sym
@@ -210,4 +184,4 @@ module PoolParty
   end
 end
 
-Dir["#{::File.dirname(__FILE__)}/../resources/*.rb"].each {|lib| require "#{lib}"}
+Dir["#{::File.dirname(__FILE__)}/../resources/*.rb"].each {|lib| require "#{lib}"}

data/lib/poolparty/poolparty/service.rb

@@ -4,12 +4,8 @@ module PoolParty
     
     include PoolParty::DependencyResolverCloudExtensions
     
-    def initialize(o={}, &block)
-      super(o, &block)
-    end
-    
     def to_properties_hash
-      { :pp_type => "plugin", :options => options, 
+      { :pp_type => "plugin", :options => dsl_options, 
         :name => self.class.to_s.top_level_class,
         :resources => ordered_resources.map {|a| a.to_properties_hash }}
     end

data/lib/poolparty/provision/boot_strapper.rb

@@ -13,6 +13,8 @@ module PoolParty
       
       # List of gems that are default to install
       def self.gem_list
+        # auser-dslify
+        # auser-parenting
         @gem_list ||= %w( logging
                           rake
                           xml-simple
@@ -26,22 +28,23 @@ module PoolParty
                           grempe-amazon-ec2
                           ohai
                           chef
-                          auser-dslify
-                          auser-parenting
                           adamwiggins-rest-client
                           rack
                           thin
+                          logging
+                          ruby2ruby
                         )
       end
 
       # Default options for the boot_strapper
-      @defaults = ::PoolParty::Default.default_options.merge({
+      @defaults = ::PoolParty::Default.dsl_options.merge({
         :full_keypair_path   => "#{ENV["AWS_KEYPAIR_NAME"]}" || "~/.ssh/id_rsa",
         :installer           => 'apt-get',
         :dependency_resolver => 'chef'
       })
       class <<self; attr_reader :defaults; end
       
+      attr_reader :cloud_name
       # In case the method is being called on ourself, let's check the 
       # defaults hash to see if it's available there
       def method_missing(m,*a,&block)
@@ -58,6 +61,7 @@ module PoolParty
         self.class.defaults.merge(opts).to_instance_variables(self)
         @target_host = host
         @cloud = opts[:cloud]
+        @cloud_name = @cloud.name
                 
         instance_eval &block if block
         @cloud.call_before_bootstrap_callbacks if @cloud
@@ -79,27 +83,27 @@ module PoolParty
       def pack_the_dependencies
         # Add the keypair to the instance... shudder
         ::Suitcase::Zipper.add(keypair, "keys")
-        
+        edge_pp_gem = Dir["#{Default.vendor_path}/../pkg/*poolparty*gem"].pop
         # Use the locally built poolparty gem if it is availabl
-        if edge_pp_gem = Dir["#{Default.vendor_path}/../pkg/*poolparty*gem"].pop
-          puts "using edge poolparty: #{::File.expand_path(edge_pp_gem)}"
-          ::Suitcase::Zipper.add(edge_pp_gem, 'gems')
-        else
-          vputs "using gem auser-poolparty. use rake build to use edge"
-          self.class.gem_list << 'auser-poolparty'
-        end
+            if edge_pp_gem
+              puts "using edge poolparty: #{::File.expand_path(edge_pp_gem)}"
+              ::Suitcase::Zipper.add(edge_pp_gem, 'gems')
+            else
+              vputs "using gem auser-poolparty. use rake build to use edge"
+              self.class.gem_list << 'auser-poolparty'
+            end
         # Add the gems to the suitcase
         puts "Adding default gem dependencies"
-        ::Suitcase::Zipper.gems self.class.gem_list, "#{Default.tmp_path}/trash/dependencies"
+        ::Suitcase::Zipper.gems self.class.gem_list, "#{cloud.tmp_path}/trash/dependencies"
 
         ::Suitcase::Zipper.packages( "http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz",
-                 "#{Default.tmp_path}/trash/dependencies/packages")
+                 "#{cloud.tmp_path}/trash/dependencies/packages")
         # ::Suitcase::Zipper.add("templates/")
         
         ::Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/../templates/monitor.ru", "/etc/poolparty/")
         ::Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/../templates/monitor.god", "/etc/poolparty/")
                 
-        ::Suitcase::Zipper.add("#{Default.tmp_path}/trash/dependencies/cache", "gems")        
+        ::Suitcase::Zipper.add("#{cloud.tmp_path}/trash/dependencies/cache", "gems")        
         
         ::Suitcase::Zipper.add("#{::File.join(File.dirname(__FILE__), '..', 'templates', 'gemrc_template' )}", "etc/poolparty")
         
@@ -108,7 +112,7 @@ module PoolParty
           {:instances => instances.flatten.compact}.to_json, 
           "neighborhood.json", "/etc/poolparty")
         
-        ::Suitcase::Zipper.build_dir!("#{Default.tmp_path}/dependencies")
+        ::Suitcase::Zipper.build_dir!("#{cloud.tmp_path}/dependencies")
         
         ::Suitcase::Zipper.flush!
         
@@ -118,8 +122,8 @@ module PoolParty
       # The commands to setup a PoolParty enviornment
       def default_commands
         pack_the_dependencies
-        ::FileUtils.rm_rf "#{Default.tmp_path}/dependencies/gems/cache"
-        rsync "#{Default.tmp_path}/dependencies", '/var/poolparty'
+        ::FileUtils.rm_rf "#{cloud.tmp_path}/dependencies/gems/cache"
+        rsync "#{cloud.tmp_path}/dependencies", '/var/poolparty'
         
         commands << [
           "mkdir -p /etc/poolparty",
@@ -137,16 +141,17 @@ module PoolParty
           "cd ../ && rm -rf rubygems-1.3.1*",
           "gem source --add http://gems.github.com",
           "cd /var/poolparty/dependencies/gems/",
-          "gem install --no-rdoc --no-ri -y *.gem",
+          "gem install --no-rdoc --no-ri  --ignore-dependencies *.gem",
           "cd /var/poolparty/dependencies",
           "cp /var/poolparty/dependencies/etc/poolparty/* /etc/poolparty/",
           'touch /var/poolparty/POOLPARTY.PROGRESS',
           "mkdir -p /root/.ssh",
           "cp /var/poolparty/dependencies/keys/* /root/.ssh/",
-          "chmod 600 /root/.ssh/#{::File.basename(@cloud.keypair.full_filepath)}",
+          "chmod 600 /root/.ssh/#{keypair_name}",
           # "god -c /etc/poolparty/monitor.god",
           "mkdir -p /var/log/poolparty/",
           "thin -R /etc/poolparty/monitor.ru -p 8642 --pid /var/run/stats_monitor.pid --daemon -l /var/log/poolparty/monitor.log start 2>/dev/null",
+          "tail /var/log/poolparty/monitor.log",
           'echo "bootstrap" >> /var/poolparty/POOLPARTY.PROGRESS']
         commands << self.class.class_commands unless self.class.class_commands.empty?
       end

data/lib/poolparty/provision/configurations/chef.rb

@@ -14,10 +14,10 @@ module PoolParty
       end
       def self.files_to_upload
         [ 
-          "#{Default.tmp_path}/dr_configure/chef/solo.rb",
-          "#{Default.tmp_path}/dr_configure/chef/dna.json",
-          "#{Default.base_config_directory}/chef/solo.rb",
-          "#{Default.base_config_directory}/chef/dna.json"
+          # "#{Default.tmp_path}/dr_configure/chef/solo.rb",
+          # "#{Default.tmp_path}/dr_configure/chef/dna.json",
+          # "#{Default.base_config_directory}/chef/solo.rb",
+          # "#{Default.base_config_directory}/chef/dna.json"
         ]
       end
     end

data/lib/poolparty/provision/dr_configure.rb

@@ -31,13 +31,14 @@ module PoolParty
        end
      end
     
-     attr_reader :cloud, :keypair, :run_count
+     attr_reader :cloud, :keypair, :run_count, :cloud_name
      
      def initialize(host, opts={}, &block)
        self.class.defaults.merge(opts).to_instance_variables(self)
        @target_host = host
        @configurator = "::PoolParty::Provision::#{dependency_resolver.capitalize}".constantize
        @cloud = opts[:cloud]
+       @cloud_name = @cloud.name
        @keypair = @cloud.keypair
        @run_count = 0
        
@@ -50,15 +51,15 @@ module PoolParty
      private
      
      def prescribe_configuration
-       ::FileUtils.mkdir_p "#{Default.tmp_path}/dr_configure" unless ::File.directory?("#{Default.tmp_path}/dr_configure")
-      ::File.cp $pool_specfile, "#{Default.tmp_path}/dr_configure/clouds.rb"
-      ::File.open "#{Default.tmp_path}/dr_configure/clouds.json", "w" do |f|
+       ::FileUtils.mkdir_p "#{cloud.tmp_path}/dr_configure" unless ::File.directory?("#{cloud.tmp_path}/dr_configure")
+      ::File.cp $pool_specfile, "#{cloud.tmp_path}/dr_configure/clouds.rb"
+      ::File.open "#{cloud.tmp_path}/dr_configure/clouds.json", "w" do |f|
         f << cloud.to_properties_hash.to_json
       end
       
       setup_configurator
       # write_erlang_cookie
-      @configurator.files_to_upload.each {|f| ::FileUtils.cp f, "#{Default.tmp_path}/dr_configure/#{::File.basename(f)}" if ::File.file?(f) }
+      @configurator.files_to_upload.each {|f| ::FileUtils.cp f, "#{cloud.tmp_path}/dr_configure/#{::File.basename(f)}" if ::File.file?(f) }
       
       pack_up_and_ship_off_suitcase
       run_commands          
@@ -106,8 +107,8 @@ module PoolParty
      end
      
      def pack_up_and_ship_off_suitcase
-       ::Suitcase::Zipper.build_dir!("#{Default.tmp_path}/dr_configure")
-       rsync "#{Default.tmp_path}/dr_configure/", "/var/poolparty/dr_configure/", ['-a --stats']
+       ::Suitcase::Zipper.build_dir!("#{cloud.tmp_path}/dr_configure")
+       rsync "#{cloud.tmp_path}/dr_configure/", "/var/poolparty/dr_configure/", ['-a --stats']
      end
      
      # Pack up  monitors verifiers plugins directories in the same direcotry as your clouds.rb and send to nodes.
@@ -115,7 +116,7 @@ module PoolParty
        # @cloud.write_properties_hash("#{Default.tmp_path}/properties_hash.rb")
        #TODO: move to puppet class       
        #TODO: remove or conditionalize this puppet specific task
-       @cloud.build_and_store_new_config_file("#{Default.tmp_path}/dr_configure/poolparty.pp")
+       @cloud.build_and_store_new_config_file("#{cloud.tmp_path}/dr_configure/poolparty.pp")
        
        %w(monitors verifiers plugins).each do |dir|
         @cloud.pack_user_directory dir
@@ -129,8 +130,8 @@ module PoolParty
      def write_erlang_cookie
        # cookie = (1..16).collect { chars[rand(chars.size)] }.pack("C*")
        cookie =  (1..65).collect {rand(9)}.join()
-       cookie_file = ::File.open("#{Default.tmp_path}/dr_configure/erlang.cookie", 'w+'){|f| f << cookie }
-       ::File.cp "#{::File.dirname(__FILE__)}/../templates/erlang_cookie_maker", "#{Default.tmp_path}/dr_configure/"
+       cookie_file = ::File.open("#{cloud.tmp_path}/dr_configure/erlang.cookie", 'w+'){|f| f << cookie }
+       ::File.cp "#{::File.dirname(__FILE__)}/../templates/erlang_cookie_maker", "#{cloud.tmp_path}/dr_configure/"
      end
      
      def self.class_commands

data/lib/poolparty/resources/cron.rb

@@ -32,10 +32,14 @@ The cron resource will set cron jobs at the intervals you set
 =end
     class Cron < Resource
       
-      default_options({
+      default_options(
         :command => nil,
-        :user => "root"
-      })
+        :user => "root",
+        :minute => "*",
+        :hour => "*",
+        :month => "*",
+        :weekday => "*"
+      )
       
       def present
         :create

data/lib/poolparty/resources/directory.rb

@@ -26,6 +26,13 @@ The above example will place the contents of '/local/path' at '/path/on/server/n
 
     class Directory < Resource
       
+      dsl_methods :owner
+      
+      default_options({
+        :recursive => true,
+        :mode => 0644
+      })
+      
       def present
         :create
       end

data/lib/poolparty/resources/exec.rb

@@ -25,6 +25,7 @@ Ensure a command is run on the instances
     
     class Exec < Resource
       
+      dsl_methods :cwd, :creates, :command
       default_options({
         :path => ["/usr/bin:/bin:/usr/local/bin:$PATH"]
       })
@@ -38,7 +39,7 @@ Ensure a command is run on the instances
       end
       
       def after_create
-        options[:name] = options[:command] unless options.name
+        dsl_options[:name] = dsl_options[:command] unless dsl_options[:name]
       end
 
     end

data/lib/poolparty/resources/file.rb

@@ -29,11 +29,21 @@ To write a file to the template directory, use:
 == Example
   has_file(:name => '/etc/motd', :content => 'Hey and welcome to your node today!')
 =end
-    class File < Resource
+    class File < Resource 
       has_searchable_paths(:dir => "templates")
       
+      dsl_methods :name,            # The name, the full path of the file
+                  :owner,           # String that describes the owner of the file
+                  :content,         # A string that describes the content of the file
+                  :template,        # The file that describes the content of the file
+                  :render_as        # Render the content (Erb) (default: Erb)
+                  
+      default_options(
+        :mode => "644"              # A string indicating the mode of the file
+      )
+      
       def loaded(o={}, &block)
-        parent.has_directory ::File.dirname(name) if parent
+        has_directory ::File.dirname(name)
       end
       
       def present
@@ -47,24 +57,28 @@ To write a file to the template directory, use:
       def after_create
         run_render = dsl_options.include?(:render_as) ? dsl_options.delete(:render_as) : false
         
-        if dsl_options.include?(:template)          
+        if dsl_options[:template]
           filename = find_file(dsl_options.delete(:template))
           file = ::File.basename( filename )
           raise TemplateNotFound.new("no template given") unless file
 
-          template_opts = (parent ? options.merge(parent.options) : options)
-          options.merge!(:content => run_render ? Template.compile_file(filename, template_opts.merge(:renderer => run_render)).gsub("\"", "\"") : open(filename).read)
+          template_opts = (parent ? dsl_options.merge(parent.dsl_options) : dsl_options)
+          dsl_options.merge!(:content => run_render ? Template.compile_file(filename, template_opts.merge(:renderer => run_render)).gsub("\"", "\"") : open(filename).read)
         end
         
         if dsl_options.include?(:content)
           cont = dsl_options.delete(:content)
-          template_opts = (parent ? options.merge(parent.options) : options).merge(:renderer => run_render)
-          options.merge!(:content => run_render ? Template.compile_string(cont, template_opts) : cont)
+          template_opts = (parent ? dsl_options.merge(parent.dsl_options) : dsl_options).merge(:renderer => run_render)
+          dsl_options.merge!(:content => run_render ? Template.compile_string(cont, template_opts) : cont)
         end
       end
       
-      def method_missing m, *a, &block
-        super rescue ::File.send(m, *a, &block)
+      # def method_missing m, *a, &block
+      #   super rescue ::File.send(m, *a, &block)
+      # end
+      
+      def variable(k,v)
+        set_default_options(k => v)
       end
 
     end

data/lib/poolparty/resources/group.rb

@@ -0,0 +1,21 @@
+module PoolParty    
+  module Resources
+        
+    class Group < Resource      
+      
+      default_options({
+        :shell => "/bin/sh"
+      })
+      
+      def present
+        :manage
+      end
+      
+      def absent
+        :remove
+      end
+      
+    end
+    
+  end
+end

data/lib/poolparty/resources/host.rb

@@ -25,10 +25,11 @@ The host parameter sets hosts on the instances. Setting this, every node will ha
     class Host < Resource
             
       default_options({
+        :ip => "127.0.0.1"
       })
       
       def aka(i=nil)
-        i ? options[:alias] = i : options[:alias]
+        i ? dsl_options[:alias] = i : dsl_options[:alias]
       end
             
     end

data/lib/poolparty/resources/mount.rb

@@ -35,10 +35,6 @@ The mount specifies a mount that is to be mounted on the instances
         :atboot => "yes"
       })
       
-      def disallowed_options
-        [:name]
-      end
-      
     end
     
   end

data/lib/poolparty/resources/remote_file.rb

@@ -43,7 +43,7 @@ To write a file to the template directory, use:
       })
       
       def source(arg=nil)
-        arg ? options[:source] = arg : "#{Default.fileserver_base}/#{::File.basename(name)}"
+        arg ? dsl_options[:source] = arg : "#{Default.fileserver_base}/#{::File.basename(name)}"
       end
       
     end

data/lib/poolparty/resources/service.rb

@@ -23,8 +23,9 @@ The service resource specifies a service that must be running on the nodes
 =end
     class Service < Resource
       
+      dsl_methods :name       # Name of the service
+      
       default_options({
-        :ensures => "enable",
         :enable => true
       })