zlx_hacker_term 0.0.3 → 1.0.1

data/README.md

@@ -12,5 +12,5 @@ Requirements
 Installation
 ------------
 * Install with `gem install hacker_term`
-* Run using `socksify_ruby 127.0.0.1 1080 run_hacker_term`
+* Run using `hacker_term [socks_server] [socks_port]`
 * Tests included; I run them using `rspec -fd` in the project directory

data/bin/hacker_term

@@ -2,5 +2,21 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'hacker_term'
 
-app = HackerTerm::TerminalApp.new
-exit app.run!
+@default_socks_server = '127.0.0.1'
+@default_socks_port = 1080
+
+if ARGV.size == 2
+  socks_server = ARGV.shift
+  socks_port = ARGV.shift
+elsif ARGV.size == 0
+  socks_server = @default_socks_server
+  socks_port = @default_socks_port
+else
+  puts "Usage: hacker_term [socks_server] [socks_port]"
+  puts "Default: socks_server: 127.0.0.1"
+  puts "         socks_port: 1080"
+  exit
+end
+
+app = HackerTerm::TerminalApp.new(socks_server, socks_port)
+exit app.run!

data/lib/hacker_term.rb

@@ -3,10 +3,13 @@ require 'hacker_term/ui'
 require 'rest_client'
 require 'launchy'
 require 'clipboard'
+require 'socksify'
 
 module HackerTerm
   class TerminalApp
-    def initialize
+    def initialize(socks_server, socks_port)
+      @socks_server = socks_server
+      @socks_port = socks_port
       @raw_json = read_json
       load
     end
@@ -82,18 +85,11 @@ module HackerTerm
     end
 
     def read_json
-      local_proxy = get_local_proxy
-      #RestClient.proxy = local_proxy unless local_proxy.nil?
+      TCPSocket::socks_server = @socks_server
+      TCPSocket::socks_port = @socks_port
       RestClient.get 'http://hndroidapi.appspot.com/news/format/json/page/'
     end
 
-    def get_local_proxy
-      # Cater for both upper and lower case env variables
-      local_proxy = ENV['all_proxy']
-      return local_proxy unless local_proxy.nil?
-      ENV['http_proxy']
-    end
-
     def clear_and_show
       @ui.clear!
       @ui.show @page

data/lib/hacker_term/version.rb

@@ -1,3 +1,3 @@
 module HackerTerm
-  VERSION = "0.0.3"
+  VERSION = "1.0.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: zlx_hacker_term
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.3
+  version: 1.0.1
 platform: ruby
 authors:
 - soffolk zhu
@@ -96,7 +96,6 @@ files:
 - lib/hacker_term/page_data.rb
 - lib/hacker_term/ui.rb
 - lib/hacker_term/version.rb
-- lib/run_hacker_term
 - spec/page_data_spec.rb
 homepage: https://github.com/zlx/hacker_term
 licenses: []

data/lib/run_hacker_term

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'hacker_term'
-
-app = HackerTerm::TerminalApp.new
-exit app.run!