fairchild-poolparty 1.1.5 → 1.2.12

data/lib/poolparty/installers/ec2.rb

@@ -0,0 +1,141 @@
+module PoolParty
+  module Installers
+    class Ec2 < BaseInstaller
+      
+      def commands
+        [
+          :get_access_key, :get_secret_access_key, :show_cert_message,
+          # :get_ec2_api_tools,
+          :get_keypair, :write_clouds_rb
+        ]
+      end
+      
+      def get_access_key        
+        key_help_str = <<-EOE
+Now you need to get your keys from Amazon AWS.
+If you don't already have your keys setup, navigate to http://aws.amazon.com
+and click on Your Account. Click on the Access Identifiers tab and find:
+Your Access Key ID. This is your access key.
+        EOE
+        access_key_str = <<-EOE
+Since you'll be using ec2, we'll have to set some things up before
+we can get going on PoolParty. Don't worry, this information will stay between us.
+
+        EOE
+        say access_key_str
+        ask_with_help :message => "First, what's your access key?",
+                      :help => key_help_str do |t|
+          @access_key = t
+        end
+      end
+      
+      def get_secret_access_key
+        key_help_str = <<-EOE
+If you don't already have your keys setup, navigate to http://aws.amazon.com
+and click on Your Account. Click on the Access Identifiers tab and find:
+Your Secret Access Key ID. Click on the - show button.
+This is your secret access key.
+        EOE
+        ask_with_help :message => "Awesome. Now what's your secret access key? ",
+                      :help => key_help_str do |t|
+          @secret_access_key = t
+        end
+      end
+      
+      def show_cert_message
+        rescued_ask_str = <<-EOS
+Super duper! You'll need to make sure you have yout X.509 certificate downloaded too.
+Save this in your ~/.ec2 directory.
+
+Press enter when you're ready
+EOS
+
+        cert_help_str = <<-EOE
+To get your X.509 certificates, navigate to http://aws.amazon.com and login. Click on
+Your Account and scroll down. The X.509 Certificate box is at the bottom. Make sure you
+click download and save the cert-*.pem file. If you don't know or don't have the pk-*.pem file
+you may have to recreate it. Not to worry though, it's super easy. Click on the Create New button. 
+From there, you can download the cert-*.pem and the pk-*.pem files.
+
+        EOE
+
+        ask_with_help :message => rescued_ask_str,
+                      :help => cert_help_str do |t|
+          @cert = true
+        end
+      end
+      
+      def get_ec2_api_tools
+        url = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351&categoryID=88"
+        download_url = "http://www.amazon.com/gp/redirect.html/ref=aws_rc_ec2tools?location=http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip&token=A80325AA4DAB186C80828ED5138633E3F49160D9"
+        require 'open-uri'
+        ::File.open("ec2-commandline-tools.zip", "w") {|f| f << open(download_url).read }
+      end
+      
+      def get_keypair
+        begin
+          ec2 = PoolParty::Remote::Ec2.ec2({:access_key => @access_key, :secret_access_key => @secret_access_key})
+          keypairs = ec2.describe_keypairs["keySet"]["item"]
+          keynames = keypairs.map {|k| k["keyName"]}  
+        rescue Exception => e
+          colored_say "There was an error: #{e}. Recheck your access_key and secret_access_key to make sure you copied them correctly"
+          exit 1
+        end
+
+        key_str =<<-EOK
+
+Finally, what's the name of the keypair you'd like to use?
+
+You already have the following keypairs setup:
+\t#{keynames.join("\n\t")}
+
+You can use one of these keys, or create a new one.
+EOK
+
+        key_str_help =<<-EOH
+  To make a new keypair, make sure you have the ec2 tools installed. You can create a new one by typing the command:
+    ec2-add-keypair
+
+  Save this into a file in your ~/.ec2 directory. Enter the name of the keypair here.
+EOH
+        ask_with_help :message => key_str,
+                      :help => key_str_help do |t|
+            @keypair = t
+            say <<-EOE
+
+In your clouds.rb, you can use this keypair in your clouds.
+
+Create one for each cloud you want to use.
+
+          EOE
+        end
+      end
+      
+      def write_clouds_rb
+        clds =<<-EOC
+pool :my_pool do
+  cloud :my_app do
+
+    # Copy these lines and source them in your .profile or .bashrc file
+    # export AWS_ACCESS_KEY="#{@access_key}"
+    # export AWS_SECRET_ACCESS_KEY="#{@secret_access_key}"
+    # export EC2_PRIVATE_KEY=$(ls ~/.ec2/pk-*.pem)
+    # export EC2_CERT=$(ls ~/.ec2/cert-*.pem)
+
+    access_key "#{@access_key}"
+    secret_access_key "#{@secret_access_key}"
+    keypair "#{@keypair}"
+
+    has_file "/etc/motd" do
+      content "Welcome to your first PoolParty instance!"
+    end
+  end
+end             
+        EOC
+
+        ::File.open("clouds.rb", "w") {|f| f << clds}
+      end
+
+    end
+  end
+end

data/lib/poolparty/installers/vmrun.rb

@@ -0,0 +1,144 @@
+module PoolParty
+  module Installers
+    class Vmrun < BaseInstaller
+      
+      def commands
+        [
+          :get_vmrun_file, :get_vm_ip, :get_key,
+          :add_vmware_fusion_to_path, :start_vmrun_instance,
+          :wait_for_connection, :scp_key, :test_login, :fix_eth0,
+          :shutdown_vmrun_instance
+        ]
+      end
+      
+      private
+      
+      def get_vmrun_file
+        if !default_vmrun_files.empty?
+          show_menu_for_vmrun_files
+        else
+          ask_for_vmrun_path
+        end
+      end
+      
+      def show_menu_for_vmrun_files
+        say "We found the following vmware files in the default vmware directory.\nChoose one of these to use as your vmrun file or select other"
+        choose do |menu|
+          menu.prompt = "Vmware file > "
+          [default_vmrun_files, :other].flatten.each do |base|
+            menu.choice base do 
+              
+              @vmrun_file = base == :other ? ask_for_vmrun_path : base
+            end
+          end
+        end
+      end
+      
+      def ask_for_vmrun_path
+        vmrun_file_help =<<-EOV
+Vmware uses a vmwarevm file to keep information about the vmware instance. To find the vmwarevm file, 
+navigate to vmware and find the vm you'd like to use. Find this in finder and paste that here.
+        EOV
+
+        vmrun_file = <<-EOE
+Awesome. What's the path to your vmwarevm file?
+        EOE
+        ask_with_help :message => vmrun_file, :help => vmrun_file_help do |t|
+          @vmrun_file = default_vmrun_file if t.nil? || t.empty?
+        end
+      end
+      
+      def get_vm_ip
+        ip_help =<<-EOV
+Right now, vmrun, the remoter base needs an explicitly set ip. Log into your vm and type ifconfig. Copy and paste that here.
+        EOV
+        ask_with_help :message => "Now, what's the ip of your vm?",
+                      :validate => /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|h|H/,
+                      :help => ip_help do |i|
+          @ip = i
+        end
+      end
+      
+      def get_key
+        key_help =<<-EOV
+Finally, we'll set somethings up here shortly, but first we'll need to know where your public key is. We'll assume it's 
+at ~/.ssh/id_rsa.pub. If this is true, then just press enter. Otherwise, enter the path of your public key.        
+        EOV
+        
+        ask_with_help :message => "What keypair would you like to use? (default: ~/.ssh/id_rsa.pub)",
+                      :help => key_help do |k|
+          @key = k.empty? ? ::File.expand_path("~/.ssh/id_rsa.pub") : k
+        end
+      end
+      
+      def wait_for_connection
+        ping_port_and(@ip, 22) do
+          puts "Instance available for connection"
+        end
+      end
+      
+      def scp_key
+        colored_say "Sending key to vmware instance..."
+        o = %x{scp #{@key} root@#{@ip}:~/.ssh/authorized_keys}
+        sleep 2
+      end
+      
+      def test_login
+        raise "Could not connect to #{@ip}. Check to make sure you set the ip properly" unless ping_port(@ip, 22, 3)
+      end
+      
+      # TODO: Fix this
+      def fix_eth0    
+      end
+      
+      def add_vmware_fusion_to_path
+        colored_say "Exporting path with the VMware Fusion. You will want to add this to your path by adding \n\texport PATH=/Library/Application Support/VMware Fusion:$PATH\n to your .profile or .bashrc file"
+        o = %x{export PATH=/Library/Application\\\ Support/VMware\\\ Fusion:$PATH}
+        sleep 2
+      end
+      
+      def start_vmrun_instance
+        vmrun_path = `which vmrun`.chomp!
+        command = "#{vmrun_path.path_quote} start #{@vmrun_file.path_quote}"
+        %x{#{command}}
+      end
+      
+      def shutdown_vmrun_instance
+        vmrun_path = `which vmrun`.chomp!
+        command = "#{vmrun_path.path_quote} stop #{@vmrun_file.path_quote}"
+        %x{#{command}}
+      end
+      
+      def closing_message
+        vmx_file = Dir["#{@vmrun_file}/*.vmx"].first
+          clds =<<-EOC
+pool :my_pool do
+  cloud :my_app do
+    using :vmrun do
+      vmx_hash({
+        "#{vmx_file}" => "#{@ip}"
+      })
+    end
+
+    has_file "/etc/motd" do
+      content "Welcome to your first PoolParty instance!"
+    end
+  end
+end             
+                EOC
+
+        ::File.open("clouds.rb", "w") {|f| f << clds}
+        super
+      end
+      
+      def default_vmrun_files
+        @default_vmrun_files ||= find_default_vmrun_files rescue nil
+      end
+      
+      def find_default_vmrun_files
+        Dir["#{::File.expand_path("~")}/Documents/Virtual\ Machines.localized/*.vmwarevm"]
+      end
+      
+    end
+  end
+end

data/lib/poolparty/lite.rb

@@ -5,12 +5,15 @@ begin
 rescue Exception => e
   require "dslify"
 end
+require "#{::File.dirname(__FILE__)}/core/string"
+require "#{::File.dirname(__FILE__)}/core/hash"
+require "#{::File.dirname(__FILE__)}/core/object"
 require "#{::File.dirname(__FILE__)}/poolparty/default"
 require "#{::File.dirname(__FILE__)}/modules/user_helpers"
+require "#{::File.dirname(__FILE__)}/modules/cloud_resourcer"
+require "#{::File.dirname(__FILE__)}/modules/pinger"
 require "#{::File.dirname(__FILE__)}/schema"
 require "#{::File.dirname(__FILE__)}/net/init"
-require "#{::File.dirname(__FILE__)}/core/string"
-require "#{::File.dirname(__FILE__)}/core/hash"
 require "#{::File.dirname(__FILE__)}/poolparty/neighborhoods"
 require "#{::File.dirname(__FILE__)}/exceptions/RemoteException.rb"
 

data/lib/poolparty/modules/callbacks.rb

@@ -11,23 +11,36 @@ module PoolParty
         [
           :before_bootstrap,
           :after_bootstrap,
+          :before_provision,
+          :after_provision,
           :before_configure,
           :after_configure,
           :after_create,
           # TODO: Add after_launch_instance and after_terminate_instance
-          # :after_launch_instance,
+          :after_launch_instance,
           # :after_terminate_instance,
           self.class.additional_callbacks
         ].flatten
       end
       
       # Callbacks on bootstrap and configuration
+      # Defines the callback accessors:
+      #   call_before/after_bootstrap/configure_callbacks
+      # 
+      # When called, this method will first check to see if there 
+      # are plugins and call those plugin's callbacks when called
+      # The method (before/after_bootstrap/configure) is called
+      # on self if the callback method is defined on self
       def setup_callbacks
         defined_callbacks.each do |meth|
           unless respond_to?("call_#{meth}_callbacks".to_sym)
             self.class.module_eval <<-EOE
               def call_#{meth}_callbacks(*args)
-                plugin_store.each {|a| a.call_#{meth}_callbacks(*args) } if respond_to?(:plugin_store) && plugin_store
+                if respond_to?(:plugin_store) && plugin_store
+                  plugin_store.each do |a| 
+                    a.call_#{meth}_callbacks(*args) if a.respond_to?(:call_#{meth}_callbacks)
+                  end
+                end
                 self.send :#{meth}, *args if respond_to?(:#{meth})
               end
             EOE

data/lib/poolparty/modules/cloud_dsl.rb

@@ -11,16 +11,18 @@ module PoolParty
     #   has_directory(:name => loc)
     # end
     
-    def dependency_resolver(name='puppet')
-      klass = name.preserved_class_constant("Resolver")
-      raise DependencyResolverException.new("Unknown resolver") unless klass
-      dsl_options[:dependency_resolver] = klass unless dsl_options[:dependency_resolver]
-    end
-    
     # Enable a service package
-    def enable(service);dsl_options[service] = :enabled;end
+    def enable(*services)
+      services.each do |service|
+        dsl_options[service] = :enabled
+      end
+    end
     # Disable a service package
-    def disable(service);dsl_options[service] = :disabled;end
+    def disable(*services)
+      services.each do |service|
+        dsl_options[service] = :disabled
+      end
+    end
     
     # Check to see if the package has been enabled
     def enabled?(srv);dsl_options.has_key?(srv) && dsl_options[srv] == :enabled;end

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -6,7 +6,7 @@
     
   method is stored, for instance. It's also where the key convenience methods are written
 =end
-require "ftools"
+require "fileutils"
 
 module PoolParty
   module CloudResourcer
@@ -55,76 +55,56 @@ module PoolParty
       end
     end
     
-    def setup_dev
-      return true if keypair || master.nil?
-    end
-        
     # Declare the remoter base
     # Check to make sure the available_bases is available, otherwise raise
     # Give access to the cloud the remote_base and instantiate a new
     # instance of the remote base
-    def using(t, &block)
-      @cloud = self
-      if t && self.class.available_bases.include?(t.to_sym)
-        unless using_remoter?
-          self.class.send :attr_reader, :remote_base
-          self.class.send :attr_reader, :parent_cloud
-          klass_string = "#{t}".classify
-          klass = "::PoolParty::Remote::#{klass_string}".constantize
-          
-          @remote_base = klass.send :new, self, &block
-          @remote_base.instance_eval &block if block          
-          options[:remote_base] = klass.to_s if respond_to?(:options)
-          
-          @parent_cloud = @cloud
-          instance_eval "def #{t};@remote_base;end"
-        end
+    def using(t, o={}, &block)
+      return self.send(t) if self.respond_to?(t)
+      klass_string = "::PoolParty::Remote::#{t.to_s.camelcase}"
+      remote_base_klass = klass_string.constantize
+      if ::PoolParty::Remote.available.include?(remote_base_klass)
+        set_default_options(remote_base_klass.default_options)
+        @remote_base = remote_base_klass.send(:new, o.merge(:cloud=>self), &block)
+        self.remoter_base t.to_sym
+        instance_eval "def #{t};@remote_base;end"
+        
+        # instance_eval "def launch_new_instance!(o={}); remote_base.launch_new_instance!;end"
+        # instance_eval "def terminate_instance!(o={}); remote_base.terminate_instance!(o);end"
+        # instance_eval "def describe_instances(o={}); remote_base.describe_instances;end"
+        # instance_eval "def describe_instance(o={}); remote_base.describe_instance(o);end"
       else
         raise "Unknown remote base: #{t}"
       end
     end
     
-    # Are we using a remoter?
-    def using_remoter?
-      !@remote_base.nil?
-    end
-    
-    # Keypairs
-    # Use the keypair path
-    def keypair(*args)
-      if args && !args.empty?
-        args.each {|arg| _keypairs.unshift Key.new(arg) unless arg.nil? || arg.empty? }
+    def dependency_resolver(name=nil)
+      if !name.nil?
+        ext = name=~/Resolver$/  ? nil : 'Resolver'
+        klass = ::PoolParty.module_eval("#{name.camelcase}#{ext}")
+        raise DependencyResolverException.new("Unknown resolver") unless klass
+        dsl_options[:dependency_resolver] = "#{name.camelcase}#{ext}"
+        @dependency_resolver = klass
       else
-        @keypair ||= _keypairs.select {|key| key.exists? }.first
+        @dependency_resolver
       end
     end
-    
-    alias :set_keypairs :keypair
-    
-    def _keypairs
-      dsl_options[:keypairs] ||= [Key.new]
-    end
-    
-    def full_keypair_path
-      @full_keypair_path ||= keypair.full_filepath
-    end
-    
-    def update_from_schema(schema)
-      keypairs = schema.options.delete(:keypairs).map {|a| PoolParty::Key.new(a.basename) }
-      options.merge! schema.options
-      dsl_options[:keypairs] = keypairs
-
-      dsl_options[:dependency_resolver] = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
-      
-    end
         
-    # TODO: deprecate
-    def number_of_resources
-      arr = resources.map do |n, r|
-        r.size
-      end
-      resources.map {|n,r| r.size}.inject(0){|sum,i| sum+=i}
-    end
+    # def update_from_schema(schema)
+    #   self.dsl_options.merge! schema.options.to_hash
+    #   self.dependency_resolver = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
+    #   keypair schema.options.keypair_name
+    #   remote_base_class = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
+    #   self.remote_base = remote_base_class.new  schema.options.remote_base.to_hash
+    #   
+    #   # self.keypair = PoolParty::Key.new schema.options.keypair.basename
+    #   # keypair = schema.options.delete(:keypairs).map {|a| PoolParty::Key.new(a.basename) }
+    #   # options.merge! schema.options.to_hash
+    #   # dsl_options[:keypairs] = keypairs
+    #   # 
+    #   # dsl_options[:dependency_resolver] = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
+    #   
+    # end
     
   end
-end
+end

data/lib/poolparty/modules/daemonizable.rb

@@ -1,6 +1,5 @@
-# TODO: Diet
-# module PoolParty
-#       
+# # TODO: Diet
+# module PoolParty      
 #   module Daemonizeable
 #     
 #     attr_accessor :pid_file
@@ -14,7 +13,7 @@
 #     end
 #     
 #     def pid_file
-#       @pid_file ||= PoolParty::Default.agent_pid_file
+#       @pid_file ||= "/tmp/poolparty_monitor.pid"
 #     end
 #     
 #     # Returns +true+ the process identied by +pid+ is running.
@@ -135,7 +134,7 @@
 #         end
 #       end
 #   end
-#   class Daemonize
+#   class Daemon
 #     include Daemonizeable
 #   end
 # end

data/lib/poolparty/modules/definable_resource.rb

@@ -16,9 +16,13 @@ module PoolParty
     # 
     # For example usage, see lib/poolparty/plugins/line.rb
     def define_resource(name, &block)
+      $stderr.puts "define_resource (#{name}) is depricated (#{caller[0]})"
       name.to_s.new_resource_class &block
     end
     
+    # DEPRICATED
+    # use plugin instead
+    #
     # Allow us to create virtual resources
     # Generally, in plugins
     # This sets a virtual resource against the Resource class
@@ -41,13 +45,8 @@ module PoolParty
     # 
     # An example is included in the poolparty-apache-plugin
     def virtual_resource(name=:virtual_resource, opts={}, &block)
-      symc = "#{name}".top_level_class.camelcase
-      klass = symc.class_constant(PoolParty::Plugin::Plugin, {:preserve => true}, &block)
-      
-      PoolParty::Service.add_has_and_does_not_have_methods_for(symc)
-      
-      klass.module_eval &block if block
-      klass
+      $stderr.puts "virtual_resource (#{name}) is depricated"
+      plugin(name, &block)
     end
     
   end

data/lib/poolparty/modules/file_writer.rb

@@ -10,7 +10,7 @@ module PoolParty
     end
     def copy_template_to_storage_directory(file, force=false)
       make_template_directory
-      path = ::File.join( Default.tmp_path, Default.template_directory, ::File.basename(file) )
+      path = ::File.join( tmp_path, Default.template_directory, ::File.basename(file) )
       if force
         FileUtils.cp file, path
       else
@@ -76,7 +76,7 @@ module PoolParty
       end            
     end
     def make_template_directory(dir=nil)
-      path = dir ? ::File.join(Default.tmp_path, Default.template_directory, ::File.basename(dir)) : ::File.join(Default.tmp_path, Default.template_directory)
+      path = dir ? ::File.join(tmp_path, Default.template_directory, ::File.basename(dir)) : ::File.join(tmp_path, Default.template_directory)
       begin
         make_base_directory
         FileUtils.mkdir path unless ::File.directory?(path)

data/lib/poolparty/modules/output.rb

@@ -6,8 +6,8 @@ module PoolParty
         args.each do |line|
           (output ||= []) << line
         end
-      end        
-    end      
+      end
+    end
 
   end
 end

data/lib/poolparty/modules/pinger.rb

@@ -1,3 +1,4 @@
+require "timeout"
 module PoolParty
   module Pinger
     module ClassMethods
@@ -5,9 +6,12 @@ module PoolParty
       # for response. 
       def ping_port(host, port=22, retry_times=400)
         connected = false
+        dputs "pinging #{host}:#{port} for #{retry_times}"
         retry_times.times do |i|
           begin
-            break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
+            timeout 5 do
+              break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
+            end            
           rescue Exception => e
             sleep(2)
           end
@@ -17,7 +21,10 @@ module PoolParty
     end
   
     module InstanceMethods
-      def ping_port(ip, port, retry_times=500);self.class.ping_port(ip, port, retry_times);end
+      def ping_port(ip, port=22, retry_times=500);self.class.ping_port(ip, port, retry_times);end
+      def ping_port_and(ip, port=22, retry_times=500, &block)        
+        block.call if ping_port(ip, port, retry_times) && block
+      end
     end
   
     def self.included(receiver)

data/lib/poolparty/modules/pretty_printer.rb

@@ -26,7 +26,7 @@ module PoolParty
     def pretty_options(pre, o)
       return "" unless o.respond_to?(:options)
       print_options = (o.respond_to?(:parent) && o.parent && o.parent.respond_to?(:options)) ? 
-        (o.dsl_options.delete_if {|k,v| o.parent.dsl_options.has_key?(k) && o.parent.options[k] == o.options[k] && !o.options[k].nil? } ) : 
+        (o.dsl_options.delete_if {|k,v| o.parent.dsl_options.has_key?(k) && o.parent.dsl_options[k] == o.dsl_options[k] && !o.dsl_options[k].nil? } ) : 
         o.options
       print_options = print_options.map {|k,v| [k, o.send(k.to_sym).to_s] }.inject({}) { |r,e| r[e[0]] = e[1] unless o.class.default_options[e[0]] == e[1] || e[1].nil? || e[1].empty?; r }
       print_options.flush_out("#{pre}\t")

data/lib/poolparty/modules/resourcing_dsl.rb

@@ -1,13 +1,5 @@
 module PoolParty
   module ResourcingDsl
-    # Overrides for syntax
-    # Allows us to send require to require a resource
-    def requires(str=nil)
-      str ? dsl_options.merge!(:require => send_if_method(str)) : dsl_options[:require]
-    end
-    def on_change(str=nil)
-      str ? dsl_options.merge!(:notify => send_if_method(str)) : dsl_options[:notify]
-    end
     def ensures(str = :present)
       if [:absent, :present].include?(str) 
         str == :absent ? is_absent : is_present
@@ -31,28 +23,8 @@ module PoolParty
       dsl_options.merge!(:ensures => absent)
       absent
     end
-    # Alias for unless
-    def ifnot(str="")
-      dsl_options.merge!(:unless => str)
-    end
-    def cancel(*args)
-      dsl_options[:cancelled] = args.empty? ? true : args[0]
-    end
-    def cancelled?
-      dsl_options[:cancelled] || false
-    end
-    def printed(*args)
-      dsl_options[:printed] = true
-    end
-    def printed?
-      dsl_options[:printed] || false
-    end
 
     #TODO: Diet
-    def render_template
-      # @templates.
-    end
-    
     def get_client_or_gem_template(file)
       if ::File.file?(file) && ::File.readable?(file)
         file
@@ -75,4 +47,4 @@ module PoolParty
       ::File.file?(file) && ::File.readable?(file)
     end
   end
-end
+end