sisimai 4.21.0-java → 4.21.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c4d63e56ce6b3ad24a43da32ad5d08f29906d9
-  data.tar.gz: b720ec17633d4e41bb5da615a3234775a1ad2251
+  metadata.gz: 4e56734a1878b0db4142786ec818b43b461f0282
+  data.tar.gz: 5a13a22e91a2c6d7fda1fef5b7a5fab06ea5e0ed
 SHA512:
-  metadata.gz: e0de9810ce05a79520e0cafe1ab82ff52e8228bb6944e591803b5b4aecb0296baf3dc961d7043630910588460b0032a7906d6ba57db64cd9b8b8bc08022d77af
-  data.tar.gz: d0c7c5962aa580beaf35827c0c20d4346ef67705e18699e9ba5f8007048d1aead8a44d794c137f9ae1eb728d98f2fd0acf600b774d836d6e48f291dae674c75e
+  metadata.gz: 5c709e7029e2d4f3470986846f29178e47e5dde07af07a2f6e780dc9d1ea3b4a675ca3ec40b9b08587d575f4ccceb7c3d09abbf3a6d1d1aa35d40700718876c0
+  data.tar.gz: 07c06395781aec135c47138158dfaeafd59e5904f73f2f3d180c04481f2e2927d0fbb08f4062871d72fd1385a6f251986d5a7c9e94bb04f76b873affe57ed9ae

data/ANALYTICAL-PRECISION

@@ -6,8 +6,8 @@ MTA::ApacheJames ........    0/0006  0.0000  Java Apache Mail Enterprise Server
 MTA::Courier ............   14/0016  0.8750  Courier MTA
 MTA::Domino .............    6/0015  0.4000  IBM Domino Server
 MTA::Exchange2003 .......    1/0051  0.0196  Microsoft Exchange Server 2003
-MTA::Exchange2007 .......    5/0007  0.7143  Microsoft Exchange Server 2007
-MTA::Exim ...............  144/0174  0.8276  Exim
+MTA::Exchange2007 .......    6/0007  0.8571  Microsoft Exchange Server 2007
+MTA::Exim ...............  146/0176  0.8295  Exim
 MTA::IMailServer ........    0/0045  0.0000  IPSWITCH IMail Server
 MTA::InterScanMSS .......    0/0009  0.0000  Trend Micro InterScan Messaging Security Suite
 MTA::MXLogic ............    0/0014  0.0000  McAfee SaaS
@@ -17,7 +17,7 @@ MTA::McAfee .............    0/0010  0.0000  McAfee Email Appliance
 MTA::MessagingServer ....   19/0022  0.8636  Oracle Communications Messaging Server
 MTA::Notes ..............    0/0012  0.0000  Lotus Notes
 MTA::OpenSMTPD ..........    6/0024  0.2500  OpenSMTPD
-MTA::Postfix ............  171/0189  0.9048  Postfix
+MTA::Postfix ............  173/0191  0.9058  Postfix
 MTA::Sendmail ...........  332/0255  1.0000  V8Sendmail: /usr/sbin/sendmail
 MTA::SurfControl ........    6/0008  0.7500  WebSense SurfControl
 MTA::V5sendmail .........    0/0386  0.0000  Sendmail version 5
@@ -27,7 +27,7 @@ MTA::X3 .................    0/0012  0.0000  Unknown MTA #3
 MTA::X4 .................    0/0029  0.0000  Unknown MTA #4 qmail clones
 MTA::X5 .................    3/0003  1.0000  Unknown MTA #5
 MTA::mFILTER ............    0/0009  0.0000  Digital Arts m-FILTER
-MTA::qmail ..............   52/0082  0.6341  qmail
+MTA::qmail ..............   53/0082  0.6463  qmail
 MSP::DE::EinsUndEins ....    0/0003  0.0000  1&1: http://www.1and1.de
 MSP::DE::GMX ............    0/0010  0.0000  GMX: http://www.gmx.net
 MSP::JP::Biglobe ........    5/0007  0.7143  BIGLOBE: http://www.biglobe.ne.jp
@@ -41,6 +41,7 @@ MSP::US::AmazonWorkMail .    8/0012  0.6667  Amazon WorkMail: https://aws.amazon
 MSP::US::Aol ............   18/0021  0.8571  Aol Mail: http://www.aol.com
 MSP::US::Bigfoot ........    2/0002  1.0000  Bigfoot: http://www.bigfoot.com
 MSP::US::Facebook .......    3/0003  1.0000  Facebook: https://www.facebook.com
+MSP::US::GSuite .........    8/0008  1.0000  G Suite: https://gsuite.google.com/
 MSP::US::Google .........   58/0062  0.9355  Google Gmail: https://mail.google.com
 MSP::US::Office365 ......    8/0011  0.7273  Microsoft Office 365: http://office.microsoft.com/
 MSP::US::Outlook ........   19/0021  0.9048  Microsoft Outlook.com: https://www.outlook.com/
@@ -53,7 +54,7 @@ CED::US::AmazonSES ......    0/0009  0.0000  Amazon SES(JSON): http://aws.amazon
 CED::US::SendGrid .......    0/0000  1.0000  SendGrid(JSON): http://sendgrid.com/
 ARF .....................    9/0050  0.1800  Abuse Feedback Reporting Format
 RFC3464 .................  136/0278  0.4892  Fallback Module for MTAs
-RFC3834 .................    0/0006  0.0000  Detector for auto replied message
+RFC3834 .................    0/0007  0.0000  Detector for auto replied message
 -------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1204/2192  0.5493
- Sisimai 4.20.0           2192/2192  1.0000
+ bounceHammer 2.7.13p3    1218/2205  0.5524
+ Sisimai 4.21.0p2         2205/2205  1.0000

data/ChangeLog.md

@@ -0,0 +1,210 @@
+RELEASE NOTES for Ruby version of Sisimai
+================================================================================
+- releases: "https://github.com/sisimai/rb-Sisimai/releases"
+- download: "https://rubygems.org/gems/sisimai"
+
+v4.21.1
+--------------------------------------------------------------------------------
+- release: "Mon, 29 May 2017 14:22:22 +0900 (JST)"
+- version: "4.21.1"
+- changes:
+  - Pull-Request #73, Fix codes for initializing a hash element with an empty
+    string in Sisimai::MTA::Postfix. Thanks to @MichiakiNakaya.
+  - Import pull-request: https://github.com/sisimai/p5-Sisimai/pull/222 from
+    p5-Sisimai to improve error message patterns.
+  - Changes file has been renamed to **ChangeLog.md** and converted to Markdown
+    format.
+  - Import Pull-Request https://github.com/sisimai/p5-Sisimai/pull/223 for code
+    improvement to detect DNS related errors at G Suite.
+  - Improved code to detect RFC7505 (NullMX) error: sisimai/set-of-emails#4.
+  - Code improvements for checking and decoding irregular MIME encoded strings
+    at is_mimeencoded and mimedecode methods in Sisimai::MIME class reported at
+    issue #75. Thanks to @winebarrel.
+  - Add unit test codes to test all the changes at issue #75.
+
+v4.21.0 - Support G Suite
+--------------------------------------------------------------------------------
+- release: "Mon, 10 Apr 2017 12:17:22 +0900 (JST)"
+- version: "4.21.0"
+- changes:
+  - Experimental implementation: new MTA module Sisimai::MSP::US::GSuite for
+    parsing a bounce mail returned from G Suite.
+  - `Sisimai.make()` and `Sisimai::Message.new()` methods check the value of a
+    `field` argument more strictly.
+  - Improved `Sisimai::SMTP::Status.find()`. The method checks whether a found
+    value as D.S.N. is IPv4 address or not.
+  - Improved code for getting error messages, D.S.N. values, and SMTP reply
+    codes in `Sisimai::MTA::Postfix.scan()` method.
+  - Pull-Request #69, Fix some typos. Thanks to @koic.
+  - Pull-Request #71, Fix break statement. Thanks to @MichiakiNakaya.
+  - Issue #70, All the value of `$PATH` in Makefile have been fixed to build a
+    gem file for JRuby Platform. Thanks to @MichiakiNakaya, @hiroyuki-sato.
+
+v4.20.2
+--------------------------------------------------------------------------------
+- release: "Sat, 11 Mar 2017 16:32:48 +0900 (JST)"
+- version: "4.20.2"
+- changes:
+  - Pull-Request #63 Add some error message patterns for a bounce message from
+    Amazon SES SMTP endpoint.
+  - Fix regular expression in `Sisimai::Message::Email.headers()` method for
+    resolving issue #65 reported from @rdeavila.
+  - Issue #67, Fix code in `Sisimai.make()` method for reading bounce email data
+    from STDIN. Thanks to @marine_dayo.
+  - Callback feature improvement: import pull-request from sisimai/p5-Sisimai
+    https://github.com/sisimai/p5-Sisimai/pull/210.
+
+v4.20.1
+--------------------------------------------------------------------------------
+- release: "Sat, 31 Dec 2016 20:10:22 +0900 (JST)"
+- version: "4.20.1"
+- changes:
+  - Fix the Java version of Gem file.
+
+v4.20.0 - Support Bounce Ojbect (JSON)
+--------------------------------------------------------------------------------
+- release: "Sat, 31 Dec 2016 13:36:22 +0900 (JST)"
+- version: "4.20.0"
+- changes:
+  - Experimental implementation: New MTA modules for 2 Cloud Email Deliveries.
+    These modules can parse JSON formatted bounce objects and can convert to
+    Sisimai::Data object.
+    - Sisimai::CED::US::AmazonSES
+    - Sisimai::CED::US::SendGrid
+  - Format of `smtpagent` in the parsed result has been changed. It includes the
+    category name of MTA/MSP modules like `MTA::Sendmail`, `MTA::Postfix`, and
+    `MSP::US::SendGrid`.
+  - The Domain part of dummy email address defined in Sisimai::Address module
+    has been changed from `dummy-domain.invalid` to `libsisimai.org.invalid`.
+  - `Sisimai::SMTP.is_softbounce()` method has been deleted.
+  - Code improvement for avoid `Invalid byte sequence in UTF-8 (ArgumentError)`
+    error in `Sisimai::String.to_plain()` method reported from M.R.
+  - Sisimai works on Ruby 2.4.0.
+
+v4.19.0 - Callback Feature
+--------------------------------------------------------------------------------
+- release: "Tue, 18 Oct 2016 14:19:10 +0900 (JST)"
+- version: "4.19.0"
+- changes:
+  - Implement a callback feature at `Sisimai.make()` and `Sisimai.dump()` methods.
+    More imformation about the feature are available at the following pages:
+    - http://libsisimai.org/en/usage#callback
+    - http://libsisimai.org/ja/usage#callback
+  - Implement `Sisimai.match()` method: issue #52.
+  - Minor bug fix in `Sisimai::MSP::US::AmazonSES.scan()` method.
+
+v4.18.1
+--------------------------------------------------------------------------------
+- release: "Sun, 11 Sep 2016 20:05:20 +0900 (JST)"
+- version: "4.18.1"
+- changes:
+  - Fix bug in `Sisimai::Mail::STDIN.read()` method reported at issue #61.
+    Thanks to @yaegassy.
+  - Fix bug in `Sisimai::MIME.qprintd()` reported at issue #60.
+  - Improved code related to MIME decoding.
+  - Implement `Sisimai::String.to_plain()` for converting from HTML message to
+    plain text before parsing. The method and related codes are imported from
+    pull-request #197 at p5-Sisimai.
+
+v4.18.0 - Improvements for Microsoft Exchange Servers
+--------------------------------------------------------------------------------
+- release: "Mon, 22 Aug 2016 20:40:55 +0900 (JST)"
+- version: "4.18.0"
+- changes:
+  - Import pull-request https://github.com/sisimai/rb-Sisimai/pull/59 (soft
+    bounce improvement) from Perl version of Sisimai.
+  - Sisimai::MTA::Exchange has been renamed to Sisimai::MTA::Exchange2003.
+  - Implement new MTA module Sisimai::MTA::Exchange2007.
+
+v4.17.2
+--------------------------------------------------------------------------------
+- release: "Tue, 26 Jul 2016 21:00:17 +0900 (JST)"
+- version: "4.17.2"
+- changes:
+  - Issue #174, Implement Sisimai::Rhost::ExchangeOnline for the bounce mail
+    from on-premises Exchange 2013 and Office 365.
+  - The reason of status code: `4.4.5` is `systemfull`.
+  - Code improvement at Sisimai::MSP::US::Office365.
+
+v4.17.1
+--------------------------------------------------------------------------------
+- release: "Wed, 30 Mar 2016 14:00:22 +0900 (JST)"
+- version: "4.17.1"
+- changes:
+  - Ported codes from https://github.com/sisimai/p5-Sisimai/pull/180 for fixing
+    issue https://github.com/sisimai/p5-Sisimai/issues/179,  a variable defined
+    in `lib/sisimai/mta/exim.rb` is not quoted before passing to `%r//` operator.
+  - Fixed serious bug in `Sisimai::Mail::Maildir#read` method reported at issue
+    #55 and #56 by pull-request #57. Thanks to @taku1201.
+
+v4.17.0 - New Error Reason "syntaxerror"
+--------------------------------------------------------------------------------
+- release: "Wed, 16 Mar 2016 12:22:44 +0900 (JST)"
+- version: "4.17.0"
+- changes:
+  - Implement new reason **syntaxerror**. Sisimai will set `syntaxerror` to the
+    raeson when the value of `replycode` begins with `50` such as 502, 503,
+    or 504. Imported from https://github.com/sisimai/p5-Sisimai/pull/170.
+  - Implement `description()` method at each class in `sisimai/reason/*.rb` and
+    `Sisimai.reason()` method for getting the list of reasons Sisimai can detect
+    and its description: issue #48.
+  - Remove unused method `Sisimai::Reason.match()`, issue #49.
+  - Some methods of Sisimai::Address class allow `postmaster`, `mailer-daemon`
+    (without a domain part) as an email address.
+  - `Sisimai::RFC5322.is_mailerdaemon()` method returns true when the argument
+    includes `postmaster`.
+  - Merge pull-request #51, new method `Sisimai::RFC5322.weedout()` and code
+    improvements in all the MTA/MSP modules.
+
+
+v4.16.0 - New Error Reason "delivered"
+--------------------------------------------------------------------------------
+- release: "Thu, 18 Feb 2016 13:49:01 +0900 (JST)"
+- version: "4.16.0"
+- changes:
+  - Implement new reason **delivered**. Sisimai set `delivered` to the reason
+    when the value of `Status:` field in a bounce message begins with `21. This
+    feature is optional and is not enabled by default.
+  - Implement new method `Sisimai.engine()`. The method returns the list of MTA
+    and MSP module list implemented in Sisimai.
+  - Fix serious bug (`gem install` fails on JRuby environment) in Gemfile and
+    sisimai.gemspec. This bug is reported at issue #46 and pull-request #47.
+    Thanks to @hiroyuki-sato and all the people who helped for resolving this
+    issue on https://github.com/rubygems/rubygems/issues/1492.
+
+v4.15.1
+--------------------------------------------------------------------------------
+- release: "Wed, 17 Feb 2016 01:36:45 +0900 (JST)"
+- version: "4.15.1"
+- changes:
+  - Fix serious bug: command `gem install sisimai` fails on JRuby, reported at
+    issue #46. Thanks to @hiroyuki-sato.
+  - v4.15.1 exist on Ruby version of Sisimai only.
+
+v4.15.0 - Oj or JrJackson Required
+--------------------------------------------------------------------------------
+- release: "Sat, 13 Feb 2016 12:40:15 +0900 (JST)"
+- version: "4.15.0"
+- changes:
+  - Beginning with this version, Sisimai requires Oj(MRI) or JrJackson(JRuby)
+    for encoding parsed data to JSON string more faster (about 10%-20% faster
+    than before). Implemented at pull-request #44 and discussed in issue #42.
+    Thanks to @hiroyuki-sato.
+  - Implement new MTA/MSP module Sisimai::MSP::US::AmazonWorkMail for parsing
+    a bounce mail via Amazon WorkMail. The module and test codes are imported
+    from https://github.com/sisimai/p5-Sisimai/pull/162.
+  - Implement new MTA/MSP module Sisimai::MSP::US::Office365 for parsing error 
+    mails via Microsoft Office 365. The module, test codes, and sample emails
+    are imported from https://github.com/sisimai/p5-Sisimai/pull/164.
+  - New method `Sisimai::Address#to_s` to get an email address as String, it is
+    implemented at pull-request #39. Thanks to @hiroyuki-sato.
+  - Almost all of the class variables are removed for resolving issue #40 and
+    merged pull-request #43, thanks to @hiroyuki-sato.
+
+v4.14.2 - Ruby Version of Sisimai
+--------------------------------------------------------------------------------
+- release: "Wed,  3 Feb 2016 13:29:17 +0900 (JST)"
+- version: "4.14.2"
+- changes:
+  - The first release of rb-Sisimai.
+

data/README-JA.md

@@ -240,7 +240,7 @@ Differences between Ruby version and Perl version
 | インストール方法                            | gem install    | cpanm         |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
 | LOC:ソースコードの行数                      | 12400行        | 9000行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 108000件       | 189600件      |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 109700件       | 191300件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 

data/README.md

@@ -244,7 +244,7 @@ and bounceHammer are available at
 | How to install                              | gem install    | cpanm         |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
 | LOC:Source lines of code                    | 12400 lines    | 9000 lines    |
-| The number of tests(spec/,t/,xt/) directory | 108000 tests   | 189600 tests  |
+| The number of tests(spec/,t/,xt/) directory | 109700 tests   | 191300 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 

data/lib/sisimai/mime.rb

@@ -30,7 +30,7 @@ module Sisimai
 
         argv1 = argv1.delete('"')
         piece = []
-        isnot = false
+        mime1 = false
 
         if argv1 =~ /[ ]/
           # Multiple MIME-Encoded strings in a line
@@ -41,11 +41,10 @@ module Sisimai
 
         piece.each do |e|
           # Check all the string in the array
-          next if e =~ /[ \t]*=[?][-_0-9A-Za-z]+[?][BbQq][?].+[?]=?[ \t]*\z/
-          isnot = true
+          next unless e =~ /[ \t]*=[?][-_0-9A-Za-z]+[?][BbQq][?].+[?]=?[ \t]*/
+          mime1 = true
         end
-        return true unless isnot
-        return false
+        return mime1
       end
 
       # Decode MIME-Encoded string
@@ -60,6 +59,9 @@ module Sisimai
         mimeencoded0 = nil
         decodedtext0 = []
 
+        notmimetext0 = ''
+        notmimetext1 = ''
+
         argvs.each do |e|
           # Check and decode each element
           e = e.lstrip.rstrip
@@ -67,12 +69,15 @@ module Sisimai
 
           if self.is_mimeencoded(e)
             # MIME Encoded string
-            if cv = e.match(/\A=[?]([-_0-9A-Za-z]+)[?]([BbQq])[?](.+)[?]=?\z/)
+            if cv = e.match(/\A(.*)=[?]([-_0-9A-Za-z]+)[?]([BbQq])[?](.+)[?]=?(.*)\z/)
               # =?utf-8?B?55m954yr44Gr44KD44KT44GT?=
-              characterset ||= cv[1]
-              encodingname ||= cv[2]
-              mimeencoded0   = cv[3]
+              notmimetext0   = cv[1]
+              characterset ||= cv[2]
+              encodingname ||= cv[3]
+              mimeencoded0   = cv[4]
+              notmimetext1   = cv[5]
 
+              decodedtext0 << notmimetext0
               if encodingname == 'Q'
                 # Quoted-Printable
                 decodedtext0 << mimeencoded0.unpack('M').first
@@ -81,6 +86,7 @@ module Sisimai
                 # Base64
                 decodedtext0 << Base64.decode64(mimeencoded0)
               end
+              decodedtext0 << notmimetext1
             end
           else
             decodedtext0 << e

data/lib/sisimai/msp/us/aol.rb

@@ -19,6 +19,7 @@ module Sisimai
         }
         ReFailure = {
           hostunknown: %r/Host[ ]or[ ]domain[ ]name[ ]not[ ]found/,
+          notaccept:   %r/type=MX:[ ]Malformed[ ]or[ ]unexpected[ ]name[ ]server[ ]reply/,
         }
         Indicators = Sisimai::MSP.INDICATORS
 

data/lib/sisimai/msp/us/gsuite.rb

@@ -14,12 +14,16 @@ module Sisimai
         }
         Re1 = {
           :begin   => %r/\A[*][*][ ].+[ ][*][*]\z/,
-          :error   => %r/\AThe[ ]response[ ]from[ ]the[ ]remote[ ]server[ ]was:\z/,
+          :error   => %r/\AThe[ ]response([ ]from[ ]the[ ]remote[ ]server)?[ ]was:\z/,
           :html    => %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
           :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
-        ErrorMayBe = { :userunknown => %r/because the address couldn't be found/ }
+        ErrorMayBe = {
+          :userunknown  => %r/because the address couldn't be found/,
+          :notaccept    => %r/Null MX/,
+          :networkerror => %r/DNS type .+ lookup of .+ responded with code NXDOMAIN/,
+        }
         Indicators = Sisimai::MSP.INDICATORS
 
         def description; return 'G Suite: https://gsuite.google.com'; end
@@ -53,6 +57,7 @@ module Sisimai
           blanklines = 0      # (Integer) The number of blank lines
           readcursor = 0      # (Integer) Points the current cursor position
           recipients = 0      # (Integer) The number of 'Final-Recipient' header
+          endoferror = true   # (Integer) Flag for a blank line after error messages
           anotherset = {}     # (Hash) Another error information
           emptylines = 0      # (Integer) The number of empty lines
           connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
@@ -90,7 +95,6 @@ module Sisimai
             else
               # Before "message/rfc822"
               next if readcursor & Indicators[:deliverystatus] == 0
-              next if e.empty?
 
               if connvalues == connheader.keys.size
                 # Final-Recipient: rfc822; kijitora@example.de
@@ -133,6 +137,16 @@ module Sisimai
                     # Diagnostic-Code: smtp; 550 #5.1.0 Address rejected.
                     v['spec'] = cv[1].upcase
                     v['diagnosis'] = cv[2]
+                  else
+                    # Append error messages continued from the previous line
+                    if endoferror && ( v['diagnosis'] && v['diagnosis'].size > 0 )
+                      endoferror = true if e.empty?
+                      endoferror = true if e =~ /\A--/
+
+                      next if endoferror
+                      next unless e =~ /\A[ ]/
+                      v['diagnosis'] += e
+                    end
                   end
                 end
 
@@ -157,7 +171,7 @@ module Sisimai
                   # Detect SMTP session error or connection error
                   if e =~ Re1[:error]
                     # The response from the remote server was:
-                    anotherset['diagnosis'] = e
+                    anotherset['diagnosis'] += e
                   else
                     # ** Address not found **
                     #
@@ -169,9 +183,14 @@ module Sisimai
                     next if e =~ Re1[:html]
 
                     if anotherset['diagnosis']
-                      # 550 #5.1.0 Address rejected.
-                      emptylines += 1 if e.empty?
-                      next if emptylines > 2
+                      # Continued error messages from the previous line like
+                      # "550 #5.1.0 Address rejected."
+                      next if emptylines > 5
+                      if e.empty?
+                        # Count and next()
+                        emptylines += 1
+                        next
+                      end
                       anotherset['diagnosis'] += ' ' + e
                     else
                       # ** Address not found **

data/lib/sisimai/mta/postfix.rb

@@ -186,11 +186,13 @@ module Sisimai
                 if cv = e.match(/[ \t][(]in reply to ([A-Z]{4}).*/)
                   # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
                   commandset << cv[1]
+                  anotherset['diagnosis'] ||= ''
                   anotherset['diagnosis'] += ' ' + e
 
                 elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
                   # to MAIL command)
                   commandset << cv[1]
+                  anotherset['diagnosis'] ||= ''
                   anotherset['diagnosis'] += ' ' + e
 
                 else