brand2csv 0.2.4 → 0.2.5

data/.gitignore

@@ -1,4 +1,6 @@
 *~
 *#
+.ruby-version
+.bundle
 ausgabe.csv
 mechanize/

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.5 26.08.2013
+
+* Add timespan validator
+
 === 0.2.4 06.06.2013
 
 * Rescue another exception

data/bin/brand2csv

@@ -5,6 +5,7 @@ root = Pathname.new(__FILE__).realpath.parent.parent
 $:.unshift root.join('lib') if $0 == __FILE__
 
 require 'optparse'
+require "date"
 require 'brand2csv'
 
 def help
@@ -22,32 +23,78 @@ Usage:
 EOS
 end
 
-parser = OptionParser.new
-opts = {}
-parser.on('--swiss_only') {|v| opts[:swiss_only] = true }
-parser.on_tail('-h', '--help') { puts help; exit }
-
-args = ARGV.dup
-begin
-  parser.parse!(args)
-rescue OptionParser::MissingArgument,
-       OptionParser::InvalidArgument,
-       OptionParser::InvalidOption
-  puts help
-  exit 1
+def validates_timespan(arg)
+  valid = true
+  timespan = ""
+  dates = arg.gsub(/[^\d\.-]/, '').split("-")
+  catch (:error) do
+    dates.map.with_index do |d, i|
+      sep = (dates.length > 1 && i != 0) ? "-" : ""
+      begin
+        Date.parse(d)
+        timespan << sep + d
+      rescue ArgumentError
+        valid = false
+        elms = d.split(".")
+        prms = [elms[2], elms[1], -1].map(&:to_i)
+        begin
+          cand = Date.new(*prms).strftime("%d.%m.%Y")
+          if elms[0] == (elms - cand.to_s.split(".")).first
+            timespan << sep + cand.to_s
+          else
+            raise
+          end
+        rescue ArgumentError
+          timespan = "" # unknown
+          throw :error
+        end
+      end
+    end
+  end
+  message = nil
+  unless valid
+    if timespan.empty?
+      message = "Timespan is invalid"
+    else
+      message = "Did you mean #{timespan} ?"
+    end
+  end
+  [valid, message]
 end
 
+if $0 == __FILE__
+  parser = OptionParser.new
+  opts = {}
+  parser.on('--swiss_only') {|v| opts[:swiss_only] = true }
+  parser.on_tail('-h', '--help') { puts help; exit }
 
-unless args.size >= 1
-  puts help
-  exit 1  
-end
+  args = ARGV.dup
+  begin
+    parser.parse!(args)
+  rescue OptionParser::MissingArgument,
+         OptionParser::InvalidArgument,
+         OptionParser::InvalidOption
+    puts help
+    exit 1
+  end
 
-begin
-  Brand2csv::run(args[0], args[1], opts[:swiss_only])
-rescue Interrupt
-  puts "Unterbrochen. Breche mit Fehler ab"
-  exit 1
-end
+  unless args.size >= 1
+    puts help
+    exit 1
+  end
+
+  valid,message = validates_timespan(args[0])
+  unless valid
+    puts message
+    exit 1
+  end
 
-puts "#{__FILE__} completed successfully" if $VERBOSE
+  begin
+    Brand2csv::run(args[0], args[1], opts[:swiss_only])
+  rescue Interrupt
+    puts "Unterbrochen. Breche mit Fehler ab"
+    exit 1
+  end
+
+  puts "#{__FILE__} completed successfully" if $VERBOSE
+end

data/lib/brand2csv/version.rb

@@ -1,3 +1,3 @@
 module Brand2csv
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.dirname(__FILE__)
+
+require 'bundler/setup'
+Bundler.require
+
+require 'rspec'
+require 'brand2csv'
+
+Dir[File.join(File.dirname(__FILE__), "spec/support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.filter_run_excluding :slow
+  #config.exclusion_filter = {:slow => true}
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brand2csv
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -28,23 +28,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -75,22 +91,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.13'
 description: ! "brand2csv creates csv files for swiss brand registered in a specific
   time period. \n  The csv contains the brand, link to image (if present), link to
   the detailinfo at swissreg.ch, name and address of owner (Inhaber)"
@@ -102,7 +134,6 @@ extra_rdoc_files:
 - History.txt
 - LICENCE.txt
 - Manifest.txt
-- README.md
 files:
 - .gitignore
 - .rspec
@@ -148,12 +179,13 @@ files:
 - spike_mechanize_swissreg.rb
 - spike_watir.rb
 - swissreg.rb
-homepage: https://github.com/zdavatz/brand2csv
+- .gemtest
+homepage: 
 licenses: []
 post_install_message: 
 rdoc_options:
 - --main
-- README.md
+- README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -170,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: brand2csv
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: brand2csv creates csv files for swiss brands.