auser-poolparty 1.2.2 → 1.2.3

data/lib/poolparty/resources/sshkey.rb

@@ -25,25 +25,23 @@ The sshkey resource specifies an ssh key that should be distributed on all the n
     
     class Sshkey < Resource
       
+      dsl_methods(:key,
+                  :keypath,
+                  :name)
+
+      default_options(:type => 'rsa')
+                  
       def initialize(opts={}, extra_opts={}, &block)
         super(opts, extra_opts, &block)
-        @key = Key.new(keypath? ? keypath : nil)
-        options[:key] = @key.content
-      end
-      
-      def name(i=nil)
-        if i
-          options[:name] = i
-        else
-          options[:name] ? options[:name] : ::File.basename(@key.full_filepath)
-        end
+        @key = Key.new(keypath ? keypath : nil)
+        self.key = @key.content
       end
       
       def enctype(i=nil)
-        i ? options[:type] = i : options[:type]
+        i ? self.type = i : type
       end
       
     end
     
   end
-end
+end

data/lib/poolparty/resources/symlink.rb

@@ -16,8 +16,8 @@ The symlink resource sets a symlink
 
 == Options
 
-* <tt>name</tt> The location of the symlink
-* <tt>target</tt> The source of the symlink, the existing file or directory
+* <tt>name</tt> The location of the symlink (target)
+* <tt>source</tt> The source of the symlink, the existing file or directory
 
 == Examples
 
@@ -25,9 +25,7 @@ The symlink resource sets a symlink
 =end
     class Symlink < Resource
       
-      def initialize *args, &block
-        super
-      end
+      dsl_methods :source
       
       def present
         :create

data/lib/poolparty/resources/user.rb

@@ -3,6 +3,11 @@ module PoolParty
         
     class User < Resource      
       
+      dsl_methods :name,        # Name of the user
+                  :password,    # Password for the user
+                  :home         # Home directory
+                  
+                  
       default_options({
         :shell => "/bin/sh"
       })

data/lib/poolparty/resources/variable.rb

@@ -27,7 +27,7 @@ To use these variables, in your Erb template, reference them like so
   has_variable(:name => "name", :value => "#{cloud.name}")
 =end
     class Variable < Resource
-      
+      dsl_methods :name, :value
     end
     
   end

data/lib/poolparty/templates/haproxy.conf

@@ -29,7 +29,7 @@ defaults
   stats uri     /poolparty
   stats realm   Statistics\ for\ PoolParty
 
-listen <%= @node[:poolparty][:haproxy_name] %>
+listen PoolParty-site-<%= @node[:poolparty][:haproxy_name] %>
   mode          <%= @node[:poolparty][:proxy_mode] %>
   bind          0.0.0.0:<%= @node[:poolparty][:ports_haproxy].join(",0.0.0.0:") %>
   cookie        POOLPARTY

data/lib/poolparty/verification/verify.rb

@@ -16,6 +16,9 @@ module PoolParty
       end
       def verify(&block)
         v = Verify.new(&block)
+        # ugly, todo fix
+        ip = nodes(:status => "running").first.ip rescue "127.0.0.1"
+        v.host = ip
         v.verifiers.each {|v| verifiers << v}
       end
       def passing?
@@ -41,6 +44,7 @@ module PoolParty
   Dir[::File.dirname(__FILE__)+"/verifiers/*"].each {|m| require m }  
   
   class Verify
+    attr_accessor :host
     def initialize(&block)
       ::PoolParty.require_user_directory "verifiers"
       

data/lib/poolparty.rb

@@ -32,10 +32,14 @@ unless @required_software.empty?
   exit(0)
 end
 
-Dir.glob(File.join(File.dirname(__FILE__),'..', 'vendor/gems/*/lib/*.rb')).each do |d|
-  require d
+Dir.glob(File.join(File.dirname(__FILE__),'..', 'vendor/gems/*/lib')).each do |d|
+  $LOAD_PATH.unshift(d)
 end
 
+require "dslify"
+require "parenting"
+require "suitcase"
+
 t=Time.now
 ## Load PoolParty
 module PoolParty
@@ -43,11 +47,9 @@ end
 
 def PoolParty.require_directory(dir)
   if ::File.file?(dir)
-    puts "#{::File.expand_path(dir)}" if $DEBUGGING || $GENERATING_MANIFEST
     require dir
   else
     Dir["#{dir}/*.rb"].sort.each do |file|
-       puts "#{::File.expand_path(file)}" if $DEBUGGING || $GENERATING_MANIFEST
        require "#{file}" if ::File.file?(file)
     end
     Dir["#{dir}/*"].sort.each do |dir|
@@ -60,6 +62,9 @@ end
 $_poolparty_load_directories = [
   "core",
   "dependencies.rb",
+  "modules/searchable_paths.rb",
+  "modules/pinger.rb",
+  "poolparty/key.rb",
   "dependency_resolver/dependency_resolver_cloud_extensions.rb",
   "dependency_resolver/dependency_resolver.rb",
   "poolparty/poolparty_base_class.rb",

data/lib/poolpartycl.rb

@@ -6,60 +6,9 @@ def help_array
   ["-h", "--help", "-V", "--version", "--debug", "-d"]
 end
 
-def ask_with_help(opts={}, &block)
-  help_str = opts[:help]
-  message = opts[:message]
-  
-  o = ask("#{message} (h for help)") do |q|    
-    q.validate = opts[:validate] if opts.has_key?(:validate)
-  end
-  
-  if %w(h H).include?(o)
-    colored_say help_str, :help
-    ask_with_help(opts, &block)
-  else
-    block.call(o)
-  end
-  o
-end
-
-def rescued_ask(m, r)
-  begin
-    t = colored_ask m
-  rescue Exception => e
-    say r
-  end
-end
-
-def colored_ask(str, color = :notice)
-  setup_colors
-  ask("<%= color(\"#{str}\", :#{color}) %>")
-end
-
-def colored_say(str, color = :headline)
-  setup_colors
-  say("<%= color(\"#{str}\", :#{color}) %>") 
-end
-
-def setup_colors
-    unless @setup_colors
-    ft = HighLine::ColorScheme.new do |cs|
-      cs[:headline]         = [ :bold, :yellow, :on_black ]
-      cs[:horizontal_line]  = [ :bold, :white, :on_blue]
-      cs[:critical]         = [ :yellow, :on_red  ]
-      cs[:error]            = [ :bold, :red  ]
-      cs[:help]             = [ :bold, :white, :on_blue]
-      cs[:notice]           = [ :blue, :on_white]
-    end
-
-    HighLine.color_scheme = ft
-    @setup_colors = true
-  end
-end
-
 def are_you_sure?(msg)
   puts msg
-  resp = gets.strip!
+  resp = STDIN.gets.chomp
 
   case resp
   when "Y"

data/spec/bin/bin_spec_helper.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "spec"
 
 $:.unshift(File.dirname(__FILE__) + '/../../lib')

data/spec/bin/server-list-active_spec.rb

@@ -15,10 +15,10 @@ describe "Server list active binary" do
       @pool_hash = @p.to_properties_hash
     end
     it "should have the name on the schema" do
-      @pool_hash.options.name.should == :binary_testing_cloud
+      @pool_hash[:options][:name].should == :binary_testing_cloud
     end
     it "should have the remoter base available" do
-      @pool_hash.options.remote_base.nil?.should == false  
+      @pool_hash[:options][:remoter_base].should_not be_nil
     end
   end
-end
+end

data/spec/poolparty/core/object_spec.rb

@@ -4,57 +4,20 @@ describe "Object" do
   it "should respond to to_os" do
     Object.new.respond_to?(:to_os).should == true
   end
-  describe "methodable object" do
-    before(:each) do
-      @obj.stub!(:run).and_return "true"
-    end
-    it "should run the method :run because it exists" do
-      @obj.send_if_method(:run).should == "true"
-    end
-    it "should not run the method :bah because it doesn't exist" do
-      @obj.send_if_method("bah").should == "bah"
-    end
-    it "should not run the method if it is sent nil" do
-      @obj.send_if_method(nil).should == nil
-    end
-    it "should not run an empty string method" do
-      @obj.send_if_method("").should == ""
-    end
-    it "should not run a method that is an integer" do
-      @obj.send_if_method(2).should == 2
-    end
-  end
+
   describe "with_options" do
     before(:each) do
-      @obj = Class.new
-    end
-    it "should respond to with_options" do
-      @obj.respond_to?(:with_options).should == true
-    end
-    it "should set the options on the parent" do
-      allow_message_expectations_on_nil
-      @a.should_receive(:clone).and_return @a
-      @a.stub!(:options).and_return({})
-      with_options({:nick => "name"}, @a) do
-      end
-    end
-    
-    describe "running" do
-      before(:each) do
-        Class.stub!(:default_options).and_return({})
-        Class.send :include, Dslify
-        @a = Class.new        
-        @b = Class.new
+      class TestObjClass
+        include Dslify
+        dsl_methods :b
         
-        with_options({:nick => "name", :b => @b}, @a) do
-          b.dude "totally"
+        def initialize(o={})
+          set_vars_from_options o
         end
-        
-      end
-      it "should set the options on the child in the instance eval" do
-        @b.dude.should == "totally"
       end
+      @obj = TestObjClass.new
     end
+    
     describe "contextual running" do
       before(:each) do
         @obj.stub!(:default_options).and_return {}
@@ -65,4 +28,4 @@ describe "Object" do
       end
     end
   end
-end
+end

data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb

@@ -8,19 +8,25 @@ end
 class DependencyResolverSpecTestResource
   include Dslify
   include PoolParty::DependencyResolverResourceExtensions
+  
+  dsl_methods :name, :template, :content
 end
 
 # plugins, base_packages
 class DependencyResolverSpecTestService < DependencyResolverCloudExtensionsSpecBase
-  
+  dsl_methods :listen
 end
 
 # clouds, duh
 class DependencyResolverSpecTestCloud < DependencyResolverCloudExtensionsSpecBase
+  dsl_methods :keypair, :name
 end
 
 class JunkClassForDefiningPlugin
   plugin :apache_plugin do
+    default_options(
+      :listen => 80
+    )
     def loaded(o={},&block)
     end
   end  
@@ -29,35 +35,35 @@ end
 describe "Resolution spec" do
   before(:each) do
     @apache_file = DependencyResolverSpecTestResource.new
-    @apache_file.name "/etc/apache2/apache2.conf"
-    @apache_file.template "/absolute/path/to/template"
-    @apache_file.content "rendered template string"
+    @apache_file.name = "/etc/apache2/apache2.conf"
+    @apache_file.template = "/absolute/path/to/template"
+    @apache_file.content = "rendered template string"
     
     @apache = DependencyResolverSpecTestService.new :apache_file
-    @apache.listen "8080"
+    @apache.listen = "8080"
     @apache.resources[:file] = []
     @apache.resources[:file] << @apache_file
         
     @cloud = DependencyResolverSpecTestCloud.new :cloud
-    @cloud.keypair "bob"
-    @cloud.name "dog"
+    @cloud.keypair = "bob"
+    @cloud.name = "dog"
     
     (@cloud.resources[:apache] ||= []) << @apache
 
     @cloud_file_motd = DependencyResolverSpecTestResource.new
-    @cloud_file_motd.name "/etc/motd"
-    @cloud_file_motd.content "Welcome to the cloud"
+    @cloud_file_motd.name = "/etc/motd"
+    @cloud_file_motd.content = "Welcome to the cloud"
     
     @cloud_file_profile = DependencyResolverSpecTestResource.new
-    @cloud_file_profile.name "/etc/profile"
-    @cloud_file_profile.content "profile info"
+    @cloud_file_profile.name = "/etc/profile"
+    @cloud_file_profile.content = "profile info"
         
     @cloud.resources[:file] = []
     @cloud.resources[:file] << @cloud_file_motd
     @cloud.resources[:file] << @cloud_file_profile
     
     @cloud_directory_var_www = DependencyResolverSpecTestResource.new
-    @cloud_directory_var_www.name "/var/www"
+    @cloud_directory_var_www.name = "/var/www"
     
     @cloud.resources[:directory] = []
     @cloud.resources[:directory] << @cloud_directory_var_www    

data/spec/poolparty/fixtures/clouds.json

@@ -34,7 +34,7 @@
         "default_properties_hash_filename": "cloud.json",
         "poolparty_home_path": "/Users/mfairchild/.poolparty",
         "keypairs": ["/Users/mfairchild/.ec2oncourse/r_and_d.pem", "/Users/mfairchild/.ssh/id_rsa"],
-        "availabilty_zone": "us-east-1a",
+        "availability_zone": "us-east-1a",
         "fileserver_base": "puppet://master/files",
         "debugging": false,
         "minimum_instances": 1,

data/spec/poolparty/helpers/optioner_spec.rb

@@ -7,11 +7,11 @@ describe "Option Parser" do
       @op = PoolParty::Optioner.new([], {:abstract => true})
       @op.parse_options
     end
-    it "should set the options as an Hash" do
-      @op.options.class.should == Hash
+    it "should set the dsl_options as an Hash" do
+      @op.dsl_options.class.should == Hash
     end
     it "should have the verbose option set to false by default" do
-      @op.verbose.should == false
+      @op.verbose?.should == false
     end
     it "should call a method called on it that is not defined on the options if they exist" do
       @op.dsl_options.should_receive(:[]).with(:verbose).at_least(1).and_return true
@@ -40,11 +40,4 @@ describe "Option Parser" do
       @op.flagged_args.should == ["-v", "-i", "1", "-x"]
     end
   end
-  
-  it "should be able to take a block and set some options on the block" do
-    PoolParty::Optioner.new(["-w"], {:abstract => false, :load_pools => false}) do |opts, optioner|
-      opts.on('-w', '--wee')    { optioner.wee "wee" }
-      opts.on('-t t', '--teatime tea')    { optioner.tea "time" }
-    end.wee.should == "wee"
-  end
-end
+end

data/spec/poolparty/modules/cloud_resourcer_spec.rb

@@ -15,7 +15,7 @@ class TestParentClass < PoolParty::Cloud::Cloud
 end
 describe "CloudResourcer" do
   before(:each) do
-    @tc = ResourcerTestClass.new :bank do
+    @tc = Cloud.new :bank do
     end
   end
   it "should have the method instances" do

data/spec/poolparty/net/remote_instance_spec.rb

@@ -5,7 +5,6 @@ include PoolParty::Remote
 
 describe "Remote Instance" do
   before(:each) do
-    setup
     @valid_hash = {:ip => "127.0.0.1", :name => "master", :responding => "true"}
   end
 

data/spec/poolparty/net/remoter_base_spec.rb

@@ -7,14 +7,10 @@ end
 
 describe "RemoterBase" do
   before(:each) do
-    setup
+    @tr = TestRemoteClass.new
   end
-  describe "methods" do
-    before(:each) do
-      @tr = TestRemoteClass.new
-    end
-    %w(launch_new_instance! terminate_instance describe_instance instances_list).each do |method|
-      eval <<-EOE
+  %w(launch_new_instance! terminate_instance describe_instance instances_list).each do |method|
+    eval <<-EOE
         it "should raise an exception if #{method} is not defined as a method" do
           # pending # Weird .should raise_error
           lambda { @tr.class.#{method} }.should raise_error
@@ -28,8 +24,8 @@ describe "RemoterBase" do
             @tr.#{method}
           }.should_not raise_error
         end
-      EOE
-    end
-    
+EOE
+        
   end
-end
+end
+    

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

@@ -3,22 +3,20 @@ class TestEC2Class < Ec2
   include CloudDsl
   include Dslify
   
-  default_options PoolParty::Default.default_options.merge({:access_key => "Not an access key", 
-    :secret_access_key => "not a secret access key", :keypair => 'id_rsa'})
+  default_options :access_key => "Not an access key", 
+                  :secret_access_key => "not a secret access key", 
+                  :keypair => 'id_rsa'
   
-  def ami;"ami-abc123";end
-  def size; "small";end
-  def security_group; "default";end
-  def ebs_volume_id; "ebs_volume_id";end
-  def availabilty_zone; "us-east-1a";end
-  def verbose; false; end
+  # def ami;"ami-abc123";end
+  # def size; "small";end
+  # def security_group; "default";end
+  # def ebs_volume_id; "ebs_volume_id";end
+  # def availability_zone; "us-east-1a";end
+  # def verbose; false; end
   def describe_instances(o={})
     response_list_of_instances
   end
 end
 
 class TestEc2RemoteInstance < PoolParty::Remote::Ec2RemoteInstance
-  def initialize(opts, p=nil)
-    super
-  end
 end

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

@@ -2,30 +2,21 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 require File.dirname(__FILE__) + '/ec2_mocks_and_stubs.rb'
 
 include PoolParty::Remote
-# include Aska
-
-# require File.dirname(__FILE__) + '/ec2_mocks_and_stubs.rb'
 
 
 describe "Ec2RemoteInstance" do
   before(:each) do
     @cloud = TestCloud.new :test_remoter_base_cloud
-    @ec2 = TestEc2RemoteInstance.new( {:name => "node3"}, TestEC2Class.new(@cloud) )
-    # node3 stubbed as  {:ip=>"192.168.0.3", :keypair=>"fake_keypair", :status=>"pending", :name=>"node3", :launching_time=>Time.now
-    @ec2.my_cloud.stub!(:describe_instances).and_return response_list_of_instances
-  end
-  it "should require options" do
-    lambda {TestEc2RemoteInstance.new()}.should raise_error
+    @tec2 = TestEC2Class.new(@cloud.dsl_options)
+    @ec2 = TestEc2RemoteInstance.new( @tec2.dsl_options.merge(:name => "node3", :status => "pending", :ip => "192.168.0.3"))
   end
   it "should have the name set in the options" do
-    @ec2.respond_to?(:name).should == false
-    @ec2.options.keys.include?(:name).should == true
+    @ec2.respond_to?(:name).should == true
+    @ec2.dsl_options.keys.include?(:name).should == true
     @ec2.name.should == 'node3'
   end
   it "should have access to parent cloud options" do
-    @ec2.my_cloud.class.should ==  TestEC2Class
-    @ec2.my_cloud.should respond_to(:describe_instances)
-    @ec2.my_cloud.size.should == 'small'    
+    @ec2.instance_type.should == 'm1.small'
   end
   it "should have instance description hash mapped to methods" do
     # puts  "<ol>"
@@ -34,43 +25,14 @@ describe "Ec2RemoteInstance" do
     @ec2.status.should == 'pending'
     @ec2.name.should  == 'node3'
     @ec2.ip.should == '192.168.0.3'
-    @ec2.launching_time.should_not be_nil
-    @ec2.valid?.should be_true
-  end
-  it "should not be the master" do
-    @ec2.master?.should_not be_true
   end
 end
 
-
-
-
-
-
 describe "Remote Instance" do
   before(:each) do
-    setup
     @valid_hash = {:ip => "127.0.0.1", :name => "master"}
   end
 
-  describe "configurable" do
-    it "should set the options sent in the options, overiding passed option with found instance values" do
-      @ec2 = TestEc2RemoteInstance.new(@valid_hash)
-      @ec2.ip.should == "127.0.0.1"
-    end
-    it "should set the options sent by the parent" do
-      @obj = Object.new
-      @obj.stub!(:options).and_return({:dude => "tte"})
-      @ec2 = @ec2 = TestEc2RemoteInstance.new(@valid_hash, @obj)
-      @ec2.dude.should == "tte"
-    end
-    it "should not overwrite the options that are already set" do
-      @obj = Object.new
-      @obj.stub!(:options).and_return({:ip => "172.176.0.1"})
-      @ec2 = TestEc2RemoteInstance.new(@valid_hash, @obj)
-      @ec2.ip.should == "127.0.0.1"
-    end
-  end
   it "should create a remote instance with a Hash" do
     @ec2 = TestEc2RemoteInstance.new(@valid_hash)
     @ec2.valid?.should == true
@@ -111,4 +73,4 @@ describe "Remote Instance" do
       # @ec2.responding.should_not be_nil
     end
   end
-end
+end

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

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/ec2_mocks_and_stubs.rb'
 describe "ec2 remote base" do
   before(:each) do
     @cloud = TestCloud.new :test_remoter_base_cloud
-    @tr = TestEC2Class.new(@cloud)
+    @tr = TestEC2Class.new(@cloud.dsl_options)
     stub_remoter_for(@tr)
     # @tr.stub!(:get_instances_description).and_return response_list_of_instances
   end
@@ -91,8 +91,7 @@ describe "ec2 remote base" do
       @tr.next_unused_elastic_ip.should == "174.129.212.93"
     end
     it "should use only the elastic ips set on the cloud" do
-      @cloud.stub!(:elastic_ips?).and_return true
-      @cloud.stub!(:elastic_ips).and_return ["182.199.200.201"]
+      @tr.stub!(:elastic_ips).and_return ["182.199.200.201"]
       @tr.stub!(:cloud).and_return @cloud
       @tr.next_unused_elastic_ip.should == "182.199.200.201"
     end

data/spec/poolparty/net/remoter_spec.rb

@@ -2,10 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Remoter" do
   before(:each) do
-    setup
     @cloud = cloud :app do;end
     @tc = TestClass.new
-    @tc.parent = @cloud
+    # @tc.parent = @cloud
     @sample_instances_list = [{:ip => "192.168.0.1", :name => "master"}, {:ip => "192.168.0.2", :name => "node1"}]
   end
   describe "ssh_string" do
@@ -130,4 +129,4 @@ describe "Remoter" do
   #   end
   # end
 
-end
+end

data/spec/poolparty/plugins/git_spec.rb

@@ -9,7 +9,7 @@ describe "Remote Instance" do
       reset!
       @tc = cloud :test_git_class_cloud do
         has_file "/var/www/bino"
-        has_git_repos :at => "/var/www/", :name => "gitrepos.git", :source => "git://git/repos/source.git", :requires_user => "finger"
+        has_git_repo "git://git/repos/source.git", :to => "/var/www/source", :requires_user => "finger"
       end
       @compiled = ChefResolver.new(@tc.to_properties_hash).compile
     end
@@ -25,17 +25,14 @@ describe "Remote Instance" do
     describe "in resource" do
       before(:each) do
         @tc = cloud :test_git_class_cloud_two do
-          has_git_repos(:name => "gittr") do
-            symlink "/var/www/xnot.org/public"
-            source "git://source.git"
-            path "/var/www/xnot.org"       
-            at "/var/www"
+          has_git_repo("git://source.git") do
+            to "/var/www/xnot.org"
           end
         end
       end
       it "should have the path set within the resource" do
-        ChefResolver.new(@tc.to_properties_hash).compile.should =~ /execute \"git-gittr/
+        ChefResolver.new(@tc.to_properties_hash).compile.should =~ /execute \"git-git:\/\/source\.git/
       end
     end
   end
-end
+end