auser-poolparty 0.2.67 → 0.2.68

data/README.txt

@@ -39,6 +39,7 @@ COMING SOON
 sudo gem install auser-poolparty
 
 == TODO:
+* Rewrite the disallowed_options to whitelist allowed_options on resources
 * Replace services with Runit
 * Refactor provisioning to use erlang
 * Add queuing of tasks on the messenger

data/Rakefile

@@ -53,7 +53,7 @@ task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :build_local_gem] do
 end
 
 desc "Generate gemspec for github"
-task :gh => [:gemspec, :ghgem] do
+task :gh => [:github_release] do
   filepath = ::File.join(::File.dirname(__FILE__), "poolparty.gemspec")
   data = open(filepath).read
   spec = eval("$SAFE = 3\n#{data}")
@@ -64,6 +64,6 @@ task :gh => [:gemspec, :ghgem] do
 end
 
 desc "Generate github gemspec and latest gem"
-task :ghgem => [:local_deploy] do
-  `mv #{::File.expand_path(::File.dirname(__FILE__))}/pkg/*.gem #{::File.expand_path(::File.dirname(__FILE__))}/pkg/poolparty.gem`
+task :ghgem => [:gh] do
+  %x[sudo gem install pkg/poolparty.gem]
 end

data/bin/pool-generate

@@ -14,4 +14,5 @@ source = RubiGen::PathSource.new(:application,
   File.join(File.dirname(__FILE__), "../generators"))
 RubiGen::Base.reset_sources
 RubiGen::Base.append_sources source
+ARGV.reject! {|a| a == "generate" }
 RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'poolspec')

data/lib/poolparty/core/string.rb

@@ -22,7 +22,7 @@ class String
     self.strip.split(/\n/).join(" && ")
   end
   def top_level_class
-    self.split("::")[-1].downcase rescue self
+    self.split("::")[-1].underscore.downcase rescue self
   end
   def sanitize
     self.gsub(/[ \.\/\-]*/, '')
@@ -60,7 +60,7 @@ class String
   # Refactor this guy to get the class if the class is defined, and not always create a new one
   # although, it doesn't really matter as ruby will just reopen the class
   def class_constant(superclass=nil, opts={}, &block)
-    symc = ((opts && opts[:preserve]) ? ("#{self.classify}Classs") : "PoolParty#{self.classify}Classs").classify
+    symc = ((opts && opts[:preserve]) ? ("#{self.camelcase}Classs") : "PoolParty#{self.camelcase}Classs").classify
     
     kla=<<-EOE
       class #{symc} #{"< #{superclass}" if superclass}
@@ -75,13 +75,13 @@ class String
   end
   
   def module_constant(append="", &block)
-    symc = "#{self}_Module#{append}".classify
+    symc = "#{self}_Module#{append}".camelcase
     mod = Object.const_defined?(symc) ? Object.const_get(symc.to_sym) : Module.new(&block)
     Object.const_set(symc, mod) unless Object.const_defined?(symc)
     symc.to_s.constantize
   end
   def preserved_module_constant(ext="", from="PoolParty::", &block)
-    symc = "#{self}#{ext}".classify
+    symc = "#{self}#{ext}".camelcase
     mod = Kernel.const_defined?(symc) ? Kernel.const_get(symc.to_sym) : Module.new(&block)
     Kernel.const_set(symc, mod) unless Kernel.const_defined?(symc)
     symc.to_s.constantize

data/lib/poolparty/dependency_resolutions/puppet.rb

@@ -47,7 +47,7 @@ module PoolParty
             end          
           end
 
-          res.each do |type, resource|
+          res.reject do |type, resource|
             str << resource.to_string("#{pre*2}")
           end
         end.join("\n")

data/lib/poolparty/modules/definable_resource.rb

@@ -16,7 +16,7 @@ module PoolParty
     # 
     # For example usage, see lib/poolparty/plugins/line.rb
     def define_resource(name, &block)
-      symc = "#{name}".classify
+      symc = "#{name}".camelcase
       klass = symc.class_constant(PoolParty::Resources::CustomResource, {:preserve => true}, &block)
       PoolParty::Resources.module_eval &block
       klass
@@ -44,7 +44,7 @@ module PoolParty
     # 
     # An example is included in the poolparty-apache-plugin
     def virtual_resource(name=:virtual_resource, opts={}, &block)
-      symc = "#{name}".classify
+      symc = "#{name}".camelcase
       eval <<-EOE
         class PoolParty::Resources::#{symc} < PoolParty::Resources::Resource
         end

data/lib/poolparty/plugins/line.rb

@@ -4,7 +4,7 @@ module PoolParty
     define_resource(:line_in_file) do
       # Should refactor
       def has_line_in_file(line="line_in_file", file="file", opts={})
-        call_function <<-EOE
+        call_custom_function <<-EOE
         line {
           '#{file}_line' :
             file => '#{file}',
@@ -16,7 +16,7 @@ module PoolParty
       end
       
       def append_if_no_such_line(line="line", file="", refreshonly='false')
-        call_function <<-EOE
+        call_custom_function <<-EOE
         append_if_no_such_line {
           '#{file}' :
             file => '#{file}',
@@ -27,7 +27,7 @@ module PoolParty
       end
       
       def delete_lines_from(file="", pattern=//, opts={})
-        call_function <<-EOE
+        call_custom_function <<-EOE
         delete_lines {
           '#{file}' :
             file => '#{file}',

data/lib/poolparty/plugins/runit.rb

@@ -3,7 +3,7 @@ module PoolParty
     define_resource(:runitservice) do
       def has_runit_service(name="runitservice", downif="", templatedir="")
         path = copy_templates_from_templatedir(templatedir)
-        call_function <<-EOC
+        call_custom_function <<-EOC
 runit_service {
 "#{name}":
   directory => "/etc/sv",

data/lib/poolparty/plugins/svn.rb

@@ -4,7 +4,7 @@ module PoolParty
     define_resource(:svn) do
       
       def has_svnpath(opts={})
-        call_function <<-EOE
+        call_custom_function <<-EOE
         svnserve { #{opts[:name]}:
           source => "#{opts[:source]}",
           path => "#{opts[:path]}",

data/lib/poolparty/pool/custom_resource.rb

@@ -7,48 +7,23 @@ module PoolParty
 
   module Resources
     
-    def call_function(str, opts={}, &block)
-      
-      if !global_resources_store.select {|r| r.key == str.keyerize }.empty?
-        @res = get_resource(:call_function, str.keyerize, parent)
-      else
-        @res = returning PoolParty::Resources::CallFunction.new(str, opts.merge(:key => str.keyerize), &block) do |o|
-          store_into_global_resource_store(o)
-          resource(:call_function) << o
-        end
-      end
-      @res
+    def call_custom_function(str, opts={}, parent=self, &block)
+      add_resource(:call_function, opts.merge({:str => str, :name => str.keyerize}), parent, &block)
     end
                 
     # Resources for function call
     class CallFunction < Resource
-      def initialize(str="", opts={}, parent=self, &block)
-        @key = opts[:key] || str.keyerize
-        @str = str
-        # super(opts, parent, &block)
-      end
-      def key
-        @key || @str.keyerize
-      end
-      def duplicatable?
-        false
-      end
       def to_string(pre="")
         returning Array.new do |arr|
-          arr << "#{pre}#{@str}"
+          arr << "#{pre}#{str}"
         end.join("\n")
       end
     end
         
     class CustomResource < Resource
-      def initialize(name=:custom_method, opts={}, parent=self, &block)
-        @name = name
-        super(opts, parent, &block)
-      end
-      
       def self.inherited(subclass)
         PoolParty::Resources.available_custom_resources << subclass
-        super(subclass)
+        super
       end
       
       def to_string(pre="")

data/lib/poolparty/pool/pool.rb

@@ -47,7 +47,7 @@ module PoolParty
       end
       
       def setup_defaults
-        plugin_directory "#{::File.dirname(pool_specfile)}/plugins" 
+        plugin_directory "#{::File.dirname(pool_specfile ? pool_specfile : Dir.pwd)}/plugins"
       end
             
       # This is where the entire process starts

data/lib/poolparty/pool/resource.rb

@@ -20,17 +20,18 @@ module PoolParty
     def add_resource(type, opts={}, parent=self, &block)
       if in_a_resource_store?(type, opts[:name])
         @res = get_resource(type, opts[:name], parent)
-        if should_duplicate_resource?(type, @res, parent, opts)
-          @res = @res.dup
-          @pa = parent
-          @res.instance_eval {@parent = @pa}
+        # if should_duplicate_resource?(type, @res, parent, opts)
+        # unless @res.parent == parent
+        #   @pa = parent
+        #   @res.instance_eval {@parent = @pa}
+        # end
           # parent.resource(type) << @res
-        end        
+        # end
       else
-        @res = returning "PoolParty::Resources::#{type.to_s.camelize}".classify.constantize.new(opts, parent, &block) do |o|                    
+        @res = returning "PoolParty::Resources::#{type.to_s.camelize}".camelize.constantize.new(opts, parent, &block) do |o|                    
           store_into_global_resource_store(o)
           resource(type) << o          
-        end
+        end        
       end
       @res
     end
@@ -90,7 +91,7 @@ module PoolParty
       
       def self.inherited(subclass)
         subclass = subclass.to_s.split("::")[-1] if subclass.to_s.index("::")
-        lowercase_class_name = subclass.to_s.downcase
+        lowercase_class_name = subclass.to_s.underscore
         
         # Add add resource method to the Resources module
         unless PoolParty::Resources.respond_to?(lowercase_class_name.to_sym)          
@@ -161,20 +162,30 @@ module PoolParty
           @pa = @pa.respond_to?(:parent) ? @pa.parent : nil
         end
         @pa
-      end      
+      end
+      
+      def parent_tree
+        @pa = self
+        returning Array.new do |arr|
+          while !(@pa.is_a?(PoolParty::Cloud::Cloud) || @pa.nil? || @pa == self)
+            @pa = @pa.respond_to?(:parent) ? @pa.parent : nil
+            arr << @pa
+          end
+        end
+      end
       
       # DSL Overriders
       include PoolParty::ResourcingDsl
       
       def same_resources_of(t, k)
-        key == k && class_name_sym == t && !duplicatable?
+        key == k && class_name_sym == t
       end
       def duplicatable?
         false
       end
       # This way we can subclass resources without worry
       def class_type_name
-        self.class.to_s.top_level_class
+        self.class.to_s.top_level_class.underscore
       end
       def self.custom_function(str)
         custom_functions << str

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

@@ -9,11 +9,12 @@ module PoolParty
       
       # Execs cannot have the following parameters
       # We use version in the gempackage resource
-      # So we have to exclude it here. Alternatively, we could
-      # exclude it in the gempackage, but this is an example
-      # of how to exclude it as well
-      def disallowed_options
-        [:ensure, :name, :source, :version, :download_url, :template]
+      # So we have to exclude it here.
+      def allowed_options
+        [
+          :command, :creates, :cwd, :env, :environment, :group, :logoutput, :user,
+          :onlyif, :path, :refresh, :refreshonly, :returns, :timeout, :unless
+        ]
       end
       
       def key

data/lib/poolparty/templates/puppetrunner

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 
 . /etc/profile
-/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master)]; then
+  echo "Run successfully"
+  else
+  /usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
+fi

data/lib/poolparty/version.rb

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

data/poolparty.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{poolparty}
-  s.version = "0.2.67"
+  s.version = "0.2.68"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]

data/spec/poolparty/core/string_spec.rb

@@ -115,6 +115,9 @@ listen web_proxy 127.0.0.1:3000
     it "should be able to get the top level class" do
       "PoolParty::Resources::File".top_level_class.should == "file"
     end
+    it "should turn file into a class" do
+      "file".camelcase.should == "File"
+    end
   end
   describe "to_option_string" do
     it "should not touch a string, but return the string with single quotes" do

data/spec/poolparty/core/time_spec.rb

@@ -17,9 +17,6 @@ describe "Time" do
     it "should be able to parse weeks" do
       2.weeks.should == 1209600
     end
-    it "should be able to parse months" do
-      1.month.should == 2592000
-    end
   end
   describe "from" do
     it "should be able to find minutes ago" do

data/spec/poolparty/pool/custom_resource_spec.rb

@@ -14,7 +14,7 @@ describe "Custom Resource" do
       lambda {
         define_resource(:rockstar) do
           def has_a_line_in_file(line="line_in_file", file="file")
-            call_function "line(#{file}, #{line})"
+            call_custom_function "line(#{file}, #{line})"
           end
           custom_function <<-EOF
           define line($file, $line, $ensure = 'present') {
@@ -28,7 +28,7 @@ describe "Custom Resource" do
       before(:each) do
         define_resource(:rockstar) do
           def has_a_line_in_file(line="line_in_file", file="file")
-            call_function "line(#{file}, #{line})"
+            call_custom_function "line(#{file}, #{line})"
           end
           custom_function <<-EOF
           define line($file, $line, $ensure = 'present') {
@@ -49,7 +49,7 @@ describe "Custom Resource" do
         reset_resources!
         define_resource(:rockstar) do
           def has_a_line_in_file(line="line_in_file", file="file")
-            call_function "line(#{file}, #{line})"
+            call_custom_function "line(#{file}, #{line})"
           end
           custom_function <<-EOF
           define line($file, $line, $ensure = 'present') {
@@ -69,7 +69,7 @@ describe "Custom Resource" do
         @resource.instance_eval do
           has_a_line_in_file("hi", "filename")
         end
-        @resource.resource(:call_function).to_string.should == "line(filename, hi)"
+        @resource.resource(:call_function).first.to_string.should == "line(filename, hi)"
       end
       it "should be stored in an array" do
         resource(:rockstar).class.should == Array

data/spec/poolparty/pool/resource_spec.rb

@@ -383,6 +383,11 @@ describe "Resource" do
             #   @cloud2.resources_string_from_resources(@cloud2.resources).should =~ /\[ Package\['apache2'\], Package\['boxers'\] \]/
             # end
           end
+          describe "inherited" do
+            it "should turn passengersite_with_ssl into PassengerSiteWithSsl" do
+              "PassengersiteWithSsl".to_s.split("::")[-1].underscore.should == "passengersite_with_ssl"
+            end
+          end
         end
       end
     end    

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.67</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.68</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.67
+  version: 0.2.68
 platform: ruby
 authors: 
 - Ari Lerner