rfetion 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/rfetion/command.rb

@@ -4,10 +4,12 @@ options = {}
 
 OptionParser.new do |opts|
   # Set a banner, displayed at the top of the help screen.
-  opts.banner = <<EOF
-  Usage: rfetion [options]
-  Example: rfetion -m mobile -p password -f friend_mobile -c sms_content
-           rfetion -m mobile -p password -a friend_mobile
+  opts.banner = "Usage: rfetion [options]"
+
+  opts.separator ""
+  opts.separator <<EOF
+    Example: rfetion -m mobile -p password -f friend_mobile -c sms_content
+             rfetion -m mobile -p password -a friend_mobile
 EOF
 
   opts.on('-m', '--mobile MOBILE', 'Fetion mobile number') do |mobile|
@@ -31,19 +33,48 @@ EOF
     options[:add_mobile] = f
   end
 
+  opts.separator ""
+  opts.separator "different mode:"
+
+  opts.on('--debug', 'debug mode') do
+    options[:debug] = true
+  end
+
+  opts.on('--silence', 'silence mode') do
+    options[:silence] = true
+  end
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
   opts.parse!
 end
 
-if options[:add_mobile]
-  if options[:mobile_no] and options[:password]
-    Fetion.add_buddy(options[:mobile_no], options[:password], options[:add_mobile])
+def level(options)
+  return Logger::DEBUG if options[:debug]
+  return Logger::ERROR if options[:silence]
+  return Logger::INFO
+end
+
+begin
+  if options[:add_mobile]
+    raise FetionException.new('You must input your mobile number and password') unless options[:mobile_no] and options[:password]
+    Fetion.add_buddy(options[:mobile_no], options[:password], options[:add_mobile], level(options))
+    exit
   end
-else
-  if options[:mobile_no] and options[:password] and options[:content]
-    if options[:friends_mobile].empty?
-      Fetion.send_sms_to_self(options[:mobile_no], options[:password], options[:content])
-    else
-      Fetion.send_sms_to_friends(options[:mobile_no], options[:password], options[:friends_mobile], options[:content])
-    end
+  
+  raise FetionException.new('You must input your mobile number, password and content') unless options[:mobile_no] and options[:password] and options[:content]
+  if options[:friends_mobile].empty?
+    Fetion.send_sms_to_self(options[:mobile_no], options[:password], options[:content], level(options))
+  else
+    Fetion.send_sms_to_friends(options[:mobile_no], options[:password], options[:friends_mobile], options[:content], level(options))
   end
+rescue FetionException => e
+  puts e.message
+  puts "Please use 'rfetion -h' to get more details"
 end

data/lib/rfetion/fetion.rb

@@ -25,8 +25,9 @@ class Fetion
     @logger.level = level
   end
 
-  def Fetion.send_sms_to_self(mobile_no, password, content)
+  def Fetion.send_sms_to_self(mobile_no, password, content, level = Logger::INFO)
     fetion = Fetion.new
+    fetion.logger_level = level
     fetion.mobile_no = mobile_no
     fetion.password = password
     fetion.login
@@ -35,10 +36,11 @@ class Fetion
     fetion.logout
   end
 
-  def Fetion.send_sms_to_friends(mobile_no, password, friend_mobiles, content)
+  def Fetion.send_sms_to_friends(mobile_no, password, friend_mobiles, content, level = Logger::INFO)
     friend_mobiles = Array(friend_mobiles)
     friend_mobiles.collect! {|mobile| mobile.to_i}
     fetion = Fetion.new
+    fetion.logger_level = level
     fetion.mobile_no = mobile_no
     fetion.password = password
     fetion.login
@@ -53,8 +55,9 @@ class Fetion
     fetion.logout
   end
 
-  def Fetion.add_buddy(mobile_no, password, friend_mobile)
+  def Fetion.add_buddy(mobile_no, password, friend_mobile, level = Logger::INFO)
     fetion = Fetion.new
+    fetion.logger_level = level
     fetion.mobile_no = mobile_no
     fetion.password = password
     fetion.login

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-10-11}
+  s.date = %q{2009-10-17}
   s.description = %q{rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.}
   s.email = %q{flyerhzm@gmail.com}
   s.executables = ["rfetion", "rfetion"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 +08:00
+date: 2009-10-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency