wurfl_device 0.1.7 → 0.1.8

data/.rvmrc

@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
-ruby_string="1.9.3"
+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}"
@@ -12,11 +14,6 @@ if rvm list strings | grep -q "${ruby_string}" ; then
     rvm --create "${ruby_string}@${gemset_name}"
   fi
 
-  if ! command -v bundle ; then
-    echo "automatically installing bundler"
-    gem install bundler
-  fi
-
 else
 
   # Notify the user to install the desired interpreter before proceeding.

data/config/unicorn.conf.rb

@@ -11,10 +11,10 @@ app_env = ENV['RACK_ENV'] || 'production'
 app_root = ::File.expand_path('../..', __FILE__)
 
 app_timeout       = 60
-app_workers       = WurflDevice::Settings::WEBSERVICE_WORKER
-app_listen_socket = File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_SOCKET)
-app_pid_file      = File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_PID)
-app_log_file      = File.join(WurflDevice::Settings::BASE_DIR, WurflDevice::Settings::WEBSERVICE_LOG)
+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

data/config.ru

@@ -1,3 +1,5 @@
+require 'bundler/setup'
+
 use Raindrops::Middleware, :stats => $stats, :path => '/_stats'
 
 require ::File.expand_path('../lib/wurfl_device/web_service',  __FILE__)

data/lib/wurfl_device/cache.rb

@@ -28,7 +28,7 @@ module WurflDevice
         def entries
           entry_ids = Array.new
           Cache.storage.keys(build_cache_id('*')).each do |key|
-            entry_ids << key.gsub(build_cache_id(''), '')
+            entry_ids << key.gsub(build_cache_id(''), '') rescue nil
           end
           entry_ids
         end
@@ -136,6 +136,7 @@ module WurflDevice
             UserAgentsManufacturers.set user_agent.manufacturer, user_agent, device_id 
           end
         end
+        Status.set_value 'last_updated', Time.now
       end
 
       def update_actual_capabilities(user_agent, capabilities)

data/lib/wurfl_device/capability.rb

@@ -39,6 +39,15 @@ module WurflDevice
     end
 
   protected
+    def get_value(name)
+      return self[name] if self.key?(name)
+      if Settings::CAPABILITY_TO_GROUP.key?(name)
+        capability_group = Settings::CAPABILITY_TO_GROUP[name]
+        return self[capability_group][name] if self.key?(capability_group)
+      end
+      return nil
+    end
+
     def convert_key(key)
       key.is_a?(Symbol) ? key.to_s : key
     end
@@ -49,16 +58,18 @@ module WurflDevice
     #   capability.shebang                  # => "/usr/lib/local/ruby"
     #   capability.test_framework?(:rspec)  # => options[:test_framework] == :rspec
     #
+    # need to rewrite this for deep hash entries
+    # use capability to group mapping
     def method_missing(method, *args, &block)
       method = method.to_s
       if method =~ /^(\w+)\?$/
         if args.empty?
-          !!self[$1]
+          !!get_value($1)
         else
-          self[$1] == args.first
+          get_value($1) == args.first
         end
       else
-        self[method]
+        get_value(method)
       end
     end
   end

data/lib/wurfl_device/cli.rb

@@ -3,6 +3,7 @@ require 'thor'
 require 'benchmark'
 require 'wurfl_device'
 require 'yaml'
+require 'json'
 
 module WurflDevice
   class CLI < Thor
@@ -48,10 +49,10 @@ module WurflDevice
         unless File.exists?(pid_file)
           WurflDevice.ui.info "starting webservice..."
           WurflDevice.ui.info "listening at #{opts.socket}"
+
+          unicorn_bin = %x[which unicorn].strip
           args = [
-            File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']),
-            '-S',
-            'unicorn',
+            unicorn_bin,
             '-E',
             'production',
             '-D',
@@ -67,18 +68,18 @@ module WurflDevice
             args << opts.port
           end
 
-          system(args.join(' '))
+          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..."
-          args = [
-            'kill',
-            '-QUIT',
-            "`cat #{pid_file}`",
-            ]
-
-          system(args.join(' '))
+          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'
@@ -128,6 +129,12 @@ module WurflDevice
       end
       WurflDevice.ui.info "initializing wurfl device cache."
       WurflDevice::Cache.initialize_cache(xml_file)
+
+      if options.update?
+        WurflDevice.ui.info "rebuilding user agent cache."
+        WurflDevice::Cache.rebuild_user_agents
+      end
+
       status true
     end
 
@@ -153,8 +160,8 @@ module WurflDevice
         matched_count = matched_count + 1
       end
       WurflDevice.ui.info "  " + commify(devices.length) + " device id's"
-      WurflDevice.ui.info "  " + commify(user_agents.length) + " exact user agents" + user_agents_message
-      WurflDevice.ui.info "  " + commify(matched_count) + " user agents matched found in cache"
+      WurflDevice.ui.info "  " + commify(user_agents.length) + " user agents in cache" + user_agents_message
+      WurflDevice.ui.info "  " + commify(matched_count) + " user agents matched"
 
       user_agent_manufacturers = Array.new
       WurflDevice::Cache::UserAgentsManufacturers.entries.each do |index|