reddit_bot 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a923835e5dce5295e1f05fd79ae40ed2f9541bc9
-  data.tar.gz: 72bbf9aec3c05fe6ccd222e35ebf5bb725206385
+  metadata.gz: a756bbcad28e9879156bae2d179a1a0ffbfd23cb
+  data.tar.gz: 445b9143887ba23365e3d63bfeb588da2ecc2e89
 SHA512:
-  metadata.gz: ee1e05ae9fe6f118cef51d12477fe212199414f9d1583868a75cc3890912d4370f2a8764d119c40fbd0e5a2fdbe8c6cc45e6eb98ea895e9143f64845e45c9a89
-  data.tar.gz: c7146ba14d38b31565ba1dbe2884f0ffc336592962753fb38370a59a3420762d0dfeb620562b16f3c552e1f36b7bbdae23915293e23cd2bf580b63fd27afb0ff
+  metadata.gz: 44c2a8ab8d5e4efe84903868750211add7aa7d7375b27d152792d5d360d68df5532fa03d03a1b9e65ab9c56a83c464f854c15bfa2a9d71849f09d97b5a524418
+  data.tar.gz: 9b8d687724b41b0ba8c8a400afd9c66fcc6961bb00660e4891032487190d9f6b935dfbfb51c582016455cb8d23847b695312a5942310dbbdef75a3423d119797

data/examples/devflairbot/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem "reddit_bot", "~>1.3.0"
-gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.0.3.1"
+gem "reddit_bot", "~>1.5.4"
+gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.0.4"

data/examples/devflairbot/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git@github.com:Nakilon/nethttputils.git
-  revision: 856f3a44f48c314ed3fdcf4532f7a7dd85ec31ef
-  tag: v0.0.3.1
+  revision: 6cb2b6a2422d82e266e08b16da4fa29e809fd260
+  tag: v0.1.0.4
   specs:
-    nethttputils (0.0.3.1)
+    nethttputils (0.1.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     json (2.1.0)
-    reddit_bot (1.3.0)
+    reddit_bot (1.5.4)
       json
 
 PLATFORMS
@@ -17,7 +17,7 @@ PLATFORMS
 
 DEPENDENCIES
   nethttputils!
-  reddit_bot (~> 1.3.0)
+  reddit_bot (~> 1.5.4)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/examples/devflairbot/main.rb

@@ -3,7 +3,6 @@
 BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
 
 loop do
-  Hearthbeat.beat "u_DevFlairBot_r_ion_r_survivetheculling", 130 unless Gem::Platform.local.os == "darwin"
   puts "LOOP #{Time.now}"
 
   [
@@ -15,7 +14,8 @@ loop do
     JSON.parse( begin
       NetHTTPUtils.request_data "https://www.reddit.com/r/#{subreddit}/comments.json", header: ["User-Agent", "ajsdjasdasd"]
     rescue NetHTTPUtils::Error => e
-      raise unless e.code == 503
+      raise unless [503, 504].include? e.code
+      sleep 60
       retry
     end )["data"]["children"].each do |comment|
       id = comment["data"]["link_id"][3..-1]

data/examples/largeimages/Gemfile

@@ -2,14 +2,14 @@
 
 gem "json"
 
-gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.0.1"
+gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.2.0"
 
 gem "reddit_bot", "~>1.5.2"
 gem "nokogiri"
 
 gem "imgur2array", git: "git@github.com:Nakilon/imgur2array.git", tag: "v0.0.2.9"
 gem "fastimage", "~>1.7.0"
-gem "url2dimensions", git: "git@github.com:Nakilon/url2dimensions.git", tag: "v0.0.0.4"
+gem "url2dimensions", git: "git@github.com:Nakilon/url2dimensions.git", tag: "v0.0.0.6"
 
 gem "gcplogger", git: "git@github.com:Nakilon/gcplogger.git", tag: "v0.0.2.0"
 gem "google-cloud-error_reporting"

data/examples/largeimages/Gemfile.lock

@@ -15,17 +15,17 @@ GIT
 
 GIT
   remote: git@github.com:Nakilon/nethttputils.git
-  revision: 9e357649157955d0fc476b88966aa9a4435ff57a
-  tag: v0.1.0.1
+  revision: 620051619245a3b0b00447817831c6fb676d3df7
+  tag: v0.1.2.0
   specs:
-    nethttputils (0.1.0.1)
+    nethttputils (0.1.2.0)
 
 GIT
   remote: git@github.com:Nakilon/url2dimensions.git
-  revision: 7364b82617bcdb7fafd5dd2bee268fedefe24074
-  tag: v0.0.0.4
+  revision: 2aae1c5a8a8f8d06c38ae3ab370ed4ed4c5d7a4b
+  tag: v0.0.0.6
   specs:
-    url2dimensions (0.0.0.4)
+    url2dimensions (0.0.0.6)
 
 GEM
   remote: https://rubygems.org/
@@ -112,4 +112,4 @@ DEPENDENCIES
   url2dimensions!
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/examples/largeimages/main.rb

@@ -44,7 +44,7 @@ fail unless 1 == search_url["https://i.imgur.com/9JTxtjW.jpg"].size
 
 loop do
   begin
-    logger.warn "LOOP #{Time.now}"
+    logger.info "LOOP #{Time.now}"
   rescue => e
     puts "oops"
     Google::Cloud::ErrorReporting.report e
@@ -84,7 +84,8 @@ loop do
       checked << id
       # next if Gem::Platform.local.os == "darwin" # prevent concurrent posting
       logger.debug "image url for #{id}: #{url}"
-      next logger.warn "skipped a post by /u/sjhill" if author == "sjhill"
+      next logger.warn "skipped a post by /u/sjhill" if author == "sjhill"      # opt-out
+      next logger.warn "skipped a post by /u/bekalaki" if author == "bekalaki"  # 9 ways to divide karmawhore
 
       next logger.warn "skipped (URL2Dimensions :skipped) #{url} from http://redd.it/#{id}" if :skipped == _ = begin
         URL2Dimensions::get_dimensions CGI.unescape_html url
@@ -97,7 +98,7 @@ loop do
       width, height, best_direct_url, *all_direct_urls = _
       logger.info "URL2Dimensions: %p" % [[width, height, best_direct_url, all_direct_urls.size]]
       unless min_resolution <= width * height
-        next logger.info "skipped low resolution #{source}"
+        next logger.debug "skipped low resolution #{source}"
       end
       # next if Gem::Platform.local.os == "darwin" # prevent concurrent posting
       # puts "https://www.reddit.com/r/LargeImages/search.json?q=url%3A#{CGI.escape url}&restrict_sr=on"
@@ -155,6 +156,6 @@ loop do
     end
   end
 
-  logger.warn "END LOOP #{Time.now}"
+  logger.info "END LOOP #{Time.now}"
   sleep 300
 end

data/examples/realtimeww2/.bashrc

@@ -0,0 +1 @@
+echo "TEST=_ bundle exec ruby main.rb"

data/examples/realtimeww2/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 gem "reddit_bot", "~>1.5.3"
-gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.0.1"
+gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.0.4"

data/examples/realtimeww2/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: git@github.com:Nakilon/nethttputils.git
-  revision: 9e357649157955d0fc476b88966aa9a4435ff57a
-  tag: v0.1.0.1
+  revision: 6cb2b6a2422d82e266e08b16da4fa29e809fd260
+  tag: v0.1.0.4
   specs:
-    nethttputils (0.1.0.1)
+    nethttputils (0.1.0.4)
 
 GEM
   remote: https://rubygems.org/
@@ -20,4 +20,4 @@ DEPENDENCIES
   reddit_bot (~> 1.5.3)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/lib/reddit_bot.rb

@@ -201,44 +201,8 @@ module RedditBot
     end
 
     def reddit_resp *args
-      response = nil
-      tap do
-        response = _resp *args
-        case response.code
-        when "502", "503", "520", "500", "521", "504", "400", "522", "504"
-          puts "LOL #{response.code} at #{Time.now}?"
-          p args
-          sleep 60
-          redo
-        when "409"
-          puts "Conflict (409)? at #{Time.now}?"
-          p args
-          sleep 5
-          redo
-        when "401"
-          puts "probably token is expired (401): #{response.body}"
-          sleep 5
-          # init *@secrets
-          @token_cached = nil # maybe just update_captcha?
-          throw :"401"
-        when "403"
-          puts "access denied: #{response.body} when requesting: #{args}"
-          sleep 300
-          redo
-          # throw :"403"
-        when "200"
-          "ok"
-        else
-          # puts response.body if response.code == "400"
-          # fail "#{response.code} at '#{args[1]}'"
-          fail "#{response.code} for '#{args}'"
-        end
-      end
-      response.body
-    end
-
-    def _resp mtd, url, form, headers, base_auth = nil
-      NetHTTPUtils.get_response(url, mtd, form: form, header: headers, auth: base_auth).tap do |response|
+      mtd, url, form, headers, base_auth = *args
+      NetHTTPUtils.request_data(url, mtd, form: form, header: headers, auth: base_auth) do |response|
         next unless remaining = response.to_hash["x-ratelimit-remaining"]
         if Gem::Platform.local.os == "darwin"
           puts %w{

data/lib/reddit_bot/version.rb

@@ -1,3 +1,3 @@
 module RedditBot
-  VERSION = "1.5.4" # :nodoc:
+  VERSION = "1.6.0" # :nodoc:
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: better than PRAW
@@ -77,6 +77,7 @@ files:
 - examples/oneplus/Gemfile
 - examples/oneplus/Gemfile.lock
 - examples/oneplus/main.rb
+- examples/realtimeww2/.bashrc
 - examples/realtimeww2/Gemfile
 - examples/realtimeww2/Gemfile.lock
 - examples/realtimeww2/main.rb
@@ -102,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Library for Reddit bots