wurfl_device 0.1.9 → 0.1.10

data/bin/wurfldevice_rpc_server

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
+
+require 'optparse'
+require 'daemons'
+require 'wurfl_device'
+require 'msgpack/rpc'
+
+$rpc_host = '0.0.0.0'
+$rpc_port = 8090
+$state_dir = File.join(ENV['HOME'], '/var/run')
+$log_dir = File.join(ENV['HOME'], '/log')
+
+args = OptionParser.new do |opts|
+  opts.on("-o", "--host=HOST", "listen on HOST (default: #{$rpc_host})") do |t|
+    $rpc_host = t
+  end
+  opts.on("-p", "--port=PORT", "set port to PORT (default: #{$rpc_port})") do |t|
+    $rpc_port = t
+  end
+  opts.on("-d", "--data=DIR", "set data dir to DIR (default: #{$state_dir})") do |t|
+    $state_dir = t
+  end
+  opts.on("-l", "--log=DIR", "set log dir to DIR (default: #{$log_dir})") do |t|
+    $log_dir = t
+  end
+end
+
+args.parse
+
+daemon_options = {
+  :backtrace => true,
+  :log_output => true,
+  :multiple => false,
+  :monitor => false,
+}
+
+class Daemons::Controller
+  def setup_options
+    @options[:dir] = $state_dir
+    @options[:log_dir] = $log_dir
+  end
+end
+
+Daemons.run_proc(File.basename($0), daemon_options) do
+  server = MessagePack::RPC::Server.new
+  server.listen($rpc_host, $rpc_port, WurflDevice::RpcServer.new)
+  server.run
+end

data/lib/wurfl_device.rb

@@ -22,6 +22,7 @@ module WurflDevice
   autoload :UserAgent,          'wurfl_device/user_agent'
   autoload :UserAgentMatcher,   'wurfl_device/user_agent_matcher'
   autoload :XmlLoader,          'wurfl_device/xml_loader'
+  autoload :RpcServer,          'wurfl_device/rpc_server'
 
   class WurflDeviceError < StandardError
     def self.status_code(code = nil)

data/lib/wurfl_device/cli.rb

@@ -28,70 +28,6 @@ module WurflDevice
       super
     end
 
-    desc "webservice [start|stop|restart|status]", "start a wurfl_device server"
-    method_option "base-dir", :type => :string, :banner => "set base directory for data files", :aliases => "-d", :default => WurflDevice::Settings::BASE_DIR
-    method_option :host, :type => :string, :banner => "set webservice host", :aliases => "-h", :default => WurflDevice::Settings::WEBSERVICE_HOST
-    method_option :port, :type => :numeric, :banner => "set webservice port", :aliases => "-p", :default => WurflDevice::Settings::WEBSERVICE_PORT
-    method_option :worker, :type => :numeric, :banner => "set worker count", :aliases => "-w", :default => WurflDevice::Settings::WEBSERVICE_WORKER
-    method_option :socket, :type => :string, :banner => "use unix domain socket", :aliases => "-s", :default => File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_SOCKET)
-    method_option :socket_only, :type => :boolean, :banner => "start as unix domain socket listener only", :aliases => "-t", :default => false
-    def webservice(action=nil)
-      opts = options.dup
-
-      action ||= 'status'
-
-      pid_file = File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_PID)
-      base_dir = opts['base-dir']
-
-      FileUtils.mkdir_p(base_dir) unless File.directory?(base_dir)
-      FileUtils.cd(File.expand_path('../../', File.dirname(__FILE__)))
-      if action == 'start'
-        unless File.exists?(pid_file)
-          WurflDevice.ui.info "starting webservice..."
-          WurflDevice.ui.info "listening at #{opts.socket}"
-
-          unicorn_bin = %x[which unicorn].strip
-          args = [
-            unicorn_bin,
-            '-E',
-            'production',
-            '-D',
-            '-c',
-            File.expand_path('../../config/unicorn.conf.rb', File.dirname(__FILE__)),
-            ]
-
-          unless opts.socket_only?
-            WurflDevice.ui.info "listening at #{opts.host}:#{opts.port}"
-            args << '-o'
-            args << opts.host
-            args << '-p'
-            args << opts.port
-          end
-
-          ENV['WURFLDEVICE_WORKER'] = opts.worker.to_s
-          ENV['WURFLDEVICE_SOCKET'] = opts.socket.to_s
-
-          exec args.join(' ')
-        end
-      elsif action == 'stop'
-        if File.exists?(pid_file)
-          WurflDevice.ui.info "stopping webservice..."
-          File.open(pid_file, 'r') do |f|
-            pid = f.gets.to_i
-            exec 'kill', '-QUIT', pid.to_s
-          end
-        end
-        FileUtils.rm_f(pid_file)
-      elsif action == 'restart'
-        webservice('stop')
-        sleep(0.3)
-        webservice('start')
-      else
-        #status
-      end
-    end
-    map %w(server) => :webservice
-
     desc "dump DEVICE_ID|USER_AGENT", "display capabilities DEVICE_ID|USER_AGENT"
     method_option :json, :type => :boolean, :banner => "show the dump in json format", :aliases => "-j"
     method_option :yaml, :type => :boolean, :banner => "show the dump in yaml format", :aliases => "-y"

data/lib/wurfl_device/rpc_server.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module WurflDevice
+  class RpcServer
+    def capabilities_from_id(device_id)
+      capabilities = WurflDevice.capabilities_from_id(device_id)
+      yield(capabilities)
+    end
+
+    def capabilities_from_user_agent(user_agent)
+      capabilities = WurflDevice.capabilities_from_user_agent(user_agent)
+      yield(capabilities)
+    end
+
+    def capability_from_user_agent(capability, user_agent)
+      capabilities = WurflDevice.capability_from_user_agent(capability, user_agent)
+      yield(capabilities)
+    end
+  end
+end

data/lib/wurfl_device/settings.rb

@@ -3,13 +3,6 @@ require 'etc'
 
 module WurflDevice
   class Settings
-    WEBSERVICE_HOST               = '127.0.0.1'
-    WEBSERVICE_PORT               = 8090
-    WEBSERVICE_PID                = 'webservice.pid'
-    WEBSERVICE_LOG                = 'webservice.log'
-    WEBSERVICE_SOCKET             = 'webservice.sock'
-    WEBSERVICE_WORKER             = 10
-
     BASE_DIR                      = File.join(File.expand_path('~'), '.wurfl_device')
 
     DB_INDEX                      = "7".freeze
@@ -19,6 +12,10 @@ module WurflDevice
 
     WORST_MATCH                   = 7
 
+    def self.default_wurfl_xml_file
+      File.join(BASE_DIR, 'wurfl.xml')
+    end
+
     MOBILE_BROWSERS   =  [
       'cldc', 'symbian', 'midp', 'j2me', 'mobile', 'wireless', 'palm', 'phone', 'pocket pc', 'pocketpc', 'netfront',
       'bolt', 'iris', 'brew', 'openwave', 'windows ce', 'wap2.', 'android', 'opera mini', 'opera mobi', 'maemo', 'fennec',
@@ -28,10 +25,6 @@ module WurflDevice
     ROBOTS            = [ 'bot', 'crawler', 'spider', 'novarra', 'transcoder', 'yahoo! searchmonkey', 'yahoo! slurp', 'feedfetcher-google', 'toolbar', 'mowser' ]
     DESKTOP_BROWSERS  = [ 'slcc1', '.net clr', 'wow64', 'media center pc', 'funwebproducts', 'macintosh', 'aol 9.', 'america online browser', 'googletoolbar' ]
 
-    def self.default_wurfl_xml_file
-      File.join(BASE_DIR, 'wurfl.xml') 
-    end
-
     # TODO this entries should be autmatically generated (in case new entries in wurfl.xml)
 
     CAPABILITY_GROUPS = [

data/lib/wurfl_device/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module WurflDevice
-  VERSION = "0.1.9".freeze
+  VERSION = "0.1.10".freeze
 end

data/wurfl_device.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'wurfl_device'
 
+  s.add_dependency 'msgpack-rpc'
+  s.add_dependency 'daemons'
   s.add_dependency 'hiredis'
   s.add_dependency 'redis'
   s.add_dependency 'thor'
   s.add_dependency 'ox'
   s.add_dependency 'text'
-  s.add_dependency 'sinatra'
-  s.add_dependency 'unicorn'
 
   s.add_development_dependency 'bundler', '>= 1.0.10'
   s.add_development_dependency 'rake', '>= 0.9.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurfl_device
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000 Z
+date: 2011-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: &187020640 !ruby/object:Gem::Requirement
+  name: msgpack-rpc
+  requirement: &38015820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *187020640
+  version_requirements: *38015820
 - !ruby/object:Gem::Dependency
-  name: redis
-  requirement: &187020000 !ruby/object:Gem::Requirement
+  name: daemons
+  requirement: &38015120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *187020000
+  version_requirements: *38015120
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &187019440 !ruby/object:Gem::Requirement
+  name: hiredis
+  requirement: &38014260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *187019440
+  version_requirements: *38014260
 - !ruby/object:Gem::Dependency
-  name: ox
-  requirement: &186910960 !ruby/object:Gem::Requirement
+  name: redis
+  requirement: &38013380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *186910960
+  version_requirements: *38013380
 - !ruby/object:Gem::Dependency
-  name: text
-  requirement: &186910360 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &38011220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *186910360
+  version_requirements: *38011220
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &186909800 !ruby/object:Gem::Requirement
+  name: ox
+  requirement: &38009440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *186909800
+  version_requirements: *38009440
 - !ruby/object:Gem::Dependency
-  name: unicorn
-  requirement: &186909220 !ruby/object:Gem::Requirement
+  name: text
+  requirement: &38007400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *186909220
+  version_requirements: *38007400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &186908420 !ruby/object:Gem::Requirement
+  requirement: &38004280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *186908420
+  version_requirements: *38004280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &186905440 !ruby/object:Gem::Requirement
+  requirement: &37181180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *186905440
+  version_requirements: *37181180
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &186904900 !ruby/object:Gem::Requirement
+  requirement: &37176540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *186904900
+  version_requirements: *37176540
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &186904360 !ruby/object:Gem::Requirement
+  requirement: &37174980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *186904360
+  version_requirements: *37174980
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &186903420 !ruby/object:Gem::Requirement
+  requirement: &37173860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *186903420
+  version_requirements: *37173860
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &187328080 !ruby/object:Gem::Requirement
+  requirement: &37173180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *187328080
+  version_requirements: *37173180
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &187326780 !ruby/object:Gem::Requirement
+  requirement: &37171500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,36 +164,36 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *187326780
+  version_requirements: *37171500
 description: Ruby client library for mobile handset detection
 email:
 - ahutalla@gmail.com
 executables:
 - wurfldevice
+- wurfldevice_rpc_server
 extensions: []
 extra_rdoc_files:
 - LICENSE
 - README.md
 files:
 - .gitignore
-- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/wurfldevice
+- bin/wurfldevice_rpc_server
 - config.ru
-- config/unicorn.conf.rb
 - lib/wurfl_device.rb
 - lib/wurfl_device/cache.rb
 - lib/wurfl_device/capability.rb
 - lib/wurfl_device/cli.rb
+- lib/wurfl_device/rpc_server.rb
 - lib/wurfl_device/settings.rb
 - lib/wurfl_device/ui.rb
 - lib/wurfl_device/user_agent.rb
 - lib/wurfl_device/user_agent_matcher.rb
 - lib/wurfl_device/version.rb
-- lib/wurfl_device/web_service.rb
 - lib/wurfl_device/xml_loader.rb
 - spec/cache/device_spec.rb
 - spec/cache/user_agents_spec.rb

data/.rvmrc

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-ruby_string="1.9"
-gemset_name="wurfl_device"
-
-if rvm list strings | grep -q "${ruby_string}" ; then
-
-  ruby_string=$(rvm list strings | head -1)
-
-  # Load or create the specified environment
-  if [[ -d "${rvm_path:-$HOME/.rvm}/environments" && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
-    \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
-  else
-    rvm --create "${ruby_string}@${gemset_name}"
-  fi
-
-else
-
-  # Notify the user to install the desired interpreter before proceeding.
-  echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
-
-fi

data/config/unicorn.conf.rb

@@ -1,27 +0,0 @@
-$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
-
-require 'wurfl_device'
-require 'raindrops'
-
-$stats ||= Raindrops::Middleware::Stats.new
-
-FileUtils.mkdir_p(WurflDevice::Settings::BASE_DIR) unless File.directory?(WurflDevice::Settings::BASE_DIR)
-
-app_env = ENV['RACK_ENV'] || 'production'
-app_root = ::File.expand_path('../..', __FILE__)
-
-app_timeout       = 60
-app_workers       = ENV['WURFLDEVICE_WORKER'].to_i || WurflDevice::Settings::WEBSERVICE_WORKER
-app_listen_socket = ENV['WURFLDEVICE_SOCKET'] || File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_SOCKET)
-app_pid_file      = ENV['WURFLDEVICE_PIDFILE'] || File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_PID)
-app_log_file      = ENV['WURFLDEVICE_LOGFILE'] || File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_LOG)
-
-timeout app_timeout
-working_directory app_root
-worker_processes (app_env != 'development' ? app_workers : 1)
-listen app_listen_socket, :backlog => 64
-pid app_pid_file
-stderr_path app_log_file
-stdout_path app_log_file
-
-preload_app false

data/lib/wurfl_device/web_service.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-require 'yaml'
-require 'json'
-require 'wurfl_device'
-require 'sinatra/base'
-
-module WurflDevice
-  class WebService < Sinatra::Base
-    get '/' do
-      user_agent = request.env['HTTP_USER_AGENT']
-      user_agent = WurflDevice::Settings::GENERIC if user_agent.nil? || user_agent.empty?
-      capabilities = WurflDevice.capabilities_from_user_agent(user_agent)
-      return capabilities.to_json if params.key?('json')
-      return capabilities.to_yaml
-    end
-
-    get '/capability/:id' do
-      user_agent = request.env['HTTP_USER_AGENT']
-      user_agent = WurflDevice::Settings::GENERIC if user_agent.nil? || user_agent.empty?
-      capability = WurflDevice.capability_from_user_agent(params[:id], user_agent)
-      return capabilities.to_json if params.key?('json')
-      return capabilities.to_yaml
-    end
-
-    get '/device/:id' do
-      capabilities = WurflDevice.capabilities_from_id(params[:id])
-      return capabilities.to_json if params.key?('json')
-      return capabilities.to_yaml
-    end
-  end
-end