flickru 0.0.12 → 0.0.13

data/bin/geowiki

@@ -1,21 +1,42 @@
 #!/usr/bin/env bash
 
+###########
+# Globals #
+###########
+
 APP_NAME=`basename $0`
+PAGE=`echo "$1" | tr ' ' '_'`
 
-function error {
-# \E[31m 0
-   echo -e "\033[31m$APP_NAME: $1: $2\033[0m" 1>&2
-}
+#############
+# Functions #
+#############
 
-if [ $# -ne 1 ]; then
+function usage {
    echo "$APP_NAME - find coordinates of a place described by Wikipedia"
    echo "usage: $APP_NAME <place Wikipedia page>"
    echo "example: $APP_NAME 'Mille-Isles, Quebec'"
+}
+
+function error {
+   echo -e "\033[31m$APP_NAME: $1: $2\033[0m" 1>&2
+}
+
+#################
+# Preconditions #
+#################
+
+if [ "$1" == "-h" -o "$1" == "--help" ]; then
+   usage
+   exit
+elif [ $# -ne 1 ]; then
+   usage
    error $LINENO "wrong number of arguments"
    exit 1
 fi
 
-PAGE=`echo "$1" | tr ' ' '_'`
+#########
+# Setup #
+#########
 
 # temporal file management
 if [ -d /tmp ]; then
@@ -29,7 +50,11 @@ function clean_up {
 }
 trap clean_up SIGHUP SIGINT SIGTERM
 
-curl "http://en.wikipedia.org/wiki/$PAGE" > "$TMP" 2> /dev/null
+########
+# Main #
+########
+
+curl "http://en.wikipedia.org/wiki/$PAGE" -o "$TMP" 2> /dev/null
 
    if [ $? -ne 0 ]; then
       error $LINENO "Wikipedia page '$PAGE' not found"
@@ -43,13 +68,14 @@ URL=`cat "$TMP" | tr '"' '\n' | grep geohack | head -n 1 | sed -e 's|&amp;|\&|'`
       clean_up 1
    fi
 
-curl "$URL" > "$TMP" 2> /dev/null
+curl "$URL" -o "$TMP" 2> /dev/null
 
    if [ $? -ne 0 ]; then
       error $LINENO "GeoHack URL '$URL' not found"
       clean_up 1
    fi
 
-cat "$TMP" | grep '<span class="geo"' | sed -e 's|^.*"Latitude">\([^<]*\)</span>, .*"Longitude">\([^<]*\)</span>.*$|\1, \2|'
+cat "$TMP" | grep '<span class="geo"' \
+| sed -e 's|^.*"Latitude">\([^<]*\)</span>, .*"Longitude">\([^<]*\)</span>.*$|\1, \2|'
 
 clean_up

data/lib/flickru.rb

@@ -89,7 +89,7 @@ def self.flickru photo_dir
               "  and better collection mosaics can be randomised."
 rescue Exception => e
   file_line = e.backtrace[0].split(':')
-  Printer.error "error:#{File.basename file_line[0]}:#{file_line[1]}: #{e.message}"
+  Printer.error "error:#{File.basename file_line[-3]}:#{file_line[-2]}: #{e.message}"
   exit 1
 end
 

data/lib/flickru/location.rb

@@ -62,10 +62,12 @@ private
   def self.locate place
     the_place = place # needed for RuntimeError reporting
     begin
-      is_win  = RbConfig::CONFIG['target_os'].downcase.include? 'mswin32'
-      command = Escape.shell_command (if is_win then ['bash', GEOWIKI, place]
-                                                else [        GEOWIKI, place] end)
-      place = `#{command} 2> /dev/null`[0..-2] \
+      is_win  = case RbConfig::CONFIG['target_os']
+                when /mswin|mingw|cygwin/i then true
+                else false end
+      command = Escape.shell_command((is_win ? ['bash'] : []) + [GEOWIKI, place])
+      null    = is_win ? 'NUL' : '/dev/null'
+      place = `#{command} 2> #{null}`[0..-2] \
         if place !~ /^#{COORD_PATTERN}, *#{COORD_PATTERN}$/
       if place =~ /^#{COORD_PATTERN}, *#{COORD_PATTERN}$/
         # latitude, longitude

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: flickru
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Jesus Pardillo