auser-poolparty 1.3.10 → 1.3.11

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 3
-:patch: 10
+:patch: 11
 :major: 1

data/bin/cloud-thrift

@@ -60,8 +60,8 @@ EOS
     if cmd == "query"
       require "command_query_handler"
       
-      @loaded_clouds.map do |cld|
-        CommandQueryHandler.run_query(cld, ARGV.shift, ARGV, options)
+      @loaded_clouds.each do |cld|
+        puts CommandQueryHandler.run_query(cld, ARGV.shift, ARGV, options)
       end
     else      
       block = Proc.new do

data/config/jeweler.rb

@@ -25,7 +25,6 @@ end
     s.test_files = Dir["test/**/test_*.rb"]
 
     s.files = (%w(Rakefile README.rdoc License.txt VERSION.yml) + Dir["{config,examples,lib,test,tasks,script,generators,bin,vendor}/**/*"])
-    
     s.files += ["vendor/erlang/hermes/ebin/*.tar.gz"]
     
     s.files.exclude 'vendor/erlang/hermes'

data/examples/thrift/thrift_example.rb

@@ -23,7 +23,8 @@ client = CloudThrift::CommandInterface::Client.new(protocol)
 transport.open()
 
 cld = CloudThrift::CloudQuery.new
-cld.name = 'monitored_app'
+cld.name = 'pp2'
+# cld.name = 'monitored_app'
 # cld.name = 'vmware'
 
 resp = client.run_command(cld, "name", [])

data/lib/cloud_providers/cloud_provider_instance.rb

@@ -68,10 +68,15 @@ module CloudProviders
         raise StandardError.new("You must pass in a cloud to configure an instance") unless cloud
         cloud.compile(self)        
         
-        scp(:source       => keypair.full_filepath, 
-            :destination  => "/etc/poolparty/keys/#{keypair.basename}")
+        # scp(:source       => keypair.full_filepath, 
+        #     :destination  => "/etc/poolparty/keys/#{keypair.basename}")
         
         FileUtils.mkdir_p cloud.tmp_path/"etc"/"poolparty" unless File.directory?(cloud.tmp_path/"etc"/"poolparty")
+        FileUtils.mkdir_p cloud.tmp_path/"etc"/"poolparty"/"keys" unless File.directory?(cloud.tmp_path/"etc"/"poolparty"/"keys")
+        
+        FileUtils.cp keypair.full_filepath, cloud.tmp_path/"etc"/"poolparty"/"keys"/keypair.basename
+        File.open(cloud.tmp_path/"etc"/"poolparty"/"cloud_name", "w") {|f| f << cloud.name }
+        
         pack_clouds_dot_rb_and_expected_directories
         
         dputs("Rsyncing #{cloud.tmp_path/"*"}")

data/lib/cloud_providers/ec2/ec2.rb

@@ -159,7 +159,7 @@ module CloudProviders
     end
     
     def after_compile(cld)
-      save_aws_env_to_yml(cld.tmp_path/"etc"/"poolparty"/"env.yml")
+      save_aws_env_to_yml(cld.tmp_path/"etc"/"poolparty"/"env.yml") rescue nil
     end
     
     # Read  yaml file and use it to set environment variables and local variables.
@@ -171,7 +171,8 @@ module CloudProviders
     
     # Save aws keys and env variables to a yaml file
     def save_aws_env_to_yml(filename='/etc/poolparty/env.yml')
-      File.open(filename, 'w') {|f| f<<YAML::dump(aws_hash(dsl_options, "/etc/poolparty/ec2")) } rescue nil
+      hsh = aws_hash(default_options, "/etc/poolparty/ec2")
+      File.open(filename, 'w') {|f| f<<YAML::dump(hsh) }
     end
     
     # Return a hash of the aws keys and environment variables

data/lib/poolparty/cloud.rb

@@ -196,12 +196,14 @@ module PoolParty
     # the defined (or the default dependency_resolver, chef)
     def compile(caller=nil)
       callback :before_compile
+      cloud_provider.before_compile(self)
       FileUtils.mkdir_p tmp_path unless File.directory?(tmp_path)
       ddputs <<-EOE
 Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"} 
   number of resources: #{ordered_resources.size}
       EOE
       out = dependency_resolver.compile_to(ordered_resources, tmp_path/"etc"/"#{dependency_resolver_name}", caller)
+      cloud_provider.after_compile(self)
       callback :after_compile
       out
     end

data/lib/poolparty/monitor.rb

@@ -27,7 +27,7 @@ You must pass a block with your monitor
     end
       EOE
       raise PoolPartyError.create("MonitorDefinitionError", msg) unless block
-      @name = monitor_name
+      @name = monitor_name.to_sym
       @monitor_block = block
     end
     

data/lib/poolparty/plugins/hermes.rb

@@ -14,6 +14,7 @@ module PoolParty
         run_dependencies
         build_rsync_directory
         add_unpack
+        run_dependencies
         run_if_needed
       end
 
@@ -53,16 +54,20 @@ module PoolParty
       end
 
       def add_unpack
-        has_exec "install_hermes", 
+        has_exec "install_hermes",
           :command => "cd /tmp/hermes && escript target_system install hermes-#{hermes_release_version} #{remote_hermes_deployed_dir}", 
           :creates => "#{remote_hermes_deployed_dir}/releases/#{hermes_release_version}",
-          :requires => get_exec("install_erlang")
+          :requires => get_package("erlang-dev")
+          
+        has_link  :name => "collectd_dir", 
+                  :to => "/var/lib/collectd/rrd/\#{`hostname -f`.chomp}", :source => "/var/lib/collectd/localhost",
+                  :requires => [get_package("collectd")]
       end
 
       def run_if_needed
-        has_exec "env GEN_CLUSTER_SEED_CONFIG=/etc/poolparty/seeds.conf #{remote_hermes_deployed_dir}/bin/erl -boot #{remote_hermes_deployed_dir}/releases/#{hermes_release_version}/start -noshell -detached", 
+        has_exec "env GEN_CLUSTER_SEED_CONFIG=/etc/poolparty/seeds.conf HERMES_RRD_DIRECTORY=/var/lib/collectd/localhost #{remote_hermes_deployed_dir}/bin/erl -boot #{remote_hermes_deployed_dir}/releases/#{hermes_release_version}/start -noshell -detached", 
           :not_if => "ps aux | grep -v grep | grep hermes | grep beam",
-          :requires => get_exec("install_hermes")
+          :requires => [get_exec("install_hermes"), get_link("collectd_dir")]
       end
 
       private

data/lib/poolparty/resources/file.rb

@@ -66,8 +66,8 @@ end
           file = arg.first
           @template = if File.file?(b = File.expand_path(file))
             b
-          elsif File.file?(c = File.expand_path(File.join(clouds_dot_rb_dir, file)))
-            c
+          elsif File.file?(d = File.expand_path(File.join(clouds_dot_rb_dir, file)))
+            d
           elsif f = search_in_known_locations(file)
             f
           else

data/lib/poolparty/resources/link.rb

@@ -30,12 +30,13 @@ module PoolParty
       
       default_options(
         :link_type  => :symbolic,
+        :source     => nil,
         :to         => nil
       )
       
       def print_to_chef
         <<-EOE
-link "<%= name %>" do
+link "<%= source || name %>" do
   link_type <%= print_variable(link_type) %>
   action :<%= exists? ? :create : :delete %>
   to <%= print_variable(to) %>

data/lib/proto/command_interface_handler.rb

@@ -4,7 +4,31 @@ class CommandInterfaceHandler
     cr = CloudThrift::CloudResponse.new
     cr.name = cld.name
     cr.command = command
-    resp = begin
+    
+    cr.response = format_response(get_response(cld, command, args))
+
+    return cr
+  end
+  
+  def cast_command(cld, command, args)
+        
+    cr = CloudThrift::CloudResponse.new
+    cr.name = cld.name
+    cr.command = command
+    cr.response = format_response("Running command: #{command}(#{args})")
+    
+    fork do
+      get_response(cld, command, args)
+    end
+
+    return cr
+  end
+  
+  
+  private
+  
+  def get_response(cld, command, args)
+    begin
       the_cloud = clouds[cld.name]
       if the_cloud
         if command.include?(".")
@@ -25,15 +49,9 @@ class CommandInterfaceHandler
       end
     rescue Exception => e
       cr.response = "Error: #{e.inspect}"
-    end
-    
-    cr.response = format_response(resp)
-
-    return cr
+    end    
   end
   
-  private
-  
   def format_response(resp)
     case resp
     when Array
@@ -44,4 +62,5 @@ class CommandInterfaceHandler
       [resp]
     end.map {|ele| ele.to_s }
   end
+  
 end

data/tasks/poolparty.rake

@@ -22,6 +22,30 @@ task :thrift do
   end
 end
 
+namespace(:hermes) do
+  
+  desc "Pack for distribution"
+  task :target_system do
+    erl_dir = File.dirname(__FILE__) + "/../vendor/erlang"
+    hermes_dir = File.join(erl_dir, "hermes")
+    
+    puts `cd #{hermes_dir} && make target_system`
+  end
+  desc "Update hermes code"
+  task :update do
+    erl_dir = File.dirname(__FILE__) + "/../vendor/erlang"
+    hermes_dir = File.join(erl_dir, "hermes")
+    
+    if File.directory?(hermes_dir)
+      `cd #{hermes_dir} && git pull origin master`
+    else
+      FileUtils.mkdir_p erl_dir
+      r = "git clone git://github.com/auser/hermes.git #{hermes_dir}"
+      Kernel.system r
+    end
+  end
+end
+
 namespace(:pp) do
   task :build_gem => ["poolparty:vendor:setup", "poolparty:vendor:update", :gemspec, :build]
   

data/test/lib/poolparty/cloud_test.rb

@@ -134,7 +134,6 @@ class CloudTest < Test::Unit::TestCase
     assert_equal 22, clouds["noneity"].ssh_port
   end
   
-  
   def test_children_getting_parent_options
     clear!
     pool "outside" do
@@ -183,5 +182,11 @@ class CloudTest < Test::Unit::TestCase
     assert_equal 1, clouds["app_cloud"].monitors.size
     
     clouds["app_cloud"].compile
+    
+    compile_dir = clouds["app_cloud"].tmp_path/"etc"/"chef"/"cookbooks"/"poolparty"
+    recipe_file = compile_dir/"recipes"/"default.rb"
+    recipe_contents = open(recipe_file).read
+    
+    assert_match /install hermes/, recipe_contents
   end
 end

data/test/lib/poolparty/monitor_test.rb

@@ -3,7 +3,7 @@ require "#{File.dirname(__FILE__)}/../../test_helper"
 class MonitorTest < Test::Unit::TestCase
   
   def setup
-    @mon = PoolParty::Monitor.new(:'cpu-idle') do |c|
+    @mon = PoolParty::Monitor.new("cpu-idle") do |c|
       vote_for(:expand) if c > 0.8
       configure if c < 0.1
     end

data/test/lib/poolparty/resources/conditional_test.rb

@@ -27,6 +27,7 @@ end'
     pool "conditional_cloud" do
       cloud "test" do
         
+        keypair "test_key"
         has_case "os" do
           when_is :ubuntu, "git-core"
           else_is "git"

metadata

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