cli_application 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba78168735c942c873ef29654d0e1c9c8d73a81
-  data.tar.gz: 76dbb97ca5ca031783e2fa207b2c3d0f49b92ba9
+  metadata.gz: 396b64a46663ed83492e82f9377ce57a4f1ff188
+  data.tar.gz: bfc59b4387917d419c521897af70bd822592275c
 SHA512:
-  metadata.gz: 143517fb5880d225cdc28ae474e3e4543ff8a6708a4f48b90fb352c363ba80c37c33af67d35a8957ee3bea57946e3eaed1a7e233dc3cc17431ea403249755943
-  data.tar.gz: 481c7078e467fd2dccd06d0a742c491084b05e147273346a83b022ce590eaee0ad7d01985e3976d7bd35816ca15a43c73017b5ddb6ebc0af530f648ef104f4a9
+  metadata.gz: f7449c7833ac02d037fc8033558851f48899b0d26d019333279d58bc6b7221d4cd4aa7f792942e782a6fdb258b226094a6ebc035bb1c1c581ca4cfa22b3a0a92
+  data.tar.gz: d0ecfcbfcddf3545f487a2772369575f46ec3835f22fe26687bc269a16afde87865e553849f1136d0316916e019b85397c182c168dcf9dc919364ecc37831011

data/lib/cli_application/argv.rb

@@ -16,7 +16,10 @@ module CliApplication
       argv.each do |one|
         if one.match(/[a-z\_0-9]\=/i)
           pair = one.split('=')
-          @params[pair.first.to_s.strip.downcase.to_sym] = pair.last
+          # UPDATE 2015-10-26 - при указании пустого параметра при запуске скрипта
+          # он становился равным самому себе, поскольку split строки вида "param="
+          # возвращал pair.first равное pair.last
+          @params[pair.first.to_s.strip.downcase.to_sym] = pair.last if pair.count > 1
         else
           warn "WARNING: некорректный ключ параметра командной строки: #{one.inspect} (#{File.basename(__FILE__)} at #{__LINE__})"
         end

data/lib/cli_application/mail_lib/sendmail.rb

@@ -59,19 +59,22 @@ module CliApplication
         # Дополнительная информация по использованию sendmail:
         #   http://blog.antage.name/posts/sendmail-in-rails.html
 
+        filename = "/tmp/cli_application_mail_#{::Time.now.usec.to_s}.msg"
+        File.open(filename, 'w') { |file| file.write(message.to_s) }
+
         cmdline = Array.new
-        cmdline << "echo \"#{'rrrrr' + message.to_s}\""
-        cmdline << '|'
         cmdline << sendmail_location
         cmdline << sendmail_arguments
+        cmdline << "< #{filename}"
         cmdline << '2>&1'
         cmdline = cmdline.join(' ')
 
         output = `#{cmdline}`
         res = $?.exitstatus
+        File.delete(filename)
 
         if res != 0
-          raise "SendmailError_#{res}"
+          raise "SendmailError_#{res} (#{output.split(/\n/).first.strip})"
         end
       end
 

data/lib/cli_application/version.rb

@@ -1,3 +1,3 @@
 module CliApplication
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/examples/1/stat/app.yml

@@ -1,33 +1,33 @@
 ---
 :name: app.rb
-:shortdescription: "Пример 7 - Отправка почты"
+:shortdescription: "Пример 4 - Различные параметры командной строки"
 :version: '1.0'
 :releasedate: '2015-05-11'
 :timezone: Moscow
-:last_started_at: '2015-06-10 22:49:55 +0300'
+:last_started_at: '2015-10-26 22:16:55 +0300'
 :folders:
-  :app: "/Users/Stan/Documents/Development/RubyMine/cli_application/test/examples/7"
+  :app: "/Users/Stan/Documents/Development/RubyMine/cli_application/test/examples/8"
   :class: "/Users/Stan/Documents/Development/RubyMine/cli_application/test/examples/1"
   :stat: "/Users/Stan/Documents/Development/RubyMine/cli_application/test/examples/1/stat"
 :avg:
-  :starts: 234
-  :executed_at: 4.56955
-  :executed_at_human: 4.56955 секунд
-  :memory: 35388
+  :starts: 241
+  :executed_at: 4.43788
+  :executed_at_human: 4.43788 секунд
+  :memory: 35433
 :last:
-  :started_at: '2015-06-10 22:49:55 +0300'
-  :executed_at: 0.033085
-  :executed_at_human: 0.033085 секунд
-  :memory: 37 кбайт
-  :exitcode: true
+  :started_at: '2015-10-26 22:16:55 +0300'
+  :executed_at: 0.029927
+  :executed_at_human: 0.029927 секунд
+  :memory: 36 кбайт
+  :exitcode: 0
 :last10:
+- 2015-10-26 22:16:55 +0300,0,0.029927,36 кбайт
+- 2015-10-26 22:16:01 +0300,0,0.02892,36 кбайт
+- 2015-10-26 22:10:40 +0300,0,0.033229,36 кбайт
+- 2015-10-26 22:10:25 +0300,0,0.036708,36 кбайт
+- 2015-10-26 22:08:56 +0300,0,0.036485,38 кбайт
+- 2015-10-26 22:07:56 +0300,0,0.035323,36 кбайт
+- 2015-10-26 22:04:20 +0300,255,0.053609,35 кбайт
 - 2015-06-10 22:49:55 +0300,true,0.033085,37 кбайт
 - 2015-06-09 23:56:11 +0300,255,0.033716,37 кбайт
 - 2015-06-09 23:44:51 +0300,true,0.053136,36 кбайт
-- 2015-06-09 23:37:45 +0300,true,0.06403,37 кбайт
-- 2015-06-09 23:35:54 +0300,true,0.050132,37 кбайт
-- 2015-06-09 23:35:40 +0300,true,0.047642,36 кбайт
-- 2015-06-09 23:32:41 +0300,true,0.04385,37 кбайт
-- 2015-06-09 23:31:44 +0300,true,0.060342,37 кбайт
-- 2015-06-09 23:30:06 +0300,true,0.048131,36 кбайт
-- 2015-06-09 23:29:48 +0300,true,0.044662,36 кбайт

data/test/examples/8/app.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+#encoding: utf-8
+require '../1/cli_example.rb'
+
+class TestApp < CliExample
+
+  def main
+    puts argv.inspect
+
+    puts
+    0
+  end
+
+end
+
+app = TestApp.new(ARGV, __dir__)
+
+app.version = '1.0'
+app.releasedate = '2015-05-11'
+app.shortdescription = 'Пример 4 - Различные параметры командной строки'
+app.description = "CliApplication gem демо. #{app.shortdescription}"
+
+app.set_argv(:string, 'arg1', 'def', 'Пример пустой строки в качестве аргумента по умолчанию')
+
+app.help
+app.footer = "{status} ({exitcode}) - приложение завершено за {executed_at} секунд (занято в памяти {memory})"
+
+app.run
+exit(app.exitcode)
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cli_application
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Stan Zhuravlev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - test/examples/6/offer.rb
 - test/examples/7/app.rb
 - test/examples/7/mail/app-mail-2015-06-10.txt
+- test/examples/8/app.rb
 - test/stat/rdebug-ide
 - test/stat/test_app.yml
 - test/test_app.rb