auser-poolparty 0.0.9 → 0.1.0

data/CHANGELOG

@@ -1,11 +1,12 @@
+v0.1.0 * Added poolnotify
+       * Updating gem on github
 v0.0.9 * Changed configuration style to rsync all files across every instance
        * Moved configuration back to a configure scrip
        * Added in vlad configuration
        * Added plugin ability to install custom software
        * Updated configuration style
        * Added cloud_list to pool
-       * Changed listing of the clouds through pool
-       * Added poolnotify
+       * Changed listing of the clouds through pool       
 v0.0.8 * Added plugin_manager
        * Moved remoting to rake remote task (from vlad)
        * Changed configuration from instance-based to cloud-based

data/Rakefile

@@ -7,9 +7,8 @@ begin
     s.author = "Ari Lerner"
     s.email = "ari.lerner@citrusbyte.com"
     s.summary = "Run your entire application off EC2, managed and auto-scaling"
-    s.url = "http://blog.citrusbyte.com"
-    s.runtime_dependencies = ["aws-s3", "amazon-ec2", "auser-aska", "git", "crafterm-sprinkle", "SystemTimer"]
-    s.development_dependencies = []
+    s.url = "http://poolpartyrb.com"
+    s.dependencies = ["aws-s3", "amazon-ec2", "auser-aska", "git", "crafterm-sprinkle", "SystemTimer"]
     s.install_message = %q{
       
       Get ready to jump in the pool, you just installed PoolParty!
@@ -33,4 +32,62 @@ end
 
 task :default => :test
 
-PoolParty.include_tasks
+PoolParty.include_tasks
+
+namespace(:pkg) do
+  ## Rake task to create/update a .manifest file in your project, as well as update *.gemspec
+  desc %{Update ".manifest" with the latest list of project filenames. Respect\
+  .gitignore by excluding everything that git ignores. Update `files` and\
+  `test_files` arrays in "*.gemspec" file if it's present.}
+  task :manifest do
+    list = Dir['**/*'].sort
+    spec_file = Dir['*.gemspec'].first
+    list -= [spec_file] if spec_file
+
+    File.read('.gitignore').each_line do |glob|
+      glob = glob.chomp.sub(/^\//, '')
+      list -= Dir[glob]
+      list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
+      puts "excluding #{glob}"
+    end
+
+    if spec_file
+      spec = File.read spec_file
+      spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
+        assignment = $1
+        bunch = $2 ? list.grep(/^test\//) : list
+        '%s%%w(%s)' % [assignment, bunch.join(' ')]
+      end
+
+      File.open(spec_file,   'w') {|f| f << spec }
+    end
+    File.open('Manifest', 'w') {|f| f << list.join("\n") }
+  end
+  desc "Build gemspec for github"
+  task :gemspec => :manifest do
+    require "yaml"
+    `rake manifest gem`
+    data = YAML.load(open("poolparty.gemspec").read).to_ruby
+    File.open("poolparty.gemspec", "w+") {|f| f << data }
+  end
+  desc "Update gemspec with the time"
+  task :gemspec_update => :gemspec do
+    data = open("poolparty.gemspec").read
+    str = "Updated at #{Time.now.strftime("%I:%M%p, %D")}"
+    
+    if data.scan(/Updated at/).empty?
+      data = data.gsub(/you just installed PoolParty\!/, '\0'+" (#{str})")
+    end
+    
+    File.open("poolparty.gemspec", "w+") {|f| f << data }
+  end
+  desc "Get ready to release the gem"
+  task :prerelease => :gemspec_update do
+    `git add .`
+    `git ci -a -m "Updated gemspec for github"`
+  end
+  desc "Release them gem to the gem server"
+  task :release => :prerelease do
+    `git push origin master`
+  end
+end

data/bin/instance

@@ -12,7 +12,9 @@ Usage: instance [OPTIONS] { #{commandables.join(" | ")} }
 -----------------------------------------------------------------
     EOU
     })
-PoolParty.load_plugins
+    
+PoolParty.load
+
 master = PoolParty::Master.new
 list = PoolParty::Optioner.parse(ARGV.dup, %w(-v --verbose))
 num = list.reject {|a| commandables.include?(a) }.pop

data/bin/pool

@@ -13,6 +13,9 @@ Starting #{PoolParty::Application.app_name ? "#{PoolParty::Application.app_name}
   Keypair: #{PoolParty::Application.keypair}
   Access key: #{PoolParty::Application.access_key}
   size: #{PoolParty::Application.size}
+  Monitors available:
+  --------------
+  #{PoolParty.registered_monitors.collect {|a| "   #{a}"}}
   Plugins:
   --------------
 #{Dir["#{PoolParty::Application.plugin_dir}/*"].collect {|a| "   #{File.basename(a)}"}.join("\n")}
@@ -27,8 +30,8 @@ Usage: pool [OPTIONS] {start | stop | list | clouds_list | maintain | restart |
 -----------------------------------------------------------------
     EOU
     })
-
-PoolParty.load_plugins
+    
+PoolParty.load
 master = PoolParty::Master.new
 list = PoolParty::Optioner.parse(ARGV.dup, %w(-v))
 
@@ -69,6 +72,7 @@ list.each do |cmd|
     master.request_termination_of_all_instances
     master.start_cloud!
   when "switch"
+    list.shift
     context = list.shift
     context ? `source ~/.#{context}_pool_keys` : puts("You must supply a context to switch to")
   else

data/config/sample-config.yml

@@ -15,9 +15,9 @@
 :shared_bucket: "poolparty-app-data"
 :services: nginx
 :environment: production
-:contract_when:
+:contract_when: |
   web > 10
   cpu < 0.2
-:expand_when:
-  cpu > 0.45
-  web < 10
+:expand_when: |
+  cpu > 0.85
+  web < 5

data/lib/core/object.rb

@@ -3,6 +3,9 @@
   Add returning to the object
 =end
 class Object
+  def my_methods
+    self.methods.sort - (self.class.methods + self.class.superclass.methods)
+  end
   def alias_method(new_id, original_id)
     original = self.method(original_id).to_proc
     define_method(new_id){|*args| original.call(*args)}

data/lib/helpers/plugin_spec_helper.rb

@@ -0,0 +1,59 @@
+module PoolParty
+  class PluginSpecHelper
+    def self.define_stubs(klass, num=1)
+      require File.dirname(__FILE__) + "/../../spec/helpers/ec2_mock"
+      
+      @klass = klass.send :new
+      klass.stub!(:new).and_return @klass
+      
+      define_master
+      @instances = define_instances(num)
+
+      @master.stub!(:execute_tasks).and_return true
+      @master.stub!(:launch_minimum_instances).and_return true
+      @master.stub!(:number_of_pending_instances).and_return 0
+      @master.stub!(:get_node).with(0).and_return @instance0
+
+      @master.stub!(:nodes).and_return @instances
+
+      Kernel.stub!(:system).and_return "true"
+
+      Provider.stub!(:install_poolparty).and_return true
+      Provider.stub!(:install_userpackages).and_return true
+
+      [@klass, @master, @instances]
+    end
+    def self.define_master
+      @master ||= Master.new
+    end
+    def self.define_instances(num)
+      # Too many gross evals
+      returning [] do |arr|
+        num.times do |i|
+          eval <<-EOE
+            @instance#{i} = RemoteInstance.new
+            @instance#{i}.stub!(:ssh).and_return "true"
+            @instance#{i}.stub!(:scp).and_return "true"
+            @instance#{i}.stub!(:name).and_return "node#{i}"
+            @instance#{i}.stub!(:ip).and_return "127.0.0.#{i}"
+          EOE
+          arr << eval("@instance#{i}")
+        end
+      end
+    end
+  end
+end
+
+module Spec
+  module Mocks
+    module Methods
+      def should_receive_at_least_once(sym, opts={}, &block)
+        begin
+          e = __mock_proxy.add_message_expectation(opts[:expected_from] || caller(1)[0], sym.to_sym, opts, &block).at_least(1)
+          __mock_proxy.add_message_expectation(opts[:expected_from] || caller(1)[0], sym.to_sym, opts, &block).any_number_of_times
+          e
+        end
+      end
+    end
+  end
+end

data/lib/modules/ec2_wrapper.rb

@@ -43,7 +43,9 @@ module PoolParty
       def get_instances_description
         @cached_descriptions ||= EC2ResponseObject.get_descriptions(ec2.describe_instances)
       end
-            
+      def reset!
+        @cached_descriptions = nil
+      end
       # EC2 connections
       def ec2
         @ec2 ||= EC2::Base.new(:access_key_id => Application.access_key, :secret_access_key => Application.secret_access_key)

data/lib/modules/file_writer.rb

@@ -27,7 +27,7 @@ module PoolParty
     end
     def remote_base_tmp_dir
       "~/tmp"
-    end    
+    end
     def make_base_directory
       `mkdir -p #{base_tmp_dir}` unless File.directory?(base_tmp_dir)
     end

data/lib/modules/vlad_override.rb

@@ -1,83 +1,83 @@
-require "vlad"
-class Rake::RemoteTask < Rake::Task  
-  def run command
-    cmd = [ssh_cmd, ssh_flags, target_host].compact
-    result = []
-    
-    commander = cmd.join(" ") << " \"#{command}\""
-    warn commander if $TRACE
-
-    pid, inn, out, err = popen4(commander)
-
-    inn.sync   = true
-    streams    = [out, err]
-    out_stream = {
-      out => $stdout,
-      err => $stderr,
-    }
-
-    # Handle process termination ourselves
-    status = nil
-    Thread.start do
-      status = Process.waitpid2(pid).last
-    end
-
-    until streams.empty? do
-      # don't busy loop
-      selected, = select streams, nil, nil, 0.1
-
-      next if selected.nil? or selected.empty?
-
-      selected.each do |stream|
-        if stream.eof? then
-          streams.delete stream if status # we've quit, so no more writing
-          next
-        end
-
-        data = stream.readpartial(1024)
-        out_stream[stream].write data
-
-        if stream == err and data =~ /^Password:/ then
-          inn.puts sudo_password
-          data << "\n"
-          $stderr.write "\n"
-        end
-
-        result << data
-      end
-    end
-
-    PoolParty.message "execution failed with status #{status.exitstatus}: #{cmd.join ' '}" unless status.success?
-
-    result.join
-  end
-  
-  def rsync local, remote
-    cmd = [rsync_cmd, rsync_flags, local, "#{@target_host}:#{remote}"].flatten.compact
-  
-    success = system(*cmd.join(" "))
-
-    unless success then
-      raise Vlad::CommandFailedError, "execution failed: #{cmd.join ' '}"
-    end
-  end
-  def set name, val = nil, &b
-    rt.set name, val, &b
-  end
-  def rt
-    @rt ||= Rake::RemoteTask
-  end
-  
-  def target_hosts
-    if hosts = ENV["HOSTS"] then
-      hosts.strip.gsub(/\s+/, '').split(",")
-    elsif options[:single]
-      @roles = {}; @roles[:app] = {}      
-      @roles[:app][options[:single]] = options[:single]
-      roles = Rake::RemoteTask.hosts_for(@roles)
-    else
-      roles = options[:roles]
-      roles ? Rake::RemoteTask.hosts_for(roles) : Rake::RemoteTask.all_hosts
-    end
-  end
-end
+# require "vlad"
+# class Rake::RemoteTask < Rake::Task  
+#   def run command
+#     cmd = [ssh_cmd, ssh_flags, target_host].compact
+#     result = []
+#     
+#     commander = cmd.join(" ") << " \"#{command}\""
+#     warn commander if $TRACE
+# 
+#     pid, inn, out, err = popen4(commander)
+# 
+#     inn.sync   = true
+#     streams    = [out, err]
+#     out_stream = {
+#       out => $stdout,
+#       err => $stderr,
+#     }
+# 
+#     # Handle process termination ourselves
+#     status = nil
+#     Thread.start do
+#       status = Process.waitpid2(pid).last
+#     end
+# 
+#     until streams.empty? do
+#       # don't busy loop
+#       selected, = select streams, nil, nil, 0.1
+# 
+#       next if selected.nil? or selected.empty?
+# 
+#       selected.each do |stream|
+#         if stream.eof? then
+#           streams.delete stream if status # we've quit, so no more writing
+#           next
+#         end
+# 
+#         data = stream.readpartial(1024)
+#         out_stream[stream].write data
+# 
+#         if stream == err and data =~ /^Password:/ then
+#           inn.puts sudo_password
+#           data << "\n"
+#           $stderr.write "\n"
+#         end
+# 
+#         result << data
+#       end
+#     end
+# 
+#     PoolParty.message "execution failed with status #{status.exitstatus}: #{cmd.join ' '}" unless status.success?
+# 
+#     result.join
+#   end
+#   
+#   def rsync local, remote
+#     cmd = [rsync_cmd, rsync_flags, local, "#{@target_host}:#{remote}"].flatten.compact
+#   
+#     success = system(*cmd.join(" "))
+# 
+#     unless success then
+#       raise Vlad::CommandFailedError, "execution failed: #{cmd.join ' '}"
+#     end
+#   end
+#   def set name, val = nil, &b
+#     rt.set name, val, &b
+#   end
+#   def rt
+#     @rt ||= Rake::RemoteTask
+#   end
+#   
+#   def target_hosts
+#     if hosts = ENV["HOSTS"] then
+#       hosts.strip.gsub(/\s+/, '').split(",")
+#     elsif options[:single]
+#       @roles = {}; @roles[:app] = {}      
+#       @roles[:app][options[:single]] = options[:single]
+#       roles = Rake::RemoteTask.hosts_for(@roles)
+#     else
+#       roles = options[:roles]
+#       roles ? Rake::RemoteTask.hosts_for(roles) : Rake::RemoteTask.all_hosts
+#     end
+#   end
+# end

data/lib/poolparty.rb

@@ -3,15 +3,14 @@
 =end
 $:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
 
+$TRACE = true
+
 # rubygems
 require 'rubygems'
 require "aws/s3"
-require "sqs"
 require "EC2"
 require "aska"
 require 'sprinkle'
-
-require 'thread'
 require "pp"
 require "tempfile"
 
@@ -20,6 +19,7 @@ begin
   require 'system_timer'
   @@timer = SystemTimer
 rescue LoadError
+  require 'thread'
   require 'timeout'
   @@timer = Timeout
 end
@@ -30,7 +30,7 @@ pwd = File.dirname(__FILE__)
 # Load the required files
 # If there is an init file, load that, otherwise
 # require all the files in each directory
-%w(core modules s3 poolparty).each do |dir|  
+%w(core modules s3 helpers poolparty).each do |dir|  
   Dir["#{pwd}/#{dir}"].each do |dir|
     begin
       require File.join(dir, "init")
@@ -41,12 +41,14 @@ pwd = File.dirname(__FILE__)
 end
 
 module PoolParty
-  module Version #:nodoc:
+  class Version #:nodoc:
     @major = 0
-    @minor = 0
-    @tiny  = 9
+    @minor = 1
+    @tiny  = 0
 
-    STRING = [@major, @minor, @tiny].join('.')
+    def self.string
+      [@major, @minor, @tiny].join('.')
+    end
   end
   def timer
     @@timer
@@ -69,7 +71,7 @@ module PoolParty
   end
   # User directory
   def user_dir
-    Dir.pwd
+    Application.working_directory
   end
   # Write string to a tempfile
   def write_to_temp_file(str="")
@@ -80,18 +82,34 @@ module PoolParty
   end
   def register_monitor(*names)
     names.each do |name|
-      PoolParty::Monitors.extend name
+      unless registered_monitor?(name)
+        PoolParty::Monitors.extend name
       
-      PoolParty::Master.send :include, name::Master
-      PoolParty::RemoteInstance.send :include, name::Remote
+        PoolParty::Master.send :include, name::Master
+        PoolParty::RemoteInstance.send :include, name::Remote
+        
+        registered_monitors << name
+      end
     end
   end
+  def registered_monitor?(name); registered_monitors.include?(name); end
+  def registered_monitors; @@registered_monitors ||= [];end
+  
+  def load
+    load_monitors
+    load_plugins
+  end  
+  def load_monitors
+    loc = File.directory?("#{user_dir}/monitors") ? "#{user_dir}/monitors" : "#{root_dir}/lib/poolparty/monitors"
+    Dir["#{loc}/*"].each {|f| require f}
+  end
+  
   def load_plugins
     Dir["#{plugin_dir}/**/init.rb"].each {|a| require a} if File.directory?(plugin_dir)
   end
   def reset!
+    @@registered_monitors = nil
     @@installed_plugins = nil
-    Application.options = nil
   end
   def plugin_dir
     "#{user_dir}/vendor"