cosgrove 0.0.1rc14 → 0.0.1rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d935e0198f1e37f2bab80435479036d5c78c4cb
-  data.tar.gz: bbc9cf7a720361fed74ab9bd744466cd51556fd4
+  metadata.gz: c0cf31a43e03d935fa8f7181b3a0579555b09dab
+  data.tar.gz: 79890eac80e09015ac09e639d564d41e4f4deec0
 SHA512:
-  metadata.gz: b2cd5265122c6be0ba37ca1a9e68f4f983d45672ff6402249f6879d5668e7d9055b68c8d727d27b45cbb966bfa461d521bef2f1a6e3efabe87232bbc3bf63057
-  data.tar.gz: 230bddb62fbdc43997e8bfa0c49d760076f2c880f3bf5156f111e6f5cc0d6958cdebcec7331990ac71fcbe887a28378af236e450f1a6922055621b8ca0b59287
+  metadata.gz: 0bd2e6b8149491f186b88e88081aaf81001fffadd6bfc47e96ecd9cee11c09e2845cad9f13f4c103b78fbec29bdf1f76096faabe10abf5221d0d49cfd997b09d
+  data.tar.gz: 2cf2c9a1d6c55a20db6fe4c1b58dba0758035e08f53ba6aefefb67096604f44b058e0a4e16e88bb3f2bfcbcb652857abb627d96f495436c5c04edbd305da624c

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'radiator', '0.3.0dev4'
 gem 'steemdata-rb', require: 'steemdata', git: 'git@github.com:steem-third-party/steemdata-rb.git'
 gem 'cleverbot_rb', git: 'git@github.com:Reaver01/cleverbot_rb.git', branch: 'master'
 

data/Gemfile.lock

@@ -17,14 +17,14 @@ GIT
 PATH
   remote: .
   specs:
-    cosgrove (0.0.1rc14)
+    cosgrove (0.0.1rc15)
       activesupport (~> 5.1, >= 5.1.1)
       ai4r (~> 1.13, >= 1.13)
       discordrb (~> 3.2, >= 3.2.1)
       mechanize (~> 2.7, >= 2.7.5)
       mongoid (~> 6.1, >= 6.1.0)
       phantomjs (~> 2.1, >= 2.1.1.0)
-      radiator (= 0.3.0dev4)
+      radiator (= 0.3.0dev5)
       railties (~> 5.1, >= 5.1.1)
       rdiscount (~> 2.2, >= 2.2.0.1)
       rmagick (~> 2.16, >= 2.16.0)
@@ -151,7 +151,7 @@ GEM
     rack (2.0.3)
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
-    radiator (0.3.0dev4)
+    radiator (0.3.0dev5)
       bitcoin-ruby (= 0.0.11)
       ffi (= 1.9.18)
       hashie (~> 3.5, >= 3.5.5)
@@ -231,7 +231,6 @@ DEPENDENCIES
   minitest-line (~> 0.6, >= 0.6.3)
   minitest-proveit (~> 1.0, >= 1.0.0)
   pry (~> 0.10, >= 0.10.3)
-  radiator (= 0.3.0dev4)
   rake (~> 11.2, >= 11.2.2)
   simplecov (~> 0.11, >= 0.11.2)
   steemdata-rb!

data/cosgrove.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.3'
   spec.add_development_dependency 'awesome_print', '~> 1.7', '>= 1.7.0'
 
-  spec.add_dependency 'radiator', '0.3.0dev4'
+  spec.add_dependency 'radiator', '0.3.0dev5'
   spec.add_dependency 'steemdata-rb', '~> 0.0', '>= 0.0.1f'
   spec.add_dependency 'steem_api', '~> 1.1', '>= 1.1.0'
   spec.add_dependency 'discordrb', '~> 3.2', '>= 3.2.1'

data/lib/cosgrove/config.rb

@@ -28,12 +28,20 @@ module Cosgrove
       chain[:steem_api_url]
     end
     
+    def steem_api_failover_urls
+      chain[:steem_api_failover_urls]
+    end
+    
     def golos_api_url
       chain[:golos_api_url]
     end
     
-    def test_api_url
-      chain[:test_api_url]
+    def golos_api_failover_urls
+      chain[:golos_api_failover_urls]
+    end
+    
+    def test_api_failover_urls
+      chain[:test_api_failover_urls]
     end
     
     def steem_account
@@ -69,6 +77,12 @@ module Cosgrove
       yml[:discord][:log_mode].to_sym
     end
     
+    def discord_fancy_log
+      return false if !!ENV['HELL_ENABLED']
+      
+      yml[:discord][:fancy_log].to_s == 'true'
+    end
+    
     def channel_upvote_weight(channel_id)
       rules = yml[:cosgrove][:upvote_rules][:channels]
       default_weight = rules[:default][:upvote_weight] rescue '0.00 %'

data/lib/cosgrove/utils.rb

@@ -19,15 +19,38 @@ module Cosgrove
       true
     end
     
+    def chain_options(chain)
+      case chain
+      when :steem
+        {
+          chain: :steem,
+          url: steem_api_url,
+          failover_urls: steem_api_failover_urls
+        }
+      when :golos
+        {
+          chain: :golos,
+          url: golos_api_url,
+          failover_urls: golos_api_failover_urls
+        }
+      when :test
+        {
+          chain: :test,
+          url: test_api_url,
+          failover_urls: test_api_failover_urls
+        }
+      end
+    end
+    
     def api(chain)
       reset_api if @cycle_api_at.nil? || @cycle_api_at < 15.minutes.ago
       
       @cycle_api_at ||= Time.now
       
       case chain
-      when :steem then @steem_api ||= Radiator::Api.new(chain: :steem, url: steem_api_url)
-      when :golos then @golos_api ||= Radiator::Api.new(chain: :golos, url: golos_api_url)
-      when :test then @test_api ||= Radiator::Api.new(chain: :test, url: test_api_url)
+      when :steem then @steem_api ||= Radiator::Api.new(chain_options(chain))
+      when :golos then @golos_api ||= Radiator::Api.new(chain_options(chain))
+      when :test then @test_api ||= Radiator::Api.new(chain_options(chain))
       end
     end
     
@@ -37,9 +60,9 @@ module Cosgrove
       @cycle_api_at ||= Time.now
       
       case chain
-      when :steem then @steem_follow_api ||= Radiator::FollowApi.new(chain: :steem, url: steem_api_url)
-      when :golos then @golos_follow_api ||= Radiator::FollowApi.new(chain: :golos, url: golos_api_url)
-      when :test then @test_follow_api ||= Radiator::FollowApi.new(chain: :test, url: test_api_url)
+      when :steem then @steem_follow_api ||= Radiator::FollowApi.new(chain_options(chain))
+      when :golos then @golos_follow_api ||= Radiator::FollowApi.new(chain_options(chain))
+      when :test then @test_follow_api ||= Radiator::FollowApi.new(chain_options(chain))
       end
     end
     
@@ -55,9 +78,9 @@ module Cosgrove
       @cycle_stream_at ||= Time.now
       
       case chain
-      when :steem then @steem_stream ||= Radiator::Stream.new(url: steem_api_url)
-      when :golos then @golos_stream ||= Radiator::Stream.new(url: golos_api_url)
-      when :test then @test_stream ||= Radiator::Stream.new(url: test_api_url)
+      when :steem then @steem_stream ||= Radiator::Stream.new(chain_options(chain))
+      when :golos then @golos_stream ||= Radiator::Stream.new(chain_options(chain))
+      when :test then @test_stream ||= Radiator::Stream.new(chain_options(chain))
       end
     end
     
@@ -100,9 +123,9 @@ module Cosgrove
     
     def new_tx(chain)
       case chain
-      when :steem then Radiator::Transaction.new(chain: :steem, wif: steem_posting_wif, url: steem_api_url)
-      when :golos then Radiator::Transaction.new(chain: :golos, wif: golos_posting_wif, url: golos_api_url)
-      when :test then Radiator::Transaction.new(chain: :test, wif: test_posting_wif, url: test_api_url)
+      when :steem then Radiator::Transaction.new(chain_options(chain).merge(wif: steem_posting_wif))
+      when :golos then Radiator::Transaction.new(chain_options(chain).merge(wif: golos_posting_wif))
+      when :test then Radiator::Transaction.new(chain_options(chain).merge(wif: test_posting_wif))
       end
     end
     

data/lib/cosgrove/version.rb

@@ -1,4 +1,4 @@
 module Cosgrove
-  VERSION = '0.0.1rc14'
+  VERSION = '0.0.1rc15'
   AGENT_ID = "cosgrove/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cosgrove
 version: !ruby/object:Gem::Version
-  version: 0.0.1rc14
+  version: 0.0.1rc15
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -290,14 +290,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0dev4
+        version: 0.3.0dev5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0dev4
+        version: 0.3.0dev5
 - !ruby/object:Gem::Dependency
   name: steemdata-rb
   requirement: !ruby/object:Gem::Requirement