jugyo-termtter 1.1.3 → 1.3.0

data/lib/plugins/{standard_commands.rb → defaults/standard_commands.rb}

@@ -7,43 +7,39 @@ config.plugins.standard.set_default(
  :limit_format,
  '<<%=remaining_color%>><%=limit.remaining_hits%></<%=remaining_color%>>/<%=limit.hourly_limit%> until <%=limit.reset_time%> (<%=remaining_time%> remaining)')
 
+config.set_default(:easy_reply, true)
+
 module Termtter::Client
 
   register_command(
     :name => :reload,
-    :exec_proc => lambda {|arg|
-      begin
-        args = @since_id ? [{:since_id => @since_id}] : []
-        statuses = Termtter::API.twitter.friends_timeline(*args)
-        unless statuses.empty?
-          print "\e[1K\e[0G" unless win?
-          @since_id = statuses[0].id
-          output(statuses, :update_friends_timeline)
-          Readline.refresh_line
-        end
-      rescue OpenURI::HTTPError => e
-        if e.message == '401 Unauthorized'
-          puts 'Could not login'
-          puts 'plese check your account settings'
-          exit!
-        end
-      rescue => e
-        handle_error(e)
+    :exec => lambda {|arg|
+      args = @since_id ? [{:since_id => @since_id}] : []
+      statuses = Termtter::API.twitter.friends_timeline(*args)
+      unless statuses.empty?
+        print "\e[1K\e[0G" unless win?
+        @since_id = statuses[0].id
+        output(statuses, :update_friends_timeline)
+        Readline.refresh_line
       end
     }
   )
 
   register_command(
-    :name => :update, :aliases => [:u],
-    :exec_proc => lambda {|arg|
+    :name => :update, :alias => :u,
+    :exec => lambda {|arg|
       unless arg.empty?
-        result = Termtter::API.twitter.update(arg)
-        puts TermColor.parse("updated => #{result.text} <90>#{result.id}</90>")
-      end
-    },
-    :completion_proc => lambda {|cmd, args|
-      if /(.*)@([^\s]*)$/ =~ args
-        find_user_candidates $2, "#{cmd} #{$1}@%s"
+        params = 
+          if config.easy_reply && /^\s*(@\w+)/ =~ arg
+            user_name = normalize_as_user_name($1)
+            in_reply_to_status_id = Termtter::API.twitter.user(user_name).status.id rescue nil
+            in_reply_to_status_id ? {:in_reply_to_status_id => in_reply_to_status_id} : {}
+          else
+            {}
+          end
+
+        result = Termtter::API.twitter.update(arg, params)
+        puts "updated => #{result.text}"
       end
     },
     :help => ["update,u TEXT", "Post a new message"]
@@ -61,7 +57,7 @@ module Termtter::Client
         end
       if id
         result = Termtter::API.twitter.remove_status(id)
-        puts TermColor.parse("deleted => #{result.text} <90>#{result.id}</90>")
+        puts "deleted => #{result.text}"
       end
     },
     :help => ['delete,del [STATUS ID]', 'Delete a status']
@@ -77,8 +73,8 @@ module Termtter::Client
     :name => :direct, :aliases => [:d],
     :exec_proc => lambda {|arg|
       case arg
-      when /^([^\s]+)\s+(.*)\s*$/
-        user, text = $1, $2
+      when /^([^\s]+)\s+?(.*)\s*$/
+        user, text = normalize_as_user_name($1), $2
         Termtter::API.twitter.direct_message(user, text)
         puts "=> to:#{user} message:#{text}"
       when 'list'
@@ -97,10 +93,6 @@ module Termtter::Client
         )
       end
     },
-    :completion_proc => lambda {|cmd, arg|
-      find_user_candidates(arg, "#{cmd} %s") + 
-        ["list", "sent_list"].grep(/^#{Regexp.quote(arg)}/).map { |i| "#{cmd} #{i}" }
-    },
     :help => [
       ["direct,d USERNAME TEXT", "Send direct message"],
       ["direct,d list", 'List direct messages'],
@@ -111,7 +103,7 @@ module Termtter::Client
   register_command(
     :name => :profile, :aliases => [:p],
     :exec_proc => lambda {|arg|
-      user = Termtter::API.twitter.user(arg.strip)
+      user = Termtter::API.twitter.user(normalize_as_user_name(arg))
       attrs = %w[ name screen_name url description profile_image_url location protected following
         friends_count followers_count statuses_count favourites_count
         id time_zone created_at utc_offset notifications
@@ -122,16 +114,13 @@ module Termtter::Client
         puts "#{attr.gsub('_', ' ').rjust(label_width)}: #{value}"
       end
     },
-    :completion_proc => lambda {|cmd, arg|
-      find_user_candidates arg, "#{cmd} %s"
-    },
     :help => ["profile,p USERNAME", "Show user's profile"]
   )
 
   register_command(
     :name => :followers,
     :exec_proc => lambda {|arg|
-      user_name = arg.strip
+      user_name = normalize_as_user_name(arg)
       user_name = config.user_name if user_name.empty?
 
       followers = []
@@ -143,9 +132,6 @@ module Termtter::Client
       public_storage[:users] += followers.map(&:screen_name)
       puts followers.map(&:screen_name).join(' ')
     },
-    :completion_proc => lambda {|cmd, arg|
-      find_user_candidates arg, "#{cmd} %s"
-    },
     :help => ["followers", "Show followers"]
   )
 
@@ -157,13 +143,11 @@ module Termtter::Client
         statuses = Termtter::API.twitter.friends_timeline
       else
         event = :list_user_timeline
-        statuses = Termtter::API.twitter.user_timeline(arg)
+        user_name = normalize_as_user_name(arg)
+        statuses = Termtter::API.twitter.user_timeline(user_name)
       end
       output(statuses, event)
     },
-    :completion_proc => lambda {|cmd, arg|
-      find_user_candidates arg, "#{cmd} %s"
-    },
     :help => ["list,l [USERNAME]", "List the posts"]
   )
 
@@ -176,7 +160,7 @@ module Termtter::Client
       output(statuses, :search)
     },
     :completion_proc => lambda {|cmd, arg|
-      public_storage[:search_keywords].grep(/#{Regexp.quote(arg)}/).map { |i| "#{cmd} #{i}" }
+      public_storage[:search_keywords].grep(/^#{Regexp.quote(arg)}/).map { |i| "#{cmd} #{i}" }
     },
     :help => ["search,s TEXT", "Search for Twitter"]
   )
@@ -184,9 +168,13 @@ module Termtter::Client
   register_command(
     :name => :replies, :aliases => [:r],
     :exec_proc => lambda {|arg|
-      output(Termtter::API.twitter.replies, :replies)
+      res = Termtter::API.twitter.replies
+      unless arg.empty?
+        res = res.map {|e| e.user.screen_name == arg ? e : nil }.compact
+      end
+      output(res, :replies)
     },
-    :help => ["replies,r", "List the most recent @replies for the authenticating user"]
+    :help => ["replies,r", "List the replies"]
   )
 
   register_command(
@@ -226,14 +214,10 @@ module Termtter::Client
     :name => :follow, :aliases => [],
     :exec_proc => lambda {|args|
       args.split(' ').each do |arg|
-        if /^(\w+)/ =~ arg
-          res = Termtter::API::twitter.follow($1.strip)
-        end
+        user_name = normalize_as_user_name(arg)
+        res = Termtter::API::twitter.follow(user_name)
       end
     },
-    :completion_proc => lambda {|cmd, args|
-      find_user_candidates args, "#{cmd} %s"
-    },
     :help => ['follow USER', 'Follow user']
   )
 
@@ -241,14 +225,10 @@ module Termtter::Client
     :name => :leave, :aliases => [],
     :exec_proc => lambda {|args|
       args.split(' ').each do |arg|
-        if /^(\w+)/ =~ arg
-          res = Termtter::API::twitter.leave($1.strip)
-        end
+        user_name = normalize_as_user_name(arg)
+        res = Termtter::API::twitter.leave(user_name)
       end
     },
-    :completion_proc => lambda {|cmd, args|
-      find_user_candidates args, "#{cmd} %s"
-    },
     :help => ['leave USER', 'Leave user']
   )
 
@@ -260,15 +240,19 @@ module Termtter::Client
       when /^\d+/
         id = arg.to_i
       when /^@([A-Za-z0-9_]+)/
-        user = $1
-        statuses = Termtter::API.twitter.user_timeline(user)
+        user_name = normalize_as_user_name($1)
+        statuses = Termtter::API.twitter.user_timeline(user_name)
         return if statuses.empty?
         id = statuses[0].id
       when /^\/(.*)$/
         word = $1
         raise "Not implemented yet."
       else
-        return
+        if public_storage[:typable_id] && typable_id?(arg)
+          id = typable_id_convert(arg)
+        else
+          return
+        end
       end
 
       r = Termtter::API.twitter.favorite id
@@ -276,15 +260,17 @@ module Termtter::Client
     },
     :completion_proc => lambda {|cmd, arg|
       case arg
-      when /@(.*)/
-        find_user_candidates $1, "#{cmd} @%s"
       when /(\d+)/
         find_status_ids(arg).map{|id| "#{cmd} #{id}"}
       else
-        %w(favorite).grep(/^#{Regexp.quote arg}/)
+        if data = Termtter::Client.typable_id_to_data(arg)
+          "#{cmd} #{data}"
+        else
+          %w(favorite).grep(/^#{Regexp.quote arg}/)
+        end
       end
     },
-    :help => ['favorite,fav (ID|@USER|/WORD)', 'Mark a status as a favorite']
+    :help => ['favorite,fav (ID|@USER|TYPABLE|/WORD)', 'Mark a status as a favorite']
   )
 
   def self.show_settings(conf, level = 0)
@@ -339,7 +325,7 @@ module Termtter::Client
   )
 
   register_command(
-    :name => :exit, :aliases => [:e],
+    :name => :exit, :aliases => [:quit],
     :exec_proc => lambda {|arg| exit},
     :help => ['exit,e', 'Exit']
   )
@@ -358,6 +344,9 @@ module Termtter::Client
         end
       end
       helps.compact!
+      unless arg.empty?
+        helps = helps.select {|n, _| /#{arg}/ =~ n }
+      end
       puts formatted_help(helps)
     },
     :help => ["help,h", "Print this help message"]
@@ -372,28 +361,6 @@ module Termtter::Client
     }.join("\n")
   end
 
-  # completion for standard commands
-
-  public_storage[:users] ||= Set.new
-  public_storage[:status_ids] ||= Set.new
-
-  register_hook(
-    :name => :for_completion,
-    :points => [:pre_filter],
-    :exec_proc => lambda {|statuses, event|
-      statuses.each do |s|
-        public_storage[:users].add(s.user.screen_name)
-        public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/).flatten
-        public_storage[:status_ids].add(s.id)
-        public_storage[:status_ids].add(s.in_reply_to_status_id) if s.in_reply_to_status_id
-      end
-    }
-  )
-
-  public_storage[:plugins] = (Dir["#{File.dirname(__FILE__)}/*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).map do |f|
-    f.match(%r|([^/]+).rb$|)[1]
-  end
-
   register_command(
     :name      => :plug,
     :alias     => :plugin,
@@ -410,22 +377,29 @@ module Termtter::Client
       end
     },
     :completion_proc => lambda {|cmd, args|
-      find_user_candidates args, "#{cmd} %s"
-      unless args.empty?
-        find_plugin_candidates args, "#{cmd} %s"
-      else
-        public_storage[:plugins].sort
-      end
+      plugin_list.grep(/^#{Regexp.quote(args)}/).map{|i| "#{cmd} #{i}"}
     },
-    :help      => ['plugin FILE', 'Load a plugin']
+    :help => ['plug FILE', 'Load a plugin']
   )
 
+  def self.plugin_list
+    (Dir["#{File.dirname(__FILE__)}/../*.rb"] + Dir["#{Termtter::CONF_DIR}/plugins/*.rb"]).
+      map{|f| File.basename(f).sub(/\.rb$/, '')}.
+      sort
+  end
+
   register_command(
-    :name      => :plugins,
+    :name => :plugins,
     :exec_proc => lambda {|arg|
-      puts public_storage[:plugins].sort.join("\n")
-    },
-    :help      => ['plugins', 'Show list of plugins']
+      list = plugin_list
+      width = list.map{|i|i.size}.max + 2
+      a = []
+      list.sort.each_slice(4) {|i|
+        a << i.map{|j| j + (" " * (width - j.size))}.join
+      }
+      puts TermColor.parse('<green>' + TermColor.escape(a.join("\n")) + '</green>')
+    },
+    :help => ['plugins', 'Show list of plugins']
   )
 
   register_command(
@@ -453,19 +427,20 @@ module Termtter::Client
       when /^\s*(\d+)\s+(.+)$/
         s = Termtter::API.twitter.show($1) rescue nil
         if s
-          update_with_user_and_id($2, s.user.screen_name, id)
+          update_with_user_and_id($2, s.user.screen_name, s.id)
+        end
+      when /^\s*(@\w+)/
+        user_name = normalize_as_user_name($1)
+        s = Termtter::API.twitter.user(user_name).status
+        if s
+          params = s ? {:in_reply_to_status_id => s.id} : {}
+          Termtter::API.twitter.update(arg, params)
+          puts "=> #{arg}"
         end
-      when /^\s*@(\w+)/
-        in_reply_to_status_id = Termtter::API.twitter.user($1).status.id rescue nil
-        params = in_reply_to_status_id ? {:in_reply_to_status_id => in_reply_to_status_id} : {}
-        Termtter::API.twitter.update(arg, params)
-        puts "=> #{arg}"
       end
     },
     :completion_proc => lambda {|cmd, arg|
       case arg
-      when /(.*)@([^\s]*)$/
-        find_user_candidates $2, "#{cmd} #{$1}@%s"
       when /(\d+)/
         find_status_ids(arg).map{|id| "#{cmd} #{id}"}
       end
@@ -500,50 +475,11 @@ module Termtter::Client
   def self.update_with_user_and_id(text, username, id)
     text = "@#{username} #{text}"
     result = Termtter::API.twitter.update(text, {'in_reply_to_status_id' => id})
-    puts TermColor.parse("replied => #{result.text} <90>#{result.id}</90>")
+    puts "replied => #{result.text}"
   end
 
-=begin
-  = Termtter reply command
-  == Usage
-  === list
-  * ステータスリストを連番と一緒に出す。
-  > reply [list|ls]
-  0: foo: foo's message
-  1: bar: bar's message
-  ..
-
-  * ユーザ指定してリスト作成。
-  > reply [list|ls] foo
-  0: foo: foo's message0
-  1: foo: foo's message1
-
-  === reply
-  メッセージ送信の際、@usernameが自動的に付与される。
-
-  * status_idを自分で入力してreply送信
-  > reply 1234567890 message to status_id
-  => @foo message to status_id (reply to 1234567890)
-
-  * reply listコマンドで出したステータス番号に対してreply送信
-  > reply up 0 message to status no
-  => @foo message to status_no
-
-  * 対象ユーザの最後の発言に対してreply
-  > reply @foo message to foo
-  => @foo message to foo
-
-  == Todo
-  * 英語で説明 => ヘルプを設定する
-  * リファクタ
-  * 補完
-  * 確認画面を出したい
-=end
-
-  def self.find_plugin_candidates(a, b)
-    public_storage[:plugins].
-      grep(/^#{Regexp.quote a}/i).
-      map {|u| b % u }
+  def self.normalize_as_user_name(text)
+    text.strip.sub(/^@/, '')
   end
 
   def self.find_status_ids(text)
@@ -553,14 +489,4 @@ module Termtter::Client
   def self.find_users(text)
     public_storage[:users].select {|user| /^#{Regexp.quote(text)}/ =~ user}
   end
-
-  def self.find_user_candidates(a, b)
-    users = 
-      if a.nil? || a.empty?
-        public_storage[:users].to_a
-      else
-        public_storage[:users].grep(/^#{Regexp.quote a}/i)
-      end
-    users.map {|u| b % u }
-  end
 end

data/lib/plugins/defaults/standard_completion.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+require 'set'
+
+module Termtter::Client
+
+  #
+  # completion for status ids
+  # (I want to delete)
+  #
+
+  public_storage[:status_ids] ||= Set.new
+
+  register_hook(:collect_status_ids, :point => :pre_filter) do |statuses, event|
+    statuses.each do |s|
+      public_storage[:status_ids].add(s.id)
+      public_storage[:status_ids].add(s.in_reply_to_status_id) if s.in_reply_to_status_id
+    end
+  end
+
+  #
+  # completion for user names
+  #
+
+  public_storage[:users] ||= Set.new
+
+  register_hook(:collect_user_names, :point => :pre_filter) do |statuses, event|
+    statuses.each do |s|
+      public_storage[:users].add(s.user.screen_name)
+      public_storage[:users] += s.text.scan(/@([a-zA-Z_0-9]*)/).flatten
+    end
+  end
+
+  register_hook(:user_names_completion, :point => :completion) do |input|
+    if /(.*)@([^\s]*)$/ =~ input
+      command_str = $1
+      part_of_user_name = $2
+
+      users = 
+        if part_of_user_name.nil? || part_of_user_name.empty?
+          public_storage[:users].to_a
+        else
+          public_storage[:users].grep(/^#{Regexp.quote(part_of_user_name)}/)
+        end
+
+      users.map {|u| "#{command_str}@%s" % u }
+    end
+  end
+
+  #
+  # completion for hashtags
+  #
+
+  public_storage[:hashtag] ||= Set.new
+
+  register_hook(:collect_hashtags, :point => /^post_exec_/) do |cmd, arg, result|
+    public_storage[:hashtag] += arg.scan(/\s+#([^\s]+)/).flatten if arg
+  end
+
+  register_hook(:hashtags_completion, :point => :completion) do |input|
+    if /(.*)#([^\s]*)$/ =~ input
+      command_str = $1
+      part_of_hashtag = $2
+      public_storage[:hashtag].grep(/^#{Regexp.quote(part_of_hashtag)}/i).map { |i| "#{command_str}##{i}" }
+    end
+  end
+end

data/lib/plugins/defaults/stdout.rb

@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+
+require 'termcolor'
+require 'erb'
+require 'tempfile'
+
+config.plugins.stdout.set_default(:colors, (31..36).to_a + (91..96).to_a)
+config.plugins.stdout.set_default(
+  :timeline_format,
+  '<90><%=time%> [<%=status_id%>]</90> <<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ' +
+  '<90><%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%><%=source%></90>'
+)
+config.plugins.stdout.set_default(:enable_pager, true)
+config.plugins.stdout.set_default(:pager, 'less -R -f +G')
+config.plugins.stdout.set_default(:window_height, 50)
+config.plugins.stdout.set_default(:typable_ids, ('aa'..'zz').to_a)
+config.plugins.stdout.set_default(:typable_id_prefix, '$')
+config.plugins.stdout.set_default(:show_as_thread, false)
+
+module Termtter
+  class TypableIdGenerator
+    def initialize(ids)
+      if not ids.kind_of?(Array)
+        raise ArgumentError, 'ids should be an Array'
+      elsif ids.empty?
+        raise ArgumentError, 'ids should not be empty'
+      end
+      @ids = ids
+      @table = {}
+    end
+
+    def next(data)
+      id = @ids.shift
+      @ids.push id
+      @table[id] = data
+      id
+    end
+
+    def get(id)
+      @table[id]
+    end
+  end
+
+  module Client
+    @typable_id_generator = TypableIdGenerator.new(config.plugins.stdout.typable_ids)
+
+    def self.data_to_typable_id(data)
+      id = config.plugins.stdout.typable_id_prefix + @typable_id_generator.next(data)
+    end
+
+    def self.typable_id_to_data(id)
+      @typable_id_generator.get(id)
+    end
+  end
+
+  class StdOut < Hook
+    def initialize
+      super(:name => :stdout, :points => [:output])
+    end
+
+    def call(statuses, event)
+      print_statuses(statuses)
+    end
+
+    def print_statuses(statuses, sort = true, time_format = nil)
+      return unless statuses and statuses.first
+      unless time_format
+        t0 = Time.now
+        t1 = Time.parse(statuses.first[:created_at])
+        t2 = Time.parse(statuses.last[:created_at])
+        time_format = 
+          if [t0.year, t0.month, t0.day] == [t1.year, t1.month, t1.day] \
+            and [t1.year, t1.month, t1.day] == [t2.year, t2.month, t2.day]
+            '%H:%M:%S'
+          else
+            '%y/%m/%d %H:%M'
+          end
+      end
+
+      output_text = ''
+      statuses.each do |s|
+        output_text << status_line(s, time_format)
+      end
+
+      if config.plugins.stdout.enable_pager && ENV['LINES'] && statuses.size > ENV['LINES'].to_i
+        file = Tempfile.new('termtter')
+        file.print output_text
+        file.close
+        system "#{config.plugins.stdout.pager} #{file.path}"
+        file.close(true)
+      else
+        print output_text
+      end
+    end
+
+    def status_line(s, time_format, indent = 0)
+      return '' unless s
+      text = TermColor.escape(s.text)
+      color = config.plugins.stdout.colors[s.user.id.to_i % config.plugins.stdout.colors.size]
+      status_id = Termtter::Client.data_to_typable_id(s.id)
+      reply_to_status_id =
+        if s.in_reply_to_status_id.nil?
+          nil
+        else
+          Termtter::Client.data_to_typable_id(s.in_reply_to_status_id)
+        end
+
+      time = "(#{Time.parse(s.created_at).strftime(time_format)})"
+      source =
+        case s.source
+        when />(.*?)</ then $1
+        when 'web' then 'web'
+        end
+
+      erbed_text = ERB.new(config.plugins.stdout.timeline_format).result(binding)
+      indent_text = indent > 0 ? "#{'    ' * (indent - 1)} ┗ " : ''
+      text = TermColor.parse(indent_text + erbed_text) + "\n"
+      if config.plugins.stdout.show_as_thread && s.in_reply_to_status_id
+        text << status_line(Status[s.in_reply_to_status_id], time_format, indent + 1)
+      end
+      text
+    end
+  end
+
+  Client.register_hook(StdOut.new)
+
+  Client.register_hook(
+    :name => :stdout_typable_id,
+    :point => /^modify_arg_for_.*/,
+    :exec => lambda { |cmd, arg|
+      if arg
+        prefix = config.plugins.stdout.typable_id_prefix
+        arg.gsub(/#{Regexp.quote(prefix)}\w+/) do |id|
+          Termtter::Client.typable_id_to_data(id[1..-1]) || id
+        end
+      else
+        arg
+      end
+    }
+  )
+end
+
+# stdout.rb
+#   output statuses to stdout
+# example config
+#   config.plugins.stdout.colors = [:none, :red, :green, :yellow, :blue, :magenta, :cyan]
+#   config.plugins.stdout.timeline_format = '<90><%=time%> [<%=status_id%>]</90> <<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ' +
+#                                           '<90><%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%><%=source%></90>'

data/lib/plugins/defaults.rb

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+module Termtter::Client
+  config.set_default(:stdout, true)
+  config.set_default(:standard_commands, true)
+  config.set_default(:standard_completion, true)
+  config.set_default(:auto_reload, true)
+
+  defaults = Dir[File.dirname(__FILE__) + '/defaults/*.rb'].map { |f|
+    f.match(%r|defaults/(.*?).rb$|)[1]
+  }.each { |plugin|
+    plug "defaults/#{plugin}" if config.__refer__(plugin.to_sym)
+  }
+end

data/lib/plugins/en2ja.rb

@@ -1,11 +1,17 @@
 # -*- coding: utf-8 -*-
 
-plugin 'translation'
+module Termtter::Client
+  plug 'translation'
 
-Termtter::Client.add_filter do |statuses, event|
-  statuses.each do |s|
-    if s.english?
-      s.text = translate(s.text, 'en|ja')
+  register_hook(:en2ja, :point => :filter_for_output) do |statuses, event|
+    statuses.each do |s|
+      if english?(s.text)
+        s.text = translate(s.text, 'en|ja')
+      end
     end
   end
+
+  def self.english?(text)
+    /[一-龠]+|[ぁ-ん]+|[ァ-ヴー]+|[ａ-ｚＡ-Ｚ０-９]+/ !~ text
+  end
 end