auser-poolparty 0.2.57 → 0.2.58

data/Manifest.txt

@@ -225,8 +225,10 @@ lib/poolparty/net/remote_bases/ec2.rb
 lib/poolparty/net/remote_instance.rb
 lib/poolparty/net/remoter.rb
 lib/poolparty/net/remoter_base.rb
+lib/poolparty/plugins/deploydirectory.rb
 lib/poolparty/plugins/git.rb
 lib/poolparty/plugins/line.rb
+lib/poolparty/plugins/rsyncmirror.rb
 lib/poolparty/plugins/runit.rb
 lib/poolparty/plugins/svn.rb
 lib/poolparty/pool/base.rb
@@ -313,6 +315,7 @@ spec/poolparty/net/remote_instance_spec.rb
 spec/poolparty/net/remote_spec.rb
 spec/poolparty/net/remoter_base_spec.rb
 spec/poolparty/net/remoter_spec.rb
+spec/poolparty/plugins/deploydirectory_spec.rb
 spec/poolparty/plugins/git_spec.rb
 spec/poolparty/plugins/line_spec.rb
 spec/poolparty/plugins/svn_spec.rb

data/bin/pool-init

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rubigen'
+
+# First, let's generate the spec
+if %w(-v --version).include? ARGV.first
+  require 'poolspec/version'
+  puts "#{File.basename($0)} #{Poolspec::VERSION::STRING}"
+  exit(0)
+end
+
+name = ARGV.first
+
+vputs "Creating pool named #{name}"
+
+require 'rubigen/scripts/generate'
+source = RubiGen::PathSource.new(:application, 
+  File.join(File.dirname(__FILE__), "../generators"))
+RubiGen::Base.reset_sources
+RubiGen::Base.append_sources source
+RubiGen::Scripts::Generate.new.run(*ARGV, :generator => 'poolspec')
+
+# Now add the keypairs for the pool based on the default pool name and cloud name
+
+@pool = load_pool(self.spec || Binary.get_existing_spec_location)
+@clouds = [@pool.cloud("#{name}_app")]
+
+@clouds.each do |cloud|  
+  with_cloud(cloud) do
+    vputs header("Creating keypair for #{name}")
+    create_keypair unless testing
+  end  
+end

data/lib/poolparty/base_packages/poolparty.rb

@@ -6,8 +6,9 @@ module PoolParty
         # Build hostsfile
         # TODO: COME BACK AND CLEAN THIS UP
         (self.respond_to?(:list_of_running_instances) ? self : parent).list_of_running_instances.each do |ri|
-          has_host({:name => "#{ri.name}", :ip => ri.ip })
-        end        
+          has_host({:name => "gen_#{ri.name}", :ip => ri.ip, :alias => "#{ri.name}" })
+        end
+        has_host({:alias => "$hostname", :name => "$hostname", :ip => "localhost"})
         
         has_package(:name => "erlang")
         has_package(:name => "erlang-dev")

data/lib/poolparty/core/string.rb

@@ -27,6 +27,9 @@ class String
   def sanitize
     self.gsub(/[ \.\/\-]*/, '')
   end
+  def dir_safe
+    self.downcase.gsub(/[ ]/, '_')
+  end
   def nice_runnable(quite=true)
     self.split(/ && /).join("\n")
   end

data/lib/poolparty/helpers/binary.rb

@@ -13,11 +13,13 @@ module PoolParty
       def binary_directory
         "#{::File.dirname(__FILE__)}/../../../bin"
       end
+      # These are the locations the spec file can be before the cloud
+      # aborts because it cannot load the cloud
       def get_existing_spec_location
         [                            
             "#{Base.remote_storage_path}/#{Base.default_specfile_name}", 
-            ENV["POOL_SPEC"],
             "#{Base.default_specfile_name}",
+            ENV["POOL_SPEC"],            
             "#{Base.storage_directory}/#{Base.default_specfile_name}",
             "#{Base.default_project_specfile_name}"
         ].reject {|a| a.nil?}.reject do |f|

data/lib/poolparty/helpers/provisioners/master.rb

@@ -25,7 +25,9 @@ module PoolParty
           setup_autosigning,
           install_poolparty,
           setup_poolparty,
-          start_puppetmaster
+          start_puppetmaster,
+          restart_puppetd,
+          clean_master_certs
         ] << configure_tasks
       end
 
@@ -129,7 +131,6 @@ ps aux | grep puppetmaster | awk '{print $2}' | xargs kill #{unix_hide_string} #
 rm -rf /etc/puppet/ssl
 # Start it back up
 puppetmasterd --verbose
-/usr/bin/puppetcleaner
 # /etc/init.d/puppetmaster start #{unix_hide_string}
         EOS
       end
@@ -168,6 +169,7 @@ cp #{Base.remote_storage_path}/poolparty.pp /etc/puppet/manifests/classes/poolpa
         returning String.new do |s|
           s << "puppetca --clean master.compute-1.internal 2>&1 > /dev/null;"
           s << "puppetca --clean master.ec2.internal 2>&1 > /dev/null"
+          s << "/usr/bin/puppetcleaner"
         end
       end
       

data/lib/poolparty/modules/file_writer.rb

@@ -41,7 +41,8 @@ module PoolParty
     end
     def make_base_path(path)
       unless FileTest.directory?(path)
-        begin          
+        begin
+          ::FileUtils.rm path if ::File.file?(path)
           ::FileUtils.mkdir_p path
         rescue Errno::ENOTDIR
         rescue Errno::EEXIST
@@ -50,11 +51,21 @@ module PoolParty
       end
     end
     def make_base_directory
-      FileUtils.mkdir_p Base.storage_directory unless ::File.directory?(Base.storage_directory)
+      begin
+        FileUtils.mkdir_p Base.storage_directory unless ::File.directory?(Base.storage_directory)
+      rescue Errno::EEXIST
+        FileUtils.rm Base.storage_directory
+        make_base_directory
+      end            
     end
     def make_template_directory(dir=nil)
       path = dir ? ::File.join(Base.tmp_path, Base.template_directory, ::File.basename(dir)) : ::File.join(Base.tmp_path, Base.template_directory)
-      FileUtils.mkdir_p path unless ::File.directory?(path)
+      begin
+        FileUtils.mkdir_p path unless ::File.directory?(path)
+      rescue Errno::EEXIST
+        FileUtils.rm path
+        make_template_directory(dir)
+      end      
       path
     end
     def clear_base_directory

data/lib/poolparty/net/remoter.rb

@@ -7,10 +7,8 @@ require File.dirname(__FILE__) + "/../helpers/provisioner_base"
 module PoolParty
   module Remote
     module Remoter
-      def rsync_storage_files_to_command(remote_instance)
-        if remote_instance
-          "#{rsync_command} #{Base.storage_directory}/ #{remote_instance.ip}:#{Base.remote_storage_path}"
-        end
+      def rsync_storage_files_to_command(remote_instance)        
+        "#{rsync_command} #{Base.storage_directory}/ #{remote_instance.ip}:#{Base.remote_storage_path}" if remote_instance
       end
       def run_command_on_command(cmd="ls -l", remote_instance=nil)
         vputs "Running #{cmd} on #{remote_instance.name == %x[hostname].chomp ? "self (master)" : "#{remote_instance.name}"}"

data/lib/poolparty/plugins/deploydirectory.rb

@@ -0,0 +1,51 @@
+module PoolParty    
+  class Deploydirectory
+        
+    virtual_resource(:deploydirectory) do
+      
+      def loaded(opts={}, parent=self)
+        package_directory
+        execute_on_master do
+          unpack_directory
+        end
+        has_rsync_mirror(:dir => cwd)
+      end
+            
+      def package_directory
+        path = ::File.join( Base.tmp_path, "#{::File.basename(from_dir)}.tar.gz" )
+        # cd /Users/auser/Sites/work/citrusbyte/internal/gems/pool-party/poolparty/spec/poolparty/plugins/ && tar -czf plugins.tar.gz . && mv plugins.tar.gz /tmp/poolparty && cd /tmp/poolparty
+        cmd = "cd #{::File.expand_path(from_dir)} && tar -czf #{name.dir_safe}.tar.gz . && mv #{name.dir_safe}.tar.gz #{Base.tmp_path}"
+        `#{cmd}` unless testing
+      end
+      
+      def unpack_directory         
+        has_exec({:name => "deploy-directory-#{name}", :requires => get_directory("#{cwd}"), :cwd => cwd}) do
+          command "cd #{parent.cwd}; tar -zxf #{Base.remote_storage_path}/#{parent.name.dir_safe}.tar.gz && rm #{Base.tmp_path}/#{parent.name.dir_safe}.tar.gz"
+        end
+      end
+      
+      def from(dir)
+        from_dir (dir.include?(" ") ? dir.gsub(/[ ]/, '') : dir)
+      end
+      
+      def to(dir)
+        cwd dir
+        has_directory(:name => "#{dir}", :requires => get_directory("#{::File.dirname(dir)}"))
+      end
+      
+      # Since git is not a native type, we have to say which core resource
+      # it is using to be able to require it
+      def class_type_name
+        "exec"
+      end
+      
+      # Because we are requiring an exec, instead of a built-in package of the git, we have to overload
+      # the to_s method and prepend it with the same name as above
+      def key
+        "deploy-directory-#{name}"
+      end
+      
+    end
+    
+  end
+end

data/lib/poolparty/plugins/rsyncmirror.rb

@@ -0,0 +1,29 @@
+module PoolParty    
+  class Git
+        
+    virtual_resource(:rsyncmirror) do
+      
+      def loaded(opts={}, parent=self)
+        has_rsync_mirror(opts, parent)
+      end
+            
+      def has_rsync_mirror(opts={}, parent=self)
+        has_exec(:command => "rsync -aRqv --no-implied-dirs --delete --delete-excluded '#{Base.user}@master:#{opts[:dir]}' '#{opts[:dir]}'", :name => "rsync-#{name}")
+      end
+            
+      # Since git is not a native type, we have to say which core resource
+      # it is using to be able to require it
+      def class_type_name
+        "exec"
+      end
+      
+      # Because we are requiring an exec, instead of a built-in package of the git, we have to overload
+      # the to_s method and prepend it with the same name as above
+      def key
+        "rsync-#{name}"
+      end
+      
+    end
+    
+  end
+end

data/lib/poolparty/pool/resource.rb

@@ -168,7 +168,7 @@ module PoolParty
           :subscribe, :owner, :group, :path, :mode, :source, :notify, :subscribe, :check, :creates, :cwd, :command, :ensure,
           :require, :schedule, :range, :alias, :hour, :minute, :user, :month, :monthday, :name, :onlyif, :unless, :refreshonly,
           :refresh, :content, :template, :ip, :repeat, :provider, :key, :device, :fstype, :remounts, :options, :atboot, :before,
-          :binary, :status, :start, :stop, :restart, :pattern
+          :binary, :status, :start, :stop, :restart, :pattern, :recurse
         ]
       end
       def key

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 57
+    TINY  = 58
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.57
+  version: 0.2.58
 platform: ruby
 authors: 
 - Ari Lerner
@@ -333,8 +333,10 @@ files:
 - lib/poolparty/net/remote_instance.rb
 - lib/poolparty/net/remoter.rb
 - lib/poolparty/net/remoter_base.rb
+- lib/poolparty/plugins/deploydirectory.rb
 - lib/poolparty/plugins/git.rb
 - lib/poolparty/plugins/line.rb
+- lib/poolparty/plugins/rsyncmirror.rb
 - lib/poolparty/plugins/runit.rb
 - lib/poolparty/plugins/svn.rb
 - lib/poolparty/pool/base.rb
@@ -421,6 +423,7 @@ files:
 - spec/poolparty/net/remote_spec.rb
 - spec/poolparty/net/remoter_base_spec.rb
 - spec/poolparty/net/remoter_spec.rb
+- spec/poolparty/plugins/deploydirectory_spec.rb
 - spec/poolparty/plugins/git_spec.rb
 - spec/poolparty/plugins/line_spec.rb
 - spec/poolparty/plugins/svn_spec.rb

data/spec/poolparty/core/string_spec.rb

@@ -147,6 +147,9 @@ listen web_proxy 127.0.0.1:3000
     it "should remove the periods from the string" do
       "xnot.org".sanitize.should == "xnotorg"
     end
+    it "should be able to turn a string into a dir safe name" do
+      "Rails app/".dir_safe.should == "rails_app/"
+    end
   end
   describe "nice_runnable" do
     before(:each) do

data/spec/poolparty/plugins/deploydirectory_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+include PoolParty::Resources
+
+class TestClass
+  include PoolParty::Resources
+end
+describe "Remote Instance" do
+  before(:each) do
+    reset_resources!
+  end
+  describe "wrapped" do
+    before(:each) do
+      @tc = TestClass.new
+      @options = {:name => "deploydirectory", :from => ::File.dirname(__FILE__), :to => "/var/www/deploydirectory", :testing => false}
+    end
+    it "should be a string" do
+      @tc.has_deploydirectory(@options).to_string.should =~ /exec \{/
+    end
+    it "should included the flushed out options" do
+      @tc.has_deploydirectory(@options).to_string.should =~ /command/
+    end
+    describe "in resource" do
+      before(:each) do
+        @tc.instance_eval do
+          has_deploydirectory do
+            name "deploydirectory"
+            from ::File.dirname(__FILE__)
+            to "/var/www/deploydirectory"
+          end
+        end
+      end
+      it "should have the path set within the resource" do
+        @tc.resource(:deploydirectory).first.to_string.should =~ /exec \{/
+      end
+      it "should not have the from in the to_string" do
+        @tc.resource(:deploydirectory).first.to_string.should_not =~ /from /
+      end
+      it "should not have the to in the to_string" do
+        @tc.resource(:deploydirectory).first.to_string.should_not =~ /to /
+      end
+    end
+  end
+end

data/spec/poolparty/pool/cloud_spec.rb

@@ -284,7 +284,7 @@ describe "Cloud" do
               File.open("test_manifest.pp", "w+") {|f| f << @manifest}
             end
             it "should include the hosts for all the listed local instances" do
-              @manifest.should =~ /host \{\n\t\t"master":/
+              @manifest.should =~ /host \{\n\t\t"gen_master":/
             end
           end
           describe "building with an existing manifest" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.57
+  version: 0.2.58
 platform: ruby
 authors: 
 - Ari Lerner
@@ -333,8 +333,10 @@ files:
 - lib/poolparty/net/remote_instance.rb
 - lib/poolparty/net/remoter.rb
 - lib/poolparty/net/remoter_base.rb
+- lib/poolparty/plugins/deploydirectory.rb
 - lib/poolparty/plugins/git.rb
 - lib/poolparty/plugins/line.rb
+- lib/poolparty/plugins/rsyncmirror.rb
 - lib/poolparty/plugins/runit.rb
 - lib/poolparty/plugins/svn.rb
 - lib/poolparty/pool/base.rb
@@ -421,6 +423,7 @@ files:
 - spec/poolparty/net/remote_spec.rb
 - spec/poolparty/net/remoter_base_spec.rb
 - spec/poolparty/net/remoter_spec.rb
+- spec/poolparty/plugins/deploydirectory_spec.rb
 - spec/poolparty/plugins/git_spec.rb
 - spec/poolparty/plugins/line_spec.rb
 - spec/poolparty/plugins/svn_spec.rb