socialcast 1.2.3 → 1.3.0

data/spec/spec_helper.rb

@@ -2,9 +2,10 @@ require 'rubygems'
 require 'bundler/setup'
 require 'webmock/rspec'
 require 'rspec/mocks'
+require 'pry'
 RSpec::Mocks::setup(Object.new)
 
-require 'socialcast/cli'
+require 'socialcast/command_line/cli'
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -10,26 +10,29 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.6
@@ -37,6 +40,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.6
@@ -44,6 +50,9 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.14.6
@@ -51,6 +60,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.14.6
@@ -58,6 +70,9 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
@@ -65,6 +80,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.2
@@ -72,6 +90,9 @@ dependencies:
   name: socialcast-net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
@@ -79,6 +100,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.6
@@ -86,34 +110,51 @@ dependencies:
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.11
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
@@ -121,6 +162,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
@@ -138,6 +182,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: publish messages to your stream from a command line interface
 email:
 - sean@socialcast.com
@@ -158,29 +216,38 @@ files:
 - Rakefile
 - bin/socialcast
 - config/ldap.yml
-- lib/ext/array_ext.rb
-- lib/ext/string_ext.rb
 - lib/socialcast.rb
-- lib/socialcast/cli.rb
-- lib/socialcast/message.rb
-- lib/socialcast/net_ldap_ext.rb
-- lib/socialcast/version.rb
+- lib/socialcast/command_line/cli.rb
+- lib/socialcast/command_line/message.rb
+- lib/socialcast/command_line/provision.rb
+- lib/socialcast/command_line/version.rb
 - socialcast.gemspec
-- spec/cli_spec.rb
 - spec/fixtures/credentials.yml
 - spec/fixtures/credentials_with_proxy.yml
 - spec/fixtures/fake_attribute_map.rb
 - spec/fixtures/ldap.yml
+- spec/fixtures/ldap_with_account_type_without_roles.yml
 - spec/fixtures/ldap_with_array_permission_mapping.yml
+- spec/fixtures/ldap_with_class_ldap_attribute.yml
+- spec/fixtures/ldap_with_connection_mapping.yml
+- spec/fixtures/ldap_with_connection_permission_mapping.yml
+- spec/fixtures/ldap_with_custom_attributes.yml
 - spec/fixtures/ldap_with_interpolated_values.yml
 - spec/fixtures/ldap_with_manager_attribute.yml
+- spec/fixtures/ldap_with_multiple_connection_mappings.yml
+- spec/fixtures/ldap_with_multiple_connection_permission_mappings.yml
 - spec/fixtures/ldap_with_plugin_mapping.yml
 - spec/fixtures/ldap_with_profile_photo.yml
+- spec/fixtures/ldap_with_roles_without_account_type.yml
+- spec/fixtures/ldap_with_unique_identifier.yml
+- spec/fixtures/ldap_without_account_type_or_roles.yml
 - spec/fixtures/ldap_without_permission_mappings.yml
-- spec/net_ldap_ext_spec.rb
+- spec/socialcast/command_line/cli_spec.rb
+- spec/socialcast/command_line/provision_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/socialcast/socialcast-command-line
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -198,21 +265,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socialcast
-rubygems_version: 2.1.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: command line interface to socialcast api
 test_files:
-- spec/cli_spec.rb
 - spec/fixtures/credentials.yml
 - spec/fixtures/credentials_with_proxy.yml
 - spec/fixtures/fake_attribute_map.rb
 - spec/fixtures/ldap.yml
+- spec/fixtures/ldap_with_account_type_without_roles.yml
 - spec/fixtures/ldap_with_array_permission_mapping.yml
+- spec/fixtures/ldap_with_class_ldap_attribute.yml
+- spec/fixtures/ldap_with_connection_mapping.yml
+- spec/fixtures/ldap_with_connection_permission_mapping.yml
+- spec/fixtures/ldap_with_custom_attributes.yml
 - spec/fixtures/ldap_with_interpolated_values.yml
 - spec/fixtures/ldap_with_manager_attribute.yml
+- spec/fixtures/ldap_with_multiple_connection_mappings.yml
+- spec/fixtures/ldap_with_multiple_connection_permission_mappings.yml
 - spec/fixtures/ldap_with_plugin_mapping.yml
 - spec/fixtures/ldap_with_profile_photo.yml
+- spec/fixtures/ldap_with_roles_without_account_type.yml
+- spec/fixtures/ldap_with_unique_identifier.yml
+- spec/fixtures/ldap_without_account_type_or_roles.yml
 - spec/fixtures/ldap_without_permission_mappings.yml
-- spec/net_ldap_ext_spec.rb
+- spec/socialcast/command_line/cli_spec.rb
+- spec/socialcast/command_line/provision_spec.rb
 - spec/spec_helper.rb

data/lib/ext/array_ext.rb

@@ -1,11 +0,0 @@
-class Array
-  def self.wrap(object)
-    if object.nil?
-      []
-    elsif object.respond_to?(:to_ary)
-      object.to_ary
-    else
-      [object]
-    end
-  end
-end

data/lib/ext/string_ext.rb

@@ -1,13 +0,0 @@
-if RUBY_VERSION < '1.9.2'
-  class String
-    old_format = instance_method(:%)
-
-    define_method(:%) do |arg|
-      if arg.is_a?(Hash)
-        self.gsub(/%\{(.*?)\}/) { arg[$1.to_sym] }
-      else
-        old_format.bind(self).call(arg)
-      end
-    end
-  end
-end

data/lib/socialcast/cli.rb

@@ -1,339 +0,0 @@
-# encoding: UTF-8
-
-require 'rubygems'
-
-require "thor"
-require 'json'
-require 'rest_client'
-require 'highline'
-require 'net/ldap'
-require 'socialcast'
-require 'socialcast/message'
-require File.join(File.dirname(__FILE__), 'net_ldap_ext')
-
-require 'zlib'
-require 'logger'
-require 'builder'
-require 'set'
-require 'fileutils'
-
-# uncomment to debug HTTP traffic
-# class ActiveResource::Connection
-#   def configure_http(http)
-#     http = apply_ssl_options(http)
-#     # Net::HTTP timeouts default to 60 seconds.
-#     if @timeout
-#       http.open_timeout = @timeout
-#       http.read_timeout = @timeout
-#     end
-#     http.set_debug_output STDOUT
-#     http
-#   end
-# end
-
-module Socialcast
-  class CLI < Thor
-    include Thor::Actions
-
-    method_option :trace, :type => :boolean, :aliases => '-v'
-    def initialize(*args); super(*args) end
-
-    desc "authenticate", "Authenticate using your Socialcast credentials"
-    method_option :user, :type => :string, :aliases => '-u', :desc => 'email address for the authenticated user'
-    method_option :password, :type => :string, :aliases => '-p', :desc => 'password for the authenticated user'
-    method_option :domain, :type => :string, :default => 'api.socialcast.com', :desc => 'Socialcast community domain'
-    method_option :proxy, :type => :string, :desc => 'HTTP proxy options for connecting to Socialcast server'
-    def authenticate
-      user = options[:user] || ask('Socialcast username: ')
-      password = options[:password] || HighLine.new.ask("Socialcast password: ") { |q| q.echo = false }.to_s
-      domain = options[:domain]
-
-      url = ['https://', domain, '/api/authentication'].join
-      say "Authenticating #{user} to #{url}"
-      params = {:email => user, :password => password }
-      RestClient.log = Logger.new(STDOUT) if options[:trace]
-      RestClient.proxy = options[:proxy] if options[:proxy]
-      resource = RestClient::Resource.new url
-      response = resource.post params, :accept => :json
-      say "API response: #{response.body.to_s}" if options[:trace]
-      communities = JSON.parse(response.body.to_s)['communities']
-      domain = communities.detect {|c| c['domain'] == domain} ? domain : communities.first['domain']
-
-      Socialcast.credentials = {:user => user, :password => password, :domain => domain, :proxy => options[:proxy]}
-      say "Authentication successful for #{domain}"
-    end
-
-    desc "share MESSAGE", "Posts a new message into socialcast"
-    method_option :url, :type => :string, :desc => '(optional) url to associate to the message'
-    method_option :message_type, :type => :string, :desc => '(optional) force an alternate message_type'
-    method_option :attachments, :type => :array, :default => []
-    method_option :group_id, :type => :numeric, :desc => "(optional) ID of group to post into"
-    def share(message = nil)
-      message ||= $stdin.read_nonblock(100_000) rescue nil
-
-      attachment_ids = []
-      options[:attachments].each do |path|
-        Dir[File.expand_path(path)].each do |attachment|
-          say "Uploading attachment #{attachment}..."
-          uploader = Socialcast.resource_for_path '/api/attachments', {}, options[:trace]
-          uploader.post({:attachment => File.new(attachment)}, {:accept => :json}) do |response, request, result|
-            if response.code == 201
-              attachment_ids << JSON.parse(response.body)['attachment']['id']
-            else
-              say "Error uploading attachment: #{response.body}"
-            end
-          end
-        end
-      end
-
-      ActiveResource::Base.logger = Logger.new(STDOUT) if options[:trace]
-      Socialcast::Message.configure_from_credentials
-      Socialcast::Message.create :body => message, :url => options[:url], :message_type => options[:message_type], :attachment_ids => attachment_ids, :group_id => options[:group_id]
-
-      say "Message has been shared"
-    end
-
-    desc 'provision', 'provision users from ldap compatible user repository'
-    method_option :config, :default => 'ldap.yml', :aliases => '-c'
-    method_option :output, :default => 'users.xml.gz', :aliases => '-o'
-    method_option :setup, :type => :boolean
-    method_option :delete_users_file, :type => :boolean
-    method_option :test, :type => :boolean
-    method_option :skip_emails, :type => :boolean
-    method_option :force, :type => :boolean, :aliases => '-f', :default => false
-    method_option :sanity_check, :type => :boolean, :default => false
-    method_option :plugins, :type => :array, :desc => "Pass in an array of plugins. Can be either the gem require or the absolute path to a ruby file."
-    def provision
-      config = ldap_config options
-      load_plugins options
-
-      http_config = config.fetch 'http', {}
-      mappings = config.fetch 'mappings', {}
-      permission_mappings = config.fetch 'permission_mappings', {}
-
-      user_identifier_list = %w{email unique_identifier employee_number}
-      user_whitelist = Set.new
-      output_file = File.join Dir.pwd, options[:output]
-
-      Zlib::GzipWriter.open(output_file) do |gz|
-        xml = Builder::XmlMarkup.new(:target => gz, :indent => 1)
-        xml.instruct!
-        xml.export do |export|
-          export.users(:type => "array") do |users|
-            each_ldap_entry(config) do |ldap, entry|
-              users.user do |user|
-                entry.build_xml_from_mappings user, ldap, mappings, permission_mappings
-              end
-              user_whitelist << user_identifier_list.map { |identifier| entry.grab(mappings[identifier]) }
-            end # connections
-          end # users
-        end # export
-      end # gzip
-
-      if options[:sanity_check]
-        say "Sanity checking users currently marked as needing to be terminated"
-        ldap_connections(config) do |key, connection, ldap|
-          (current_socialcast_users(http_config) - user_whitelist).each do |user_identifiers|
-            combined_filters = []
-            user_identifier_list.each_with_index do |identifier, index|
-              combined_filters << ((mappings[identifier].blank? || user_identifiers[index].nil?) ? nil : Net::LDAP::Filter.eq(mappings[identifier], user_identifiers[index]))
-            end
-            combined_filters.compact!
-            filter = ((combined_filters.size > 1) ? '(|%s)' : '%s') % combined_filters.join(' ')
-            filter = Net::LDAP::Filter.construct(filter) & Net::LDAP::Filter.construct(connection["filter"])
-            ldap_result = ldap.search(:return_result => true, :base => connection["basedn"], :filter => filter, :attributes => ldap_search_attributes(config))
-            Kernel.abort("Found user marked for termination that should not be terminated: #{user_identifiers}") unless ldap_result.blank?
-          end
-        end
-      end
-
-      if user_whitelist.empty? && !options[:force]
-        Kernel.abort("Skipping upload to Socialcast since no users were found")
-      else
-        say "Uploading dataset to Socialcast..."
-        resource = Socialcast.resource_for_path '/api/users/provision', http_config
-        begin
-          File.open(output_file, 'r') do |file|
-            request_params = {:file => file}
-            request_params[:skip_emails] = 'true' if (config['options']["skip_emails"] || options[:skip_emails])
-            request_params[:test] = 'true' if (config['options']["test"] || options[:test])
-            resource.post request_params, :accept => :json
-          end
-        rescue RestClient::Unauthorized => e
-          Kernel.abort "Authenticated user either does not have administration privileges or the community is not configured to allow provisioning. Please contact Socialcast support to if you need help." if e.http_code == 401
-        end
-        say "Finished"
-      end
-      File.delete(output_file) if (config['options']['delete_users_file'] || options[:delete_users_file])
-    end
-
-    desc 'sync_photos', 'Upload default avatar photos from LDAP repository'
-    method_option :config, :default => 'ldap.yml', :aliases => '-c'
-    def sync_photos
-      config = ldap_config options
-      http_config = config.fetch 'http', {}
-      mappings = config.fetch 'mappings', {}
-      profile_photo_field = mappings.fetch('profile_photo')
-
-      search_users_resource = Socialcast.resource_for_path '/api/users/search', http_config
-
-      each_ldap_entry(config) do |ldap, entry|
-        email = entry.grab(mappings['email'])
-        if profile_photo_data = entry.grab(mappings['profile_photo'])
-          profile_photo_data = profile_photo_data.force_encoding('binary')
-
-          user_search_response = search_users_resource.get(:params => { :q => email, :per_page => 1 }, :accept => :json)
-          user_info = JSON.parse(user_search_response)['users'].first
-          if user_info && user_info['avatars'] && user_info['avatars']['is_system_default']
-            say "Uploading photo for #{email}"
-
-            user_resource = Socialcast.resource_for_path "/api/users/#{user_info['id']}", http_config
-            content_type = case profile_photo_data
-            when Regexp.new("\AGIF8", nil, 'n')
-              'gif'
-            when Regexp.new('\A\x89PNG', nil, 'n')
-              'png'
-            when Regexp.new("\A\xff\xd8\xff\xe0\x00\x10JFIF", nil, 'n'), Regexp.new("\A\xff\xd8\xff\xe1(.*){2}Exif", nil, 'n')
-              'jpg'
-            else
-              say "Skipping photo for #{email}: unknown image format (supports .gif, .png, .jpg)"
-              next
-            end
-
-            tempfile = Tempfile.new(["photo_upload", ".#{content_type}"])
-            tempfile.write(profile_photo_data)
-            tempfile.rewind
-            begin
-              user_resource.put({ :user => { :profile_photo => { :data => tempfile } } })
-            ensure
-              tempfile.unlink
-            end
-          end
-        end
-
-      end
-    end
-
-    no_tasks do
-      def load_plugins(options)
-        Array.wrap(options[:plugins]).each do |plugin|
-          begin
-            require plugin
-          rescue LoadError => e
-            fail "Unable to load #{plugin}: #{e}"
-          end
-        end
-      end
-
-      def ldap_config(options)
-        config_file = File.expand_path options[:config]
-
-        if options[:setup]
-          create_file config_file do
-            File.read File.join(File.dirname(__FILE__), '..', '..', 'config', 'ldap.yml')
-          end
-          say "Created config file: #{config_file}"
-          Kernel.exit 0
-        end
-
-        fail "Unable to load configuration file: #{config_file}" unless File.exists?(config_file)
-        say "Using configuration file: #{config_file}"
-        config = YAML.load_file config_file
-
-        mappings = config.fetch 'mappings', {}
-        required_mappings = %w{email first_name last_name}
-        required_mappings.each do |field|
-          unless mappings.has_key? field
-            fail "Missing required mapping: #{field}"
-          end
-        end
-
-        config
-      end
-
-      def ldap_search_attributes(config)
-        mappings = config.fetch 'mappings', {}
-        permission_mappings = config.fetch 'permission_mappings', {}
-
-        membership_attribute = permission_mappings.fetch 'attribute_name', 'memberof'
-        attributes = mappings.values.map do |mapping_value|
-          mapping_value = begin
-            mapping_value.camelize.constantize
-          rescue NameError
-            mapping_value
-          end
-          case mapping_value
-          when Hash
-            dup_mapping_value = mapping_value.dup
-            dup_mapping_value.delete("value")
-            dup_mapping_value.values
-          when String
-            mapping_value
-          when Class, Module
-            fail "Please add the attributes method to #{mapping_value}" unless mapping_value.respond_to?(:attributes)
-            mapping_value.attributes
-          end
-        end.flatten
-        attributes << membership_attribute
-      end
-
-      def each_ldap_entry(config, &block)
-        count = 0
-        mappings = config.fetch 'mappings', {}
-
-        ldap_connections(config) do |key, connection, ldap|
-          ldap.search(:return_result => false, :filter => connection["filter"], :base => connection["basedn"], :attributes => ldap_search_attributes(config)) do |entry|
-            
-            if entry.grab(mappings["email"]).present? || (mappings.has_key?("unique_identifier") && entry.grab(mappings["unique_identifier"]).present?)
-              yield ldap, entry
-            end
-
-            count += 1
-            say "Scanned #{count} users" if ((count % 100) == 0)
-          end
-        end
-        say "Finished scanning #{count} users"
-      end
-
-      def ldap_connections(config)
-        config["connections"].each_pair do |key, connection|
-          say "Connecting to #{key} at #{[connection["host"], connection["port"]].join(':')}"
-          ldap = create_ldap_instance(connection)
-          say "Searching base DN: #{connection["basedn"]} with filter: #{connection["filter"]}"
-          yield key, connection, ldap
-        end
-      end
-
-      def create_ldap_instance(connection)
-        ldap = Net::LDAP.new :host => connection["host"], :port => connection["port"], :base => connection["basedn"]
-        ldap.encryption connection['encryption'].to_sym if connection['encryption']
-        ldap.auth connection["username"], connection["password"]
-        ldap
-      end
-
-      def current_socialcast_users(http_config)
-        current_socialcast_list = Set.new
-        request_params = {:per_page => 500}
-        request_params[:page] = 1
-        resource = create_socialcast_user_index_request(http_config, request_params)
-        while true
-          response = resource.get :accept => :json
-          result = JSON.parse(response)
-          users = result["users"]
-          break if users.blank?
-          request_params[:page] += 1
-          resource = create_socialcast_user_index_request(http_config, request_params)
-          users.each do |user|
-            current_socialcast_list << [user['contact_info']['email'], user['company_login'], user['employee_number']]
-          end
-        end
-        current_socialcast_list
-      end
-
-      def create_socialcast_user_index_request(http_config, request_params)
-        path_template = "/api/users?per_page=%{per_page}&page=%{page}"
-        Socialcast.resource_for_path((path_template % request_params), http_config)
-      end
-    end
-  end
-end