rfetion 0.3.3 → 0.3.4

data/README.textile

@@ -28,7 +28,7 @@ Fetion.send_sms_to_self(mobile_no, password, content)
 
 send sms to friends
 <pre><code>
-Fetion.send_sms_to_friends(mobile_no, password, friend_mobile_no or array of friends_mobile_no, content)
+Fetion.send_sms_to_friends(mobile_no, password, friends_mobile_or_fetion_number, content)
 </code></pre>
 
 add friend
@@ -43,14 +43,19 @@ h2. Shell command
 you can use it in shell command directly
 
 <pre><code>
-rfetion -h
+Usage: rfetion [options]
+    Example: rfetion -m mobile -p password -f friends_mobile_or_fetion_number -c sms_content
+
+             rfetion -m mobile -p password -a friend_mobile
 
-  Usage: rfetion [options]
-  Example: rfetion -m mobile -p password -f friend_mobile -c sms_content
-           rfetion -m mobile -p password -a friend_mobile
     -m, --mobile MOBILE              Fetion mobile number
     -p, --password PASSWORD          Fetion password
     -c, --content CONTENT            Fetion message content
-    -f, --friends MOBILE1,MOBILE2    (optional) Fetion friends mobile number, if no friends mobile number, send message to yourself
+    -f, --friends MOBILE,FETION      (optional) Fetion friends mobile number or fetion number, if no friends mobile number and fetion number, send message to yourself
     -a, --add_buddy MOBILE           Add friend mobile as fetion friend
+different mode:
+        --debug                      debug mode
+        --silence                    silence mode
+Common options:
+    -h, --help                       Show this message
 </code></pre>

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/rfetion/command.rb

@@ -8,7 +8,7 @@ OptionParser.new do |opts|
 
   opts.separator ""
   opts.separator <<EOF
-    Example: rfetion -m mobile -p password -f friend_mobile -c sms_content
+    Example: rfetion -m mobile -p password -f friends_mobile_or_fetion_number -c sms_content
              rfetion -m mobile -p password -a friend_mobile
 EOF
 
@@ -24,9 +24,9 @@ EOF
     options[:content] = f
   end
 
-  options[:friends_mobile] = []
-  opts.on('-f', '--friends MOBILE1,MOBILE2', Array, '(optional) Fetion friends mobile number, if no friends mobile number, send message to yourself') do |f|
-    options[:friends_mobile] = f
+  options[:friends] = []
+  opts.on('-f', '--friends MOBILE,FETION', Array, '(optional) Fetion friends mobile number or fetion number, if no friends mobile number and fetion number, send message to yourself') do |f|
+    options[:friends] = f
   end
 
   opts.on('-a', '--add_buddy MOBILE', 'Add friend mobile as fetion friend') do |f|
@@ -69,10 +69,10 @@ begin
   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?
+  if options[:friends].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))
+    Fetion.send_sms_to_friends(options[:mobile_no], options[:password], options[:friends], options[:content], level(options))
   end
 rescue FetionException => e
   puts e.message

data/lib/rfetion/fetion.rb

@@ -36,9 +36,9 @@ class Fetion
     fetion.logout
   end
 
-  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}
+  def Fetion.send_sms_to_friends(mobile_no, password, friends, content, level = Logger::INFO)
+    friends = Array(friends)
+    friends.collect! {|friend| friend.to_i}
     fetion = Fetion.new
     fetion.logger_level = level
     fetion.mobile_no = mobile_no
@@ -48,8 +48,10 @@ class Fetion
     fetion.get_buddy_list
     fetion.get_contacts_info
     fetion.contacts.each do |contact|
-      if friend_mobiles.include? contact[:mobile_no].to_i
+      if friends.include? contact[:mobile_no].to_i
         fetion.send_sms(contact[:sip], content)
+      elsif friends.any? { |friend| contact[:sip].index(friend) }
+        fetion.send_sms
       end
     end
     fetion.logout
@@ -129,8 +131,8 @@ class Fetion
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
 
+    raise FetionException.new('Fetion Error: Register failed.') unless response.is_a? Net::HTTPSuccess
     @logger.info "fetion http register success"
-    response.is_a? Net::HTTPSuccess
   end
 
   def get_buddy_list
@@ -139,12 +141,12 @@ class Fetion
     msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'GetContactList'}, arg) + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
-    raise FetionException.new("Fetion Error: No buddy list found") unless response.body =~ /.*?\r\n\r\n(.*)#{FETION_SIPP}\s*$/i
+    raise FetionException.new("Fetion Error: Get buddy list error") unless response.is_a? Net::HTTPSuccess
 
     response.body.scan(/uri="([^"]+)"/).each do |buddy|
       @buddies << {:uri => buddy[0]}
     end
-    @logger.debug @buddies.inspect
+    @logger.debug "buddies: #{@buddies.inspect}"
     @logger.info "fetion get buddy list success"
   end
 
@@ -159,6 +161,8 @@ class Fetion
     msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'GetContactsInfo'}, arg) + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
+    raise FetionException.new("Fetion Error: Get contacts info error") unless response.is_a? Net::HTTPSuccess
+
     response.body.scan(/uri="([^"]+)".*?mobile-no="([^"]+)"/).each do |contact|
       @contacts << {:sip => contact[0], :mobile_no => contact[1]}
     end
@@ -169,20 +173,22 @@ class Fetion
   def send_sms(to, content)
     @logger.info "fetion send sms to #{to}"
     msg = sip_create('M fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 M', 'T' => to, 'N' => 'SendSMS'}, content) + FETION_SIPP
-    response = curl_exec(next_url, @ssic, msg)
+    curl_exec(next_url, @ssic, msg)
+    response = curl_exec(next_url, @ssic, FETION_SIPP)
 
+    raise FetionException.new("Fetion Error: Send sms error") unless response.is_a? Net::HTTPSuccess
     @logger.info "fetion send sms to #{to} success"
-    response.is_a? Net::HTTPSuccess
   end
 
   def add_buddy(mobile, nickname = nil)
     @logger.info "fetion send request to add #{mobile} as friend"
     arg = %Q{<args><contacts><buddies><buddy uri="tel:#{mobile}" local-name="#{nickname}" buddy-lists="1" expose-mobile-no="1" expose-name="1" /></buddies></contacts></args>}
     msg = sip_create('S fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '1 S', 'N' => 'AddBuddy'}, arg) + FETION_SIPP
-    response = curl_exec(next_url, @ssic, msg)
+    curl_exec(next_url, @ssic, msg)
+    response = curl_exec(next_url, @ssic, FETION_SIPP)
 
+    raise FetionException.new("Fetion Error: Add buddy error") unless response.is_a? Net::HTTPSuccess
     @logger.info "fetion send request to add #{mobile} as friend success"
-    response.is_a? Net::HTTPSuccess
   end
 
   def logout
@@ -190,6 +196,8 @@ class Fetion
     msg = sip_create('R fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => next_call, 'Q' => '2 R', 'X' => 0}, '') + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
+
+    raise FetionException.new("Fetion Error: Logout error") unless response.is_a? Net::HTTPSuccess
     @logger.info "fetion logout success"
   end
 
@@ -244,7 +252,6 @@ class Fetion
 
   def next_call
     @next_call += 1
-    @next_call
   end
 end
 

data/rfetion.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Richard Huang