poolparty 1.6.4 → 1.6.5

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 6
-:patch: 4
+:patch: 5
 :major: 1
 :build: 

data/bin/cloud

@@ -49,6 +49,7 @@ EOS
   run do |command|
     subcommands = GitStyleBinary.list_subcommands
     
+    puts "cloud %s" % PoolParty.version
     puts "Usage: cloud COMMAND [ARGS]
     
     The cloud subcommands commands are:

data/lib/cloud_providers/connections.rb

@@ -35,6 +35,9 @@ module CloudProviders
     end
 
     def ssh( commands=[], extra_ssh_ops={})
+      # commands can be single commands, as well as array
+      commands = [commands] unless commands.respond_to? :each
+
       # Get the environment hash out of
       # the extra_ssh_ops and then delete
       # the element
@@ -44,12 +47,12 @@ module CloudProviders
       extra_ssh_ops.delete :env
 
       # Decide to use sudo or not
-      do_sudo = true
+      do_sudo = user!="root"
+
       if extra_ssh_ops.has_key? :do_sudo
         do_sudo = extra_ssh_ops[:do_sudo] 
         extra_ssh_ops.delete :do_sudo
       end
-      do_sudo=user!="root"
 
       envstring = env.collect {|k,v| "#{k}=#{v}"}.join ' && '
       envstring += " && " unless envstring.size == 0
@@ -74,6 +77,15 @@ module CloudProviders
         r
       end
     end
+
+    # remove hostname and corresponding from known_hosts file.  Avoids warning when reusing elastic_ip, and 
+    # less likely, if amazone reassigns ip.  By default removes both dns_name and ip
+    def ssh_cleanup_known_hosts!(hosts=[host, public_ip])
+      hosts = [hosts] unless hosts.respond_to? :each
+      hosts.compact.each do |name|
+        system_run "ssh-keygen -R %s" % name
+      end
+    end
     
     # Take a hash of options and join them into a string, combined with default options.
     # Default options are -o StrictHostKeyChecking=no -i keypair.full_filepath -l user

data/lib/cloud_providers/ec2/ec2.rb

@@ -75,7 +75,6 @@ module CloudProviders
     
     default_options(
       :instance_type          => 'm1.small',
-      :addressing_type        => "public",
       :availability_zones     => ["us-east-1a"],
       :user_id                => default_user_id,
       :private_key            => default_private_key,
@@ -89,10 +88,12 @@ module CloudProviders
       :min_count              => 1,
       :max_count              => 1,
       :user_data              => '',
-      :addressing_type        => nil,
       :kernel_id              => nil,
       :ramdisk_id             => nil,
-      :block_device_mapping  => [{}]
+      :block_device_mapping  => [{}],
+      :disable_api_termination => nil,
+      :instance_initiated_shutdown_behavior => nil,
+      :subnet_id => nil
     )
 
     # Called when the create command is called on the cloud
@@ -173,6 +174,7 @@ module CloudProviders
       end
       
       assign_elastic_ips
+      cleanup_ssh_known_hosts!
       puts "Attaching EBS volumes"
       assign_ebs_volumes # Assign EBS volumes
     end
@@ -196,7 +198,10 @@ module CloudProviders
         :availability_zone => availability_zones.first,
         :base64_encoded => true,
         :cloud => cloud,
-        :block_device_mapping => block_device_mapping
+        :block_device_mapping => block_device_mapping,
+        :disable_api_termination => disable_api_termination,
+        :instance_initiated_shutdown_behavior => instance_initiated_shutdown_behavior,
+        :subnet_id => subnet_id,
       })
       progress_bar_until("Waiting for node to launch...") do
         wait_for_node(e)
@@ -223,7 +228,9 @@ module CloudProviders
     def contract_by(num=1)
       raise RuntimeError, "Contracting instances by #{num} will lower the number of instances below specified minimum" unless nodes.size - num > minimum_instances
       num.times do |i|
-        id = nodes[-num].instance_id
+        node = nodes[-num]
+        id = node.instance_id
+        node.ssh_cleanup_known_hosts!
         Ec2Instance.terminate!(:instance_id => id, :cloud => cloud)
       end
       reset!
@@ -245,17 +252,11 @@ module CloudProviders
     end
     
     def configure_nodes!(tmp_path=nil)
-      unless security_groups.map {|a| a.authorizes.map {|t| t.from_port.to_i }.flatten }.flatten.include?(22)      
-        warn "Cloud security_groups are not authorized for ssh. Cannot configure."
-        return
-      end
-      tmp_path ||= cloud.tmp_path
-      nodes.each do |node|
-        next unless node.in_service?
-        node.cloud_provider = self
-        node.rsync_dir(tmp_path) if tmp_path
-        node.run_chef!
-      end
+      # removed duplicated code (now configure_nodes! invokes
+      # node.bootstrap_chef!, while old version did not, but I believe
+      # this is harmless)
+      bootstrap_nodes!(tmp_path) 
+
       ebs_volume_groups.each do |vol_grp|
         vol_grp.verify_attachments nodes
       end
@@ -284,7 +285,17 @@ module CloudProviders
         end
       end
     end
-    
+
+    def cleanup_ssh_known_hosts!(nodes_to_cleanup=nodes,
+                                 even_unavailable=false)
+      puts "cleaning up .ssh/known_hosts"
+      nodes_to_cleanup.find_all do |node|
+        even_unavailable || node.ssh_available?
+      end.each do |node|
+        node.ssh_cleanup_known_hosts!
+      end
+    end
+
     def nodes
       all_nodes.select {|i| i.in_service? }#describe_instances.select {|i| i.in_service? && security_groups.include?(i.security_groups) }
     end

data/lib/cloud_providers/ec2/ec2_instance.rb

@@ -10,7 +10,10 @@ module CloudProviders
       :key_name => nil,
       :launch_time => nil,
       :availability_zones => [],
-      :block_device_mapping => [{}]
+      :block_device_mapping => [{}],
+      :disable_api_termination => nil,
+      :instance_initiated_shutdown_behavior => nil,
+      :subnet_id => nil
     )
     
     def initialize(raw_response={})
@@ -27,6 +30,9 @@ module CloudProviders
       self.availability_zones = raw_response["placement"]["availabilityZone"] rescue nil
       self.status = raw_response["instanceState"]["name"] rescue nil
       self.block_device_mapping = raw_response["blockDeviceMapping"] rescue nil
+      self.disable_api_termination = raw_response["disableApiTermination"] rescue nil
+      self.instance_initiated_shutdown_behavior = raw_response["instance_initiated_shutdown_behavior"] rescue nil
+      self.subnet_id = raw_response["subnetId"] rescue nil
       super
     end
     
@@ -43,7 +49,12 @@ module CloudProviders
     end
 
     def ssh_available?
-      cloud.security_groups.map {|a| a.authorizes.map {|t| t.from_port.to_i }.flatten }.flatten.include?(22) and reachable? and in_service?
+      cloud.security_groups.map {|a|
+        a.authorizes.map {|t| t.from_port.to_i }.flatten
+      }.flatten.include?(22) and
+        reachable? and
+        in_service? and
+        keypair and keypair.exists?
     end
     
     def in_service?

data/lib/cloud_providers/remote_instance.rb

@@ -37,12 +37,13 @@ module CloudProviders
     end
     
     def chef_bootstrapped?
-      # do_sudo is false cause we want to capture the return code of the call
-      @chef_bootstrapped ||= cloud.chef.node_bootsrapped?(self)
+      @chef_bootstrapped ||= cloud.chef.node_bootstrapped?(self)
     end
     
+    # TODO: chef_bootstrapped? should go away, since Chef#node_bootstrap!
+    # already checks node_bootstrap!.  There is a force flag as well.
     def bootstrap_chef!
-      cloud.chef.node_bootstrap(self) unless chef_bootstrapped?
+      cloud.chef.node_bootstrap!(self)
     end
     
     def run_chef!

data/lib/keypair.rb

@@ -5,20 +5,25 @@ class Keypair
   
   include SearchablePaths
   has_searchable_paths(:prepend_paths => [Dir.pwd, '/etc/poolparty/keys', "#{ENV["HOME"]}/.ssh/", "#{ENV["HOME"]}/.ec2/", ENV['EC2_CONFIG_DIR']])
-  
+
+  # Amazon will not append suffix, but public key may have '.pem' suffix
+  SEARCH_SUFFIXES = %w( .pem )
+
   attr_accessor :filepath
   attr_reader :extra_paths, :opts
+  attr_reader :search_suffixes
   
   # Create a new key that defaults to id_rsa as the name. 
   def initialize(fpath, extra_paths=[], opts={})
     @filepath = fpath
     @opts = opts
     @extra_paths = extra_paths.map {|a| File.expand_path(a) }
+    @search_suffixes = SEARCH_SUFFIXES
   end
   
-  # If the full_filepath is nil, then the key doesn't exist
+  # If the full_filepath is nil or false, then the key doesn't exist
   def exists?
-    full_filepath != nil
+    !! full_filepath
   end
   
   # Read the content of the key
@@ -29,13 +34,9 @@ class Keypair
   # Returns the full_filepath of the key. If a full filepath is passed, we just return the expanded filepath
   # for the keypair, otherwise query where it is against known locations
   def full_filepath
-    return @full_filepath if @full_filepath
-    @full_filepath = if File.file?(File.expand_path(filepath))
-      ::File.expand_path(filepath)
-      else
-        search_in_known_locations(filepath, extra_paths)
-      end
-    @full_filepath ? @full_filepath : false
+    @full_filepath ||= 
+      find_file_in_path_with_suffix(filepath, extra_paths, 
+                                    search_suffixes) || false
   end
   
   def to_s
@@ -99,6 +100,24 @@ class Keypair
       raise StandardError.new("#{filepath} key file cannot be found") unless filepath.nil?
     end
   end
+
+  # try filename with suffix and without suffixes.
+  # Checks all paths without suffix first, then try all paths for all suffixes.
+  def find_file_in_path_with_suffix(file, extra_paths, suffixes=[], 
+                                    try_wo_suffix=true)
+    suffixes_to_try = suffixes.dup
+    suffixes_to_try.unshift '' if try_wo_suffix
+
+    suffixes_to_try.map {|s| file + s }.each do |suffixed|
+      fullpath = if File.file?(File.expand_path(suffixed))
+                   ::File.expand_path(suffixed)
+                 else
+                   search_in_known_locations(suffixed, extra_paths)
+                 end
+      return fullpath if fullpath
+    end
+
+    nil
+  end
   
-  
-end
+end

data/lib/poolparty/chef.rb

@@ -1,5 +1,21 @@
 module PoolParty
   class Chef < Base
+
+    BOOTSTRAP_PACKAGES = %w( ruby ruby1.8-dev libopenssl-ruby1.8 rdoc
+      ri irb build-essential wget ssl-cert rubygems git-core rake
+      librspec-ruby libxml-ruby zlib1g-dev libxml2-dev )
+    # thin couchdb 
+    BOOTSTRAP_GEMS = %w( chef )
+
+    # we dont specifically install these binaries, they installed by
+    # packages and gems above, but we check for them
+    BOOTSTRAP_BINS = %w( gem chef-solo chef-client )
+    BOOTSTRAP_DIRS = %w( /var/log/chef /var/cache/chef /var/run/chef )
+
+    def compile!
+      build_tmp_dir
+    end
+
     def self.types
       return [:solo,:client]
     end
@@ -48,26 +64,76 @@ module PoolParty
     end
 
     def node_run!(remote_instance)
+      node_stop!(remote_instance)
+      node_configure!(remote_instance)
+
       envhash = {
         :GEM_BIN => %q%$(gem env | grep "EXECUTABLE DIRECTORY" | awk "{print \\$4}")%
       }
-      remote_instance.ssh([chef_cmd.strip.squeeze(' ')], :env => envhash )
+      cmds = chef_cmd
+      cmds = [cmds] unless cmds.respond_to? :each
+
+      remote_instance.ssh(cmds.map{|c| c.strip.squeeze(' ')}, :env => envhash )
     end
 
-    def node_bootsrapped?(remote_instance)
-      # "(gem list; dpkg -l chef) | grep -q chef && echo 'chef installed'"
-      remote_instance.ssh(['if [ ! -n "$(gem list 2>/dev/null | grep chef)" ]; then echo "chef installed"; fi'], :do_sudo => false).empty? rescue false
+    def node_stop!(remote_instance)
+      remote_instance.ssh("killall -q chef-client chef-solo; [ -f /etc/init.d/chef-client ] && invoke-rc.d chef-client stop")
     end
-   def node_bootstrap(remote_instance)
-      remote_instance.ssh([
-        'apt-get update',
-        'apt-get autoremove -y',
-        'apt-get install -y ruby ruby-dev rubygems git-core libopenssl-ruby',
-        'gem sources -a http://gems.opscode.com',
-        'gem install chef ohai --no-rdoc --no-ri' ])
-      remote_instance.ssh(remote_instance.bootstrap_gems.collect { |g| "gem install #{g} --no-rdoc --no-ri" } )
+
+    def node_configure!(remote_instance)
+      # nothing in the superclass
     end
+
+    def node_bootstrapped?(remote_instance, quiet=true)
+      # using which command instead of calling gem directly.  On
+      # ubuntu, calling a command from package not installed
+      # 'helpfully' prints message, which result confuses detection
+      #
+      cmd = "which %s" % BOOTSTRAP_BINS.join(' ') +
+        " && dpkg -l %s " % BOOTSTRAP_PACKAGES.join(' ') +
+        BOOTSTRAP_GEMS.map{ |gem|
+          "&& gem search '^#{gem}$' | grep -v GEMS | wc -l | grep -q 1"
+        }.join(' ') +
+        BOOTSTRAP_DIRS.map{ |dir|
+          "&& [[ -d #{dir} ]] "
+        }.join(' ') +
+        (quiet ? " >/dev/null " : "" ) +
+        " && echo OK || echo MISSING"
+
+      r = remote_instance.ssh(cmd, :do_sudo => false )
+      r.lines.to_a.last.chomp == "OK"
+    end
+
+    def node_bootstrap!(remote_instance, force=false)
+      return if !force && node_bootstrapped?(remote_instance)
+
+      # TODO: this should not be hardcoded (like in node_run)
+      deb_gem_bin='/var/lib/gems/1.8/bin'
+      gem_src='http://gems.opscode.com'
+
+      bootstrap_cmds =
+        [
+         'apt-get update',
+         'apt-get autoremove -y',
+         'apt-get install -y %s' % BOOTSTRAP_PACKAGES.join(' '),
+         "gem source -l | grep -q #{gem_src} || gem source -a #{gem_src} ",
+         'gem install %s --no-rdoc --no-ri' % 
+            (BOOTSTRAP_GEMS + remote_instance.bootstrap_gems).join(' '),
+         "apt-get install -y %s" % BOOTSTRAP_PACKAGES.join(' '),
+         "[ -d #{deb_gem_bin} ] && ln -sf #{deb_gem_bin}/* /usr/local/bin",
+         "mkdir -p %s" % BOOTSTRAP_DIRS.join(' ')
+        ]
+
+      remote_instance.ssh(bootstrap_cmds)
+    end
+
     private
+
+    def chef_cmd
+      return <<-CMD
+        PATH="$PATH:$GEM_BIN" #{chef_bin} -j /etc/chef/dna.json -c /etc/chef/client.rb -d -i 1800 -s 20
+      CMD
+    end
     
     def _recipes
       @_recipes ||= []

data/lib/poolparty/chef_client.rb

@@ -1,8 +1,15 @@
+require 'uri' # for URI.parse in write_bootstrap_files
+
 module PoolParty
   # Chef class bootstrapping chef-client.
   class ChefClient < Chef
-    dsl_methods :server_url,:validation_token
-    
+    dsl_methods :server_url,:validation_token, :validation_key
+
+    # When init_style.nil?, old behavior is used (just run the client).
+    # If init_style is specified, bootstrap::client cookbook is executed
+    # To this init style.
+    dsl_methods :init_style
+
     def openid_url(url=nil)
       if url.nil?
         return @openid_url||= (u=URI.parse(server_url)
@@ -18,27 +25,48 @@ module PoolParty
       @_roles=roles
     end
 
-    def compile!
-      build_tmp_dir
-    end
-
     private
     def after_initialized
       raise PoolPartyError.create("ChefArgumentMissing", "server_url must be specified!") unless server_url
     end
+    def chef_bin
+      "chef-client"
+    end
+
     def chef_cmd
-      return <<-CMD
-        PATH="$PATH:$GEM_BIN" chef-client -j /etc/chef/dna.json -c /etc/chef/client.rb -d -i 1800 -s 20
-      CMD
+      # without init_style, let parent class start chef-client
+      return super unless init_style
+
+      'invoke-rc.d chef-client start'
     end
+
+    def node_configure!(remote_instance)
+      super
+      cmds = 
+        [ 'PATH="$PATH:$GEM_BIN" chef-solo -j /tmp/chef/chef.json -c /tmp/chef/solo.rb',
+          'invoke-rc.d chef-client stop',
+          'PATH="$PATH:$GEM_BIN" chef-client -j /etc/chef/dna.json -c /etc/chef/client.rb',
+        ]
+
+      remote_instance.ssh cmds
+    end
+
     # The NEW actual chef resolver.
     def build_tmp_dir
       base_directory = tmp_path/"etc"/"chef"
       FileUtils.rm_rf base_directory
       FileUtils.mkdir_p base_directory   
+      FileUtils.cp validation_key, base_directory if validation_key
       puts "Creating the dna.json"
       attributes.to_dna [], base_directory/"dna.json", {:run_list => roles.map{|r| "role[#{r}]"} + _recipes.map{|r| "recipe[#{r}]"}}.merge(attributes.init_opts)
-      write_client_dot_rb
+      unless init_style then    # original style init
+        write_client_dot_rb
+      else
+        bootstrap_tmp_dir = tmp_path/"tmp/chef"
+        FileUtils.rm_rf bootstrap_tmp_dir
+        FileUtils.mkdir_p bootstrap_tmp_dir
+        write_bootstrap_files bootstrap_tmp_dir/"solo.rb", bootstrap_tmp_dir/"chef.json"
+      end
     end
     
     def write_client_dot_rb(to=tmp_path/"etc"/"chef"/"client.rb")
@@ -51,13 +79,43 @@ pid_file           "/var/run/chef/client.pid"
 Chef::Log::Formatter.show_time = true
 openid_url         "#{openid_url}"
       EOE
-      %w(search_url role_url remotefile_url template_url registration_url).each{|url|
+      %w(chef_server_url).each{|url|
         content+="#{url}   \"#{server_url}\"\n"
       }
       content+="validation_token  \"#{validation_token}\"\n" if validation_token
+      content+="validation_key    \"/etc/chef/#{File.basename validation_key}\"\n" if validation_key
       File.open(to, "w") do |f|
         f << content
       end
     end
+
+    def write_bootstrap_files(solo_rb, chef_json)
+      uri=URI.parse(server_url)
+      # this maybe reduntant, URL should have a port in there
+      uri.port=4000 if uri.port == 80 # default port for chef
+
+      contents_solo_rb = <<-EOE
+file_cache_path "/tmp/chef-solo"
+cookbook_path "/tmp/chef-solo/cookbooks"
+recipe_url "http://s3.amazonaws.com/chef-solo/bootstrap-latest.tar.gz"
+      EOE
+      File.open(solo_rb, "w") do |f| f << contents_solo_rb end
+
+      bootstrap_json = 
+        {
+        :bootstrap => {
+          :chef => {
+            :url_type =>  uri.scheme,
+            :init_style => init_style,
+            :path => "/srv/chef",
+            :serve_path => "/srv/chef",
+            :server_fqdn => uri.host,
+            :server_port => uri.port,
+          },
+        },
+        :run_list => [ 'recipe[bootstrap::client]' ],
+      }
+      ChefAttribute.new(bootstrap_json).to_dna([], chef_json)
+    end
   end
 end

data/lib/poolparty/chef_solo.rb

@@ -3,16 +3,12 @@ require "fileutils"
 module PoolParty
   class ChefSolo < Chef
     dsl_methods :repo 
-    def compile!
-      build_tmp_dir
-    end
 
     private
-    def chef_cmd
-      return <<-CMD
-        PATH="$PATH:$GEM_BIN" chef-solo -j /etc/chef/dna.json -c /etc/chef/solo.rb
-      CMD
+    def chef_bin
+      "chef-solo"
     end
+
     # The NEW actual chef resolver.
     def build_tmp_dir
       base_directory = tmp_path/"etc"/"chef"

data/lib/poolparty.rb

@@ -20,6 +20,7 @@ module PoolParty
     return @version if @version
     config = YAML.load(File.read(File.expand_path("#{File.dirname(__FILE__)}/../VERSION.yml")))
     @version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+    @version += "-" + config[:build] if  config[:build]
   end
   def self.lib_dir
   File.join(File.dirname(__FILE__), "..")

data/test/fixtures/keys/pem_key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAywLYTlQ+keNiZI2FeBik6q34xStF3fF2+XPk3e21B0YQfbQI
+xYJG8gbSro90Tu1hnEBZfYm+AC8HXsR9Kx9LpfTSa3aGFRREwdsi8xuaoeHWNxOh
+MykU4UcxahT0Ft5+738kLmtVhw8bjjkqcpxCSgrpcJbad2B2ft1KBE02kiU2y7yS
+92sUSWBzVkkJTmiWBDvn5pT9y6IpVCKseWbumGQ6nozEfXe4ihUsKAH42XPxSXMX
+Xe64JuONQlxZPrqyF7L/lt6ZeyKQ7yXVcxr6P4W3rPqlBhq5yXNI3vV67KUNCh+w
+HH6RLagaguS0VTdBYwo3dvkmuL6TJqnzPzrv1wIBIwKCAQBczhm9aFceHs3k0vsv
+ljzDDbONVZxIM96d69ZW0xDtYdunLbrd8mmTNlGu4n5P930UOqyRKQZme+YcsZhO
+OjE17ELvTCAJot2acs4l/f2L1PQ2b1+iW+xJuiU3zxB/e6e98PqY4Jwge+9W9Y+/
+XWAh2RpCGRNpxbKDI1UJR95usRxhxlmY0RmUtpDjc3qEOPRgj7E2iC4fFVdvYzKt
+FBkGR6Gv2/jqm+c/TmRCFnyaWJXC8W6LkkACjUc6IKUOBSbs6l+3DH0PBOr+XbGv
+peExAfYCTfvGy/NNPpzP0JJUJ92sWaZUPUTf8McSsgrTTRBfklsJuf9Hje/8abcr
+AheLAoGBAPGX3CDMU68BTgO8bOvGhFHQSu9AypIhEh0PrE1CYsEvYrIRg9h23fuz
+1nz7Z6kIYTNMywxfphEL65CTiJ5eSJV+UGMFAKYziCwH7MDD4Wc6cPLrGmA0eYDz
+QMUQJwqfuXKq/dMw2VB6qGbNmbERWmq3wteF/afyTatd6poV4UcXAoGBANcd/o4s
+zf1SwxKoT4GGp62gtqT+gIbGkV0AzWBcaDarRNbcV7uFZLL7wzPcCR8/cPZiN+ks
++LsVYvDfrFHRxtdzIesxcqG2v6LazB/+/rZp4Hqc1a4OwxSdOYzINjA01GV2HcET
+XzoJIQA8ZYuVpELaNzjLtKBZ6mrQmBh7RRVBAoGBAJ7C4RzeCxs7XycGyzvaObIb
+Ke2uO/mgtCG516B8FQKbe18S0vv2V1xC+qnnCZr24MnworBcHKwdxq925L/Xjsij
+dqd4UOI/Hvhc+qqPWZubbsuEjazvSIfwTyJps0F+55R+/pIYyVIkt86HG9rCQrso
+TNbFw/IFoMER1K5mJlNJAoGAT+aRv8d/tdzpXrOLPrz8c7C43jKkxFhh4LcnthOx
+refXvYUKpLyEfP5tE0MZVL/K3yvLn8A/IOqvuI2Xxp5fzF32p9CJqceJAfl/BJHp
+lDX0SsyJ4ZB0WB0kARcqEee8mrbX2f/hipWtK/ktB/XAqx3Z/ycXND6nhsKBorFx
+bksCgYEAtPns7oc98wmF8j37ELikMFJOvQgccbGTzcJ1RVzji95HfN4p3kA6emo/
+hRyP8XNedEI/CD6MmthKKymw5Ck1I51nwDW4+zTEDAN14nh4T9p6Jqe7lSENqLaY
+A5jkgXV8e0YqKkjLNec5hAzoEY09KryQdz81KXeHvbEUfIiItTk=
+-----END RSA PRIVATE KEY-----

data/test/fixtures/keys/pem_pub_key.pem

@@ -0,0 +1,8 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCAKCAQEAywLYTlQ+keNiZI2FeBik6q34xStF3fF2+XPk3e21B0YQfbQIxYJG
+8gbSro90Tu1hnEBZfYm+AC8HXsR9Kx9LpfTSa3aGFRREwdsi8xuaoeHWNxOhMykU
+4UcxahT0Ft5+738kLmtVhw8bjjkqcpxCSgrpcJbad2B2ft1KBE02kiU2y7yS92sU
+SWBzVkkJTmiWBDvn5pT9y6IpVCKseWbumGQ6nozEfXe4ihUsKAH42XPxSXMXXe64
+JuONQlxZPrqyF7L/lt6ZeyKQ7yXVcxr6P4W3rPqlBhq5yXNI3vV67KUNCh+wHH6R
+LagaguS0VTdBYwo3dvkmuL6TJqnzPzrv1wIBIw==
+-----END RSA PUBLIC KEY-----

data/test/lib/poolparty/keypair_test.rb

@@ -6,6 +6,7 @@ class KeypairTest < Test::Unit::TestCase
   context "Base" do
     setup do
       @keypair = Keypair.new(fixtures_dir/"keys"/"test_key")
+      @keypair_pem = Keypair.new(fixtures_dir/"keys"/"pem_key")
     end
     
     should "set the file given as the file for the keypair" do
@@ -13,6 +14,25 @@ class KeypairTest < Test::Unit::TestCase
       assert_equal @keypair.full_filepath, File.expand_path(fixtures_dir/"keys"/"test_key")
       assert_match @keypair.to_s, File.expand_path(fixtures_dir/"keys"/"test_key")
     end
+
+    should "find the suffixed file given without pem suffix" do
+      assert_equal @keypair_pem.filepath, fixtures_dir/"keys"/"pem_key"
+      assert_equal @keypair_pem.full_filepath, File.expand_path(fixtures_dir/"keys"/"pem_key.pem")
+      assert_match @keypair_pem.to_s, File.expand_path(fixtures_dir/"keys"/"pem_key")
+    end
+
+    should "find the suffixed file given without pem suffix or dir" do
+      basename = File.basename(@keypair_pem.full_filepath)
+      basename_no_suffix = File.basename(basename, '.pem')
+
+      search_dirs = [File.dirname(@keypair_pem.full_filepath)]
+
+      keypair = Keypair.new(basename, search_dirs)
+      keypair_no_suffix = Keypair.new(basename_no_suffix, search_dirs)
+
+      assert_equal keypair.full_filepath, @keypair_pem.full_filepath
+      assert_equal keypair_no_suffix.full_filepath, @keypair_pem.full_filepath
+    end
     
     should "have the content of the file available" do
       assert_equal @keypair.content, open(fixtures_dir/"keys"/"test_key").read
@@ -37,4 +57,4 @@ class KeypairTest < Test::Unit::TestCase
       end
     end
   end  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors: 
 - Ari Lerner
@@ -291,6 +291,8 @@ files:
 - test/fixtures/ec2/ec2-terminate-instances_response_body.xml
 - test/fixtures/ec2/elb-describe-load-balancers.xml
 - test/fixtures/ec2/rds-describe-db-instances-empty_response_body.xml
+- test/fixtures/keys/pem_key.pem
+- test/fixtures/keys/pem_pub_key.pem
 - test/fixtures/keys/test_key
 - test/fixtures/keys/test_pub_key
 - test/fixtures/resources/fake_plugin.rb