twitter2vk 0.3 → 0.3.1

data/ChangeLog

@@ -1,3 +1,8 @@
+== 0.3.1 (Рис)
+* Installer use log file in cron task.
+* Check required options in reposter.
+* Fix issue on empty last message ID file.
+
 == 0.3 (Суп)
 * Repost retweets.
 * Add last format, which will be add to status after trimmed text.

data/README.markdown

@@ -1,57 +1,8 @@
 # twitter2vk
 
-## English
-Automatic script to repost statuses from Twitter to VK. It also contain in
-separated package CLI tool to create config and add cron task.
-
-Warning: config contain session ID for VK, which can be used to get full access.
-Make sure that outsiders don’t have access to this file.
-
-By default, reply and statuses with #novk willn’t be reposted to VK (but you may
-use #vk to repost any status).
-
-You may install on server only twitter2vk_reposter package and create config
-on home computer (don’t remember to add cron task). Or you can uninstall
-twitter2vk after you create config.
-
-You can follow author @andrey_sitnik to receive last updates info.
-
-### Install
-1. Install Ruby and Rubygems. For example, on Ubuntu:
-   
-        sudo apt-get install rubygems
-   
-2. Install twitter2vk gem:
-   
-        sudo gem install twitter2vk
-   
-3. Run master to create config and add crom task:
-   
-        twitter2vk
-
-### Config
-Config is a YAML files with options:
-
-* `vk_session` – session ID to access to VK.
-* `twitter_token`, `twitter_secret` — data to access to Twitter by OAuth.
-* `exclude` – list of text or regexp patterns to exclude statuses from your VK.
-  Code `:reply` will exclude your replies to another users, `:retweet` will
-  exclude retweets by you.
-* `include` – list of text or regexp patterns to repost excluded statuses.
-* `format` – format reposted status. `%status%` will be replaced by status text,
-  `%url%` by status link on Twitter.
-* `last` — text after `format`. If status will be longer that VK allow,
-  `format` will be trim first. So `last` it useful, to set link to Twitter
-  status.
-* `retweet` — format of retweet. `%status%` will be replaced by text,
-  `%author%` will be replace by tweet author.
-* `replace` – list of array with 2 elements to replace text in status. Code
-  `:user_to_url` will replace user name to his Twitter link.
-* `last_message` – file to contain ID of last reposted message.
-
 ## По-русски
 
-Автоматический скрипт для публикации статусов Twitter’а во В Контакте. Так же
+Скрипт для автоматической публикации статусов Twitter’а во В Контакте. Так же
 в отдельном пакете есть консольная утилита для создания настроек и добавления
 задачи в cron.
 
@@ -68,6 +19,13 @@ Config is a YAML files with options:
 Вы можете последовать за автором @andrey_sitnik, чтобы получать информацию
 о последних обновлениях.
 
+Подробная статья — http://habrahabr.ru/blogs/twitter/88386/ .
+
+### Возможности
+- Не хранит пароли в настройках.
+- Поддерживает ретвиты.
+- Имеет гибкие настройки формата статуса и игнорирования статусов.
+
 ### Установка
 1. Установите Ruby и Rubygems. Например, для Ubuntu:
    
@@ -101,3 +59,57 @@ Config is a YAML files with options:
 * `replace` — список массивов из двух элементов для замены текста в статусе. Код
   `:user_to_url` заменит имена пользователей на ссылку на их Twitter.
 * `last_message` — файл, чтобы хранить ID последнего полученного сообщения.
+
+## English
+Script to automatically repost statuses from Twitter to VK. It also contain in
+separated package CLI tool to create config and add cron task.
+
+Warning: config contain session ID for VK, which can be used to get full access.
+Make sure that outsiders don’t have access to this file.
+
+By default, reply and statuses with #novk willn’t be reposted to VK (but you may
+use #vk to repost any status).
+
+You may install on server only twitter2vk_reposter package and create config
+on home computer (don’t remember to add cron task). Or you can uninstall
+twitter2vk after you create config.
+
+You can follow author @andrey_sitnik to receive last updates info.
+
+### Features
+* Don’t store passwords in config.
+* Retweet support.
+* Flexible status format and ignore rules.
+
+### Install
+1. Install Ruby and Rubygems. For example, on Ubuntu:
+   
+        sudo apt-get install rubygems
+   
+2. Install twitter2vk gem:
+   
+        sudo gem install twitter2vk
+   
+3. Run master to create config and add crom task:
+   
+        twitter2vk
+
+### Config
+Config is a YAML files with options:
+
+* `vk_session` – session ID to access to VK.
+* `twitter_token`, `twitter_secret` — data to access to Twitter by OAuth.
+* `exclude` – list of text or regexp patterns to exclude statuses from your VK.
+  Code `:reply` will exclude your replies to another users, `:retweet` will
+  exclude retweets by you.
+* `include` – list of text or regexp patterns to repost excluded statuses.
+* `format` – format reposted status. `%status%` will be replaced by status text,
+  `%url%` by status link on Twitter.
+* `last` — text after `format`. If status will be longer that VK allow,
+  `format` will be trim first. So `last` it useful, to set link to Twitter
+  status.
+* `retweet` — format of retweet. `%status%` will be replaced by text,
+  `%author%` will be replace by tweet author.
+* `replace` – list of array with 2 elements to replace text in status. Code
+  `:user_to_url` will replace user name to his Twitter link.
+* `last_message` – file to contain ID of last reposted message.

data/bin/i18n/en.yml

@@ -5,6 +5,7 @@ vk:
   error: 'Error: VK e-mail or password is incorrect.'
 twitter: "Open in browser %1\nAnd enter the number they give you: "
 config: 'Config path: '
+log: 'Log path: '
 update_error: Overwrite config, because previous version can be loaded.
 last_message: 'File with last message ID: '
 period: 'Check period in minutes: '
@@ -12,5 +13,6 @@ cron: Install cron task?
 success:
   cron: Config and cron task are created.
   print:
-    Config are created. To check your twitter automatically print `crontab -e`
-    and add `%1`
+    "Config are created.
+    \nTo check your twitter automatically print `crontab -e` and add:
+    \n%1"

data/bin/i18n/ru.yml

@@ -6,6 +6,7 @@ vk:
 
 twitter: "Откройте в браузере %1\nИ введите число, которое вам дали: "
 config: 'Путь к настройкам: '
+log: 'Путь к журналу ошибок: '
 update_error: Старые настройки будут перезаписаны, поскольку их не удалось загрузить.
 last_message: 'Файл с ID последнего сообщения: '
 period: 'Период проверки в минутах: '
@@ -13,5 +14,6 @@ cron: Установить задачу в cron
 success:
   cron: Настройки и задача для cron созданы.
   print:
-    Настройки созданы. Для автоматический проверки введите `crontab -e` и
-    добавьте туда `%1`
+    "Настройки созданы.
+    \nДля автоматический проверки введите `crontab -e` и добавьте туда:
+    \n%1"

data/bin/twitter2vk

@@ -54,11 +54,13 @@ config['twitter_secret'] = access.secret
 twitter = TwitterOAuth::Client.new(:consumer_key => KEY,
   :consumer_secret => SECRET, :token => access.token, :secret => access.secret)
 
-path = ask(i18n.config) { |q|
-  q.default = "./#{twitter.info['screen_name']}.yml"
-}
+screen_name = twitter.info['screen_name']
+path = ask(i18n.config) { |q| q.default = "./#{screen_name}.yml" }
 path = File.expand_path(path)
 
+log = ask(i18n.log) { |q| q.default = "./#{screen_name}.log" }
+log = File.expand_path(log)
+
 if File.exists? path
   (config = YAML.load_file(path).merge(config)) rescue puts i18n.update_error
 end
@@ -74,7 +76,7 @@ default = {
 config = default.merge(config)
 
 config['last_message'] = ask(i18n.last_message) do |q|
-  q.default = "./#{config['twitter']}_last_message"
+  q.default = "./#{screen_name}_last_message"
 end
 config['last_message'] = File.expand_path(config['last_message'])
 
@@ -91,7 +93,7 @@ else
   'twitter2vk_reposter'
 end
 
-task = "*/#{period} *  *   *   *      #{reposter} #{path}"
+task = "*/#{period} *  *   *   *      #{reposter} #{path} 2>> #{log}"
 
 if agree(i18n.cron) { |q| q.default = 'yes' }
   tasks = `crontab -l`
@@ -106,4 +108,3 @@ if agree(i18n.cron) { |q| q.default = 'yes' }
 else
   say i18n.success.print(task)
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2vk
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +03:00
+date: 2010-03-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: 0.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport