tunnelblick 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9020554bb01597251a84afa93fba28b1671af724
-  data.tar.gz: fd009bc41776853bcb9f2e04e6a85d23c463db28
+  metadata.gz: fc3e6167cf01210b6feaec5ffebc749501876b83
+  data.tar.gz: 38d9e73b2c1a9e3a2afa1f46d6650353a6d10710
 SHA512:
-  metadata.gz: 2a702b9771234bc39044122f84ae7e261f1fd5370ca68513343f759924fce7ac479d68420fe341f0016b9e69a41291f321b4ebf169576207a56f81b3a854d711
-  data.tar.gz: d98223bba55c2de548553efcd3dfd8be9b87fde4bf8ba49ff390b5bae44643d9d201706df4793880e538b23e7f603be02dc0e88559fe54c114bce9178b3725f3
+  metadata.gz: 7c7f62780f49ba8cb5da03718e77b898366f79c2154d9c3c8dec4934a4abd3b562bcd6672973f3d1e97fd20b95a9fbf97e1b530fdeda802d11549c6861096d19
+  data.tar.gz: 2f8b9fd8f188da55978d7a1de510ed592041bdd89660698d278b4904022dba5bb702128ed7103815e5f53ba17e47db7446be827e5556882902f062cc6de9f44d

data/lib/tunnel_blick.rb

@@ -3,14 +3,13 @@ require 'flex_console'
 require 'flex_pg'
 require 'open-uri'
 require 'rb-scpt'
-require 'tunnel_blick/express_vpn'
+require_relative 'tunnel_blick/express_vpn'
 
 include Appscript
 
 class TunnelBlick
 
-  attr_accessor :tunnel, :module, :d_id, :my_ip, :max_requests, :arguments,
-                :doms, :allowance
+  attr_accessor :tunnel, :module, :d_id, :max_requests, :arguments, :doms, :allowance
   attr_reader :database
 
   def initialize (database = Dummy.new('dummy database'))
@@ -30,7 +29,7 @@ class TunnelBlick
   def add_websites (*websites)
     websites.each { |w|
       w.tunnel = self
-      w.allowance = allowance
+      w.allowance = @allowance
     }
   end
 
@@ -62,33 +61,43 @@ class TunnelBlick
   def reallocate
     disconnect
     @allowance = 0
-    connect_smart(max_requests, arguments, *doms)
+    connect_smart(@max_requests, @arguments, *@doms)
   end
 
-  def connect_smart (limit, args = {}, *domains)
+  def connect_smart (limit, args = {}, *websites)
     @allowance = 0
-    blocked = true
+    blocked = false
+    domains = websites.map {|ws|
+      extract = ws.home_url.scan(/[^\/]+/)
+      dom = extract.size == 1 ? extract[0] : extract[1]
+      database[:websites][domain_url: dom][:id]
+    }
 
-    while @allowance < 1 || blocked
-      database.disconnect
-      puts @my_ip = open('http://icanhazip.com').read.strip if my_ip.nil?
+    puts @my_ip = open('http://icanhazip.com').read.strip if @my_ip.nil?
 
+    while @allowance < 1 || blocked
       blocked = false
+      database.disconnect
       connect_rand(3, args) unless connected?
 
-      allowances = domains.map { |dom|
-        limit - database[:browser_requests].where(ip_address: my_ip, domain: dom).count
-      }
-
       domains.each { |dom|
-        result = database[:website_ip_status].where(public_ip: my_ip, website: dom, status: 'blocked').count
+        result = database[:website_ip_status].where(public_ip: @my_ip, website: dom, status: 'blocked').count
+
         if result != 0
           puts 'This ip is blocked'
           blocked = true
         end
       }
-      puts @allowance = allowances.min
-      disconnect if @allowance < 1 || blocked
+      puts blocked
+
+      unless blocked
+        allowances = domains.map { |dom|
+          limit - database[:browser_requests].where(ip_address: @my_ip, domain: dom).count
+        }
+        puts @allowance = allowances.min
+      end
+
+      disconnect if blocked || @allowance < 0
     end
 
     @max_requests = limit
@@ -107,10 +116,10 @@ class TunnelBlick
     unless connected?
       puts 'connect_rand'
       if args[:filter].nil?
-        tunnel.connect(vpn_configs.sample)
+        @tunnel.connect(vpn_configs.sample)
       else
         puts shortlist = config_filter(args[:filter])
-        tunnel.connect(shortlist.sample)
+        @tunnel.connect(shortlist.sample)
       end
 
       count = 0
@@ -136,7 +145,7 @@ class TunnelBlick
     sleep(3)
     puts @my_ip = open('http://icanhazip.com').read.strip
 
-    details.store(:public_ip, my_ip)
+    details.store(:public_ip, @my_ip)
 
     sleep(6)
     database[:ip_addresses].upsert(details)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunnelblick
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Eugene Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: A controller for Tunnelblick