seventeen_mon 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67565bb88595073803e59351a86c4756ab42185
-  data.tar.gz: 098be274cac30f71f87e03655fc07168d0f4beaf
+  metadata.gz: b6663d4ddeb5e3ea04c62da49b527bc038fe49a5
+  data.tar.gz: ba29fe84dbae2548803f64b3c6617ddfa17d38f1
 SHA512:
-  metadata.gz: b829112def8be294ffce2ac952f9245e0d82e7bd95f528ee2564e42cdcd17c3c2391389718fc36b3d720db98c739c39f0bcf1bc18c114fd802f091cf4540dd79
-  data.tar.gz: 84574fdbd059f0b7e640879a03b0db94f2ee48fddd1942d95bd151ed2391350dac9ca3442533e19a1b167d8424467aa1e2d82442e78c838dcec8fd1288253312
+  metadata.gz: 4cc0bb55fc45741bbef57719e27ad1f3c5d49cb32ba9d643760895ee34f1f3eb99e5175f80d18d36f597fe5d1b5947c5797c4b2b9f4d8ed2f55310efdfdf1ccd
+  data.tar.gz: 3ca3c66c11d64e171a6d04f8c76d889bfbae22efa660bc10b1c012d8ac46cca6bedbd189e3dc5548c4a48829ee55aec648dd873536ca9254b8efcaf65e2294c8

data/README.md

@@ -1,6 +1,6 @@
 # SeventeenMon
 
-Simply find location by IP.
+SeventeenMon simply help you find location by IP address. Data is totally based on [17MON.CN](http://tool.17mon.cn/).
 
 
 ## Installation
@@ -19,14 +19,28 @@ Or you can install simply by
 
 ## Usage
 
+### In Ruby
 ```(ruby)
-SeventeenMon.find_by_ip ip: "YOUR_IP_ADDRESS"
+SM.find_by_ip "YOUR_IP_ADDRESS"
 # => {:country=>"英国", :city=>"英国"}
 
-SM.find_by_address address: "ruby-lang.com", protocol: "http"
+SM.find_by_address "http://ruby-lang.com"
 # => {:country=>"荷兰", :city=>"荷兰"}
 ```
 
+### In Command Line
+
+```(bash)
+$ seventeen ip 188.74.78.234
+Country:   英国
+City:      英国
+
+
+$ seventeen address https://github.com
+Country:   美国
+City:      美国
+```
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/seventeen_mom/fork )
@@ -34,3 +48,7 @@ SM.find_by_address address: "ruby-lang.com", protocol: "http"
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Thanks
+
+[高春辉 Paul Gao](http://tool.17mon.cn/) - for his awesome data.

data/bin/seventeen

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+$LOAD_PATH << File.dirname(__FILE__) + "/../lib" if $0 == __FILE__
+
+require 'optparse'
+require 'seventeen_mon'
+
+CONFIG = {}
+OPERATIONS = %w(ip address)
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "Seventeen Mon #{SeventeenMon::VERSION}, a location finder for human\n" \
+    "Usage: #{File.basename(__FILE__)} [#{OPERATIONS.join('|')}] [pattern]"
+
+  opts.separator <<-EOS
+
+Supported commands:
+
+ ip [pattern]            Display the location by ip
+ address [pattern]       Display the location by address
+
+
+Example:
+ seventeen ip 188.74.78.234
+ seventeen address http://ruby-lang.com
+
+Note: NSFW if you run seventeen as root.
+EOS
+end
+option_parser.parse!
+
+
+op = ARGV.shift
+if OPERATIONS.include?(op)
+  begin
+    result = SM.send("find_by_#{op}".to_sym, ARGV.first)
+    puts <<-EOS
+Country:   #{result[:country]}
+City:      #{result[:city]}
+EOS
+
+  rescue ArgumentError => ex
+    puts ex.message
+
+  rescue Exception => e
+    puts "Mmmmm, I didn't expect this:"
+    puts e.message
+    puts e.backtrace.join("\n")
+  end
+else
+  puts option_parser.help
+end

data/lib/seventeen_mon.rb

@@ -12,8 +12,9 @@ module SeventeenMon
     IP.new(ip: _ip).find
   end
 
-  def self.find_by_address(address: nil, protocol: "http")
-    IP.new(address: address, protocol: protocol).find
+  def self.find_by_address(_address)
+    prot, addr = _address.split("://")
+    IP.new(address: addr, protocol: prot).find
   end
 end
 

data/lib/seventeen_mon/version.rb

@@ -1,3 +1,3 @@
 module SeventeenMon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/seventeen_mon_spec.rb

@@ -13,10 +13,7 @@ describe SeventeenMon do
   describe "# query test" do
     before do
       @ip_param = "129.215.5.255"
-      @url_params = {
-          address: "www.ruby-lang.com",
-          protocol: "http"
-        }
+      @url_param = "http://www.ruby-lang.com"
     end
 
     it "can find location by ip" do
@@ -26,7 +23,7 @@ describe SeventeenMon do
     end
 
     it "can find location by address" do
-      result = SM.find_by_address @url_params
+      result = SM.find_by_address @url_param
       result.should include(:city)
       result.should include(:country)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seventeen_mon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jingkai He
@@ -69,7 +69,8 @@ dependencies:
 description: Simply find location by IP.
 email:
 - jaxihe@gmail.com
-executables: []
+executables:
+- seventeen
 extensions: []
 extra_rdoc_files: []
 files:
@@ -78,6 +79,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/seventeen
 - lib/data/17monipdb.dat
 - lib/seventeen_mon.rb
 - lib/seventeen_mon/ip.rb