wifi_location 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.2 2012-08-03
+
+* add whereami command
+
+
 === 0.0.1 2012-08-03
 
 * first release

data/Manifest.txt

@@ -2,7 +2,7 @@ History.txt
 Manifest.txt
 README.rdoc
 Rakefile
-bin/wifi_location
+bin/whereami
 lib/wifi_location.rb
 samples/sample.rb
 script/console

data/README.rdoc

@@ -6,6 +6,19 @@
 
 Get your location with WiFi Mac Address and GoogleMap.
 
+
+== INSTALL:
+
+    % gem install wifi_location
+
+
+== GET Location:
+
+    % which whereami
+    % whereami --help
+    % whereami --dump
+
+
 == SYNOPSIS:
 
     require 'rubygems'
@@ -17,11 +30,8 @@ Get your location with WiFi Mac Address and GoogleMap.
 
 == REQUIREMENTS:
 
-* WiFI, Mac OSX or Linux
-
-== INSTALL:
+* WiFi, Mac OSX or Linux
 
-* gem install wifi_location
 
 == LICENSE:
 

data/Rakefile

@@ -12,8 +12,10 @@ Hoe.plugin :newgem
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'wifi_location' do
   self.developer 'Sho Hashimoto', 'hashimoto@shokai.org'
+  self.post_install_message = "!! You can get your location with \"whereami\" command. For more information on wifi_location, see https://rubygems.org/gems/wifi_location"
   self.rubyforge_name       = self.name # TODO this is default value
-  # self.extra_deps         = [['json','>= 1.5.3']]
+  self.extra_deps         = [['json','>= 1.5.3'],
+                             ['args_parser', '>= 0.0.2']]
 
 end
 

data/bin/whereami

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+require File.expand_path '../lib/wifi_location', File.dirname(__FILE__)
+require 'rubygems'
+require 'args_parser'
+require 'json'
+
+parser = ArgsParser.parse ARGV do
+  arg :help, 'show help', :alias => :h
+  arg :towers, 'dump WiFi towers'
+  arg :dump, 'dump ALL'
+  arg :map, 'open Google Map'
+  arg :version, 'show version', :alias => :v
+end
+
+if parser.has_option? :help
+  puts parser.help
+  puts "--"
+  puts "wifi_location v#{WiFiLocation::VERSION} - https://github.com/shokai/wifi_location"
+  exit
+end
+
+if parser.has_option? :version
+  puts "wifi_location v#{WiFiLocation::VERSION} - https://github.com/shokai/wifi_location"
+  exit
+end
+
+if parser.has_option? :towers
+  puts WiFiLocation.wifi_towers.to_json
+  exit
+end
+
+if parser.has_option? :dump
+  towers = WiFiLocation.wifi_towers
+  location = WiFiLocation.location towers
+  h = {:towers => towers, :location => location}
+  puts h.to_json
+  exit
+end
+
+if parser.has_option? :map
+  location = WiFiLocation.location
+  puts url = "https://maps.google.com/?ll=#{location['latitude']},#{location['longitude']}"
+  ['xdg-open', 'open'].each do |cmd|
+    cmd = `which #{cmd}`.strip
+    unless cmd.empty?
+      system "#{cmd} #{url}"
+      break
+    end
+  end
+  exit
+end
+
+location = WiFiLocation.location
+puts "lat=#{location['latitude']},lon=#{location['longitude']}"

data/lib/wifi_location.rb

@@ -4,7 +4,7 @@ require 'uri'
 require 'json'
 
 module WiFiLocation
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   def self.wifi_towers
     case RUBY_PLATFORM
@@ -13,14 +13,14 @@ module WiFiLocation
       lines.shift
       lines.map{|i|
         a = i.scan(/[^\s]+/)
-        {:bssid => a[1], :signal => a[2].to_i}
+        {'bssid' => a[1], 'signal' => a[2].to_i}
       }
     when /linux/
       lines = `iwlist wlan0 scan`.split(/[\r\n]/)
       addrs = []
       lines.each do |line|
-        addrs.push({:bssid => line.split(/\s+/).last, :signal => 8}) if line =~ /Address: /
-        addrs.last[:signal] = line.scan(/Signal level=(\-?\d+)/)[0][0].to_i rescue next if line =~ /Signal level=/
+        addrs.push({'bssid' => line.split(/\s+/).last, 'signal' => 8}) if line =~ /Address: /
+        addrs.last['signal'] = line.scan(/Signal level=(\-?\d+)/)[0][0].to_i rescue next if line =~ /Signal level=/
       end
       addrs
     end
@@ -28,15 +28,14 @@ module WiFiLocation
 
   def self.location(wifi_towers=self.wifi_towers)
     uri = URI.parse 'http://www.google.com/loc/json'
-    wifi_towers = self.wifi_towers unless wifi_towers
     query = {
       :version => '1.1.0',
       :host => 'maps.google.com',
       :request_address => true,
       :address_language => ENV['LANG'] ? ENV['LANG'].scan(/([^\.]+)/)[0][0] : 'en_US',
-      :wifi_towers => wifi_towers.map{|addr| {:mac_address => addr[:bssid], :signal_strength => addr[:signal], :age => 0} }
+      :wifi_towers => wifi_towers.map{|tower| {:mac_address => tower['bssid'], :signal_strength => tower['signal'], :age => 0} }
     }.to_json
-    headers = {'Content-Type' => 'application/x-www-form-urlencoded'}
+    headers = {'Content-Type' => 'application/json'}
     res = Net::HTTP.start(uri.host, uri.port).request(Net::HTTP::Post.new(uri.request_uri, headers), query)
     raise "Response Error (#{res.code})" unless res.code.to_i == 200
     JSON.parse(res.body)['location']

metadata

@@ -1,80 +1,117 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: wifi_location
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-08-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :runtime
+  name: json
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: newgem
-  requirement: !ruby/object:Gem::Requirement
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  name: args_parser
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
+  name: rdoc
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
         version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :development
+  name: newgem
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  name: hoe
+  version_requirements: *id005
 description: Get your location with WiFi Mac Address and GoogleMap.
-email:
+email: 
 - hashimoto@shokai.org
-executables:
-- wifi_location
+executables: 
+- whereami
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
-files:
+files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- bin/wifi_location
+- bin/whereami
 - lib/wifi_location.rb
 - samples/sample.rb
 - script/console
@@ -85,30 +122,38 @@ files:
 - .gemtest
 homepage: http://github.com/shokai/wifi_location
 licenses: []
-post_install_message: 
-rdoc_options:
+
+post_install_message: "!! You can get your location with \"whereami\" command. For more information on wifi_location, see https://rubygems.org/gems/wifi_location"
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: wifi_location
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Get your location with WiFi Mac Address and GoogleMap.
-test_files:
+test_files: 
 - test/test_helper.rb
 - test/test_wifi_location.rb

data/bin/wifi_location

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-require File.expand_path '../lib/wifi_location', File.dirname(__FILE__)
-
-towers = WiFiLocation.wifi_towers
-puts "towers - #{towers.inspect}"
-
-location = WiFiLocation.location towers
-puts "location - #{location.inspect}"
-
-puts "map - https://maps.google.com/?ll=#{location['latitude']},#{location['longitude']}&z=16"