twitter2vk 0.2.1 → 0.2.2

data/ChangeLog

@@ -1,3 +1,6 @@
+== 0.2.2 (Багет)
+* Installer can update previous config.
+
 == 0.2.1 (Оливье)
 * Fix UTF-8 support.
 

data/bin/i18n/en.yml

@@ -5,6 +5,7 @@ vk:
   error: 'Error: VK e-mail or password is incorrect.'
 twitter: 'Twitter name: '
 config: 'Config path: '
+update_error: Overwrite config, because previous version can be loaded.
 last_message: 'File with last message ID: '
 period: 'Check period in minutes: '
 cron: Install cron task?

data/bin/i18n/ru.yml

@@ -5,6 +5,7 @@ vk:
   error: 'Ошибка: e-mail и пароль для В Контакте неправильны.'
 twitter: 'Имя в Twitter’е: '
 config: 'Путь к настройкам: '
+update_error: Старые настройки будут перезаписаны, поскольку их не удалось загрузить.
 last_message: 'Файл с ID последнего сообщения: '
 period: 'Период проверки в минутах: '
 cron: Установить задачу в cron

data/bin/twitter2vk

@@ -39,14 +39,18 @@ end
 config['vk_session'] = resource.body.match(/value='([a-z0-9]+)'/)[1]
 config['twitter']    = ask(i18n.twitter)
 
-config['exclude'] = ['#novk', :reply]
-config['include'] = ['#vk']
-config['format'] = '%status%'
-config['replace'] = []
-
 path = ask(i18n.config) { |q| q.default = "./#{config['twitter']}.yml" }
 path = File.expand_path(path)
 
+if File.exists? path
+  (config = YAML.load_file(path).merge(config)) rescue puts i18n.update_error
+end
+
+config['exclude'] = ['#novk', :reply] unless config.has_key? 'exclude'
+config['include'] = ['#vk']           unless config.has_key? 'include'
+config['replace'] = []                unless config.has_key? 'replace'
+config['format']  = '%status%'        unless config.has_key? 'format'
+
 config['last_message'] = ask(i18n.last_message) do |q|
   q.default = "./#{config['twitter']}_last_message"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2vk
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 +04:00
+date: 2009-10-18 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline