v2gpti 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f53b2eecf9f72b895dca650a0ad5054e28c4da11
-  data.tar.gz: 3b561a4430fa050469c30579c51ebe91f6576184
+  metadata.gz: 5a09e57e80af81a45583c28e77abbbd0077152f7
+  data.tar.gz: 9755fa1d0100286f3861264260d55d044b2fc910
 SHA512:
-  metadata.gz: e1618d849ae1535eb523d12eb76502fece99b506379a4b9f014b21cff3c0d713c7c60048a73591f625d08446a7ede574409ce0a9423fa3ef080326e3d7c38795
-  data.tar.gz: 81d3474a038ca15529083077340409d3da965ab8406899ee741df52f5c39d8172c09b7706afa6e4eb0d96bc0695287a19f46ced772dfac406b00457c6c07042d
+  metadata.gz: 2fa6335e4af27e4d660d90e968ee36fe1ed795e5cd34e632c8d5c7015fc71478e5ed30a04601b52a633ef98efbda6ce9da0b890916808bac6704003460e8e5a0
+  data.tar.gz: 0fa9f32ee10a80862d8680793b4d4da7e95d86ef7a171b117f5b572cbdfc49f92051428e4840d45463c0faa080487182458dfa61e39f4e043246c5ee1e10d1a8

data/config_template

@@ -6,9 +6,6 @@ project-name =
 project-manager =
 project-manager-email =
 
-[toggl]
-project-id =
-
 [platform]
 platform-name =
 

data/lib/git-pivotal-tracker-integration.rb

@@ -40,5 +40,3 @@ module GitPivotalTrackerIntegration
   end
 end
 
-autoload :Toggl,          'git-pivotal-tracker-integration/util/togglV8'
-autoload :TogglException, 'git-pivotal-tracker-integration/util/togglV8'

data/lib/git-pivotal-tracker-integration/command/base.rb

@@ -37,7 +37,6 @@ module GitPivotalTrackerIntegration
         end
 
         @repository_root  = Util::Git.repository_root
-        @toggl            = Toggl.new
         @configuration    = Command::Configuration.new
 
         @configuration.check_for_config_file
@@ -58,28 +57,6 @@ module GitPivotalTrackerIntegration
         end
       end
 
-      def finish_toggle(configuration, time_spent)
-        current_story = @configuration.story(@project)
-
-        # If a story gets rejected and the developer works on it, then we need to check if the task is already created or not.
-        params =  parameters(configuration, time_spent)
-        if params[:tid].nil?
-          begin
-            @toggl.create_task(params)
-          rescue StandardError => te
-            $LOG.error(te.backtrace.join("\n\t"))
-          end
-        end
-
-        #If for some reason time entry cannot be done, then catch exception and continue.
-        begin
-          @toggl.create_time_entry(params)
-        rescue StandardError => te
-          $LOG.error(te.backtrace.join("\n\t"))
-          puts "Unable to log the time."
-        end
-      end
-
       def start_logging
         $LOG = Logger.new("#{logger_filename}", 'weekly')
       end
@@ -111,46 +88,7 @@ module GitPivotalTrackerIntegration
         raise NotImplementedError
       end
 
-      # Toggl keys
-      # name              : The name of the task (string, required, unique in project)
-      # pid               : project ID for the task (integer, required)
-      # wid               : workspace ID, where the task will be saved (integer, project's workspace id is used when not supplied)
-      # uid               : user ID, to whom the task is assigned to (integer, not required)
-      # estimated_seconds : estimated duration of task in seconds (integer, not required)
-      # active            : whether the task is done or not (boolean, by default true)
-      # at                : timestamp that is sent in the response for PUT, indicates the time task was last updated
-      # -- Additional fields --
-      # done_seconds      : duration (in seconds) of all the time entries registered for this task
-      # uname             : full name of the person to whom the task is assigned to
-      TIMER_TOKENS = {
-          "m" => (60),
-          "h" => (60 * 60),
-          "d" => (60 * 60 * 8) # a work day is 8 hours
-      }
-      def parameters(configuration, time_spent)
-        current_story              = configuration.story(@project)
-        params                     = Hash.new
-        params[:name]              = "#{current_story.id}" + " - " + "#{current_story.name}"
-        params[:estimated_seconds] = estimated_seconds current_story
-        params[:pid]               = configuration.toggl_project_id
-        params[:uid]               = @toggl.me["id"]
-        params[:tags]              = [current_story.story_type]
-        params[:active]            = false
-        params[:description]       = "#{current_story.id}" + " commit:" + "#{(Util::Shell.exec "git rev-parse HEAD").chomp[0..6]}"
-        params[:created_with]      = "v2gpti"
-        params[:duration]          = seconds_spent(time_spent)
-        params[:start]             = (Time.now - params[:duration]).iso8601
-        task                       = @toggl.get_project_task_with_name(configuration.toggl_project_id, "#{current_story.id}")
-         if !task.nil?
-           params[:tid] = task['id']
-         end
-        params
-      rescue TogglException => te
-        $LOG.error("[TOGGL] ----------------  #{te.message}")
-        $LOG.error("[TOGGL] ----------------  #{te.message}")
-        params
-      end
-
+      
       def seconds_spent(time_spent)
         seconds = 0
         time_spent.scan(/(\d+)(\w)/).each do |amount, measure|

data/lib/git-pivotal-tracker-integration/command/configuration.rb

@@ -44,14 +44,6 @@ module GitPivotalTrackerIntegration
         api_token
       end
 
-      def toggl_project_id
-        toggle_config = self.pconfig["toggl"]
-        if toggle_config.nil?
-          abort "toggle project id not set"
-        else
-          toggle_config["project-id"]
-        end
-      end
 
       def check_config_project_id
         Util::Git.set_config("pivotal.project-id", self.pconfig["pivotal-tracker"]["project-id"])

data/lib/git-pivotal-tracker-integration/command/finish.rb

@@ -43,16 +43,6 @@ module GitPivotalTrackerIntegration
 
         self.commit_new_build
 
-        time_spent = ""
-        while 1
-          time_spent = ask("How much time did you spend on this task? (example: 15m, 2.5h)")
-          if (/\d/.match( time_spent )) && /[mhd]/.match(time_spent)
-            break
-          end
-        end
-
-        finish_toggle(@configuration, time_spent)
-
         Util::Git.merge(@configuration.story(@project), no_complete)
         Util::Git.push Util::Git.branch_name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jeff Wolski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -186,28 +186,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -338,15 +338,15 @@ description: Provides a set of additional Git commands to help developers when w
   with Pivotal Tracker
 email: jeff@xxxxxxxxx.com
 executables:
-- git-deliver
-- git-finish
-- git-newbug
-- git-newfeature
 - git-qa
-- git-release
+- git-uat
+- git-newbug
+- git-finish
 - git-report
+- git-newfeature
 - git-start
-- git-uat
+- git-deliver
+- git-release
 extensions: []
 extra_rdoc_files: []
 files:
@@ -378,7 +378,6 @@ files:
 - lib/git-pivotal-tracker-integration/util/git.rb
 - lib/git-pivotal-tracker-integration/util/shell.rb
 - lib/git-pivotal-tracker-integration/util/story.rb
-- lib/git-pivotal-tracker-integration/util/togglV8.rb
 - lib/git-pivotal-tracker-integration/version-update/gradle.rb
 - spec/git-pivotal-tracker-integration/command/base_spec.rb
 - spec/git-pivotal-tracker-integration/command/configuration_spec.rb
@@ -447,17 +446,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Git commands for integration with Pivotal Tracker
 test_files:
-- spec/git-pivotal-tracker-integration/command/base_spec.rb
-- spec/git-pivotal-tracker-integration/command/configuration_spec.rb
-- spec/git-pivotal-tracker-integration/command/finish_spec.rb
-- spec/git-pivotal-tracker-integration/command/release_spec.rb
-- spec/git-pivotal-tracker-integration/command/start_spec.rb
 - spec/git-pivotal-tracker-integration/util/git_spec.rb
 - spec/git-pivotal-tracker-integration/util/shell_spec.rb
 - spec/git-pivotal-tracker-integration/util/story_spec.rb
 - spec/git-pivotal-tracker-integration/version-update/gradle_spec.rb
+- spec/git-pivotal-tracker-integration/command/configuration_spec.rb
+- spec/git-pivotal-tracker-integration/command/finish_spec.rb
+- spec/git-pivotal-tracker-integration/command/start_spec.rb
+- spec/git-pivotal-tracker-integration/command/release_spec.rb
+- spec/git-pivotal-tracker-integration/command/base_spec.rb

data/lib/git-pivotal-tracker-integration/util/togglV8.rb

@@ -1,438 +0,0 @@
-#! /usr/bin/env rvm ruby-1.9.3-head do ruby
-# encoding: utf-8
-
-require 'rubygems'
-require 'logger'
-require 'faraday'
-require 'json'
-
-require 'awesome_print' # for debug output
-
-class TogglException < StandardError
-  def initialize(message)
-    @message = "[Toggl] #{message}"
-  end
-end
-
-class Toggl
-  attr_accessor :conn, :debug
-
-  def initialize(username=nil, password='api_token', debug=nil)
-    self.debug_on(debug) if !debug.nil?
-    if (password.to_s == 'api_token' && username.to_s == '')
-      toggl_api_file = self.toggl_file
-      username = IO.read(toggl_api_file).strip
-    end
-
-    @conn = connection(username, password)
-  end
-
-  def toggl_file
-    t_file = ENV['HOME']+'/.toggl'
-    if !FileTest.exist?(t_file) then
-      puts "\n\nIt looks like this is the first time you have used Toggl on this machine.\n"
-      t_API_key = ask("Please enter your Toggl API key:")
-      output = File.open( t_file, "w")
-      output << t_API_key
-      output.close
-    end
-
-    t_file
-  end
-  def connection(username, password)
-    Faraday.new(url: 'https://www.toggl.com/api/v8', :ssl => {:verify => false}) do |faraday|
-      faraday.request :url_encoded
-      faraday.response :logger, Logger.new('faraday.log')
-      faraday.adapter Faraday.default_adapter
-      faraday.headers = {"Content-Type" => "application/json"}
-      faraday.basic_auth username, password
-    end
-  end
-
-  def debug_on(debug=true)
-    puts "debugging is %s" % [debug ? "ON" : "OFF"]
-    @debug = debug
-  end
-
-  def checkParams(params, fields=[])
-    raise ArgumentError, 'params is not a Hash' unless params.is_a? Hash
-    return if fields.empty?
-    errors = []
-    for f in fields
-      errors.push("params[#{f}] is required") unless params.has_key?(f)
-    end
-    raise ArgumentError, errors.join(', ') if !errors.empty?
-  end
-
-#----------#
-#--- Me ---#
-#----------#
-
-  def me(all=nil)
-    # TODO: Reconcile this with get_client_projects
-    get "me%s" % [all.nil? ? "" : "?with_related_data=#{all}"]
-  rescue TogglException => te
-    puts "Failed to retrieve the Toggl User Id"
-    raise te
-  end
-
-  def my_clients(user)
-    user['projects']
-  end
-
-  def my_projects(user)
-    user['projects']
-  end
-
-  def my_tags(user)
-    user['tags']
-  end
-
-  def my_time_entries(user)
-    user['time_entries']
-  end
-
-  def my_workspaces(user)
-    user['workspaces']
-  end
-
-#---------------#
-#--- Clients ---#
-#---------------#
-
-# name  : The name of the client (string, required, unique in workspace)
-# wid   : workspace ID, where the client will be used (integer, required)
-# notes : Notes for the client (string, not required)
-# hrate : The hourly rate for this client (float, not required, available only for pro workspaces)
-# cur   : The name of the client's currency (string, not required, available only for pro workspaces)
-# at    : timestamp that is sent in the response, indicates the time client was last updated
-
-  def create_client(params)
-    checkParams(params, [:name, :wid])
-    post "clients", {client: params}
-  end
-
-  def get_client(client_id)
-    get "clients/#{client_id}"
-  end
-
-  def update_client(client_id, params)
-    put "clients/#{client_id}", {client: params}
-  end
-
-  def delete_client(client_id)
-    delete "clients/#{client_id}"
-  end
-
-  def get_client_projects(client_id, params={})
-    active = params.has_key?(:active) ? "?active=#{params[:active]}" : ""
-    get "clients/#{client_id}/projects#{active}"
-  end
-
-
-#----------------#
-#--- Projects ---#
-#----------------#
-
-# name        : The name of the project (string, required, unique for client and workspace)
-# wid         : workspace ID, where the project will be saved (integer, required)
-# cid         : client ID(integer, not required)
-# active      : whether the project is archived or not (boolean, by default true)
-# is_private  : whether project is accessible for only project users or for all workspace users (boolean, default true)
-# template    : whether the project can be used as a template (boolean, not required)
-# template_id : id of the template project used on current project's creation
-# billable    : whether the project is billable or not (boolean, default true, available only for pro workspaces)
-# at          : timestamp that is sent in the response for PUT, indicates the time task was last updated
-# -- Undocumented --
-# color       : number (in the range 0-23?)
-
-  def create_project(params)
-    checkParams(params, [:name, :wid])
-    post "projects", {project: params}
-  end
-
-  def get_project(project_id)
-    get "projects/#{project_id}"
-  end
-
-  def update_project(project_id, params)
-    put "projects/#{project_id}", {project: params}
-  end
-
-  def get_project_users(project_id)
-    get "projects/#{project_id}/project_users"
-  end
-
-  def get_project_tasks(project_id)
-    get "projects/#{project_id}/tasks"
-  end
-
-  def get_project_task_with_name(project_id, task_name)
-    task = nil
-    project_tasks = get_project_tasks(project_id) || []
-    project_tasks.each { |a_task|
-      a_task_name = "#{a_task["name"]}"
-      if (a_task_name.include?task_name)
-        task = a_task
-        break
-      end
-    }
-  task
-  end
-#---------------------#
-#--- Project users ---#
-#---------------------#
-
-# pid      : project ID (integer, required)
-# uid      : user ID, who is added to the project (integer, required)
-# wid      : workspace ID, where the project belongs to (integer, not-required, project's workspace id is used)
-# manager  : admin rights for this project (boolean, default false)
-# rate     : hourly rate for the project user (float, not-required, only for pro workspaces) in the currency of the project's client or in workspace default currency.
-# at       : timestamp that is sent in the response, indicates when the project user was last updated
-# -- Additional fields --
-# fullname : full name of the user, who is added to the project
-
-  def create_project_user(params)
-    checkParams(params, [:pid, :uid])
-    params[:fields] = "fullname"  # for simplicity, always request fullname field
-    post "project_users", {project_user: params}
-  end
-
-  def update_project_user(project_user_id, params)
-    params[:fields] = "fullname"  # for simplicity, always request fullname field
-    put "project_users/#{project_user_id}", {project_user: params}
-  end
-
-  def delete_project_user(project_user_id)
-    delete "project_users/#{project_user_id}"
-  end
-
-#------------#
-#--- Tags ---#
-#------------#
-
-# name : The name of the tag (string, required, unique in workspace)
-# wid  : workspace ID, where the tag will be used (integer, required)
-
-  def create_tag(params)
-    checkParams(params, [:name, :wid])
-    post "tags", {tag: params}
-  end
-
-  # ex: update_tag(12345, {name: "same tame game"})
-  def update_tag(tag_id, params)
-    put "tags/#{tag_id}", {tag: params}
-  end
-
-  def delete_tag(tag_id)
-    delete "tags/#{tag_id}"
-  end
-
-#-------------#
-#--- Tasks ---#
-#-------------#
-
-# name              : The name of the task (string, required, unique in project)
-# pid               : project ID for the task (integer, required)
-# wid               : workspace ID, where the task will be saved (integer, project's workspace id is used when not supplied)
-# uid               : user ID, to whom the task is assigned to (integer, not required)
-# estimated_seconds : estimated duration of task in seconds (integer, not required)
-# active            : whether the task is done or not (boolean, by default true)
-# at                : timestamp that is sent in the response for PUT, indicates the time task was last updated
-# -- Additional fields --
-# done_seconds      : duration (in seconds) of all the time entries registered for this task
-# uname             : full name of the person to whom the task is assigned to
-
-  def create_task(params)
-    checkParams(params, [:name, :pid])
-    post "tasks", {task: params}
-  end
-
-  def get_task(task_id)
-    get "tasks/#{task_id}"
-  end
-
-  # ex: update_task(1894675, {active: true, estimated_seconds: 4500, fields: "done_seconds,uname"})
-  def update_task(*task_id, params)
-    put "tasks/#{task_id.join(',')}", {task: params}
-  end
-
-  def delete_task(*task_id)
-    delete "tasks/#{task_id.join(',')}"
-  end
-
-#--------------------#
-#--- Time entries ---#
-#--------------------#
-
-# description  : (string, required)
-# wid          : workspace ID (integer, required if pid or tid not supplied)
-# pid          : project ID (integer, not required)
-# tid          : task ID (integer, not required)
-# billable     : (boolean, not required, default false, available for pro workspaces)
-# start        : time entry start time (string, required, ISO 8601 date and time)
-# stop         : time entry stop time (string, not required, ISO 8601 date and time)
-# duration     : time entry duration in seconds. If the time entry is currently running, the duration attribute contains a negative value, denoting the start of the time entry in seconds since epoch (Jan 1 1970). The correct duration can be calculated as current_time + duration, where current_time is the current time in seconds since epoch. (integer, required)
-# created_with : the name of your client app (string, required)
-# tags         : a list of tag names (array of strings, not required)
-# duronly      : should Toggl show the start and stop time of this time entry? (boolean, not required)
-# at           : timestamp that is sent in the response, indicates the time item was last updated
-
-  def create_time_entry(params)
-    checkParams(params, [:description, :start, :created_with])
-    if !params.has_key?(:wid) and !params.has_key?(:pid) and !params.has_key?(:tid) then
-      raise ArgumentError, "one of params['wid'], params['pid'], params['tid'] is required"
-    end
-    post "time_entries", {time_entry: params}
-  end
-
-  def start_time_entry(params)
-    if !params.has_key?(:wid) and !params.has_key?(:pid) and !params.has_key?(:tid) then
-      raise ArgumentError, "one of params['wid'], params['pid'], params['tid'] is required"
-    end
-    post "time_entries/start", {time_entry: params}
-  end
-
-  def stop_time_entry(time_entry_id)
-    put "time_entries/#{time_entry_id}/stop", {}
-  end
-
-  def get_time_entry(time_entry_id)
-    get "time_entries/#{time_entry_id}"
-  end
-
-  def update_time_entry(time_entry_id, params)
-    put "time_entries/#{time_entry_id}", {time_entry: params}
-  end
-
-  def delete_time_entry(time_entry_id)
-    delete "time_entries/#{time_entry_id}"
-  end
-
-  def iso8601(date)
-    return nil if date.nil?
-    if date.is_a?(Time) or date.is_a?(Date)
-      iso = date.iso8601
-    elsif date.is_a?(String)
-      iso =  DateTime.parse(date).iso8601
-    else
-      raise ArgumentError, "Can't convert #{date.class} to ISO-8601 Date/Time"
-    end
-    return Faraday::Utils.escape(iso)
-  end
-
-  def get_time_entries(start_date=nil, end_date=nil)
-    params = []
-    params.push("start_date=#{iso8601(start_date)}") if !start_date.nil?
-    params.push("end_date=#{iso8601(end_date)}") if !end_date.nil?
-    get "time_entries%s" % [params.empty? ? "" : "?#{params.join('&')}"]
-  end
-
-#-------------#
-#--- Users ---#
-#-------------#
-
-# api_token                 : (string)
-# default_wid               : default workspace id (integer)
-# email                     : (string)
-# jquery_timeofday_format   : (string)
-# jquery_date_format        :(string)
-# timeofday_format          : (string)
-# date_format               : (string)
-# store_start_and_stop_time : whether start and stop time are saved on time entry (boolean)
-# beginning_of_week         : (integer, Sunday=0)
-# language                  : user's language (string)
-# image_url                 : url with the user's profile picture(string)
-# sidebar_piechart          : should a piechart be shown on the sidebar (boolean)
-# at                        : timestamp of last changes
-# new_blog_post             : an object with toggl blog post title and link
-
-#------------------#
-#--- Workspaces ---#
-#------------------#
-
-# name    : (string, required)
-# premium : If it's a pro workspace or not. Shows if someone is paying for the workspace or not (boolean, not required)
-# at      : timestamp that is sent in the response, indicates the time item was last updated
-
-  def workspaces
-    get "workspaces"
-  end
-
-  def clients(workspace=nil)
-    if workspace.nil?
-      get "clients"
-    else
-      get "workspaces/#{workspace}/clients"
-    end
-  end
-
-  def projects(workspace, params={})
-    active = params.has_key?(:active) ? "?active=#{params[:active]}" : ""
-    get "workspaces/#{workspace}/projects#{active}"
-  end
-
-  def users(workspace)
-    get "workspaces/#{workspace}/users"
-  end
-
-  def tasks(workspace, params={})
-    active = params.has_key?(:active) ? "?active=#{params[:active]}" : ""
-    get "workspaces/#{workspace}/tasks#{active}"
-  end
-
-#---------------#
-#--- Private ---#
-#---------------#
-
-  private
-
-  def get(resource)
-    puts "GET #{resource}" if @debug
-    full_res = self.conn.get(resource)
-    # ap full_res.env if @debug
-    return nil if full_res.env[:body] == 'null'
-    res = JSON.parse(full_res.env[:body])
-    res.is_a?(Array) || res['data'].nil? ? res : res['data']
-  rescue StandardError => e
-    raise TogglException, "GET #{resource} Failed -- #{e.message}"
-  end
-
-  def post(resource, data)
-    puts "POST #{resource} / #{data}" if @debug
-    full_res = self.conn.post(resource, JSON.generate(data))
-    #ap full_res.env if @debug
-    if (200 == full_res.env[:status]) then
-      res = JSON.parse(full_res.env[:body])
-      res['data'].nil? ? res : res['data']
-    else
-      puts(full_res.env[:body])
-    end
-  rescue StandardError => e
-    raise TogglException, "POST #{resource} / #{data} Failed -- #{e.message}"
-  end
-
-  def put(resource, data)
-    puts "PUT #{resource} / #{data}" if @debug
-    full_res = self.conn.put(resource, JSON.generate(data))
-    # ap full_res.env if @debug
-    if (200 == full_res.env[:status]) then
-      res = JSON.parse(full_res.env[:body])
-      res['data'].nil? ? res : res['data']
-    else
-      puts(full_res.env[:body])
-    end
-  rescue StandardError => e
-    raise TogglException, "PUT #{resource} / #{data} Failed -- #{e.message}"
-  end
-
-  def delete(resource)
-    puts "DELETE #{resource}" if @debug
-    full_res = self.conn.delete(resource)
-    # ap full_res.env if @debug
-    (200 == full_res.env[:status]) ? "" : puts(full_res.env[:body])
-  rescue StandardError => e
-    raise TogglException, "DELETE #{resource} Failed -- #{e.message}"
-  end
-
-end