auser-poolparty 0.2.16 → 0.2.20

data/lib/poolparty/pool/resource.rb

@@ -18,23 +18,36 @@ module PoolParty
     end
     
     def add_resource(type, opts={}, parent=self, &block)      
-      resource = get_resource(type, opts[:name], parent)
-      if resource
-        resource 
+      if in_resources?(type, opts[:name])
+        get_resource(type, opts[:name], parent)
       else
-        returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|
-          resource(type) << o
+        returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|                    
+          store_into_global_resource_store(o)
+          resource(type) << o          
         end
       end
+    end    
+    def get_resource(ty, key, parent=self)
+      resource(ty).select {|r| r.key == key }.first || get_from_global_resource_store(ty, key)
     end
-    
-    def get_resource(type, key, parent=self)
-      resource(type).select {|resource| resource.key == key }.first
+    def in_resources?(type, key, parent=self)
+      !(get_resource(type, key) && in_global_resource_store?(type, key)).nil?
+    end
+    def global_resources_store
+      $global_resources ||= []
+    end
+    def store_into_global_resource_store(r)
+      global_resources_store << r unless in_global_resource_store?(r.class_name_sym, r.key)
+    end
+    def get_from_global_resource_store(ty, key)
+      global_resources_store.select {|r| r if r.same_resources_of(ty, key) }.first
+    end
+    def in_global_resource_store?(ty, key)
+      !get_from_global_resource_store(ty, key).nil?
     end
-            
     #:nodoc:
     def reset_resources!
-      @resources = nil
+      $global_resources = @resources = nil
     end
         
     # def resources_string(pre="")
@@ -66,6 +79,9 @@ module PoolParty
             def #{lowercase_class_name}(opts={}, parent=self, &blk)
               add_resource(:#{lowercase_class_name}, opts, parent, &blk)
             end
+            def get_#{lowercase_class_name}(name)              
+              get_resource(:#{lowercase_class_name}, name) if in_resources?(:#{lowercase_class_name}, name)
+            end
           EOE
           PoolParty::Resources.module_eval method
           PoolParty::Resources.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym)
@@ -102,18 +118,7 @@ module PoolParty
           requires parent.to_s if @parent.is_a?(PoolParty::Resources::Resource) && printable? && @parent.printable?
         end
       end
-      
-      # def requirement_tree
-      #   p = @parent
-      #   returning Array.new do |arr|
-      #     arr << p.to_s
-      #     while p && p != self && p.is_a?(PoolParty::Resources::Resource) && p.requires
-      #       arr << p.requires
-      #       p = p.parent
-      #     end
-      #   end.flatten.uniq
-      # 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,14 +128,19 @@ module PoolParty
       # DSL Overriders
       include PoolParty::ResourcingDsl
       
+      def same_resources_of(t, k)
+        key == k && class_name_sym == t && !duplicatable?
+      end
+      def duplicatable?
+        false
+      end
       # This way we can subclass resources without worry
       def class_type_name
         self.class.to_s.top_level_class
-      end      
+      end
       def self.custom_function(str)
         custom_functions << str
       end
-      
       def self.custom_function(str)
         custom_functions << str
       end      
@@ -163,6 +173,10 @@ module PoolParty
       def printable?
         true
       end
+      # Private method just for resource retrievling purposes
+      def class_name_sym
+        self.class.to_s.top_level_class.downcase.to_sym
+      end
       # We want to gather the options, but if the option sent is nil
       # then we want to override the option value by sending the key as
       # a method so that we can override this if necessary. 

data/lib/poolparty/pool/resources/class_package.rb

@@ -12,7 +12,7 @@ module PoolParty
     class Classpackage < Resource
             
       default_options({
-        :name => nil
+        :name => "custom"
       })
       
       def initialize(opts={}, parent=self, &block)
@@ -38,7 +38,7 @@ module PoolParty
       end
       
       def name(*args)
-        args.empty? ? (@name || parent.name) : @name ||= args.first
+        args.empty? ? (@name || parent.name || "custom_#{Time.now.to_i}") : @name ||= args.first
       end
 
     end

data/lib/poolparty/pool/resources/conditional.rb

@@ -2,12 +2,12 @@ module PoolParty
   module Resources
     
     def execute_if(attr_s="$hostname", str="", parent=self, &block)
-      parent = parent.is_a?(PoolParty::Cloud::Cloud) ? parent : parent.parent
+      # parent = parent.is_a?(PoolParty::Cloud::Cloud) ? parent : parent.parent
       opts = {:attribute => attr_s, :equal => str}
       options = parent.respond_to?(:options) ? parent.options.merge!(opts) : opts
-      @c = PoolParty::Resources::Conditional.new(options, parent, &block)
-      parent.instance_eval {add_resource(:conditional, options, parent, &block) }
-      @c
+      # @c = PoolParty::Resources::Conditional.new(options, parent, &block)
+      parent.add_resource(:conditional, options, parent, &block)
+      # @c
     end
     
     class Conditional < Resource
@@ -29,6 +29,10 @@ module PoolParty
         false
       end
       
+      def duplicatable?
+        false
+      end
+      
       def to_string(pre="")
         returning Array.new do |output|
           output << "# #{name.sanitize}"

data/lib/poolparty/pool/resources/package.rb

@@ -6,7 +6,14 @@ module PoolParty
       default_options({
         :ensure => "installed",
         :name => nil
-      })      
+      })
+      
+      def present
+        "installed"
+      end
+      def absent
+        "absent"
+      end
       
     end
     

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 18
+    TINY  = 20
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/poolparty.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 
 # Load required gems
-%w(active_support open4 ftools logging ruby2ruby).each do |lib|
+%w(activesupport open4 ftools logging ruby2ruby).each do |lib|
   begin
     require lib
   rescue Exception => e