tunnelblick 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66f4735c7dfe937fc36c330ab403cc67c080aef
-  data.tar.gz: 4f8955327de66bcc3d9bf846c5b2feeecfef8664
+  metadata.gz: 4f36c8ae27a7e36bf54072b78fa2681cc9387514
+  data.tar.gz: 73350a0eede1e321a4c4dee3a44a946897d0d4fb
 SHA512:
-  metadata.gz: 0c4061147ecf0e5b51a0de51166399ebf59727f0be81779d734ff97e22668e50d5bcab86f4fa6b917823082138015190f909f733a9a988bb746791fea927e500
-  data.tar.gz: c3da8c77a288113d08514f2e89091dae6d6e9ea8632ac2fc9ef88b04fe9575b2dc0d2dea35d5d41070a595c1b23a5b3240610fc14c2e881812b91d3c486d63fe
+  metadata.gz: 66d8cf838fb232b4c6e4ad2d4de91f9a64e74dbd915fde14f8f9b1546d2f210e5788a0f26afc42b9e7c2c189f67dcbcd0050cf596a8f50cb32fe3d29fc9674bd
+  data.tar.gz: 12293c3f760876abf43c23a62dfa6a6caa536327ff62ffc9f8d9f76e59755e5ea72a610d27af7a11813919c09561a8b112915276cb1e3aff3faca35c14dd7662

data/lib/tunnel_blick.rb

@@ -1,62 +1,155 @@
+require 'flex_config'
+require 'flex_console'
+require 'flex_pg'
+require 'open-uri'
 require 'rb-scpt'
 require 'tunnel_blick/express_vpn'
 
 include Appscript
 
-module TunnelBlick
+class TunnelBlick
 
-  class << self
-    attr_accessor :tunnel, :module, :d_id
+  attr_accessor :tunnel, :module, :d_id, :my_ip, :max_requests, :arguments,
+                :doms, :allowance
+  attr_reader :database
 
-    def config_match (file_name)
-      case file_name
-        when /\Amy_expressvpn.+/
-          puts 'Express VPN'
-        else
-          puts 'VPN not recognized.'
-      end
-    end
+  def initialize (database = Dummy.new('dummy database'))
+    @config = FlexConfig.new('/Users/YCL/Documents/RubyProjects/gems/tunnel_blick', {})
+    @database = database
+    @tunnel = Appscript.app('Tunnelblick.app')
+    @websites = []
+  end
+
+  def manual
+
+    puts @my_ip = open('http://icanhazip.com').read.strip
+    database[:ip_addresses].insert_ignore.insert(:public_ip => @my_ip)
+
+  end
+
+  def add_websites (*websites)
+    websites.each { |w|
+      w.tunnel = self
+      w.allowance = allowance
+    }
+  end
 
-    def connected?
-      vpn_states.include?('CONNECTED')
+  def config_match (file_name)
+    file_name
+    case file_name
+      when /\Amy_expressvpn.+/
+        #puts 'Express VPN'
+        @loaded_module = TunnelBlick::ExpressVPN
+      else
+        puts 'VPN not recognized.'
     end
+  end
+
+  def config_filter (countries)
+    countries
+    vpn_configs.inject([]) { |acc, conf|
+      config_match(conf)
+      details = @loaded_module.parse_config(conf)
+      if countries.include?(details[:country])
+        acc << conf
+        acc
+      else
+        acc
+      end
+    }
+  end
+
+  def reallocate
+    disconnect
+    @allowance = 0
+    connect_smart(max_requests, arguments, *doms)
+  end
 
-    def connect_rand (extra_waits = 2)
+  def connect_smart (limit, args = {}, *domains)
+    @allowance = 0
+    blocked = true
 
-      unless TunnelBlick.connected?
+    while @allowance < 1 || blocked
+      database.disconnect
+      puts @my_ip = open('http://icanhazip.com').read.strip if my_ip.nil?
 
-        TunnelBlick.connect(vpn_configs.sample)
+      blocked = false
+      connect_rand(3, args) unless connected?
 
-        count = 0
-        while count <= extra_waits && !TunnelBlick.connected?
-          sleep(5)
-          count += 1
-        end
+      allowances = domains.map { |dom|
+        limit - database[:browser_requests].where(ip_address: my_ip, domain: dom).count
+      }
 
-        unless TunnelBlick.connected?
-          puts 'VPN did not connect in time'
-          return
+      domains.each { |dom|
+        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
+          break
         end
+      }
+      puts @allowance = allowances.min
+      disconnect if @allowance < 1 || blocked
+    end
+
+    @max_requests = limit
+    @arguments = args
+    @doms = domains
+
+    @allowance
+  end
 
+  def connected?
+    vpn_states.include?('CONNECTED')
+  end
+
+  def connect_rand (extra_waits = 2, args = {})
+
+    unless connected?
+      puts 'connect_rand'
+      if args[:filter].nil?
+        tunnel.connect(vpn_configs.sample)
+      else
+        puts shortlist = config_filter(args[:filter])
+        tunnel.connect(shortlist.sample)
       end
 
-      config_file_name = vpn_configs[vpn_states.index('CONNECTED')]
-      loaded_module = TunnelBlick::TunnelBlick.module
+      count = 0
 
-      loaded_module.parse_config(config_file_name)
-    end
+      while count <= extra_waits && !connected?
+        sleep(5)
+        count += 1
+      end
+
+      unless connected?
+        puts 'VPN did not connect in time'
+        return
+      end
 
-    def method_missing (method, *args, &block)
-      @tunnel.send(method, *args, &block)
     end
 
+    config_file_name = vpn_configs[vpn_states.index('CONNECTED')]
+    config_match(config_file_name)
+    details = @loaded_module.parse_config(config_file_name)
+
+    sleep(3)
+    puts @my_ip = open('http://icanhazip.com').read.strip
+
+    details.store(:public_ip, my_ip)
+
+    sleep(6)
+    database[:ip_addresses].upsert(details)
   end
 
-  def self.included(base)
-    TunnelBlick.tunnel = Appscript.app('Tunnelblick.app')
-    TunnelBlick.tunnel.extend(TunnelBlick)
+  def method_missing (method, *args, &block)
+    tunnel.send(method, *args, &block)
   end
 
+  # def self.included(base)
+  #   TunnelBlick.tunnel = Appscript.app('Tunnelblick.app')
+  #   TunnelBlick.tunnel.extend(TunnelBlick)
+  # end
+
   def connected_vpn
     p vpn_states
     if vpn_state == 'CONNECTED'
@@ -67,7 +160,10 @@ module TunnelBlick
   end
 
   def disconnect
-    TunnelBlick.disconnect_all
+    puts 'Disconnecting from prior tunnels'
+    tunnel.disconnect_all
+    puts 'Sleep(6)'
+    sleep(6)
   end
 
   def vpn_state
@@ -75,11 +171,11 @@ module TunnelBlick
   end
 
   def vpn_configs
-    TunnelBlick.configurations.name.get
+    configurations.name.get
   end
 
   def vpn_states
-    TunnelBlick.configurations.state.get
+    configurations.state.get
   end
 
 end

data/lib/tunnel_blick/express_vpn.rb

@@ -1,14 +1,14 @@
 require 'facets/hash/op_push'
 require 'facets/string/titlecase'
 
-module TunnelBlick
+class TunnelBlick
 
   module ExpressVPN
 
     class << self
 
       def parse_config (string)
-        details = {}
+        details = {provider: 'ExpressVPN'}
 
         string = string.sub('my_expressvpn_', '')
         string.sub!(/_\D{3}\z/, '')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tunnelblick
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Eugene Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flex_config
+  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'
 - !ruby/object:Gem::Dependency
   name: rb-scpt
   requirement: !ruby/object:Gem::Requirement