rfetion 0.3.12 → 0.3.13

data/README.textile

@@ -31,9 +31,14 @@ send sms to friends
 Fetion.send_sms_to_friends(mobile_no, password, friends_mobile_or_fetion_number, content)
 </code></pre>
 
-add friend
+add friend with mobile
 <pre><code>
-Fetion.add_buddy(mobile_no, password, friend_mobile)
+Fetion.add_buddy_with_mobile(mobile_no, password, friend_mobile)
+</code></pre>
+
+add friend with sip
+<pre><code>
+Fetion.add_buddy_with_sip(mobile_no, password, friend_sip)
 </code></pre>
 
 **************************************************************************
@@ -44,19 +49,27 @@ you can use it in shell command directly
 
 <pre><code>
 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
+             rfetion -m mobile -p password --add-buddy-with-mobile friend_mobile
+
+             rfetion -m mobile -p password --add-buddy-with-sip friend_sip
 
     -m, --mobile MOBILE              Fetion mobile number
     -p, --password PASSWORD          Fetion password
     -c, --content CONTENT            Fetion message content
     -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
+        --add-buddy-with-mobile MOBILE
+                                     Add friend mobile as fetion friend
+        --add-buddy-with-sip SIP     Add friend fetion sip as fetion friend
+
 different mode:
         --debug                      debug mode
         --silence                    silence mode
+
 Common options:
+    -v, --version                    Show this version
     -h, --help                       Show this message
 </code></pre>
 

data/Rakefile

@@ -6,7 +6,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.summary = 'rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.'
   gemspec.description = 'rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.'
   gemspec.email = 'flyerhzm@gmail.com'
-  gemspec.homepage = ''
+  gemspec.homepage = 'http://github.com/flyerhzm/rfetion'
   gemspec.authors = ['Richard Huang']
   gemspec.files.exclude '.gitignore'
   gemspec.add_dependency 'guid', '>= 0.1.1'

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/lib/rfetion/command.rb

@@ -9,7 +9,8 @@ OptionParser.new do |opts|
   opts.separator ""
   opts.separator <<-EOF
     Example: rfetion -m mobile -p password -f friends_mobile_or_fetion_number -c sms_content
-             rfetion -m mobile -p password -a friend_mobile
+             rfetion -m mobile -p password --add-buddy-with-mobile friend_mobile
+             rfetion -m mobile -p password --add-buddy-with-sip friend_sip
   EOF
 
   opts.on('-m', '--mobile MOBILE', 'Fetion mobile number') do |mobile|
@@ -29,10 +30,14 @@ OptionParser.new do |opts|
     options[:friends] = f
   end
 
-  opts.on('-a', '--add_buddy MOBILE', 'Add friend mobile as fetion friend') do |f|
+  opts.on('--add-buddy-with-mobile MOBILE', 'Add friend mobile as fetion friend') do |f|
     options[:add_mobile] = f
   end
 
+  opts.on('--add-buddy-with-sip SIP', 'Add friend fetion sip as fetion friend') do |f|
+    options[:add_sip] = f
+  end
+
   opts.separator ""
   opts.separator "different mode:"
 
@@ -67,9 +72,10 @@ def level(options)
 end
 
 begin
-  if options[:add_mobile]
+  if options[:add_mobile] or options[:add_sip]
     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))
+    Fetion.add_buddy_with_mobile(options[:mobile_no], options[:password], options[:add_mobile], level(options)) if options[:add_mobile]
+    Fetion.add_buddy_with_sip(options[:mobile_no], options[:password], options[:add_sip], level(options)) if options[:add_sip]
     exit
   end
   

data/lib/rfetion/fetion.rb

@@ -55,14 +55,25 @@ class Fetion
     fetion.logout
   end
 
-  def Fetion.add_buddy(mobile_no, password, friend_mobile, level = Logger::INFO)
+  def Fetion.add_buddy_with_mobile(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
     fetion.register
-    fetion.add_buddy(friend_mobile)
+    fetion.add_buddy_with_mobile(friend_mobile)
+    fetion.logout
+  end
+
+  def Fetion.add_buddy_with_sip(mobile_no, password, friend_sip, level = Logger::INFO)
+    fetion = Fetion.new
+    fetion.logger_level = level
+    fetion.mobile_no = mobile_no
+    fetion.password = password
+    fetion.login
+    fetion.register
+    fetion.add_buddy_with_sip(friend_sip)
     fetion.logout
   end
 
@@ -203,15 +214,26 @@ class Fetion
     @logger.info "fetion send sms to #{to} success"
   end
 
-  def add_buddy(mobile, nickname = nil)
-    @logger.info "fetion send request to add #{mobile} as friend"
+  def add_buddy_with_mobile(mobile, nickname = nil)
+    @logger.info "fetion send request to add mobile:#{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
     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"
+    @logger.info "fetion send request to add mobile:#{mobile} as friend success"
+  end
+
+  def add_buddy_with_sip(sip, nickname = nil)
+    @logger.info "fetion send request to add sip:#{sip} as friend"
+    arg = %Q{<args><contacts><buddies><buddy uri="sip:#{sip}" 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
+    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 sip:#{sip} as friend success"
   end
 
   def logout

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-11-25}
+  s.date = %q{2009-11-28}
   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"]
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
      "lib/rfetion/fetion.rb",
      "rfetion.gemspec"
   ]
-  s.homepage = %q{}
+  s.homepage = %q{http://github.com/flyerhzm/rfetion}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 +08:00
+date: 2009-11-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ files:
 - lib/rfetion/fetion.rb
 - rfetion.gemspec
 has_rdoc: true
-homepage: ""
+homepage: http://github.com/flyerhzm/rfetion
 licenses: []
 
 post_install_message: