auser-poolparty 1.3.8 → 1.3.10

data/VERSION.yml

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

data/bin/cloud-thrift

@@ -22,9 +22,11 @@ Usage: #{$0} #{all_options_string}
 EOS
 
   short_desc "Start the cloud thrift interface"
-  opt :port, "Start a port", :type => :integer, :default => 11223
+  opt :port, "Start on port", :type => :integer, :default => 11223
   opt :dir, "Pid directory", :type => :string, :default => "/tmp"
   opt :daemon, "Daemonize", :type => :bool, :default => true
+  # Query params
+  opt :host, "Query on host", :type => :string, :default => "localhost"
 
   run do |command|
     
@@ -33,12 +35,12 @@ EOS
     cmd = ARGV.shift
     cmd = ARGV.shift if cmd == "thrift"
     
-    if %w(run start restart stop).include?(cmd)
+    if %w(run start restart stop query).include?(cmd)
       args = [cmd]
       args << ["--", command.argv] unless command.argv.empty?
       args.flatten!
     else
-      puts "You must pass one of the following: #{%w(run start restart stop).join(", ")}"
+      puts "You must pass one of the following: #{%w(run start restart stop query).join(", ")}"
       args = ["--help"]
     end
     
@@ -55,22 +57,30 @@ EOS
       :monitor    => true
     }.merge(command.opts)
     
-    block = Proc.new do
-      handler = CommandInterfaceHandler.new
-      processor = CloudThrift::CommandInterface::Processor.new(handler)
-      transport = Thrift::ServerSocket.new( options[:port] )
-      transportFactory = Thrift::BufferedTransportFactory.new()
-      server = Thrift::SimpleServer.new(processor, transport, transportFactory)
+    if cmd == "query"
+      require "command_query_handler"
       
-      puts "Starting the cloud server..."
-      server.serve()
-      puts "done."
-    end
-    
-    if command[:daemon]
-      Daemons.run_proc("cloud-thrift", options, &block)
-    else
-      block.call
+      @loaded_clouds.map do |cld|
+        CommandQueryHandler.run_query(cld, ARGV.shift, ARGV, options)
+      end
+    else      
+      block = Proc.new do
+        handler = CommandInterfaceHandler.new
+        processor = CloudThrift::CommandInterface::Processor.new(handler)
+        transport = Thrift::ServerSocket.new( options[:port] )
+        transportFactory = Thrift::BufferedTransportFactory.new()
+        server = Thrift::SimpleServer.new(processor, transport, transportFactory)
+
+        puts "Starting the cloud server..."
+        server.serve()
+        puts "done."
+      end
+
+      if command[:daemon]
+        Daemons.run_proc("cloud-thrift", options, &block)
+      else
+        block.call
+      end
     end
     
   end

data/config/jeweler.rb

@@ -26,7 +26,9 @@ end
 
     s.files = (%w(Rakefile README.rdoc License.txt VERSION.yml) + Dir["{config,examples,lib,test,tasks,script,generators,bin,vendor}/**/*"])
     
-    s.files.exclude 'vendor/erlang/*'
+    s.files += ["vendor/erlang/hermes/ebin/*.tar.gz"]
+    
+    s.files.exclude 'vendor/erlang/hermes'
     s.files.exclude 'examples/thrift/**/*.beam'
     # s.files.exclude "**/*/erl_crash.dump"
     

data/examples/thrift/thrift_example.rb

@@ -15,6 +15,7 @@ require "poolparty_types"
 port = ARGV.pop || 11223
 
 transport = Thrift::BufferedTransport.new(Thrift::Socket.new('localhost', port))
+# transport = Thrift::BufferedTransport.new(Thrift::Socket.new('192.168.2.31', port))
 # transport = Thrift::BufferedTransport.new(Thrift::Socket.new('vm', port))
 protocol = Thrift::BinaryProtocol.new(transport)
 

data/lib/cloud_providers/ec2/ec2.rb

@@ -63,7 +63,7 @@ module CloudProviders
       return @aws_yml if @aws_yml && caching==true
       return {} unless File.exists?(filename)
       ddputs("Reading keys from file: #{filename}")
-      @aws_yml = YAML::load( open(filename).read )
+      @aws_yml = YAML::load( open(filename).read ) || {}
     end
     
     default_options({
@@ -94,7 +94,7 @@ module CloudProviders
       
       
     def ec2(o={})
-      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog, :default_host => ec2_url))
+      @ec2 ||= Rightscale::Ec2.new(access_key, secret_access_key, o.merge(:logger => PoolParty::PoolPartyLog, :endpoint_url => ec2_url))
     end
     
     # Start a new instance with the given options

data/lib/poolparty/plugins/hermes.rb

@@ -11,22 +11,27 @@ module PoolParty
       )
 
       def after_loaded
+        run_dependencies
+        build_rsync_directory
         add_unpack
         run_if_needed
       end
 
       def after_compile
-        run_dependencies
-        build_rsync_directory
       end
 
       def run_dependencies
-        case cloud.platform
+        install_packages = case cloud.platform
         when false
         else
-          has_package "erlang-nox"
-          has_package "erlang-dev"
-          has_package "rrdtool"
+          ["erlang-nox", "erlang-dev"]
+        end
+        has_package "rrdtool"
+        has_exec "install_erlang" do
+          command "echo ''"
+          install_packages.each do |pkg|
+            has_package pkg
+          end
         end
       end
 
@@ -43,18 +48,21 @@ module PoolParty
         etc_poolparty = cloud.tmp_path + "/etc/poolparty"
         FileUtils.mkdir_p(etc_poolparty)
         node_names = cloud.nodes.collect{|n| n.internal_ip || n.dns_name}.compact.collect{|n| "hermes@#{n}"}
-        contents = node_names.collect{|n| %Q{"#{n}".}}.join("\n")
+        contents = node_names.collect{|n| %Q{'#{n}'.}}.join("\n")
         File.open(etc_poolparty + "/seeds.conf", "w") {|f| f.puts contents}
       end
 
       def add_unpack
-        has_exec "cd /tmp/hermes && escript target_system install hermes-#{hermes_release_version} #{remote_hermes_deployed_dir}", 
-          :creates => "#{remote_hermes_deployed_dir}/releases/#{hermes_release_version}"
+        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")
       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", 
-          :not_if => "ps aux | grep -v grep | grep hermes | grep beam"
+          :not_if => "ps aux | grep -v grep | grep hermes | grep beam",
+          :requires => get_exec("install_hermes")
       end
 
       private

data/lib/poolparty/pool.rb

@@ -151,17 +151,16 @@ module PoolParty
     #   + calls the resource define_resource_methods to define the resource methods
     #   + sets up the log
     def self.before_file_load(filepath)
-      $:.unshift(::File.dirname(filepath))
-      Dir["#{ ::File.dirname(filepath)}/{plugins,lib}/**/*"].each do |plugin_path| 
+      $:.unshift(File.dirname(filepath))
+      $:.unshift("#{File.dirname(filepath)}/lib")
+      $:.unshift("#{File.dirname(filepath)}/plugins")
+      
+      Dir["#{File.dirname(filepath)}/lib/*"].each {|lib_path| require lib_path }
+      Dir["#{File.dirname(filepath)}/plugins/*"].each do |plugin_path|
         if File.directory?(plugin_path)
           $:.unshift(plugin_path)
-
-          ["#{plugin_path}/#{File.basename(plugin_path)}", "#{plugin_path}/lib/#{File.basename(plugin_path)}"].each do |potential|
-            require potential if File.exists?(potential)
-          end
-
-        elsif File.file?(plugin_path) && plugin_path.match(/.rb$/)
-          require plugin_path
+        else
+          require plugin_path if File.file?(plugin_path) && plugin_path.match(/.rb$/)
         end
       end
     end

data/lib/proto/command_query_handler.rb

@@ -0,0 +1,19 @@
+class CommandQueryHandler
+  def self.run_query(on_cloud, command, args, opts={})
+    port = opts[:port] || 11223
+    host = opts[:host] || "localhost"
+
+    transport = Thrift::BufferedTransport.new(Thrift::Socket.new(host, port))
+    protocol = Thrift::BinaryProtocol.new(transport)
+
+    client = CloudThrift::CommandInterface::Client.new(protocol)
+    transport.open()
+
+    cld = CloudThrift::CloudQuery.new
+    cld.name = on_cloud.name
+    
+    ddputs("Running command: #{command} on #{cld.name} at #{host}:#{port}")
+    resp = client.run_command(cld, command, args)
+    resp.response
+  end
+end

data/test/lib/proto/command_query_handler_test.rb

@@ -0,0 +1,11 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+$:.unshift("#{File.dirname(__FILE__)}/../../../lib/proto")
+require "command_query_handler"
+
+class CommandQueryHandlerTest < Test::Unit::TestCase
+
+  def test_has_run_query_command
+    assert CommandQueryHandler.respond_to?(:run_query)
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.3.8
+  version: 1.3.10
 platform: ruby
 authors: 
 - Ari Lerner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -208,6 +208,7 @@ files:
 - lib/poolparty/resources/user.rb
 - lib/poolparty/resources/variable.rb
 - lib/proto/command_interface_handler.rb
+- lib/proto/command_query_handler.rb
 - lib/proto/gen-erl/commandInterface_thrift.erl
 - lib/proto/gen-erl/commandInterface_thrift.hrl
 - lib/proto/gen-erl/poolparty_constants.hrl
@@ -335,6 +336,7 @@ files:
 - test/lib/poolparty/resources/service_test.rb
 - test/lib/poolparty/resources/user_test.rb
 - test/lib/poolparty/resources/variable_test.rb
+- test/lib/proto/command_query_handler_test.rb
 - test/lib/provision/base_test.rb
 - test/lib/provision/bootstrapper_test.rb
 - test/test_helper.rb
@@ -1112,7 +1114,6 @@ files:
 - vendor/gems/trollop/www/index.html
 has_rdoc: false
 homepage: http://poolpartyrb.com
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --quiet
@@ -1138,7 +1139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Self-healing, auto-scaling system administration, provisioning and maintaining tool that makes cloud computing easy and fun