auser-poolparty 1.2.12 → 1.3.0

data/bin/cloud-show

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-# require "poolpartycl"
+
 require 'git-style-binary/command'
 
 GitStyleBinary.command do
@@ -21,25 +21,16 @@ EOS
 
     @loaded_clouds.each do |cld|
         
-        dputs "Showing #{cld.name}"
-        puts "\nFrom #{$pool_specfile}\n"
-        print_with_nice_printer "Cloud: #{cld.name}", [
-          "instances #{cld.minimum_instances}..#{cld.maximum_instances}",
-          "keypair #{cld.keypair}",
-          "using #{cld.remote_base.class.to_s.top_level_class}"
-        ] do |printer|
-          if cld.nodes(:status => "running").size > 0
-            printer.empty
-            printer.center("Active instances")
-            printer << cld.nodes(:status => "running").map{|a| a.ip.strip rescue nil }.compact.join("\n")
-          end
-          if cld.nodes(:status => "pending").size > 0
-            printer.empty
-            printer.center "Pending instances"
-            printer << cld.nodes(:status => "pending").map{|a| a.ip.strip rescue nil }.join("\n")
-          end
-          printer.empty
-        end
+      msg = [
+        "Cloud: #{cld.name}",
+        "----------------------------",
+        "Instances: #{cld.nodes(:status => "running").size}",
+        "Minimum instances: #{cld.minimum_instances}",
+        "Maximum instances: #{cld.maximum_instances}",
+        "Running on: #{cld.cloud_provider_name}"
+      ]
+      
+      print_msg(msg)
       
     end
     

data/bin/cloud-ssh

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-# require "poolpartycl"
+
 require 'git-style-binary/command'
 
-GitStyleBinary.command do  
-  version "PoolParty #{$0} command"  
+GitStyleBinary.command do
   banner <<-EOS
 Usage: #{$0} #{all_options_string}
 
@@ -13,18 +12,15 @@ Usage: #{$0} #{all_options_string}
 EOS
 
   short_desc "ssh into an instance of the cloud"
-  opt :inst_num, "The number of the instance to ssh to, starts at 0.", :type => :int
   
-  run do |command|    
-    @cloud = @loaded_clouds.first
-    nodes = @cloud.nodes(:status => "running")
+  run do |command|
+    cloud = @loaded_clouds.first
     
-    if !nodes.empty?
-      n = command[:inst_num] ? command[:inst_num].to_i : 0
-      @cloud.ssh_into( nodes[n].ip || nodes[n].public_ip ) if @cloud
+    if !cloud.nodes.empty?
+      cloud.nodes.first.ssh
     else
       puts "No running instances can be found"
     end
     
-  end    
+  end
 end

data/bin/cloud-start

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-# require "poolpartycl"
+
 require 'git-style-binary/command'
 
-GitStyleBinary.command do  
-  version "PoolParty #{$0} command"  
+GitStyleBinary.command do
   banner <<-EOS
 Usage: #{$0} #{all_options_string}
 
@@ -18,22 +17,29 @@ EOS
     
     @loaded_clouds.each do |cld|
 
-      if cld.nodes(:status => "running").size.zero?
+      if cld.nodes.size.zero?
         puts "Starting cloud #{cld.name} (#{cld.keypair})"
         puts "#{cld.nodes(:status => "running").size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})"
         
-        cld.launch_instance!(:cloud_name => cld.name) do |node|
-          
-          ::PoolParty::Provision::BootStrapper.new(node.ip, :cloud => cld)
-          ::PoolParty::Provision::DrConfigure.new(node.ip,  :cloud => cld)
-          
-          puts <<-EOM
-            Your cloud has started. Your ip is #{node.ip}
-          EOM
+        cld.minimum_instances.times do |i|
+          cld.expand
         end
-      
+        # cld.nodes.each do |node|
+        #   vputs "Bootstrapping: #{node.instance_id}"
+        #   node.bootstrap!
+        #   node.configure!(:cloud => cld)
+        # end
+        
+        msg = [
+          "Your cloud has started with the following public_ips:"
+        ]
+        
+        cld.nodes.each {|node| msg << "#{node.public_ip}"}
+        
+        print_msg(msg)
       else
         puts <<-EOE
+          #{cld.nodes}
           Your cloud is already running.
         EOE
       end

data/bin/cloud-terminate

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-require "poolpartycl"
+
 require 'git-style-binary/command'
 
-GitStyleBinary.command do  
-  version "PoolParty #{$0} command"  
+GitStyleBinary.command do
   banner <<-EOS
 Usage: #{$0} #{all_options_string} COMMAND [ARGS]
 
@@ -18,22 +17,17 @@ EOS
 
   run do |command|    
     @loaded_clouds.each do |cld|
+      msg = [
+      "Shutting down #{cld.name} cloud",
+      "Are you sure? (Y/N)"
+      ]
       
-      cld.nodes(:status => "running").each do |inst|
-        msg = <<-EOM
-    Shutting down #{inst.instance_id}
-    Are you sure? (Y/N)
-        EOM
-        o = are_you_sure? msg || command[:yes]
-        if o
-          puts "Shutting down #{inst.instance_id}"
-          cld.terminate_instance!(:instance_id => inst.instance_id)
-        else
-          if are_you_sure?(msg)
-            puts "Shutting down #{inst.instance_id}"
-            cld.terminate_instance!(:instance_id => inst.instance_id)
-          end
-        end
+      o = command[:yes] || are_you_sure?(msg)
+      if o
+        vputs "Shutting down cloud"
+        cld.terminate!
+      else
+        
       end
       
     end    

data/bin/cloud-thrift

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "poolparty"
+require "daemons"
+
+$:.unshift("#{File.dirname(__FILE__)}/../lib/proto")
+$:.unshift("#{File.dirname(__FILE__)}/../lib/proto/gen-rb")
+
+require "thrift"
+require "command_interface"
+require "poolparty_constants"
+require "poolparty_types"
+require "command_interface_handler"
+
+require 'git-style-binary/command'
+
+GitStyleBinary.command do
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
+
+  Start cloud thrift interface
+EOS
+
+  short_desc "Start the cloud thrift interface"
+  opt :port, "Start a port", :type => :integer, :default => 11223
+  opt :dir, "Pid directory", :type => :string, :default => "/tmp"
+  opt :daemon, "Daemonize", :type => :bool, :default => true
+
+  run do |command|
+    
+    command.process_args(ARGV)
+    
+    cmd = ARGV.shift
+    cmd = ARGV.shift if cmd == "thrift"
+    
+    if %w(run start restart stop).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(", ")}"
+      args = ["--help"]
+    end
+    
+    require PoolParty::Pool.clouds_dot_rb_file
+    
+    options = {
+      :app_name   => "cloud-thrift",
+      :ARGV       => args,
+      :dir        => File.expand_path(command[:dir]),
+      :mode       => :load,
+      :dir_mode   => :normal,
+      :ontop      => true,
+      :log_output => true,
+      :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)
+      
+      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/bin/cloud-verify

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-# require "poolpartycl"
+
 require 'git-style-binary/command'
 
-GitStyleBinary.command do  
-  version "PoolParty #{$0} command"  
+GitStyleBinary.command do
   banner <<-EOS
 Usage: #{$0} #{all_options_string}
 

data/bin/install-poolparty

@@ -1,22 +1,20 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-require "poolpartycl"
-require "poolparty/installers/base_installer"
-require "highline/import"
+require "poolparty/installer"
 
-say("\nWhat remoter base would you like to use?")
-choose do |menu|
-  menu.prompt = "> "
+msg = "\nWhat remoter base would you like to use?"
 
-  PoolParty::Remote::RemoterBase.available_bases.each do |base|
-    menu.choice base.to_sym do 
-      
-      say "Great, we'll be using #{base}"
-      
-      klass = "::PoolParty::Installers::#{base.to_s.capitalize}".constantize
-      klass.send :new
-    end
-  end
+providers = {}
+PoolParty::Installer.all.each_with_index do |installer,idx|
+  providers.merge!(idx+1 => installer)
+end
+
+o = {}
+PoolParty::Installer.choose(msg, providers, o) do |output|
+  PoolParty::Installer.colored_say "Great, we'll be using #{output.to_s.top_level_class}"
   
+  klass = output
+  inst = klass.send :new
+  inst.run
 end

data/config/jeweler.rb

@@ -8,25 +8,28 @@ class Array
     Regexp.new "(#{option_list})"
   end
 end
-
+  require 'rubygems'
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "poolparty"
     s.description = "PoolParty: The easy, open-source, cross-cloud management solution"
     s.summary = <<-EOM      
       Self-healing, auto-scaling system administration, provisioning
-      and maintaining tool that makes cloud computing fun and easy
+      and maintaining tool that makes cloud computing easy and fun
     EOM
     
     s.homepage = "http://poolpartyrb.com"
-    s.email = "ari.lerner@citrusbyte.com"
-    s.authors = ["Ari Lerner"]
+    s.email = "arilerner@mac.com"
+    s.authors = ["Ari Lerner", "Michael Fairchild", "Nate Murray"]
     
     s.test_files = Dir["test/**/test_*.rb"]
-    excludes_regexp = ["lib/erlang"].one_of_regex
+    excludes_regexp = ["lib/erlang"].one_of_regex    
 
-    s.files = (%w(Rakefile History.txt README.txt PostInstall.txt License.txt VERSION.yml) + 
-              Dir["{config,examples,lib,spec,test,tasks,script,generators,bin,vendor}/**/*"]).delete_if{|f| f =~ excludes_regexp}
+    s.files = (%w(Rakefile README.rdoc License.txt VERSION.yml) + 
+              Dir["{config,examples,lib,test,tasks,script,generators,bin,vendor}/**/*"]).delete_if{|f| f =~ excludes_regexp}
+    
+    s.files.exclude '**/*.beam'
+    s.files.exclude "**/*/erl_crash.dump"
     
     s.has_rdoc = true
     s.extra_rdoc_files = ["README.txt", "License.txt", 'History.txt']
@@ -36,15 +39,10 @@ end
         "--main", "README"
         ]
     
-    # s.add_dependency 'activesupport'
+    s.add_dependency 'activesupport'
     s.add_dependency 'logging'
-    # s.add_dependency 'auser-dslify'
-    # s.add_dependency 'auser-parenting'
-    # s.add_dependency 'auser-suitcase'
-    # s.add_dependency 'ruby2ruby'  #TODO: remove this after verifying removing doesnt break anything
-    s.add_dependency 'grempe-amazon-ec2'
-    # s.add_dependency 'rubigen', ">=1.5.2"
-    # Certainly there should be more here
+    s.add_dependency 'right_aws'
+    s.add_dependency 'rubigen', ">=1.5.2"
     
   end
 rescue LoadError

data/examples/basic.rb

@@ -3,20 +3,28 @@
 pool :application do
   instances 1..5
   
-  cloud :frontend do
+  cloud :basic_app do
     minimum_instances 3
-    keypair 'application_frontend'
-    image_id "ami-abc123"
+    maximum_instances 10
+    keypair 'ari'
+    using :ec2 do
+      image_id "ami-abc123"
+    end
+    
+    monitor :cpu do |v|
+      configure if v < 0.2
+      vote_for(:expand) if v > 0.9
+    end
+    
     has_file :name => "/etc/motd", :content => "Welcome to your PoolParty instance"
   end
   
-  cloud :database do
-    keypair 'application_database'
-    using :vmrun do
-      vmx_hash "/path/to/vmx_file" => "192.168.248.122"
-    end
+  cloud :basic_db do    
     minimum_instances 1
-    image_id "ami-1234bc"
+    keypair "id_rsa"
+    using :ec2 do
+      image_id "ami-1234bc"
+    end
   end
 
 end

data/examples/custom_bootstrap.sh

@@ -0,0 +1,7 @@
+#!/bin/sh -x
+
+echo "this is a custom bootstrap script"
+mkdir -p /etc/poolparty
+mkdir -p /var/log/poolparty
+touch /var/poolparty/bootstrapped
+echo "Done!"

data/examples/eucalyptus.rb

@@ -0,0 +1,63 @@
+$:.unshift File.dirname(__FILE__)+'/../lib/'
+require "poolparty"
+# $DEBUGGING=true
+# $VERBOSE=true
+pool :eucalyptus do
+  clouds_dot_rb_file File.expand_path(__FILE__)
+    
+  cloud :sample do
+    instances 1..2
+    os :ubuntu
+    bootstrap_script File.expand_path(File.dirname(__FILE__)/'custom_bootstrap.sh')
+    
+    # monitor :load do |l|
+    #   vote_for(:expand) if l > 0.9
+    # end
+    
+    keypair "eucalyptus_sample"
+    using :ec2 do
+      image_id 'emi-39CA160F'
+    end
+    
+    has_file "/etc/motd", :content => "Welcome to your eucalyptus cloud!!!!!!!"
+    has_directory '/mnt/ebs', :owner => 'poolparty'
+    has_exec 'touch /tmp/touched'
+    has_group 'partiers'
+    has_user 'fred'
+    
+    has_cron :minute=>'5', :command => 'touch /tmp/touched'
+    has_line_in_file '/tmp/touched', :line => 'lined up HERE!'
+    
+    has_package 'vim'
+    has_variable "hookie", "pookie"
+    
+    has_directory "/etc/poolparty/nodes"
+    
+    clouds.each do |oname, cld|
+      has_directory "/etc/poolparty/nodes/#{oname}"
+      cld.nodes.each do |n|
+        has_file "/etc/poolparty/nodes/#{oname}/#{n.instance_id}", :content => "#{n.public_ip}"
+      end
+    end
+    
+  end
+  
+  cloud :bab do
+    instances 1
+    keypair "ari"
+    using :ec2 do
+      image_id 'emi-39CA160F'
+    end
+    
+    has_directory "/etc/poolparty/nodes"
+    
+    clouds.each do |oname, cld|
+      has_directory "/etc/poolparty/nodes/#{oname}"
+      cld.nodes.each do |n|
+        has_file "/etc/poolparty/nodes/#{oname}/#{n.instance_id}", :content => "#{n.public_ip}"
+      end
+    end
+    
+  end
+  
+end

data/examples/eucalyptus_test_run.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+#Simple test script for poolparty examples
+# TODO: investiage using TAP test anything protocol for this
+# http://en.wikipedia.org/wiki/Test_Anything_Protocol
+# http://github.com/chneukirchen/knock
+
+#You must run this file from within the examples/ directory
+
+. ./knock.sh
+
+cld='/eucalyptus.rb'
+
+# result=../bin/cloud-list -c $cld
+ok "../bin/cloud-list -c $cld -n sample|grep -v i-*"
+#check that its zero
+# 
+# ./bin/cloud-start -c $cld
+ok "../bin/cloud-start -c $cld |grep  192*"
+ 
+ok "../bin/cloud-list -c $cld -n sample|grep  i-*"
+# #check that it is 1
+ 
+# ./bin/cloud-expand -c $cld
+# #assert_equal 2, nodes.size
+ 
+# ./bin/cloud-contract -c $cld
+# #assert_equal 1, nodes.size
+ 
+ok "../bin/cloud-terminate -c $cld"
+# #assert_equal 0, nodes.size

data/examples/knock.sh

@@ -0,0 +1,27 @@
+ok() {
+   exec 3>&1
+   eval `
+      exec 4>&1 >&3 3>&-
+      {
+          eval "$@" 2>&1 >/dev/null
+          echo "EC=$?;" >&4
+      } | sed 's/^/# /'
+      `
+   [ "$EC" = 0 ] && echo "ok - $@" || echo "not ok - $@: $EC"
+   return $EC
+}
+
+
+# example usage:
+
+ # ok true
+ # ok ! false
+ # 
+ # ok "(ok true | grep -q '^ok')"
+ # ok "(ok false | grep -q '^not ok')"
+ # 
+ # # self-test
+ # ok ok true
+ # ok ! ok "false"
+ # 
+ # ok "(ok 'echo foo>/dev/stderr' 2>&1 | grep -q '# foo') # stderr gets commented"

data/examples/monitored_cloud.rb

@@ -0,0 +1,22 @@
+# Poolparty spec
+
+pool "poolparty" do
+  
+  instances 1
+  
+  cloud "monitored_app" do
+    keypair "eucalyptus_sample"
+    using :ec2 do
+      image_id 'emi-39CA160F'
+    end
+    
+    monitor :cpu do |c|
+      vote_for(:expand) if c > 0.9
+      vote_for(:contract) if c < 0.5
+    end
+        
+    has_file "/etc/motd", :content => "Simple"
+    
+  end
+  
+end

data/examples/simple.rb

@@ -1,13 +1,17 @@
 # Poolparty spec
 
-pool :poolparty do
+pool "poolparty" do
   
   instances 1
-    
-  cloud :app do
-    keypair "cloudteam_test"
-    
+  
+  cloud "simple_app" do
+    keypair "eucalyptus_sample"
+    using :ec2 do
+      image_id 'emi-39CA160F'
+    end
+        
     has_file "/etc/motd", :content => "Simple"
+    
   end
   
 end

data/examples/ssh_garden.rb

@@ -0,0 +1,21 @@
+$:.unshift File.dirname(__FILE__)+'/../lib/'
+require "poolparty"
+
+pool :acres do
+  
+  cloud :garden do
+    os :centos
+    instances 1 #this should equal the number of hosts listed below
+    keypair 'id_rsa'  # this keypair must be in /root/.ssh/authorized_keys on each host
+    has_file '/etc/motd', :content=>"Welcome to the #{self.name} cloud"
+    has_file '/touhced'
+    has_directory '/mnt/ebs', :owner => 'poolparty'
+    has_exec 'touch /tmp/touched'
+    
+    using :ssh do
+      hosts %w(67.23.21.192)  #the hosts to use in this cloud
+    end
+    
+  end
+  
+end

data/examples/thrift/erlang/Emakefile

@@ -0,0 +1,5 @@
+{ ['./src/*'], [
+  {i, ["./include"]},
+  {outdir, "./ebin"},
+  debug_info
+]}.

data/examples/thrift/erlang/Makefile

@@ -0,0 +1,26 @@
+LIBDIR					= `erl -eval 'io:format("~s~n", [code:lib_dir()])' -s init stop -noshell`
+CC							= erlc
+ERL							= erl
+EBIN						= ebin
+CFLAGS					= +debug_info -W0 -I include -I ../../../../lib/proto/gen-erl -pa $(EBIN)
+COMPILE					= $(CC) $(CFLAGS) -o $(EBIN)
+EBIN_DIRS				= $(wildcard deps/*/ebin)
+APP							= hermes
+
+all: ebin compile
+deps: thrift
+	
+compile:
+	@$(ERL) -pa $(EBIN_DIRS) -noinput +B -eval 'case make:all() of up_to_date -> halt(0); error -> halt(1) end.'
+
+run: all
+	@$(ERL) -pa ./ebin -pa $(EBIN_DIRS) -s -s thrift_example run -s init stop
+
+ebin:
+	@mkdir ebin
+
+clean:
+	rm -rf ebin/*.beam ebin/erl_crash.dump erl_crash.dump ebin/*.boot ebin/*.rel ebin/*.script 
+
+thrift:
+	@(cd deps/thrift;$(MAKE))

data/examples/thrift/erlang/deps/thrift/COPYING

@@ -0,0 +1,24 @@
+Thrift Software License
+Copyright (c) 2006- Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.