oversip 1.0.1 → 1.0.2

data/AUTHORS

@@ -9,3 +9,10 @@ CONTRIBUTORS
 ============
 
 - Jon Bonilla <manwe@aholab.ehu.es> (Github @manwe)
+  Lot of help with Debian package.
+
+- Saúl Ibarra <saghul@gmail.com> (Github @saghul)
+  Testing, ideas, proposals, too much proposals.
+
+- José Luis Millán <jmillan@aliax.net> (Github @jmillan)
+  Intensive testing with JsSIP library acting as client with OverSIP.

data/README.md

@@ -1,5 +1,4 @@
-OverSIP
-=======
+<a style="color: red" href="http://www.oversip.net"><img src="https://github.com/versatica/OverSIP/wiki/oversip-banner.png"/></a>
 
 **WEB UNDER CONSTRUCTION:** The code is stable and working. This web page and documentation is not... please wait a bit.
 

data/debian/control

@@ -9,7 +9,7 @@ Standards-Version: 3.9.3
 Package: oversip
 Architecture: all
 Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1, ruby1.9.1-dev, make, g++, libssl-dev, libev-dev
-Recommends: unbound
+Suggests: unbound
 Description: OverSIP (the SIP dreams factory) is an async SIP proxy/server programmable in Ruby language.
   Some features of OverSIP are:
   - SIP transports: UDP, TCP, TLS and WebSocket.

data/debian/oversip.init

@@ -31,7 +31,7 @@ UBUNTU_LOGGING=0
 
 
 # Checks for the start action.
-if [ "$1" == "start" ] ; then
+if [ "$1" == "start" ] || [ "$1" == "restart" ] || [ "$1" == "force-reload" ] ; then
 
   # Ensure that the admin has set RUN=yes in /etc/default/$NAME file.
   if [ "$RUN" != "yes" ] ; then
@@ -79,7 +79,7 @@ if [ -n "$GROUP" ] ; then
 fi
 
 
-check_homedir ()
+check_homedir()
 {
   # Create HOMEDIR directory in case it doesn't exist.
   # Useful in Ubuntu as /var/run/ content is deleted in shutdown.
@@ -107,8 +107,22 @@ get_status() {
 }
 
 
-# TODO: mirar get_status() en vez de esperar a que oversip pete si estaba ya corriendo...
 start() {
+  set +e
+  get_status
+  case $? in
+    0)  # Already running, do nothing.
+      log_warning_msg "already running."
+      exit 0
+      ;;
+    3)  # Not running, start it.
+      ;;
+    1)  # Not running but PID file exists, remove it and start.
+      log_warning_msg "not running but PID file '$PIDFILE' exists, deleting it."
+      rm "$PIDFILE"
+      ;;
+  esac
+
   start-stop-daemon --start --quiet --pidfile $PIDFILE --quiet \
     --exec $DAEMON -- $OPTIONS
   res=$?
@@ -121,9 +135,6 @@ start() {
       log_failure_msg "error, failed to start."
       log_end_msg 1
       exit 1
-    elif read pid < "$PIDFILE" && ps -p "$pid" > /dev/null 2>&1; then
-      log_warning_msg "already running."
-      exit 0
     else
       log_failure_msg "error, failed to start (and PID file '$PIDFILE' exists)."
       log_end_msg 1
@@ -189,18 +200,20 @@ case "$1" in
     ;;
 
   status)
+    set +e
     get_status
     case $? in
-      3)
-        log_warning_msg "$DESC ($NAME) is not running."
+      3)  # Not running.
+        log_begin_msg "$DESC ($NAME) is not running."
+        [ $UBUNTU_LOGGING -eq 0 ] && echo
         exit 3
         ;;
-      0)
+      0)  # Running.
         log_begin_msg "$DESC ($NAME) is running."
         [ $UBUNTU_LOGGING -eq 0 ] && echo
         exit 0
         ;;
-      1)
+      1)  # Not running but PID file exists.
         log_warning_msg "$DESC ($NAME) is not running but PID file '$PIDFILE' exists."
         exit 1
         ;;

data/debian/preinst

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# preinst script can be called with arguments 'install', 'upgrade' and 'abort-upgrade'.
+
+set -e
+
+#DEBHELPER#
+
+OVERSIP_GEM_VERSION="~>1.0.1"
+
+case "$1" in
+
+  install)
+    # Add a Debian system user/group called "oversip".
+    adduser --quiet --system --group --disabled-password \
+            --shell /bin/false --gecos "OverSIP" \
+            --home /var/run/oversip oversip || true
+
+    # Install the Ruby gem.
+    echo "installing 'oversip' Ruby Gem (version $OVERSIP_GEM_VERSION)..."
+    gem1.9.1 install oversip --no-rdoc --no-ri -v $OVERSIP_GEM_VERSION
+    ;;
+
+  upgrade)
+    # Install the Ruby gem.
+    echo "installing 'oversip' Ruby Gem (version $OVERSIP_GEM_VERSION)..."
+    gem1.9.1 install oversip --no-rdoc --no-ri -v $OVERSIP_GEM_VERSION
+    ;;
+
+esac
+
+exit 0
+
+#DEBHELPER#

data/lib/oversip/config.rb

@@ -135,7 +135,7 @@ module OverSIP
 
 
     def self.load conf_dir = nil
-      @conf_dir ||= DEFAULT_CONFIG_DIR
+      @conf_dir ||= (conf_dir || DEFAULT_CONFIG_DIR)
 
       begin
         conf_yaml = ::YAML.load_file conf_file

data/lib/oversip/version.rb

@@ -5,7 +5,7 @@ module OverSIP
   module Version
     MAJOR = 1
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
   end
 
   PROGRAM_NAME     = "OverSIP"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
-  requirement: &11745940 !ruby/object:Gem::Requirement
+  requirement: &8648800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *11745940
+  version_requirements: *8648800
 - !ruby/object:Gem::Dependency
   name: iobuffer
-  requirement: &11744480 !ruby/object:Gem::Requirement
+  requirement: &8648320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *11744480
+  version_requirements: *8648320
 - !ruby/object:Gem::Dependency
   name: em-posixmq
-  requirement: &12616040 !ruby/object:Gem::Requirement
+  requirement: &8647860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *12616040
+  version_requirements: *8647860
 - !ruby/object:Gem::Dependency
   name: em-udns
-  requirement: &12615400 !ruby/object:Gem::Requirement
+  requirement: &8647340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *12615400
+  version_requirements: *8647340
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &12614940 !ruby/object:Gem::Requirement
+  requirement: &8646840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *12614940
+  version_requirements: *8646840
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &12614500 !ruby/object:Gem::Requirement
+  requirement: &8646380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12614500
+  version_requirements: *8646380
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &12613980 !ruby/object:Gem::Requirement
+  requirement: &8645760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12613980
+  version_requirements: *8645760
 description: ! "OverSIP is an async SIP server. Built on top of Ruby EventMachine\n
   \   library it follows the Reactor Pattern, allowing thousands of concurrent connections
   and requests\n    handled by a single processor in a never-blocking fashion. It
@@ -234,8 +234,8 @@ files:
 - debian/oversip.init
 - debian/oversip.default
 - debian/changelog
-- debian/postinst
 - debian/control
+- debian/preinst
 - Rakefile
 - README.md
 - AUTHORS

data/debian/postinst

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -e
-
-
-#DEBHELPER#
-
-OVERSIP_GEM_VERSION="~>1.0.1"
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-  configure)
-    # Add a Debian system user/group called "oversip".
-    adduser --quiet --system --group --disabled-password \
-            --shell /bin/false --gecos "OverSIP" \
-            --home /var/run/oversip oversip || true
-
-    # Install the Ruby gem.
-    # TODO: ACTIVAR
-    #echo "installing 'oversip' Ruby Gem (version $OVERSIP_GEM_VERSION)..."
-    #gem1.9.1 install oversip --no-rdoc --no-ri -v $OVERSIP_GEM_VERSION
-    ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-exit 0
-
-#DEBHELPER#