smsforall 0.0.4 → 0.1.0

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+gem 'logger-colors'
+

data/bin/smsforall

@@ -2,90 +2,128 @@
 
 require 'smsforall'
 require 'optparse'
+require 'logger/colors'
 
-# Parameters parsing
-options = {}
- 
-optparse = OptionParser.new do|opts|
-  opts.banner = "Usage: smsforall (-l login -p password|--test) COMMAND [options] ..."
-
-  opts.separator  ""
-  opts.separator  "Commands"
-  opts.separator  "     balance                   : get balance"
-  opts.separator  "     send SENDER NUMBER TEXT   : send SMS with TEXT to NUMBER"
-  opts.separator  "     status TRANSACTION        : get status of transaction"
-  opts.separator  ""
-  opts.separator  "Options"
- 
-  # Define the options, and what they do
-  options[:login] = nil
-  opts.on( '-l', '--login LOGIN', 'Login' ) do|login|
-    options[:login] = login
-  end
- 
-  options[:password] = nil
-  opts.on( '-p', '--password PASSWORD', 'Password' ) do|password|
-    options[:password] = password
-  end
- 
-  options[:test] = :production
-  opts.on( '-t', '--test', 'Enable test mode' ) do
-    options[:test] = :test
-  end
- 
-  opts.on( '-h', '--help', 'Display this screen' ) do
-    puts opts
-    exit
+class SmsforallScript
+
+  def initialize
+    @log = Logger.new(STDOUT)
+    @log.formatter = proc{ |level, datetime, progname, msg| "[#{level}]: #{msg}\n" }
+    @log.level = Logger::ERROR
+    parse_parameters
+    @sms = Smsforall::Sms.new(@options[:login],@options[:password], @options[:test])
+    route
   end
-end
- 
-optparse.parse!
 
-if options[:test] == :test
-  puts "[WARNING]: test mode enabled!"
-  options[:login] = "test"
-  options[:password] = "test"
-end
+  private
 
-if not (options[:login] && options[:password])
-  puts "[ERROR]: you must provide login and password!"
-  exit
-end
+  def parse_parameters
+    # Parameters parsing
+    @options = {}
+    
+    optparse = OptionParser.new do|opts|
+      opts.banner = "Usage: smsforall (-l login -p password|--test) [-v|V] [-q] COMMAND [options] ..."
 
-if not %w[balance send status].include?(ARGV[0])
-  puts "[ERROR]: command not defined!"
-  exit
-end
+      opts.separator  ""
+      opts.separator  "Commands"
+      opts.separator  "     balance                   : get balance"
+      opts.separator  "     send SENDER NUMBER TEXT   : send SMS with TEXT to NUMBER"
+      opts.separator  "     status TRANSACTION        : get status of transaction"
+      opts.separator  ""
+      opts.separator  "Options"
+      
+      # Define the options, and what they do
+      @options[:login] = nil
+      opts.on( '-l', '--login LOGIN', 'Login' ) do|login|
+        @options[:login] = login
+      end
+      
+      @options[:password] = nil
+      opts.on( '-p', '--password PASSWORD', 'Password' ) do|password|
+        @options[:password] = password
+      end
+      
+      @options[:test] = :production
+      opts.on( '-t', '--test', 'Enable test mode' ) do
+        @options[:test] = :test
+      end
 
-# actions
-def get_balance(login, password, test)
-  sms = Smsforall::Sms.new(login,password, test)
-  puts "[INFO]: getting balance for #{login}"
-  balance = sms.get_balance()
-  puts "#{balance}"
-end
+      @options[:verbose] = false
+      opts.on( '-v', '--verbose', 'Verbose output' ) do
+        @options[:verbose] = true
+      end
+
+      @options[:more_verbose] = false
+      opts.on( '-V', '--more_verbose', 'More verbose output' ) do
+        @options[:more_verbose] = true
+      end
+
+      @options[:quiet] = false
+      opts.on( '-q', '--quiet', 'Quiet mode' ) do
+        @options[:quiet] = true
+      end
+      
+      opts.on( '-h', '--help', 'Display this screen' ) do
+        puts opts
+        exit
+      end
+    end
+    
+    optparse.parse!
+
+    if @options[:verbose] then @log.level = Logger::WARN end
+    if @options[:more_verbose] then @log.level = Logger::DEBUG end
+    if @options[:quiet] then @log.level = Logger::FATAL end
 
-def send_sms(login, password, test, sender, number, text)
-  if not (sender && number && text)
-    puts "[ERROR]: wrong number of parameters!"
-    exit
+    if @options[:test] == :test
+      @log.warn "test mode enabled!"
+      @options[:login] = "test"
+      @options[:password] = "test"
+    end
+
+    if not (@options[:login] && @options[:password])
+      @log.error "you must provide login and password!"
+      exit
+    end
+
+    if not %w[balance send status].include?(ARGV[0])
+      @log.error "command not defined!"
+      exit
+    end
   end
-  puts "[INFO]: sending SMS to #{number}"
-  sms = Smsforall::Sms.new(login,password, test)
-  transaction = sms.send_message(sender, text, number)
-  puts "#{transaction}"
-end
 
-def get_status(login, password, test, transaction)
-  puts "[INFO]: getting status"
-  sms = Smsforall::Sms.new(login,password, test)
-  status = sms.get_status(transaction)["status"]
-  puts "#{status}"
-end
+  # route command
+  def route
+    case ARGV[0]
+      when "balance" then get_balance
+      when "send"    then send_sms(ARGV[1], ARGV[2], ARGV[3])
+      when "status"  then get_status(ARGV[1])
+    end
+  end
 
-# route command
-action = case ARGV[0]
-           when "balance" then get_balance(options[:login], options[:password], options[:test])
-           when "send" then send_sms(options[:login], options[:password], options[:test], ARGV[1], ARGV[2], ARGV[3])
-           when "status" then get_status(options[:login], options[:password], options[:test], ARGV[1])
+  # actions
+  def get_balance()
+    @log.info "getting balance for #{@options[:login]}"
+    balance = @sms.get_balance()
+    puts "#{balance}"
+  end
+
+  def send_sms(sender, number, text)
+    if not (sender && number && text)
+      @log.error "wrong number of parameters!"
+      exit
+    end
+    @log.info "sending SMS to #{number}"
+    transaction = @sms.send_message(sender, text, number)
+    puts "#{transaction}"
+  end
+
+  def get_status(transaction)
+    @log.info "getting status"
+    status = @sms.get_status(transaction)["status"]
+    puts "#{status}"
+  end
+  
 end
+
+sms = SmsforallScript.new

data/lib/smsforall/version.rb

@@ -1,4 +1,4 @@
 module Smsforall
   # GEM version
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/smsforall.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Smsforall::VERSION
 
   gem.add_dependency 'json_pure'
+  gem.add_dependency 'logger-colors'
 
   gem.add_development_dependency 'rspec'
 end

metadata

@@ -2,7 +2,7 @@
 name: smsforall
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - drakmail
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-02 00:00:00 Z
+date: 2012-09-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -24,7 +24,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: logger-colors
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -32,8 +32,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Interaction with smsforall.ru API
 email: 
 - drakmail@delta.pm