ridley 1.7.1 → 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -207,20 +207,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -249,20 +235,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-- !ruby/object:Gem::Dependency
-  name: winrm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: buff-ruby_engine
   requirement: !ruby/object:Gem::Requirement
@@ -323,12 +295,6 @@ files:
 - lib/ridley/command_context/windows_uninstall.rb
 - lib/ridley/connection.rb
 - lib/ridley/errors.rb
-- lib/ridley/host_commander.rb
-- lib/ridley/host_connector.rb
-- lib/ridley/host_connector/response.rb
-- lib/ridley/host_connector/ssh.rb
-- lib/ridley/host_connector/winrm.rb
-- lib/ridley/host_connector/winrm/command_uploader.rb
 - lib/ridley/logging.rb
 - lib/ridley/middleware.rb
 - lib/ridley/middleware/chef_auth.rb
@@ -412,11 +378,6 @@ files:
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
-- spec/unit/ridley/host_commander_spec.rb
-- spec/unit/ridley/host_connector/ssh_spec.rb
-- spec/unit/ridley/host_connector/winrm/command_uploader_spec.rb
-- spec/unit/ridley/host_connector/winrm_spec.rb
-- spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
@@ -513,11 +474,6 @@ test_files:
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
-- spec/unit/ridley/host_commander_spec.rb
-- spec/unit/ridley/host_connector/ssh_spec.rb
-- spec/unit/ridley/host_connector/winrm/command_uploader_spec.rb
-- spec/unit/ridley/host_connector/winrm_spec.rb
-- spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb

data/lib/ridley/host_commander.rb

@@ -1,231 +0,0 @@
-module Ridley
-  class ConnectorSupervisor < ::Celluloid::SupervisionGroup
-    # @param [Celluloid::Registry] registry
-    def initialize(registry)
-      super(registry)
-      supervise_as :ssh, HostConnector::SSH
-      supervise_as :winrm, HostConnector::WinRM
-    end
-  end
-
-  class HostCommander
-    include Celluloid
-    include Ridley::Logging
-
-    PORT_CHECK_TIMEOUT = 3
-
-    finalizer :finalize_callback
-
-    def initialize
-      @connector_registry   = Celluloid::Registry.new
-      @connector_supervisor = ConnectorSupervisor.new_link(@connector_registry)
-    end
-
-    # Execute a shell command on a node
-    #
-    # @param [String] host
-    #   the host to perform the action on
-    # @param [String] command
-    #
-    # @option options [Hash] :ssh
-    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the shell user that will perform the bootstrap
-    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-    #   * :sudo (Boolean) run as sudo
-    # @option options [Hash] :winrm
-    #   * :user (String) a user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the user that will perform the bootstrap (required)
-    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    #
-    # @return [HostConnector::Response]
-    def run(host, command, options = {})
-      execute(__method__, host, command, options)
-    end
-
-    # Bootstrap a node
-    #
-    # @param [String] host
-    #   the host to perform the action on
-    #
-    # @option options [Hash] :ssh
-    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the shell user that will perform the bootstrap
-    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-    #   * :sudo (Boolean) run as sudo
-    # @option options [Hash] :winrm
-    #   * :user (String) a user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the user that will perform the bootstrap (required)
-    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    #
-    # @return [HostConnector::Response]
-    def bootstrap(host, options = {})
-      execute(__method__, host, options)
-    end
-
-    # Perform a chef client run on a node
-    #
-    # @param [String] host
-    #   the host to perform the action on
-    #
-    # @option options [Hash] :ssh
-    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the shell user that will perform the bootstrap
-    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-    #   * :sudo (Boolean) run as sudo
-    # @option options [Hash] :winrm
-    #   * :user (String) a user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the user that will perform the bootstrap (required)
-    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    #
-    # @return [HostConnector::Response]
-    def chef_client(host, options = {})
-      execute(__method__, host, options)
-    end
-
-    # Write your encrypted data bag secret on a node
-    #
-    # @param [String] host
-    #   the host to perform the action on
-    # @param [String] secret
-    #   your organization's encrypted data bag secret
-    #
-    # @option options [Hash] :ssh
-    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the shell user that will perform the bootstrap
-    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-    #   * :sudo (Boolean) run as sudo
-    # @option options [Hash] :winrm
-    #   * :user (String) a user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the user that will perform the bootstrap (required)
-    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    #
-    # @return [HostConnector::Response]
-    def put_secret(host, secret, options = {})
-      execute(__method__, host, secret, options)
-    end
-
-    # Execute line(s) of Ruby code on a node using Chef's embedded Ruby
-    #
-    # @param [String] host
-    #   the host to perform the action on
-    # @param [Array<String>] command_lines
-    #   An Array of lines of the command to be executed
-    #
-    # @option options [Hash] :ssh
-    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the shell user that will perform the bootstrap
-    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-    #   * :sudo (Boolean) run as sudo
-    # @option options [Hash] :winrm
-    #   * :user (String) a user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the user that will perform the bootstrap (required)
-    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    #
-    # @return [HostConnector::Response]
-    def ruby_script(host, command_lines, options = {})
-      execute(__method__, host, command_lines, options)
-    end
-
-    # Uninstall Chef from a node
-    #
-    # @param [String] host
-    #   the host to perform the action on
-    #
-    # @option options [Boolena] :skip_chef (false)
-    #   skip removal of the Chef package and the contents of the installation
-    #   directory. Setting this to true will only remove any data and configurations
-    #   generated by running Chef client.
-    # @option options [Hash] :ssh
-    #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the shell user that will perform the bootstrap
-    #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-    #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-    #   * :sudo (Boolean) run as sudo (true)
-    # @option options [Hash] :winrm
-    #   * :user (String) a user that will login to each node and perform the bootstrap command on
-    #   * :password (String) the password for the user that will perform the bootstrap (required)
-    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    #
-    # @return [HostConnector::Response]
-    def uninstall_chef(host, options = {})
-      execute(__method__, host, options)
-    end
-
-    # Finds and returns the best HostConnector for a given host
-    #
-    # @param [String] host
-    #   the host to attempt to connect to
-    # @option options [Hash] :ssh
-    #   * :port (Fixnum) the ssh port to connect on the node the bootstrap will be performed on (22)
-    #   * :timeout (Float) [5.0] timeout value for testing SSH connection
-    # @option options [Hash] :winrm
-    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-    # @param block [Proc]
-    #   an optional block that is yielded the best HostConnector
-    #
-    # @return [HostConnector::SSH, HostConnector::WinRM]
-    def connector_for(host, options = {})
-      options = options.reverse_merge(ssh: Hash.new, winrm: Hash.new)
-      options[:ssh][:port]   ||= HostConnector::SSH::DEFAULT_PORT
-      options[:winrm][:port] ||= HostConnector::WinRM::DEFAULT_PORT
-
-      if connector_port_open?(host, options[:winrm][:port])
-        options.delete(:ssh)
-        winrm
-      elsif connector_port_open?(host, options[:ssh][:port], options[:ssh][:timeout])
-        options.delete(:winrm)
-        ssh
-      else
-        raise Errors::HostConnectionError, "No connector ports open on '#{host}'"
-      end
-    end
-
-    private
-
-      def execute(method, host, *args)
-        options = args.last.is_a?(Hash) ? args.pop : Hash.new
-
-        connector_for(host, options).send(method, host, *args, options)
-      rescue Errors::HostConnectionError => ex
-        abort(ex)
-      rescue Resolv::ResolvError => ex
-        abort Errors::DNSResolvError.new(ex)
-      end
-
-      # Checks to see if the given port is open for TCP connections
-      # on the given host.
-      #
-      # @param [String] host
-      #   the host to attempt to connect to
-      # @param [Fixnum] port
-      #   the port to attempt to connect on
-      # @param [Float] wait_time ({PORT_CHECK_TIMEOUT})
-      #   the number of seconds to wait
-      #
-      # @return [Boolean]
-      def connector_port_open?(host, port, wait_time = nil)
-        defer {
-          Timeout.timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
-        }
-      rescue Errno::ETIMEDOUT, Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
-        false
-      end
-
-      def finalize_callback
-        @connector_supervisor.terminate if @connector_supervisor && @connector_supervisor.alive?
-      end
-
-      def ssh
-        @connector_registry[:ssh]
-      end
-
-      def winrm
-        @connector_registry[:winrm]
-      end
-  end
-end

data/lib/ridley/host_connector.rb

@@ -1,83 +0,0 @@
-module Ridley
-  module HostConnector
-    class Base
-      include Celluloid
-      include Ridley::Logging
-
-      # Execute a shell command on a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [String] command
-      # @param [Hash] options
-      #
-      # @return [HostConnector::Response]
-      def run(host, command, options = {})
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-
-      # Bootstrap a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [Hash] options
-      #
-      # @return [HostConnector::Response]
-      def bootstrap(host, options = {})
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-
-      # Perform a chef client run on a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [Hash] options
-      #
-      # @return [HostConnector::Response]
-      def chef_client(host, options = {})
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-
-      # Write your encrypted data bag secret on a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [String] secret
-      #   your organization's encrypted data bag secret
-      # @param [Hash] options
-      #
-      # @return [HostConnector::Response]
-      def put_secret(host, secret, options = {})
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-
-      # Execute line(s) of Ruby code on a node using Chef's embedded Ruby
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [Array<String>] command_lines
-      #   An Array of lines of the command to be executed
-      # @param [Hash] options
-      #
-      # @return [HostConnector::Response]
-      def ruby_script(host, command_lines, options = {})
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-
-      # Uninstall Chef from a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [Hash] options
-      #
-      # @return [HostConnector::Response]
-      def uninstall_chef(host, options = {})
-        raise RuntimeError, "abstract function: must be implemented on includer"
-      end
-    end
-
-    require_relative 'host_connector/response'
-    require_relative 'host_connector/ssh'
-    require_relative 'host_connector/winrm'
-  end
-end

data/lib/ridley/host_connector/response.rb

@@ -1,27 +0,0 @@
-module Ridley
-  module HostConnector
-    class Response
-      attr_reader :host
-
-      attr_accessor :stdout
-      attr_accessor :stderr
-      attr_accessor :exit_code
-      attr_accessor :exit_signal
-
-      def initialize(host, options = {})
-        @host        = host
-        @stdout      = options[:stdout] || String.new
-        @stderr      = options[:stderr] || String.new
-        @exit_code   = options[:exit_code] || -1
-        @exit_signal = options[:exit_signal] || nil
-      end
-
-      # Return true if the response was not successful
-      #
-      # @return [Boolean]
-      def error?
-        self.exit_code != 0
-      end
-    end
-  end
-end

data/lib/ridley/host_connector/ssh.rb

@@ -1,211 +0,0 @@
-require 'net/ssh'
-
-module Ridley
-  module HostConnector
-    class SSH < HostConnector::Base
-      DEFAULT_PORT       = 22
-      EMBEDDED_RUBY_PATH = '/opt/chef/embedded/bin/ruby'.freeze
-
-      # Execute a shell command on a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [String] command
-      #
-      # @option options [Hash] :ssh
-      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-      #   * :password (String) the password for the shell user that will perform the bootstrap
-      #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-      #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-      #   * :sudo (Boolean) run as sudo
-      #
-      # @return [HostConnector::Response]
-      def run(host, command, options = {})
-        options = options.reverse_merge(ssh: Hash.new)
-        options[:ssh].reverse_merge!(port: DEFAULT_PORT, paranoid: false, sudo: false)
-
-        command = "sudo #{command}" if options[:ssh][:sudo]
-
-        Ridley::HostConnector::Response.new(host).tap do |response|
-          begin
-            log.info "Running SSH command: '#{command}' on: '#{host}' as: '#{options[:ssh][:user]}'"
-
-            defer {
-              Net::SSH.start(host, options[:ssh][:user], options[:ssh].slice(*Net::SSH::VALID_OPTIONS)) do |ssh|
-                ssh.open_channel do |channel|
-                  if options[:sudo]
-                    channel.request_pty do |channel, success|
-                      unless success
-                        raise "Could not aquire pty: A pty is required for running sudo commands."
-                      end
-
-                      channel_exec(channel, command, host, response)
-                    end
-                  else
-                    channel_exec(channel, command, host, response)
-                  end
-                end
-                ssh.loop
-              end
-            }
-          rescue Net::SSH::AuthenticationFailed => ex
-            response.exit_code = -1
-            response.stderr    = "Authentication failure for user #{ex}"
-          rescue Net::SSH::ConnectionTimeout, Timeout::Error
-            response.exit_code = -1
-            response.stderr    = "Connection timed out"
-          rescue Errno::EHOSTUNREACH
-            response.exit_code = -1
-            response.stderr    = "Host unreachable"
-          rescue Errno::ECONNREFUSED
-            response.exit_code = -1
-            response.stderr    = "Connection refused"
-          rescue Net::SSH::Exception => ex
-            response.exit_code = -1
-            response.stderr    = ex.inspect
-          end
-
-          case response.exit_code
-          when 0
-            log.info "Successfully ran SSH command on: '#{host}' as: '#{options[:ssh][:user]}'"
-          when -1
-            log.info "Failed to run SSH command on: '#{host}' as: '#{options[:ssh][:user]}'"
-          else
-            log.info "Successfully ran SSH command on: '#{host}' as: '#{options[:ssh][:user]}' but it failed"
-          end
-        end
-      end
-
-      # Bootstrap a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      #
-      # @option options [Hash] :ssh
-      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-      #   * :password (String) the password for the shell user that will perform the bootstrap
-      #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-      #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-      #   * :sudo (Boolean) run as sudo
-      #
-      # @return [HostConnector::Response]
-      def bootstrap(host, options = {})
-        options = options.reverse_merge(ssh: Hash.new)
-        options[:ssh].reverse_merge!(sudo: true, timeout: 5.0)
-        context = BootstrapContext::Unix.new(options)
-
-        log.info "Bootstrapping host: #{host}"
-        run(host, context.boot_command, options)
-      end
-
-      # Perform a chef client run on a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      #
-      # @option options [Hash] :ssh
-      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-      #   * :password (String) the password for the shell user that will perform the bootstrap
-      #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-      #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-      #   * :sudo (Boolean) run as sudo
-      #
-      # @return [HostConnector::Response]
-      def chef_client(host, options = {})
-        run(host, "chef-client", options)
-      end
-
-      # Write your encrypted data bag secret on a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [String] secret
-      #   your organization's encrypted data bag secret
-      #
-      # @option options [Hash] :ssh
-      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-      #   * :password (String) the password for the shell user that will perform the bootstrap
-      #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-      #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-      #   * :sudo (Boolean) run as sudo
-      #
-      # @return [HostConnector::Response]
-      def put_secret(host, secret, options = {})
-        cmd = "echo '#{secret}' > /etc/chef/encrypted_data_bag_secret; chmod 0600 /etc/chef/encrypted_data_bag_secret"
-        run(host, cmd, options)
-      end
-
-      # Execute line(s) of Ruby code on a node using Chef's embedded Ruby
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      # @param [Array<String>] command_lines
-      #   An Array of lines of the command to be executed
-      #
-      # @option options [Hash] :ssh
-      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-      #   * :password (String) the password for the shell user that will perform the bootstrap
-      #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-      #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-      #   * :sudo (Boolean) run as sudo
-      #
-      # @return [HostConnector::Response]
-      def ruby_script(host, command_lines, options = {})
-        run(host, "#{EMBEDDED_RUBY_PATH} -e \"#{command_lines.join(';')}\"", options)
-      end
-
-      # Uninstall Chef from a node
-      #
-      # @param [String] host
-      #   the host to perform the action on
-      #
-      # @option options [Boolena] :skip_chef (false)
-      #   skip removal of the Chef package and the contents of the installation
-      #   directory. Setting this to true will only remove any data and configurations
-      #   generated by running Chef client.
-      # @option options [Hash] :ssh
-      #   * :user (String) a shell user that will login to each node and perform the bootstrap command on
-      #   * :password (String) the password for the shell user that will perform the bootstrap
-      #   * :keys (Array, String) an array of key(s) to authenticate the ssh user with instead of a password
-      #   * :timeout (Float) timeout value for SSH bootstrap (5.0)
-      #   * :sudo (Boolean) run as sudo (true)
-      #
-      # @return [HostConnector::Response]
-      def uninstall_chef(host, options = {})
-        options = options.reverse_merge(ssh: Hash.new)
-        options[:ssh].reverse_merge!(sudo: true, timeout: 5.0)
-
-        log.info "Uninstalling Chef from host: #{host}"
-        run(host, CommandContext::UnixUninstall.command(options), options)
-      end
-
-      private
-
-        def channel_exec(channel, command, host, response)
-          channel.exec(command) do |ch, success|
-            unless success
-              raise "Channel execution failed while executing command #{command}"
-            end
-
-            channel.on_data do |ch, data|
-              response.stdout += data
-              log.info "[#{host}](SSH) #{data}" if data.present? and data != "\r\n"
-            end
-
-            channel.on_extended_data do |ch, type, data|
-              response.stderr += data
-              log.info "[#{host}](SSH) #{data}" if data.present? and data != "\r\n"
-            end
-
-            channel.on_request("exit-status") do |ch, data|
-              response.exit_code = data.read_long
-            end
-
-            channel.on_request("exit-signal") do |ch, data|
-              response.exit_signal = data.read_string
-            end
-          end
-        end
-    end
-  end
-end