auser-poolparty 1.2.10 → 1.2.11

data/lib/poolparty/{resources → plugins}/host.rb

@@ -1,5 +1,5 @@
 module PoolParty    
-  module Resources
+  module Plugin
 =begin rdoc
 
 == Host
@@ -22,14 +22,15 @@ The host parameter sets hosts on the instances. Setting this, every node will ha
 
   has_host({:name => "other_machine", :ip => 192.168.0.101 })
 =end       
-    class Host < Resource
+    class Host < Plugin
             
       default_options({
+        :name => "localhost",
         :ip => "127.0.0.1"
       })
       
-      def aka(i=nil)
-        i ? dsl_options[:alias] = i : dsl_options[:alias]
+      def loaded(o={},&block)
+        has_line_in_file(:file => "/etc/hosts", :line => "#{o[:ip]} #{o[:name]}")
       end
             
     end

data/lib/poolparty/plugins/line_in_file.rb

@@ -16,7 +16,7 @@ Ensures that the line given is in the file
 =end
 
   module Plugin
-    class  LineInFile < Plugin
+    class LineInFile < Plugin
     
       dsl_methods :file, :line
       default_options(

data/lib/poolparty/{resources → plugins}/sshkey.rb

@@ -1,5 +1,5 @@
 module PoolParty    
-  module Resources
+  module Plugin
 =begin rdoc
 
 == Ssh Key
@@ -16,30 +16,32 @@ The sshkey resource specifies an ssh key that should be distributed on all the n
 == Options
 
 * <tt>key</tt> The key content for the ssh key
-* <tt>target</tt> The location of the ssh key
+* <tt>name</tt> The location of the ssh key
 
 == Examples
 
-  has_sshkey(:key => "ABIGLONGSTRINGOFDIGETS", :target => "/root/.ssh/key_file")
+  has_sshkey(:key => "ABIGLONGSTRINGOFDIGETS", :name => "/root/.ssh/key_file")
 =end
     
-    class Sshkey < Resource
+    class Sshkey < Plugin
       
       dsl_methods(:key,
                   :keypath,
                   :name)
 
-      default_options(:type => 'rsa')
+      default_options(:type => 'rsa', :mode => "600")
                   
       def initialize(opts={}, extra_opts={}, &block)
         super(opts, extra_opts, &block)
         @key = Key.new(keypath ? keypath : nil)
         self.key = @key.content
       end
-      
-      def enctype(i=nil)
-        i ? self.type = i : type
+
+      def loaded(opts={}, &block)
+        has_directory(::File.dirname(opts[:name]))
+        has_file(:name => opts[:name], :content => self.key, :mode => opts[:mode])
       end
+
       
     end
     

data/lib/poolparty/poolparty/cloud.rb

@@ -83,6 +83,7 @@ module PoolParty
       
       additional_callbacks [
         "after_launch_instance",
+        "before_provision",
         "after_provision"
       ]
       
@@ -352,6 +353,12 @@ module PoolParty
       def after_bootstrap
         after_blocks[:bootstrap].each {|b| b.call(self) } if after_blocks.has_key?(:bootstrap)
       end
+      def before_provision
+        before_blocks[:provision].each {|b| b.call(self) } if before_blocks.has_key?(:provision)
+      end
+      def after_provision
+        after_blocks[:provision].each {|b| b.call(self) } if after_blocks.has_key?(:provision)
+      end
       def before_configure
         before_blocks[:configure].each {|b| b.call(self) } if before_blocks.has_key?(:configure)
       end

data/lib/poolparty/poolparty/default.rb

@@ -11,9 +11,7 @@ module PoolParty
     # def self.options
     default_options(
       :verbose => false,
-      :debug => false,
       :testing => false,
-      :debugging => false,
       :minimum_instances => 2,
       :maximum_instances => 5,
       :user => "root", # This should change here

data/lib/poolparty/poolparty/pool.rb

@@ -51,10 +51,20 @@ module PoolParty
         #%w(monitors plugins verifiers).each do |lib|
         #  Dir[File.join(::File.dirname(::File.basename(filename)), lib, '*')].each{|f| require f }
         # end
-        File.open(filename, 'r') do |f|
-          instance_eval f.read, pool_specfile
+        o = File.open(filename, 'r') do |f|
+          instance_eval f.read, (pool_specfile || filename)
         end
-        # a
+        o.call_after_all_loaded if o.respond_to?(:call_after_all_loaded)
+        o
+      end
+      
+      # callback
+      def after_all_loaded(&block)
+        @after_all_loaded ||= block
+      end
+      
+      def call_after_all_loaded
+        after_all_loaded.call if after_all_loaded
       end
       
       def name(*args)

data/lib/poolparty/provision/boot_strapper.rb

@@ -27,12 +27,11 @@ module PoolParty
                           lockfile
                           rubigen
                           json
-                          activesupport
                           grempe-amazon-ec2
                           ohai
                           chef
                           ruby-openid
-                          adamwiggins-rest-client
+                          auser-rest-client
                           rack
                           thin
                           logging
@@ -91,7 +90,7 @@ module PoolParty
         ::Suitcase::Zipper.add_content_as(Default.keys_in_yaml, "ppkeys", "keys")
         
         edge_pp_gem = Dir["#{Default.vendor_path}/../pkg/*poolparty*gem"].pop
-        # Use the locally built poolparty gem if it is availabl
+        # Use the locally built poolparty gem if it is available
             if edge_pp_gem
               puts "using edge poolparty: #{::File.expand_path(edge_pp_gem)}"
               ::Suitcase::Zipper.add(edge_pp_gem, 'gems')
@@ -101,9 +100,9 @@ module PoolParty
             end
         # Add the gems to the suitcase
         puts "Adding default gem dependencies"
-        ::Suitcase::Zipper.gems self.class.gem_list, "#{cloud.tmp_path}/trash/dependencies"
+        ::Suitcase::Zipper.gems self.class.gem_list, :gem_location => "#{cloud.tmp_path}/trash/dependencies", :search_paths => ["#{Default.vendor_path}/../pkg"]
 
-        ::Suitcase::Zipper.packages( "http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz",
+        ::Suitcase::Zipper.packages( "http://rubyforge.org/frs/download.php/57643/rubygems-1.3.4.tgz",
                  "#{cloud.tmp_path}/trash/dependencies/packages")
         # ::Suitcase::Zipper.add("templates/")
         
@@ -141,9 +140,9 @@ module PoolParty
           'cd /var/poolparty/dependencies',
           "cp /var/poolparty/dependencies/etc/poolparty/gemrc_template /etc/poolparty",          
           "#{installer} update",
-          "#{installer} install -y ruby ruby1.8-dev libopenssl-ruby1.8 build-essential wget",  #optional, but nice to have
-          "tar -zxvf packages/rubygems-1.3.1.tgz",
-          "cd rubygems-1.3.1",
+          "#{installer} install -y ruby ruby1.8-dev irb libopenssl-ruby1.8 build-essential wget",  #optional, but nice to have
+          "tar -zxvf packages/rubygems-1.3.4.tgz",
+          "cd rubygems-1.3.4",
           "ruby setup.rb --no-ri --no-rdoc",
           "ln -sfv /usr/bin/gem1.8 /usr/bin/gem", #TODO: check if this is really needed
           "cd ../ && rm -rf rubygems-1.3.1*",
@@ -160,6 +159,7 @@ module PoolParty
           # "god -c /etc/poolparty/monitor.god",
           "mkdir -p /var/log/poolparty/",
           "echo '-- Starting monitor_rack --'",
+          # NOTE: if someone has an old version of thin/rack on their system, this will fail silently and never finish bootstrapping
           "thin -R /etc/poolparty/monitor.ru -p 8642 --pid /var/run/stats_monitor.pid --daemon -l /var/log/poolparty/monitor.log start 2>/dev/null",
           "tail -n 20 /var/log/poolparty/monitor.log",
           'echo "bootstrap" >> /var/poolparty/POOLPARTY.PROGRESS']

data/lib/poolparty/resources/exec.rb

@@ -29,6 +29,13 @@ Ensure a command is run on the instances
       default_options({
         :path => ["/usr/bin:/bin:/usr/local/bin:$PATH"]
       })
+
+      def loaded(o={})
+        if user
+          name "sudo -u #{user} -H #{name}"
+          dsl_options.delete(:user)
+        end
+      end
       
       def present
         nil

data/lib/poolparty/resources/group.rb

@@ -3,9 +3,9 @@ module PoolParty
         
     class Group < Resource      
       
-      default_options({
-        :shell => "/bin/sh"
-      })
+      # default_options({
+      #   :shell => "/bin/sh"
+      # })
       
       def present
         :manage

data/lib/poolparty/resources/user.rb

@@ -5,13 +5,18 @@ module PoolParty
       
       dsl_methods :name,        # Name of the user
                   :password,    # Password for the user
-                  :home,         # Home directory
+                  :home,        # Home directory
+                  :gid,        # primary group for user
                   :authorized_keys
                   
                   
       default_options({
         :shell => "/bin/sh"
       })
+
+      def loaded(o={})
+        @group = dsl_options.delete(:group)
+      end
       
       def after_create
         if authorized_keys

data/lib/poolparty/templates/monitor.ru

@@ -4,6 +4,7 @@ require 'rack'
 require 'json'
 require 'thin'
 require 'rest_client'
+$:.unshift("#{::File.dirname(__FILE__)}/../../")
 require "poolparty/monitors/monitor_rack" 
 
 app = Rack::Builder.new do
@@ -12,6 +13,17 @@ app = Rack::Builder.new do
   use Rack::CommonLogger
   # use Rack::PostBodyContentTypeParser  #parses json requests to params hash
   run Monitors::MonitorRack.new()
+  
+  # Dumb daemon for now
+  begin
+    PoolParty::MonitorDaemon.run  :daemonize => true, 
+                                  :sleep_time => 10, 
+                                  :log_file_path => "/var/log/poolparty/monitor_daemon.log"
+
+  rescue Exception => e
+    puts "Error with daemon: #{e.inspect}"
+  end
+  
 end
 
 run app

data/spec/poolparty/net/remoter_bases/ec2_remote_instance_spec.rb

@@ -69,8 +69,6 @@ describe "Remote Instance" do
     end
     it "should say that it is responding? if responding is not nil" do
       @ec2.running?.should == true
-      @ec2.responding?.should == true
-      # @ec2.responding.should_not be_nil
     end
   end
 end

data/spec/poolparty/net/remoter_bases/ec2_spec.rb

@@ -17,9 +17,12 @@ describe "ec2 remote base" do
     EOE
   end
   describe "helpers" do
-    it "should be able to convert an ec2 ip to a real ip" do
+    it "should be able to convert an american ec2 ip to a real ip" do
       "ec2-72-44-36-12.compute-1.amazonaws.com".convert_from_ec2_to_ip.should == "72.44.36.12"
     end
+    it "should be able to convert an european ec2 ip to a real ip" do
+      "ec2-72-44-36-12.eu-west-1.compute.amazonaws.com".convert_from_ec2_to_ip.should == "72.44.36.12"
+    end
     it "should not throw an error if another string is returned" do
       "72.44.36.12".convert_from_ec2_to_ip.should == "72.44.36.12"
     end
@@ -49,7 +52,7 @@ describe "ec2 remote base" do
     #   @tr.launch_new_instance!
     # end
     it "should get the hash response from EC2ResponseObject" do
-      EC2ResponseObject.should_receive(:get_hash_from_response).and_return @ret_hash
+      EC2ResponseObject.should_receive(:describe_instance).and_return @ret_hash
       @tr.launch_new_instance! :keypair => "keys"
     end
   end
@@ -87,8 +90,8 @@ describe "ec2 remote base" do
       @resp = {"requestId"=>"be9bd2e9-4f8c-448f-993d-c21fe537e322", "addressesSet"=>{"item"=>[{"instanceId"=>nil, "publicIp"=>"174.129.212.93"}, {"instanceId"=>nil, "publicIp"=>"182.199.200.201"}]}, "xmlns"=>"http://ec2.amazonaws.com/doc/2008-12-01/"}
       @tr.ec2.stub!(:describe_addresses).and_return @resp
     end
-    it "should have the next available elastic_ip" do
-      @tr.next_unused_elastic_ip.should == "174.129.212.93"
+    it "should have the next available elastic_ip as nil if there are no ips set" do
+      @tr.next_unused_elastic_ip.should == nil
     end
     it "should use only the elastic ips set on the cloud" do
       @tr.stub!(:elastic_ips).and_return ["182.199.200.201"]

data/spec/poolparty/poolparty/example_spec.rb

@@ -4,14 +4,14 @@ require "open-uri"
 # pool :application do
 #   instances 1..5
 #   
-#   cloud :basic_app do
+#   cloud :frontend do
 #     minimum_instances 3
 #     keypair 'front'
 #     image_id "ami-abc123"
 #     has_file :name => "/etc/motd", :content => "Welcome to your PoolParty instance"
 #   end
 #   
-#   cloud :basic_db do
+#   cloud :database do
 #     using :vmrun do
 #       vmx_hash "/path/to/vmx_file" => "192.168.248.122"
 #     end
@@ -27,55 +27,55 @@ describe "basic" do
     @example_spec_file = ::File.join(::File.dirname(__FILE__), "..", "..", "..", "examples", 'basic.rb')
     set_pool_specfile @example_spec_file
     PoolParty::Pool::Pool.load_from_file(@example_spec_file)
-    @db = clouds[:basic_db]
-    @app = clouds[:basic_app]
+    @db = clouds[:database]
+    @app = clouds[:frontend]
   end
   it "should have a remote base" do
-    clouds[:basic_app].remoter_base.should == :ec2
-    clouds[:basic_app].remote_base.class.should == Ec2
+    clouds[:frontend].remoter_base.should == :ec2
+    clouds[:frontend].remote_base.class.should == Ec2
   end
   it "should have one pool called :app" do
     pool(:application).should_not == nil
     pools[:application].should_not == nil
   end
   it "should have a cloud called :app" do
-    clouds[:basic_app].should_not == nil
+    clouds[:frontend].should_not == nil
   end
   it "should have a cloud called :db" do
-    pools[:application].clouds[:basic_db].should_not == nil
+    pools[:application].clouds[:database].should_not == nil
   end
   it "should set the minimum_instances on the cloud (overriding the pool options)" do    
     pools[:application].minimum_instances.should == 1
-    clouds[:basic_app].minimum_instances.should == 3
+    clouds[:frontend].minimum_instances.should == 3
   end
   it "should set the maximum_instances on the cloud to 5" do
-    clouds[:basic_app].maximum_instances.should == 5
+    clouds[:frontend].maximum_instances.should == 5
   end
   it "should set the minimum_instances on the db cloud " do
-    clouds[:basic_db].minimum_instances.should == 1
-    clouds[:basic_app].minimum_instances.should == 3
+    clouds[:database].minimum_instances.should == 1
+    clouds[:frontend].minimum_instances.should == 3
     pools[:application].minimum_instances.should == 1
   end
   it "should set the parent to the pool" do
-    clouds[:basic_app].parent.should == pools[:application]
-    clouds[:basic_db].parent.should == pools[:application]
-    clouds[:basic_db].parent.should_not == pools[:app]
+    clouds[:frontend].parent.should == pools[:application]
+    clouds[:database].parent.should == pools[:application]
+    clouds[:database].parent.should_not == pools[:app]
   end
   it "should have the keypair matching /auser/on the db cloud " do
-    clouds[:basic_db]._keypairs.select{|a| a.filepath.match(/auser/)}
+    clouds[:database]._keypairs.select{|a| a.filepath.match(/auser/)}
   end
   it "cloud should know what remoter base it is using" do
-    clouds[:basic_db].remote_base.class.should == PoolParty::Remote::Vmrun
+    clouds[:database].remote_base.class.should == PoolParty::Remote::Vmrun
   end
   it "cloud should have methods from the remoter base available" do
-    clouds[:basic_db].remote_base.should_receive(:describe_instances).and_return({})
-    clouds[:basic_db].describe_instances.should == {}
+    clouds[:database].remote_base.should_receive(:describe_instances).and_return({})
+    clouds[:database].describe_instances.should == {}
   end
   it "should not return nil to undefined methods" do
-    lambda {clouds[:basic_db].not_a_method_that_exists_anywhere}.should raise_error
+    lambda {clouds[:database].not_a_method_that_exists_anywhere}.should raise_error
   end
   it "should have the keypair set for the specific cloud on top of the keypair stack" do
     #I think this should be the behavior. mf
-    # pools[:application].clouds[:basic_db].keypairs.last.filepath.should_match(/auser/)
+    # pools[:application].clouds[:database].keypairs.last.filepath.should_match(/auser/)
   end
 end

data/spec/poolparty/poolparty/pool_spec.rb

@@ -88,6 +88,7 @@ describe "Pool" do
       it "should have 2 clouds in the pool when there are 2 described" do
         @pool.clouds.size.should == 2
       end
-    end  
+    end
+    
   end
 end

data/spec/poolparty/resources/sshkey_spec.rb

@@ -1,40 +1,39 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "Sshkey" do
-  describe "instances" do
-    before(:each) do
-      @key = Key.new
-      Key.stub!(:new).and_return @key
-      @key.stub!(:content).and_return "DIGITSOFTHEKEY"
-      @tc = TestBaseClass.new do
-        has_sshkey({:name => "~/.ssh/id_rsa"}) do
-          enctype "rsa"
-        end
-      end
-      @dir = @tc.resource(:sshkey).first
-    end
-    it "have the name in the options" do
-      @dir.name.should == "~/.ssh/id_rsa"
-    end
-    it "should store the owner's name" do
-      @dir.enctype.should == "rsa"
-    end
-    describe "into PuppetResolver" do
-      before(:each) do
-        @compiled = PuppetResolver.new(@tc.to_properties_hash).compile
-      end
-      it "should set the filename to the name of the file" do
-        @compiled.should match(/sshkey \{ "~\/\.ssh\/id_rsa"/)
-      end
-      it "should say it's a sshkey in the ensure method" do
-        @compiled.should match(/ensure => "present"/)
-      end
-      it "have the mode set in the puppet output" do
-        @compiled.should match(/type => "rsa"/)
-      end
-      it "have the long string of digits key" do
-        @compiled.should match(/key => "DIGITSOFTHEKEY"/)
-      end
-    end
-  end
-end
+# TODO: UPDATE THIS
+# require File.dirname(__FILE__) + '/../spec_helper'
+# 
+# describe "Sshkey" do
+#   describe "instances" do
+#     before(:each) do
+#       @key = Key.new
+#       Key.stub!(:new).and_return @key
+#       @key.stub!(:content).and_return "DIGITSOFTHEKEY"
+#       @tc = TestBaseClass.new do
+#         has_sshkey({:name => "~/.ssh/id_rsa"})
+#       end
+#       @dir = @tc.resource(:sshkey).first
+#     end
+#     it "have the name in the options" do
+#       @dir.name.should == "~/.ssh/id_rsa"
+#     end
+#     it "should store the owner's name" do
+#       @dir.enctype.should == "rsa"
+#     end
+#     describe "into PuppetResolver" do
+#       before(:each) do
+#         @compiled = PuppetResolver.new(@tc.to_properties_hash).compile
+#       end
+#       it "should set the filename to the name of the file" do
+#         @compiled.should match(/sshkey \{ "~\/\.ssh\/id_rsa"/)
+#       end
+#       it "should say it's a sshkey in the ensure method" do
+#         @compiled.should match(/ensure => "present"/)
+#       end
+#       it "have the mode set in the puppet output" do
+#         @compiled.should match(/type => "rsa"/)
+#       end
+#       it "have the long string of digits key" do
+#         @compiled.should match(/key => "DIGITSOFTHEKEY"/)
+#       end
+#     end
+#   end
+# end