machiawase 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5daaa6bc7d71d7b055b35b590e4b9590a58aa05e
-  data.tar.gz: 6e8e8e6494da115a06435ae08f86451365ca7db6
+  metadata.gz: a59e3325556437023b8d609451fffc6c4ef30805
+  data.tar.gz: f7553855c8764924347e525b7a5df87a958b6dca
 SHA512:
-  metadata.gz: 8699b0fb6002770b15c6161601672c7b8fc54839d0a6784aa136c293c4d7cefa4ef8164a4d9add0f8b6d4efc89b6d61d2e7943370b4ee0bc23dbc4af00340a12
-  data.tar.gz: bf2a7bf5184f4c914bff6fc51c0387596e493d08a02308917f684b664f7944c372cb88e60d1d7f197461c27edf9a45ca996ad42301f7875ebb8b3fbb3edb33b6
+  metadata.gz: 72e490d88ae4e99129426f33bf8c140864409b1637d1998fafe442ab9fe46c33fbbb9b204131206660bb9ab1648ac12406721d8b52efdf3444418e7a11728759
+  data.tar.gz: cb6f8069c9b808f2b80e83f829cf96ed62473358e4dcfce78d77c19887d27ee518c7eea454d980c75f067d99185b3b13257268b55ab39b6cf47b8b3b8a2cbf98

data/README.md

@@ -17,6 +17,7 @@ Or install it yourself as:
     $ gem install machiawase
 
 ## Usage
+### As a Command
 
     $ machiawase PLACE_A PLACE_B
     
@@ -28,6 +29,10 @@ or
     
     $ machiawase 横浜 東京 川崎
 
+### As a Library
+
+see <http://rubydoc.info/gems/machiawase>
+
 ## Contributing
 
 1. Fork it

data/bin/machiawase

@@ -2,5 +2,40 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
 require 'machiawase'
+require 'optparse'
+require 'ostruct'
+
+options = OpenStruct.new
+options.show_all = false
+
+opt_parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: machiawase PLACE1 PLACE2 ... [options]'
+
+  opts.separator ""
+  opts.separator "Specific options:"
+
+  opts.on('-a', '--all', 'Show all informations of the result with JSON format') {
+    options.show_all = true
+  }
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  # No argument, shows at tail.  This will print an options summary.
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  # Another typical switch to print the version.
+  opts.on_tail("-v", "--version", "Show version") do
+    puts Machiawase::VERSION
+    exit
+  end
+end
+
+places = opt_parser.parse(ARGV)
+result = Machiawase.where(*places)
+puts options.show_all ? result.to_json : result.address
+
 
-puts Machiawase.where(*ARGV).address

data/lib/machiawase.rb

@@ -12,13 +12,7 @@ module Machiawase
 
   # @param argv [Array<Place>] the array of places.
   # @return [Place] the place to rendezvous.
-  def self.where(*argv)
-    require 'optparse'
-    opt = OptionParser.new do |opt|
-      opt.version = VERSION
-    end
-    addresses = opt.parse(argv)
-
+  def self.where(*addresses)
     places = Array.new
     addresses.each do |address|
       g = Place.geocode(address)

data/lib/machiawase/version.rb

@@ -1,3 +1,3 @@
 module Machiawase
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machiawase
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -89,14 +89,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
 - .gitignore
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
-- autotest/discover.rb
 - bin/machiawase
 - lib/machiawase.rb
 - lib/machiawase/place.rb

data/.autotest

@@ -1,9 +0,0 @@
-Autotest.add_hook(:initialize) {|at|
-	at.add_exception %r{^\.git} # ignore Version Control System
-	at.add_exception %r{^./tmp} # ignore temp files, lest autotest will run again, and again...
-  # at.clear_mappings #take out the default (test/test*rb)
-	at.add_mapping(%r{^lib/.*\.rb$}) {|f, _|
-		Dir['spec/**/*_spec.rb']
-	}
-	nil
-}

data/autotest/discover.rb

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-Autotest.add_discovery { "rspec2" }