twitter2vk_reposter 0.3.9 → 0.4

data/ChangeLog

@@ -1,3 +1,8 @@
+== 0.4 (Тефтели)
+* Fix Twitter OAuth in reposter.
+* Add --debug option to reposter.
+* Show error messages from Twitter on reposting.
+
 == 0.3.9 (Мармелад)
 * Remove Twitter OAuth consumer key and secret from sources. Twitter policy deny
   open API keys in sources, so now you must create your own Twitter app to use

data/bin/twitter2vk_reposter

@@ -14,10 +14,25 @@ require 'yaml'
 require 'open-uri'
 require 'net/http'
 
-if ARGV.empty? or '--help' == ARGV.first or '-h' == ARGV.first
-  puts 'Usage: twitter2vk_reposter.rb CONFIG'
+help = false
+debug = false
+config_path = nil
+ARGV.each do |arg|
+  if '--help' == arg or '-h' == arg
+    help = true
+  elsif '--debug' == arg
+    debug = true
+  else
+    config_path = arg
+  end
+end
+
+if help or config_path.nil?
+  puts 'Usage: twitter2vk_reposter.rb [OPTION] CONFIG'
   puts 'Repost Twitter statuses to VK.com. Call twitter2vk script to create ' +
        'config and add cron task.'
+  puts 'You can use --debug option to show next message to repost. Program ' +
+       'would not repost it or save it ID in last_message_id file.'
   exit 0
 end
 
@@ -89,7 +104,7 @@ default = {
   'last'    => '',
   'retweet' => 'RT %author%: %status%'
 }
-config = default.merge(YAML.load_file(ARGV.first))
+config = default.merge(YAML.load_file(config_path))
 
 missed = %w{twitter_token twitter_secret last_message vk_session} - config.keys
 unless missed.empty?
@@ -104,15 +119,25 @@ end
 last_message = nil unless last_message =~ /^\d/
 
 begin
-  twitter = TwitterOAuth::Client.new(:consumer_key => 'lGdk5MXwNqFyQ6glsog0g',
-    :consumer_secret => 'jHfpLGY11clNSh9M0Fqnjl7fzqeHwrKSWTBo4i8TUcE',
-    :token => config['twitter_token'], :secret => config['twitter_secret'])
+  twitter = TwitterOAuth::Client.new(
+    :consumer_key    => config['twitter_consumer_key'],
+    :consumer_secret => config['twitter_consumer_secret'],
+    :token           => config['twitter_token'],
+    :secret          => config['twitter_secret'])
   if last_message
     query = { :since_id => last_message }
   else
     query = { :count => 1 }
   end
-  statuses = twitter.user_timeline(query) + twitter.retweeted_by_me(query)
+  tweets   = twitter.user_timeline(query)
+  retweets = twitter.retweeted_by_me(query)
+  [tweets, retweets].each do |array|
+    unless array.is_a? Array
+      STDERR.puts 'Wrong answer from Twitter: ' + array.inspect
+      exit 1
+    end
+  end
+  statuses = tweets + retweets
   statuses.sort! { |a, b| a['id'] <=> b['id'] }
 rescue JSON::ParserError => e
   exit 1
@@ -128,11 +153,17 @@ unless statuses.empty?
     next unless repost? status, config
     text = format_status(status, config)
     last_message_id = status['id']
-    vk.set_status(text)
+    if debug
+      puts "Message to VK:\n#{text}"
+    else
+      vk.set_status(text)
+    end
     break
   end
   
   if last_message_id
-    File.open(config['last_message'], 'w') { |io| io << last_message_id }
+    unless debug
+      File.open(config['last_message'], 'w') { |io| io << last_message_id }
+    end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: twitter2vk_reposter
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik