auser-poolparty 1.1.7 → 1.2.0

data/lib/poolparty/net/remoter/interactive.rb

@@ -1,28 +1,12 @@
 module PoolParty
   module Remote
     
-    # #DEPRECATE We'll stub the ip to be the master ip for ease and accessibility
-    # def ip(i=nil)
-    #   puts "DEPRECATED:  ip will only be callable against a RemoteInstance in the next release."
-    #   i ? options[:ip] = i : (master ? master.ip : options[:ip])
-    # end
-    # #DEPRECATE: get the master instance
-    def master
-      puts "DEPRECATED:  'master' is deprecated and will be removed in the next major release."
-      get_instance_by_number(0)
-    end
-    
     # Select a list of instances based on their status
     def nodes(hsh={})
       # _nodes[hsh] ||= 
       list_of_instances.select_with_hash(hsh)
     end
     
-    # Cache the instances_by_status here
-    def _nodes
-      @_nodes ||= {}
-    end
-    
     # Select the list of instances, either based on the neighborhoods
     # loaded from /etc/poolparty/neighborhood.json
     # or by the remote_base on keypair
@@ -34,6 +18,11 @@ module PoolParty
     end
 
     private
+    # Cache the instances_by_status here
+    def _nodes
+      @_nodes ||= {}
+    end
+    
     # List the instances for the current key pair, regardless of their states
     # If no keypair is passed, select them all
     def _list_of_instances(select={})

data/lib/poolparty/net/remoter_bases/ec2/ec2.rb

@@ -74,6 +74,7 @@ module PoolParty
         return describe_instances.first if o[:instance_id].nil?
         describe_instances.detect {|a| a[:name] == o[:instance_id] || a[:ip] == o[:instance_id] || a[:instance_id] == o[:instance_id] }
       end
+      # TODO: Clean up this method and remove hostnames
       def describe_instances(o={})
         id = 0
         get_instances_description(options.merge(o)).each_with_index do |h,i|          
@@ -137,16 +138,6 @@ module PoolParty
           associate_address(inst)
         end
       end
-    
-      # Attach a volume to the instance
-      # DEPRECATE this relies on master.  master will be removed in next major release.  This method will be in ec2_remote_instance instead, or require an instance id
-      def attach_volume(instance=nil)
-        if ebs_volume_id
-          vputs "Attaching volume #{ebs_volume_id} to the master at #{ebs_volume_device}"
-          instance = master        
-          ec2.attach_volume(:volume_id => ebs_volume_id, :instance_id => instance.instance_id, :device => ebs_volume_device) if ebs_volume_id && ebs_volume_mount_point
-        end
-      end
       
       # Associate an address with the instance using ec2
       # Get the next_unused_elastic_ip

data/lib/poolparty/plugins/apache2.rb

@@ -0,0 +1,53 @@
+module PoolParty
+  class Base
+    plugin :apache do
+      
+      # Called after the plugin is loaded entirely, all the options are set, etc.
+      def loaded(o={}, &block)
+        include_chef_recipe chef_apache2_recipe_root # We want to include the chef apache2 recipe to use it
+      end
+      
+      def present_apache_module(*names)
+        names.each do |name|
+          has_chef_recipe "apache2::mod_" + name
+        end
+      end
+
+      private
+      def chef_apache2_recipe_root
+        "#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2"
+      end
+      
+    end
+
+
+    # Usage:°
+    #°
+    # enable_php5 do
+    #   extras :cli, :pspell, :mysql
+    # end
+    virtual_resource(:enable_php5) do
+      def loaded(opts={}, parent=self)
+        has_package("php5")
+        has_package("libapache2-mod-php5")
+        present_apache_module("php5")
+        has_file({:name => "/etc/php5/apache2/php.ini",
+                :template => File.dirname(__FILE__) + "/../templates/php.ini.erb",
+                :mode => 755,
+                :requires => get_package("libapache2-mod-php5")})
+                # :notify => get_exec("reload-apache2")})
+      end
+
+      def extras(*names)
+        names.each do |name|
+          # has_package(:name => "php5-#{name}", :requires => get_package("php5"))
+          has_package(:name => "php5-#{name}")
+        end
+      end
+
+    end
+
+
+  end
+
+end

data/lib/poolparty/plugins/deploy_directory.rb

@@ -1,18 +1,22 @@
-=begin rdoc
-  DeployDirectory
+module PoolParty
+
+=begin  rdoc    
+== Deploy Directory
+
+The deploy directory will copy the source directory from the developer machine (i.e. your laptop) to /tmp/poolparty, and then rsync it to the specified target directory on the cloud nodes.
+
+== Usage
+
+  has_deploy_directory(has_deploy_directory 'bob', 
+                     :from => "~/path/to/my/site", 
+                     :to => "/mnt",
+                     :owner => 'www-data' 
+
+This will place the contents of ~/path/to/my/site from your machine to /mnt/bob on the cloud instances virtual_resource(:deploy_directory)
 
-  Deploy directory will rsync a local directory to 
-  each instance of your cloud. 
-  
-  example:
-    has_directory 'name', :from => '/local/path', :to => '/path/on/server/'
-    
-  The above example will place the contents of '/local/path' at '/path/on/server/name'
 =end
-module PoolParty
+
   class Deploydirectory
-    
-    virtual_resource(:deploy_directory) do
       
       def loaded(opts={}, &block)        
         add_unpack_directory
@@ -40,8 +44,6 @@ module PoolParty
         end
         
       end
-      
-    end
     
   end
 end

data/lib/poolparty/plugins/gem_package.rb

@@ -4,6 +4,30 @@ module PoolParty
   # You can optionally pass a :download_url if you want a specific gem or version installed
   # example:
   #   has_gem_package :name => 'rubot',  :download_url => 'http://rubyforge.org/frs/download.php/35089/rubot-base-0.0.1.gem'
+
+=begin rdoc
+== Gempackage
+
+Gempackages describe distributed gems on the cloud. The gem is only downloaded once and then hosted on the master if a download url is given. 
+
+== Usage
+
+  has_gempackage(:name => '...') do
+    # More options. 
+    # This block is optional
+  end
+
+== Options
+
+* <tt>name</tt> The gem name
+* <tt>download_url</tt> The location of the gem to download and server across the instances
+* <tt>version</tt> The gem version requirement (optional and useless if download_url is given)
+* <tt>source</tt> The gem source (optional and useless matter if download_url is given)
+
+== Examples
+  has_gempackage(:name => 'rake', 
+    :download_url => 'http://rubyforge.org/frs/download.php/43954/rake-0.8.3.gem')
+=end
   
   class GempackageResource
     

data/lib/poolparty/plugins/line_in_file.rb

@@ -1,4 +1,20 @@
 module PoolParty    
+=begin rdoc
+
+
+== Line in File
+
+Ensures that the line given is in the file
+
+== Usage
+
+  has_line_in_file('line', '/full/file/path.ext')
+
+== Examples
+
+  has_line_in_file("ENABLED=1", "/etc/default/haproxy")
+=end
+
   class LineInFile
     
     virtual_resource(:line_in_file) do

data/lib/poolparty/poolparty/plugin.rb

@@ -8,22 +8,20 @@ module PoolParty
       include CloudResourcer
       include PoolParty::DependencyResolverCloudExtensions
       include PoolParty::Callbacks
-            
-      default_options({})
       
       def initialize(opts={}, prnt=nil, &block)
+        setup_callbacks
         before_load(opts, &block)
         
         block = Proc.new {enable} unless block
-
-        @opts = opts        
+        
+        @opts = (opts.is_a?(Hash) ? opts : {:name => opts})
         super(opts, &block)
         
         run_in_context do
           loaded @opts, &block
         end
-        
-        setup_callbacks
+                
         after_create
       end
       
@@ -41,6 +39,10 @@ module PoolParty
       def is_plugin?
         true
       end
+      def cloud
+        @parent
+      end
+      
       def bootstrap_gems *gems
         gems.each do |g|
           Provision::BootStrapper.gem_list << g unless Provision::BootStrapper.gem_list.include?(g)

data/lib/poolparty/provision/dr_configure.rb

@@ -44,6 +44,7 @@ module PoolParty
        @cloud.call_before_configure_callbacks if @cloud
        prescribe_configuration
        execute!
+       @cloud.call_after_configure_callbacks if @cloud
      end
      
      private

data/lib/poolparty/resources.rb

@@ -0,0 +1,42 @@
+module PoolParty    
+=begin rdoc
+
+Resources are items that poolparty can make available in your clouds.
+Resources are used in the <tt>clouds.rb</tt>, and in Plugins.
+Plugins are collections of resources.
+
+All of these resources can be defined as <tt>has_resource</tt> and <tt>does_not_have_resource</tt>:
+
+* <tt>has_</tt>
+  example <tt>has_file(...)</tt>
+* <tt>does_not_have_</tt>
+  For example: <tt>does_not_have_file(...)</tt>
+
+== Resources
+
+
+see PoolParty::Resources::File
+
+* +has_file+ PoolParty::Resources::File
+* +has_package+ PoolParty::Resources::Package
+* +has_gempackage+ PoolParty::Resources::GempackageResource
+* +has_exec+ PoolParty::Resources::Exec
+* +has_variable+ (for templates) PoolParty::Resources::Variable
+* +has_line_in_file+ PoolParty::Resources::LineInFile
+* +has_remotefile+ PoolParty::Resources::Remotefile
+* +hash_cron+ PoolParty::Resources::Cron
+* +has_host+ PoolParty::Resources::Host
+* +has_service+ PoolParty::Resources::Service
+* +has_symlink+ PoolParty::Resources::Symlink
+* +has_directory+ PoolParty::Resources::Directory
+* +has_deploy_directory+ PoolParty::Resources::Deploydirectory
+* +has_mount+ PoolParty::Resources::Mount
+
+== Helper methods
+    * execute_if
+
+=end
+
+  module Resources
+  end
+end

data/lib/poolparty/resources/cron.rb

@@ -1,6 +1,35 @@
 module PoolParty    
   module Resources
-        
+=begin rdoc
+== Cron
+
+The cron resource will set cron jobs at the intervals you set
+
+== Usage
+
+  has_cron(:name => '...') do
+    # More options.
+    # This block is optional
+  end
+
+== Options
+
+* <tt>name</tt> The name of the cronjob
+* <tt>user</tt> The users who owns the cronjob  
+* <tt>command</tt> The cronjob command to run
+* <tt>minute</tt> Set the minute of the cronjob
+* <tt>hour</tt> Set the hour of the cronjob
+* <tt>month</tt> Set the month of the cronjob
+* <tt>monthday</tt> Set the day of the month of the cronjob
+* <tt>weekday</tt> Set the weekday of the cronjob, in 0-6 format, where 0 is Sunday
+
+== Example
+
+  has_cron(:name => "report mailer", :minute => "5", :hour => "0", :weekday => 1) do
+    command "/bin/sh /home/user/email_reports.sh"
+  end
+
+=end
     class Cron < Resource
       
       default_options({

data/lib/poolparty/resources/directory.rb

@@ -1,6 +1,29 @@
 module PoolParty    
   module Resources
         
+=begin rdoc rdoc
+== Directory
+
+The directory resource is used to describe a directory that should be present
+on all of the instances.
+
+== Usage
+
+  has_directory 'name', :from => '/local/path', :to => '/path/on/server/'
+  
+The above example will place the contents of '/local/path' at '/path/on/server/name'
+
+  has_directory(:name => '/etc/apache2')
+
+== Options
+
+* <tt>name</tt> Describe the location of the file with the name
+* <tt>mode</tt> Describe the mode of the file (default: 644)
+* <tt>owner</tt> The owner of the file (default: poolparty user)
+
+=end
+
+
     class Directory < Resource
       
       def present

data/lib/poolparty/resources/exec.rb

@@ -1,5 +1,27 @@
 module PoolParty    
   module Resources
+=begin rdoc rdoc
+== Exec
+
+Ensure a command is run on the instances
+
+== Usage
+
+  has_exec(:name => '...') do
+    # More options. 
+    # This block is optional
+  end
+
+== Options
+
+* <tt>name</tt> The name of your exec. This is optional, but nice for debugging purposes
+* <tt>cwd</tt> Current working directory to execute the command (optional)
+* <tt>command</tt> This describes the command to run
+* <tt>path</tt> The path to run the command with (optional)
+
+== Examples
+  has_exec(:name => 'start messenger', :command => 'server-start-node', :requires => get_gempackage('poolparty-latest', :onlyif => 'ps aux | grep beam | grep master')
+=end
     
     class Exec < Resource
       

data/lib/poolparty/resources/file.rb

@@ -1,6 +1,34 @@
 module PoolParty    
   module Resources
         
+=begin rdoc rdoc
+== File
+
+The file resource is used to describe a file that should be present on all of the instances.
+
+== Usage
+
+  has_file(:name => '...') do
+    # More options. 
+    # This block is optional
+  end
+
+== Options
+
+* <tt>name</tt> Describe the location of the file with the name
+* <tt>mode</tt> Describe the mode of the file (default: 644)
+* <tt>owner</tt> The owner of the file (default: poolparty user)
+* <tt>content</tt> The contents of the file
+* <tt>source</tt> Used to describe a file that is hosted on the master instance.
+* <tt>template</tt> The file contents are described with the template. The location given must be readable
+  
+To write a file to the template directory, use:
+
+  copy_template_to_storage_directory(filepath)
+
+== Example
+  has_file(:name => '/etc/motd', :content => 'Hey and welcome to your node today!')
+=end
     class File < Resource
       
       def loaded(o={}, &block)

data/lib/poolparty/resources/host.rb

@@ -1,6 +1,27 @@
 module PoolParty    
   module Resources
-        
+=begin rdoc
+
+== Host
+
+The host parameter sets hosts on the instances. Setting this, every node will have the host.
+
+== Usage
+
+  has_host(:name => '...') do
+    # More options. 
+    # This block is optional
+  end
+
+== Options
+
+* <tt>name</tt>The name of the instance
+* <tt>ip</tt> IP address of the instance for the host entry
+
+== Examples
+
+  has_host({:name => "other_machine", :ip => 192.168.0.101 })
+=end       
     class Host < Resource
             
       default_options({