pswincom 0.1.5 → 0.1.6

data/README.md

@@ -41,6 +41,7 @@ Properties currently supported are:
 * :TTL - time to live in minutes
 * :deliverytime - a Time object specifying when to send the message
 * :tariff - the amount (in local currency as cents/"ører") to charge the receiver
+* :servicecode - ServiceCode for sending GAS messages. Requires that :tariff is set
 
 Specifying Host
 ---------------

data/lib/pswincom/request.rb

@@ -9,6 +9,12 @@ module PSWinCom
       @messages = []		
     end
     def add args
+      # Only accept servicecode when there is a tariff associated
+      # with the message
+      if args[:servicecode] && args[:tariff].nil?
+        raise ArgumentError, "A message with a servicecode also needs a tariff"
+      end
+      
       @messages << args
       self
     end
@@ -30,6 +36,7 @@ module PSWinCom
         m.SND args[:sender] if args[:sender]
         m.TTL args[:TTL] if args[:TTL]
         m.TARIFF args[:tariff] if args[:tariff]
+        m.SERVICECODE args[:servicecode] if args[:servicecode]
         m.DELIVERYTIME args[:deliverytime].strftime(TIME_FORMAT) if args.include? :deliverytime
       end
   end

data/lib/pswincom/utility/options.rb

@@ -7,26 +7,39 @@ module PSWinCom
     class Options
       class << self
         
+        def current_setting setting          
+          value = @options.send(setting)
+          value ||= "(not set)"
+          "    #{setting.to_s}:".ljust(37) + value.to_s
+        end
+
         def parse(args)          
           @options = self.default_options
           parser = OptionParser.new do |opts|
             opts.banner = "Usage: sms [options] recipient(s) message"
+            opts.separator ""
             opts.separator "  Recipients can be a comma-separated list, up to 100 max."
             opts.separator ""
-            opts.separator "Specific options:"
+            opts.separator "  Current settings:"
+            opts.separator current_setting(:username)
+            opts.separator current_setting(:password)
+            opts.separator current_setting(:from)
+            opts.separator current_setting(:host)
+            opts.separator ""
+            opts.separator "  Specific options:"
           
             opts.on('-u', '--username USERNAME',
-              "Specify the pswincom username (overrides ~/.pswincom setting)") do |username|
+              "Specify username (overrides ~/.pswincom setting)") do |username|
                @options.username = username 
             end
           
             opts.on('-p', '--password PASSWORD',
-              "Specify the pswincom password (overrides ~/.pswincom setting)") do |password|
+              "Specify password (overrides ~/.pswincom setting)") do |password|
                @options.password = password
             end
                       
             opts.on('-f', '--from NAME_OR_NUMBER',
-              "Specify the name or number that the SMS will appear from") do |from|
+              "Specify name or number of sender") do |from|
                @options.from = from 
             end
             
@@ -35,11 +48,13 @@ module PSWinCom
               @options.host = host
             end
 
-            opts.on('-d', '--debug') do
+            opts.on('-d', '--debug',
+               "Print debug information") do
                PSWinCom::API.debug_mode = true
             end
 
-            opts.on('-t', '--test') do
+            opts.on('-t', '--test',
+               "Messages will not really be sent") do
                PSWinCom::API.test_mode = true
             end
           

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pswincom
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - PSWinCom AS
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-04-30 00:00:00 +02:00
 default_executable: sms
 dependencies: 
 - !ruby/object:Gem::Dependency