reddit_bot 1.6.13 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645a6f7aaf1ab61bbc83b3a4d3a7d57f8f305e1a
-  data.tar.gz: 6a76531bfabed4d18796d6a25fce201113e07407
+  metadata.gz: f0c06107eb4207ba45e047f0215189bd5fe47fc2
+  data.tar.gz: e0d609e5b43af0229d3b8f96b0f9dd406635ae56
 SHA512:
-  metadata.gz: 59c592e1b11fac0a770a17e2d25a7283d08b49d79b4e5f414d495a1762ad1abdbedd09af84614b39a0f87a24c77d7ea309111eff0b2d0d0c87751723445c9aa8
-  data.tar.gz: 3dd6469209d4991668f60d8658115a6ffd9be6e77a209cd05d740c96475213f64cfa829b1854c57000cfe1507c41c6e700ec90935b955823da98a2ddc99d14c9
+  metadata.gz: 4978e63e9a25c61094f15db396f274099e4ccf9f475fb1c71b630d9fe717cd07764a29fd3bb56533cedc55e071a79cd1a37911255635663d2f20d7c7507931bc
+  data.tar.gz: 07cf64c0550cb8505a2dfb87b86bf503680ac24c3020ba3791aede79fe9ea452fd307a164b8abf647f9bca311eb124ed18b117d2b0e64e1e44f7f856d62bdd13

data/README.md

@@ -67,9 +67,11 @@ or via Gemfile:
 
 helloworld.rb:
 
-    require "reddit_bot"
+```ruby
+require "reddit_bot"
+```
 
-You obviously can't run these examples as is, because they use some dependencies that are not in git repo, like `secrets.yaml` file for Reddit authorization of the following format:
+You obviously can't run these examples as is, because they use local configs that are not in git repo, like `secrets.yaml` file for Reddit authorization of the following format:
 
     :client_id: Kb9.......6wBw
     :client_secret: Fqo.....................AFI
@@ -77,6 +79,12 @@ You obviously can't run these examples as is, because they use some dependencies
     :login: MyBotUsername
     # :user_agent: optional_custom_useragent_to_bypass_reddit_spam_protection
 
+To change the log level:
+
+```ruby
+RedditBot.logger.level = Logger::ERROR
+```
+
 To update the gem version in Gemfile.lock when using Gemfile like this: `gem "reddit_bot", "~>1.1.0"`, do the:
 
     $ bundle update reddit_bot

data/examples/Gemfile.lock

@@ -1,35 +1,17 @@
-GIT
-  remote: git@github.com:Nakilon/imgur2array.git
-  revision: eea2aa8a39d72726318aae8805b66bcddd7acbb6
-  tag: v0.0.2.7
-  specs:
-    imgur2array (0.0.2.7)
-
-GIT
-  remote: git@github.com:Nakilon/nethttputils.git
-  revision: 84ac32db6d44b68f5bd6e2f1ce8698fc5e2ad968
-  tag: v0.0.4.1
-  specs:
-    nethttputils (0.0.4.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    fastimage (1.7.0)
-      addressable (~> 2.3, >= 2.3.5)
     json (2.1.0)
-    public_suffix (2.0.5)
+    nethttputils (0.2.5.1)
+    reddit_bot (1.6.13)
+      json
+      nethttputils (~> 0.2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fastimage (= 1.7.0)
-  imgur2array!
-  json
-  nethttputils!
+  reddit_bot
 
 BUNDLED WITH
-   1.16.0
+   1.17.1

data/examples/councilofricks/main.rb

@@ -1,6 +1,6 @@
 require_relative "../boilerplate"
 
-BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
+BOT = RedditBot::Bot.new YAML.load_file "secrets.yaml"
 SUBREDDIT = "CouncilOfRicks"
 
 CSS_CLASS = "blueflair"

data/examples/cptflairbot3/main.rb

@@ -1,5 +1,5 @@
 require_relative "../boilerplate"
-BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
+BOT = RedditBot::Bot.new YAML.load_file "secrets.yaml"
 
 require "gcplogger"
 logger = GCPLogger.logger "cptflairbot3"

data/examples/devflairbot/main.rb

@@ -4,7 +4,7 @@
 #   so it's possible to miss if bot is down for a while but in fact it's enough stable and does not go down.
 
 require_relative "../boilerplate"
-BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
+BOT = RedditBot::Bot.new YAML.load_file "secrets.yaml"
 
 fail("no ENV['ERROR_REPORTING_KEYFILE'] specified") unless ENV["ERROR_REPORTING_KEYFILE"]
 require "google/cloud/error_reporting"

data/examples/largeimages/Gemfile.lock

@@ -85,7 +85,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     os (0.9.6)
     public_suffix (2.0.5)
-    reddit_bot (1.6.10)
+    reddit_bot (1.6.13)
       json
       nethttputils (~> 0.2.5.1)
     rly (0.2.3)

data/examples/largeimages/main.rb

@@ -16,7 +16,7 @@ require "directlink"
 require "nokogiri"
 
 require "../boilerplate"
-BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
+BOT = RedditBot::Bot.new YAML.load_file "secrets.yaml"
 
 INCLUDE = %w{
     user/kjoneslol/m/sfwpornnetwork

data/examples/mlgtv/main.rb

@@ -1,6 +1,6 @@
 require_relative File.join "../boilerplate"
 
-BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
+BOT = RedditBot::Bot.new YAML.load_file "secrets.yaml"
 
 SUBREDDIT = "codcompetitive"
 

data/examples/sexypizza/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     json (2.1.0)
-    reddit_bot (1.3.0)
+    reddit_bot (1.3.1)
       json
 
 PLATFORMS
@@ -12,4 +12,4 @@ DEPENDENCIES
   reddit_bot (~> 1.3.0)
 
 BUNDLED WITH
-   1.13.1
+   1.17.1

data/examples/sexypizza/main.rb

@@ -4,7 +4,6 @@ BOT = RedditBot::Bot.new YAML.load(File.read "secrets.yaml"), ignore_captcha: tr
 SUBREDDIT = "sexypizza"
 
 loop do
-  Hearthbeat.beat "u_SexyPizzaBot_r_sexypizza", 3610 unless Gem::Platform.local.os == "darwin"
   puts "LOOP #{Time.now}"
 
   flairs = BOT.json(:get, "/r/#{SUBREDDIT}/api/flairlist", {limit: 1000})["users"]

data/examples/wallpaper/Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "fastimage", "1.7.0"
-gem "reddit_bot", "~>1.3.0"
-gem "net_http_utils", ?0, gist: "97549ceb58d21e1fcbc0e6cdaf92fce8"
+gem "nokogiri", "~>1.6.7"   # Ruby 2.0
+gem "public_suffix", "<3.0" # Ruby 2.0
+gem "directlink"

data/examples/wallpaper/Gemfile.lock

@@ -1,26 +1,33 @@
-GIT
-  remote: https://gist.github.com/97549ceb58d21e1fcbc0e6cdaf92fce8.git
-  revision: 54c47ab3f9665f3e35a8e94fdd267e3743c736a9
-  specs:
-    net_http_utils (0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
-    fastimage (1.7.0)
-      addressable (~> 2.3, >= 2.3.5)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    directlink (0.0.4.7)
+      addressable
+      fastimage (~> 2.1.3)
+      kramdown
+      nokogiri
+      reddit_bot (~> 1.6.13)
+    fastimage (2.1.5)
     json (2.1.0)
-    reddit_bot (1.3.0)
+    kramdown (1.17.0)
+    mini_portile2 (2.1.0)
+    nethttputils (0.2.5.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    public_suffix (2.0.5)
+    reddit_bot (1.6.13)
       json
+      nethttputils (~> 0.2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fastimage (= 1.7.0)
-  net_http_utils (= 0)!
-  reddit_bot (~> 1.3.0)
+  directlink
+  nokogiri (~> 1.6.7)
+  public_suffix (< 3.0)
 
 BUNDLED WITH
-   1.13.1
+   1.17.1

data/examples/wallpaper/main.rb

@@ -1,31 +1,25 @@
 require_relative "../boilerplate"
 
-BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
+BOT = RedditBot::Bot.new YAML.load_file "secrets.yaml"
 SUBREDDIT = "wallpaper"
 
-if Gem::Platform.local.os == "darwin"
-  require_relative "../../../../dimensioner/get_dimensions"
-else
-  require_relative "#{Dir.home}/get_dimensions"
-end
+require "directlink"
 
 checked = []
 loop do
-  Hearthbeat.beat "u_wallpaperpedantbot_r_#{SUBREDDIT}", 70 unless Gem::Platform.local.os == "darwin"
   puts "LOOP #{Time.now}"
 
   BOT.json(:get, "/r/#{SUBREDDIT}/new")["data"]["children"].each do |post|
     id, url, title, subreddit = post["data"].values_at(*%w{ id url title subreddit })
     next if checked.include? id
     checked.push id
-    next puts "skipped #{url} from http://redd.it/#{id}" if :skipped == _ = GetDimensions::get_dimensions(url)
-    next puts "unable #{url} from http://redd.it/#{id}" unless _
-    width, height, best_direct_url, *all_direct_urls = _
-
-    resolution = "#{width}x#{height}"
-    result = title[/\s*\[?#{width}\s*[*x×]\s*#{height}\]?\s*/i]
-    puts "#{!!result} #{id} [#{resolution}] #{title} #{url}"
-    BOT.report "true resolution is #{resolution}", "t3_#{id}" unless result
+    t = DirectLink url
+    (t.is_a?(Array) ? t : [t]).each do |s|
+      resolution = "#{s.width}x#{s.height}"
+      result = title[/\s*\[?#{s.width}\s*[*x×]\s*#{s.height}\]?\s*/i]
+      puts "#{!!result} #{id} [#{resolution}] #{title} #{s.url}"
+      BOT.report "true resolution is #{resolution}", "t3_#{id}" unless result
+    end
   end
 
   puts "END LOOP #{Time.now}"

data/examples/yayornay/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     json (2.1.0)
-    reddit_bot (1.3.0)
+    reddit_bot (1.3.1)
       json
 
 PLATFORMS
@@ -12,4 +12,4 @@ DEPENDENCIES
   reddit_bot (~> 1.3.0)
 
 BUNDLED WITH
-   1.13.1
+   1.17.1

data/examples/yayornay/main.rb

@@ -4,7 +4,6 @@ SUBREDDIT = "yayornay"
 BOT = RedditBot::Bot.new YAML.load(File.read "secrets.yaml"), subreddit: SUBREDDIT
 
 loop do
-  Hearthbeat.beat "u_gotfan247_r_yayornay", 310 unless Gem::Platform.local.os == "darwin"
   puts "LOOP #{Time.now}"
 
   BOT.each_new_post_with_top_level_comments do |post, comments|

data/lib/reddit_bot.rb

@@ -1,7 +1,6 @@
 STDOUT.sync = true
 # require "pp"
 
-require "net/http"
 require "openssl"
 require "json"
 
@@ -228,13 +227,16 @@ module RedditBot
 
     def resp_with_token mtd, path, form
       fail unless path.start_with? ?/
+      timeout = 5
       begin
         reddit_resp mtd, "https://oauth.reddit.com" + path, form, {
           "Authorization" => "bearer #{token}",
           "User-Agent" => "bot/#{@user_agent || @name}/#{RedditBot::VERSION} by /u/nakilon",
         }
       rescue NetHTTPUtils::Error => e
-        sleep 5
+        sleep timeout
+        Module.nesting[1].logger.info "sleeping #{timeout} seconds because of #{e.code}"
+        timeout *= 2
         raise unless e.code == 401
         @token_cached = nil
         retry

data/lib/reddit_bot/version.rb

@@ -1,3 +1,3 @@
 module RedditBot
-  VERSION = "1.6.13" # :nodoc:
+  VERSION = "1.7.0" # :nodoc:
 end

data/reddit_bot.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   # spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "json"
-  spec.add_runtime_dependency "nethttputils", "~>0.2.5.1"
+  spec.add_runtime_dependency "nethttputils", "~>0.3.1.0"
   # spec.add_development_dependency "bundler", "~> 1.11"
   # spec.add_development_dependency "rake", "~> 10.0"
   # spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.6.13
+  version: 1.7.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5.1
+        version: 0.3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5.1
+        version: 0.3.1.0
 description: better than PRAW
 email:
 - nakilon@gmail.com