sarnesjo-twhere 0.0.9 → 0.0.10

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 9
+:patch: 10
 :major: 0

data/bin/twhere

@@ -6,28 +6,66 @@ require 'optparse'
 
 config_file = nil
 
-OptionParser.new do |opts|
-  opts.banner = 'usage: twhere.rb [options]'
+opts = OptionParser.new do |o|
+  o.banner = 'usage: twhere [options]'
 
-  opts.on('-c', '--config FILE', 'specify config file') do |c|
+  o.on('-c', '--config FILE', 'specify config file') do |c|
     config_file = c
   end
 
-  opts.on_tail('-h', '--help', 'show this message') do
-    puts opts
+  o.on_tail('-h', '--help', 'show this message') do
+    $stderr.puts o
     exit
   end
 
-  opts.on_tail('--version', 'show version') do
+  o.on_tail('-V', '--version', 'show version') do
     version = YAML::load(File.open(File.join(File.dirname(__FILE__), '..', 'VERSION.yml')))
-    puts "#{version[:major]}.#{version[:minor]}.#{version[:patch]}"
+    $stderr.puts "#{version[:major]}.#{version[:minor]}.#{version[:patch]}"
     exit
   end
-end.parse!
+end
+
+opts.parse!
+
+# make sure the config option was given
+unless config_file
+  $stderr.puts opts
+  exit 1
+end
 
 # load config
 config = YAML::load(File.open(config_file))
 
+# make sure config was properly loaded
+unless config
+  $stderr.puts "could not load config from #{config_file}"
+  exit 1
+end
+
+# make sure these keys are set
+[:twhere, :twitter].each do |key|
+  unless config[key]
+    $stderr.puts "could not find :#{key} in config"
+    exit 1
+  end
+end
+
+# make sure these keys are set
+[:locations_file, :template_file].each do |key|
+  unless config[:twhere][key]
+    $stderr.puts "could not find :#{key} in config"
+    exit 1
+  end
+end
+
+# make sure these keys are set
+[:username, :password].each do |key|
+  unless config[:twitter][key]
+    $stderr.puts "could not find :#{key} in config"
+    exit 1
+  end
+end
+
 # load known locations
 locations = YAML::load(File.open(config[:twhere][:locations_file]))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sarnesjo-twhere
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - "Jesper S\xC3\xA4rnesj\xC3\xB6"