wasserstand 0.0.9 → 0.0.10

data/README.md

@@ -20,4 +20,4 @@ Or install it yourself as:
 
 ## Usage
 
-see tests
+See the tests or bin/wasserstand for usage examples.

data/TODO

@@ -0,0 +1,3 @@
+* Tests for the command line client
+* CSV output for the command line client
+* JSON output for the command line client

data/bin/wasserstand

@@ -6,11 +6,61 @@ Bundler.require
 require 'wasserstand'
 require 'optparse'
 
-options = {}
 OptionParser.new do |opts|
-  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-    options[:verbose] = v
+  opts.banner = <<HERE
+Wasserstand provides water level information as provided by PegelOnline.
+
+Usage:
+    #{File.basename($0)} [options] [WATERWAY | LEVEL]
+
+Author:
+    Nicolas E. Rabenau nerab@gmx.at
+
+Homepage:
+    http://github.com/nerab/wasserstand
+
+Options:
+HERE
+
+  opts.on("-w", "--verbose", "Run verbosely") do |v|
+    Wasserstand.logger.level = Log4r::INFO
+    Wasserstand.logger.info("Enable info logger")
+  end
+
+  opts.on("-t", "--trace", "Run with traces enabled") do |v|
+    Wasserstand.logger.level = Log4r::ALL
+    Wasserstand.logger.debug("Enable debug logger")
+  end
+
+  opts.on("-u", "--url URL", "Use URL to fetch levels") do |url|
+    Wasserstand.logger.info("Using URL #{url}")
+    Wasserstand.provider = Wasserstand::Provider::PegelOnline.new(url)
   end
 end.parse!
 
-puts Wasserstand::Waterway['BODENSEE'].pegel.first.last.messwerte.first
+query = ARGV.shift
+
+if query.nil?
+  Wasserstand::Waterway.all.each{|ww| puts "#{ww.name} (#{ww.levels.size} levels)"}
+else
+  begin
+    waterway = Wasserstand::Waterway[query]
+
+    if waterway
+      puts "#{waterway.name} has #{waterway.levels.size} levels:"
+      waterway.levels.sort_by{|name, level| level.km}.each{|name, level| puts "#{name} (km #{level.km}): #{level.measurements.last}"}
+    else
+      level = Wasserstand::Level[query]
+
+      if level.nil?
+        STDERR.puts "#{File.basename($0)}: No waterway nor level found that matches '#{query}."
+      else
+        puts "Level #{level.name} (#{level.waterway}, km #{level.km}):"
+        level.measurements.each{|measurement| puts measurement}
+      end
+    end
+  rescue
+    STDERR.puts $!
+    $!.backtrace.each{|msg| Wasserstand.logger.debug(msg)}
+  end
+end

data/lib/wasserstand.rb

@@ -4,8 +4,9 @@ require 'tzinfo'
 require 'unicode_utils/upcase'
 require 'unicode_utils/downcase'
 require 'forwardable'
-
+require 'log4r'
 require 'require_all'
+
 require_rel 'wasserstand'
 
 module Wasserstand
@@ -17,5 +18,14 @@ module Wasserstand
     def provider
       @provider ||= Provider::PegelOnline.new
     end
+
+    def logger
+      @logger ||= Log4r::Logger.new(self.name).tap do |logger|
+        out = Log4r::Outputter.stderr
+        out.formatter = Log4r::PatternFormatter.new(:pattern => "%l: %m")
+        logger.outputters = out
+        logger.level = Log4r::WARN
+      end
+    end
   end
 end

data/lib/wasserstand/finders.rb

@@ -1,6 +1,7 @@
 module Wasserstand
   module Finders
     def [](name)
+      return nil if name.to_s.empty?
       results = all.select{|named| UnicodeUtils.upcase(name) == named.name}
 
       case results.size

data/lib/wasserstand/hash_clod.rb

@@ -1,10 +1,12 @@
-# http://stackoverflow.com/questions/2030336/how-do-i-create-a-hash-in-ruby-that-compares-strings-ignoring-case
-class HashClod < Hash
-  def [](key)
-    key.respond_to?(:upcase) ? super(UnicodeUtils.upcase(key)) : super(key)
-  end
+module Wasserstand
+  # http://stackoverflow.com/questions/2030336/how-do-i-create-a-hash-in-ruby-that-compares-strings-ignoring-case
+  class HashClod < Hash
+    def [](key)
+      key.respond_to?(:upcase) ? super(UnicodeUtils.upcase(key)) : super(key)
+    end
 
-  def []=(key, value)
-    key.respond_to?(:upcase) ? super(UnicodeUtils.upcase(key), value) : super(key, value)
+    def []=(key, value)
+      key.respond_to?(:upcase) ? super(UnicodeUtils.upcase(key), value) : super(key, value)
+    end
   end
 end

data/lib/wasserstand/heap_cache.rb

@@ -1,16 +1,18 @@
-class HeapCache
-  def initialize
-    @backend = {}
-  end
+module Wasserstand
+  class HeapCache
+    def initialize
+      @backend = {}
+    end
 
-  def get(name)
-    result = @backend[name]
-    STDERR.puts "#{self.class.name} GET #{result ? 'HIT' : 'MISS'} #{name}"
-    result
-  end
+    def get(name)
+      result = @backend[name]
+      Wasserstand.logger.debug "#{self.class.name} GET #{result ? 'HIT' : 'MISS'} #{name}"
+      result
+    end
 
-  def set(name, value)
-    STDERR.puts "#{self.class.name} SET #{name} => #{value.inspect}"
-    @backend[name] = value
+    def set(name, value)
+      Wasserstand.logger.debug "#{self.class.name} SET #{name} => #{value.inspect}"
+      @backend[name] = value
+    end
   end
 end

data/lib/wasserstand/measurement.rb

@@ -11,7 +11,7 @@ module Wasserstand
     end
 
     def to_s
-      "#{@date}: #{@value} cm, trend #{@trend}"
+      "#{@date}: #{@value} cm, Trend #{@trend}"
     end
   end
 end

data/lib/wasserstand/provider/pegel_online.rb

@@ -44,7 +44,7 @@ module Wasserstand
       #
       def replenish
         @names.clear
-        STDERR.puts "FETCH #{@url}"
+        Wasserstand.logger.info "Fetching #{@url}"
         doc = Nokogiri::HTML(open(@url).read, nil, 'ISO-8859-1')
         doc.xpath("//data/table/gewaesser").each do |node|
           ww = WaterwayMapper.map(node)

data/lib/wasserstand/version.rb

@@ -1,3 +1,3 @@
 module Wasserstand
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/wasserstand.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'nokogiri'
   gem.add_runtime_dependency 'tzinfo'
   gem.add_runtime_dependency 'unicode_utils'
+  gem.add_runtime_dependency 'log4r'
+
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasserstand
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +187,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - bin/wasserstand
 - lib/wasserstand.rb
 - lib/wasserstand/finders.rb
@@ -222,3 +239,4 @@ test_files:
 - test/unit/test_measurement.rb
 - test/unit/test_trend.rb
 - test/unit/test_waterway.rb
+has_rdoc: