bin/brand2csv in brand2csv-0.2.5 vs bin/brand2csv in brand2csv-0.2.6

@@ -26,11 +26,11 @@
 def validates_timespan(arg)
   valid = true
   timespan = ""
   dates = arg.gsub(/[^\d\.-]/, '').split("-")
   catch (:error) do
-    dates.map.with_index do |d, i|
+    dates.each_with_index do |d, i|
       sep = (dates.length > 1 && i != 0) ? "-" : ""
       begin
         Date.parse(d)
         timespan << sep + d
       rescue ArgumentError
@@ -60,41 +60,41 @@
     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 }
+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
-  end
+args = ARGV.dup
+begin
+  parser.parse!(args)
+rescue OptionParser::MissingArgument,
+       OptionParser::InvalidArgument,
+       OptionParser::InvalidOption
+  puts help
+  exit 1
+end
 
-  unless args.size >= 1
-    puts help
-    exit 1
-  end
+unless args.size >= 1
+  puts help
+  exit 1
+end
 
+unless args.empty?
   valid,message = validates_timespan(args[0])
   unless valid
     puts message
     exit 1
   end
+end
 
-  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
+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