auser-poolparty 0.2.70 → 0.2.71

data/Manifest.txt

@@ -303,7 +303,27 @@ lib/poolparty/pool/resources/sshkey.rb
 lib/poolparty/pool/resources/symlink.rb
 lib/poolparty/pool/resources/variable.rb
 lib/poolparty/pool/script.rb
-lib/poolparty/spec/have_base.rb
+lib/poolparty/spec/core/string.rb
+lib/poolparty/spec/matchers/a_spec_extensions_base.rb
+lib/poolparty/spec/matchers/have_cron.rb
+lib/poolparty/spec/matchers/have_deploydirectory.rb
+lib/poolparty/spec/matchers/have_directory.rb
+lib/poolparty/spec/matchers/have_exec.rb
+lib/poolparty/spec/matchers/have_file.rb
+lib/poolparty/spec/matchers/have_gempackage.rb
+lib/poolparty/spec/matchers/have_git.rb
+lib/poolparty/spec/matchers/have_host.rb
+lib/poolparty/spec/matchers/have_mount.rb
+lib/poolparty/spec/matchers/have_package.rb
+lib/poolparty/spec/matchers/have_remotefile.rb
+lib/poolparty/spec/matchers/have_rsyncmirror.rb
+lib/poolparty/spec/matchers/have_service.rb
+lib/poolparty/spec/matchers/have_sshkey.rb
+lib/poolparty/spec/matchers/have_symlink.rb
+lib/poolparty/spec/matchers/have_variable.rb
+lib/poolparty/spec/spec/dynamic_matchers.rb
+lib/poolparty/spec/spec/ensure_matchers_exist.rb
+lib/poolparty/spec/templates/have_base.rb
 lib/poolparty/templates/authkeys
 lib/poolparty/templates/cib.xml
 lib/poolparty/templates/gem

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 16:15 11/25/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 17:10 11/26/08)
 
 To get started, run the generator:
 

data/lib/poolparty/core/class.rb

@@ -1,2 +1,26 @@
+# Taken from rspec with high respect. 
+# Mainly unused, for now
 class Class
+  # Creates a new subclass of self, with a name "under" our own name.
+  # Example:
+  #
+  #   x = Foo::Bar.subclass('Zap'){}
+  #   x.name # => Foo::Bar::Zap_1
+  #   x.superclass.name # => Foo::Bar
+  def subclass(base_name, &body)
+    klass = Class.new(self)
+    class_name = "#{base_name}_#{class_count!}"
+    instance_eval do
+      const_set(class_name, klass)
+    end
+    klass.instance_eval(&body)
+    klass
+  end
+
+  private
+  def class_count!
+    @class_count ||= 0
+    @class_count += 1
+    @class_count
+  end
 end

data/lib/poolparty/core/module.rb

@@ -34,7 +34,7 @@ class Module
     end
     nil
   end
-  def set(*args)
+  def instance_variables_from_hash(h={})
+    h.each {|k,v| instance_eval "@#{k} = #{v}"}
   end
-  alias_method :custom, :set
 end

data/lib/poolparty/dependency_resolutions/puppet.rb

@@ -54,9 +54,16 @@ module PoolParty
       end
       
       def to_s
-        "#{class_type_name.capitalize}['#{key}']"
+        self.class.resource_string_name(class_type_name.capitalize, key)
+      end
+    end
+  end
+  
+  module Resources
+    class Resource
+      def self.resource_string_name(name, key)
+        "#{name}['#{key}']"
       end
-      
     end
   end
 end

data/lib/poolparty/helpers/provisioners/master.rb

@@ -192,14 +192,9 @@ cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolpa
       def restart_puppetd
         <<-EOS
 echo "Running puppet manifest"
-/usr/bin/puppetrunner
+/usr/bin/puppetrunner;/usr/bin/puppetrerun
         EOS
       end
-      def last_install_tasks
-        [
-          "/usr/bin/puppetrerun"
-        ]
-      end
     end
   end
 end

data/lib/poolparty/plugins/deploydirectory.rb

@@ -45,7 +45,11 @@ module PoolParty
       
       def to(dir)
         cwd dir
-        has_directory(:name => "#{dir}", :requires => get_directory("#{::File.dirname(dir)}"))
+        name dir
+        has_directory(:name => "#{dir}", 
+                      :requires => get_directory("#{::File.dirname(dir)}"), 
+                      :owner => owner,
+                      :mode => mode)
       end
       
       # Since git is not a native type, we have to say which core resource

data/lib/poolparty/pool/cloud.rb

@@ -48,7 +48,8 @@ module PoolParty
         plugin_directory
                 
         p = pare.is_a?(PoolParty::Pool::Pool) ? pare : nil
-        run_setup(p, &block)
+        store_block(&block)
+        run_setup(p, &block)        
         
         # set_parent(parent) if parent && !@parent
         # self.run_in_context parent, &block if block

data/lib/poolparty/pool/resource.rb

@@ -86,6 +86,9 @@ module PoolParty
       
       include CloudResourcer
       include Configurable
+      # For the time being, we'll make puppet the only available dependency resolution
+      # base, but in the future, we can rip this out and make it an option
+      include PoolParty::DependencyResolutions::Puppet
       
       extend PoolParty::Resources
       include PoolParty::Resources
@@ -101,7 +104,11 @@ module PoolParty
               add_resource(:#{lowercase_class_name}, opts, parent, &blk)
             end
             def get_#{lowercase_class_name}(name)              
-              get_resource(:#{lowercase_class_name}, name) if in_a_resource_store?(:#{lowercase_class_name}, name)
+              res = in_a_resource_store?(:#{lowercase_class_name}, name) ?
+                get_resource(:#{lowercase_class_name}, name) :
+                self.class.resource_string_name(ty, key)
+              res ||= self.class.resource_string_name(ty, key)
+              res
             end
           EOE
           PoolParty::Resources.module_eval method
@@ -254,10 +261,6 @@ module PoolParty
         end
         @modified_options
       end
-      
-      # For the time being, we'll make puppet the only available dependency resolution
-      # base, but in the future, we can rip this out and make it an option
-      include PoolParty::DependencyResolutions::Puppet
     end
     
     # Adds two methods to the module

data/lib/poolparty/pool/script.rb

@@ -3,7 +3,7 @@ module PoolParty
   class Script
     
     def self.inflate_file(file)
-      inflate open(file).read
+      inflate open(file).read if file
     end
         
     def self.inflate(script, file="__SCRIPT__")

data/lib/poolparty/spec/core/string.rb

@@ -0,0 +1,10 @@
+class String
+  def grab_entry_for(type, name)
+    begin
+      allowed = /[ \$\._\-\[\]\n\t\\\/&,\(\)"':=>0-9a-zA-Z]/
+      matches = self.match(/#{type}(.*)\{(.*)#{name}\":(.*)(#{allowed})*\}/)[0]
+    rescue
+      ""
+    end
+  end
+end

data/lib/poolparty/spec/matchers/a_spec_extensions_base.rb

@@ -0,0 +1,24 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class SpecExtensionsBase
+        def ensured_as(ensured="present")
+          str = "ensure => '#{ensured}'"
+          !grab_entry.scan(/#{str}/).empty?
+        end
+        def is_present?
+          !grab_entry.empty? && is_valid_resource?
+        end
+        def grab_entry
+          @target.grab_entry_for(type, @expected)
+        end
+        def type
+          "file"
+        end
+        def is_valid_resource?
+          grab_entry.split(/\n/).select {|l| l.match(/(.*)=>([ \t]*),$/) }.empty?
+        end
+      end
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_cron.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveCron < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have cron #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have cron #{@expected}"
+        end
+        def type
+          "cron"
+        end
+      end
+    end
+    def have_cron(name, extra="")
+      SpecExtensions::HaveCron.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_deploydirectory.rb

@@ -0,0 +1,15 @@
+module PoolParty
+  class SpecCore
+    dynamic_matcher_for(:deploydirectory) do
+      it "should have the directory" do
+        @manifest.should have_directory(@to)
+      end
+      it "should have the rsyncmirror" do
+        @manifest.should have_rsyncmirror("deploydirectory-#{@to}")
+      end
+      it "should have the exec to unpack the archive" do
+        @manifest.should have_exec("deploy-directory-#{@to}")
+      end
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_directory.rb

@@ -0,0 +1,31 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveDirectory < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present? && is_a_directory?
+        end
+        def is_a_directory?
+          ensured_as("directory")
+        end
+        def failure_message
+          "expected #{@target.inspect} to have directory #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have directory #{@expected}"
+        end
+        def type
+          "file"
+        end
+      end
+    end
+    def have_directory(name, extra="")
+      SpecExtensions::HaveDirectory.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_exec.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveExec < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have exec #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have exec #{@expected}"
+        end
+        def type
+          "exec"
+        end
+      end
+    end
+    def have_exec(name, extra="")
+      SpecExtensions::HaveExec.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_file.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveFile < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have file #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have file #{@expected}"
+        end
+        def type
+          "file"
+        end
+      end
+    end
+    def have_file(name, extra="")
+      SpecExtensions::HaveFile.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_gempackage.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveGempackage < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have gempackage #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have gempackage #{@expected}"
+        end
+        def type
+          "gempackage"
+        end
+      end
+    end
+    def have_gempackage(name, extra="")
+      SpecExtensions::HaveGempackage.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_git.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveGit < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have git #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have git #{@expected}"
+        end
+        def type
+          "git"
+        end
+      end
+    end
+    def have_git(name, extra="")
+      SpecExtensions::HaveGit.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_host.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveHost < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have host #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have host #{@expected}"
+        end
+        def type
+          "host"
+        end
+      end
+    end
+    def have_host(name, extra="")
+      SpecExtensions::HaveHost.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_mount.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveMount < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have mount #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have mount #{@expected}"
+        end
+        def type
+          "mount"
+        end
+      end
+    end
+    def have_mount(name, extra="")
+      SpecExtensions::HaveMount.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_package.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HavePackage < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have package #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have package #{@expected}"
+        end
+        def type
+          "package"
+        end
+      end
+    end
+    def have_package(name, extra="")
+      SpecExtensions::HavePackage.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_remotefile.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveRemotefile < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have remotefile #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have remotefile #{@expected}"
+        end
+        def type
+          "remotefile"
+        end
+      end
+    end
+    def have_remotefile(name, extra="")
+      SpecExtensions::HaveRemotefile.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_rsyncmirror.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveRsyncmirror < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have rsyncmirror #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have rsyncmirror #{@expected}"
+        end
+        def type
+          "rsyncmirror"
+        end
+      end
+    end
+    def have_rsyncmirror(name, extra="")
+      SpecExtensions::HaveRsyncmirror.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_service.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveService < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have service #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have service #{@expected}"
+        end
+        def type
+          "service"
+        end
+      end
+    end
+    def have_service(name, extra="")
+      SpecExtensions::HaveService.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_sshkey.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveSshkey < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have sshkey #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have sshkey #{@expected}"
+        end
+        def type
+          "sshkey"
+        end
+      end
+    end
+    def have_sshkey(name, extra="")
+      SpecExtensions::HaveSshkey.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_symlink.rb

@@ -0,0 +1,28 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveSymlink < SpecExtensionsBase
+        def initialize(expected,extra="")
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def failure_message
+          "expected #{@target.inspect} to have symlink #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have symlink #{@expected}"
+        end
+        def type
+          "symlink"
+        end
+      end
+    end
+    def have_symlink(name, extra="")
+      SpecExtensions::HaveSymlink.new(name, extra)
+    end
+  end
+end

data/lib/poolparty/spec/matchers/have_variable.rb

@@ -0,0 +1,32 @@
+module Spec
+  module Matchers
+    module SpecExtensions
+      class HaveVariable < SpecExtensionsBase
+        def initialize(varname, expected,extra="")
+          @varname = varname
+          @expected = expected
+          @extra = extra
+        end
+        def matches?(target)
+          @target = target
+          is_present?
+        end
+        def is_present?
+          @target.match(/\$#{@varname}(\W+)=(\W+)#{@expected}/)[0]
+        end
+        def failure_message
+          "expected #{@target.inspect} to have variable #{@expected}"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to have variable #{@expected}"
+        end
+        def type
+          "variable"
+        end
+      end
+    end
+    def have_variable(name, extra="")
+      SpecExtensions::HaveVariable.new(name, extra)
+    end
+  end
+end