Skip to content

Commit

Permalink
Update retryable dependency to ~> 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sferik committed Jan 13, 2015
1 parent 7c8b497 commit 879bb83
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
22 changes: 11 additions & 11 deletions lib/t/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def favorite(status_id, *status_ids)
status_ids.unshift(status_id)
status_ids.collect!(&:to_i)
require 'retryable'
favorites = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
favorites = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.favorite(status_ids)
end
number = favorites.length
Expand Down Expand Up @@ -319,7 +319,7 @@ def followings(user = nil)
end
following_ids = client.friend_ids(user).to_a
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(following_ids)
end
print_users(users)
Expand All @@ -345,7 +345,7 @@ def followings_following(user1, user2 = nil)
following_ids = Thread.new { client.friend_ids(user2).to_a }
followings_following_ids = follower_ids.value & following_ids.value
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(followings_following_ids)
end
print_users(users)
Expand All @@ -367,7 +367,7 @@ def followers(user = nil)
end
follower_ids = client.follower_ids(user).to_a
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(follower_ids)
end
print_users(users)
Expand All @@ -392,7 +392,7 @@ def friends(user = nil)
follower_ids = Thread.new { client.follower_ids(user).to_a }
friend_ids = following_ids.value & follower_ids.value
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(friend_ids)
end
print_users(users)
Expand All @@ -417,7 +417,7 @@ def groupies(user = nil)
following_ids = Thread.new { client.friend_ids(user).to_a }
groupie_ids = (follower_ids.value - following_ids.value)
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(groupie_ids)
end
print_users(users)
Expand Down Expand Up @@ -449,7 +449,7 @@ def intersection(first_user, *users)
end
intersection = sets.reduce(:&)
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(intersection)
end
print_users(users)
Expand All @@ -475,7 +475,7 @@ def leaders(user = nil)
follower_ids = Thread.new { client.follower_ids(user).to_a }
leader_ids = (following_ids.value - follower_ids.value)
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(leader_ids)
end
print_users(users)
Expand Down Expand Up @@ -548,7 +548,7 @@ def mute(user, *users)
def muted
muted_ids = client.muted_ids.to_a
require 'retryable'
muted_users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
muted_users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(muted_ids)
end
print_users(muted_users)
Expand Down Expand Up @@ -635,7 +635,7 @@ def retweet(status_id, *status_ids)
status_ids.unshift(status_id)
status_ids.collect!(&:to_i)
require 'retryable'
retweets = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
retweets = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.retweet(status_ids, trim_user: true)
end
number = retweets.length
Expand Down Expand Up @@ -871,7 +871,7 @@ def users(user, *users)
require 't/core_ext/string'
options['id'] ? users.collect!(&:to_i) : users.collect!(&:strip_ats)
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
client.users(users)
end
print_users(users)
Expand Down
4 changes: 2 additions & 2 deletions lib/t/collectable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Collectable
MAX_PAGE = 51

def collect_with_max_id(collection = [], max_id = nil, &block)
tweets = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
tweets = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
yield(max_id)
end
return collection if tweets.nil?
Expand All @@ -31,7 +31,7 @@ def collect_with_count(count)
end

def collect_with_page(collection = ::Set.new, page = 1, previous = nil, &block) # rubocop:disable ParameterLists
tweets = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
tweets = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
block.call(page)
end
return collection if tweets.nil? || tweets == previous || page >= MAX_PAGE
Expand Down
2 changes: 1 addition & 1 deletion lib/t/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def distance_of_time_in_words(from_time, to_time = Time.now) # rubocop:disable C
def fetch_users(users, options)
format_users!(users, options)
require 'retryable'
users = retryable(tries: 3, on: Twitter::Error, sleep: 0) do
users = Retryable.retryable(tries: 3, on: Twitter::Error, sleep: 0) do
yield users
end
[users, users.length]
Expand Down
2 changes: 1 addition & 1 deletion t.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'geokit', ['>= 1.8.3', '< 2']
spec.add_dependency 'htmlentities', '~> 4.3'
spec.add_dependency 'oauth', '~> 0.4.7'
spec.add_dependency 'retryable', '~> 1.3'
spec.add_dependency 'retryable', '~> 2.0'
spec.add_dependency 'thor', ['>= 0.19.1', '< 2']
spec.add_dependency 'twitter', '~> 5.13'
spec.add_development_dependency 'bundler', '~> 1.0'
Expand Down

0 comments on commit 879bb83

Please sign in to comment.