wurfl_device 0.1.4 → 0.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/.rvmrc +25 -1
  2. data/config/unicorn.conf.rb +13 -7
  3. data/lib/wurfl_device/cli.rb +41 -26
  4. data/lib/wurfl_device/constants.rb +7 -0
  5. data/lib/wurfl_device/version.rb +1 -1
  6. metadata +28 -28
data/.rvmrc CHANGED
@@ -1 +1,25 @@
1
- rvm use 1.9.2
1
+ #!/usr/bin/env bash
2
+
3
+ ruby_string="1.9.2"
4
+ gemset_name="wurfl_device"
5
+
6
+ if rvm list strings | grep -q "${ruby_string}" ; then
7
+
8
+ # Load or create the specified environment
9
+ if [[ -d "${rvm_path:-$HOME/.rvm}/environments" && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
10
+ \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
11
+ else
12
+ rvm --create "${ruby_string}@${gemset_name}"
13
+ fi
14
+
15
+ if ! command -v bundle ; then
16
+ echo "automatically installing bundler"
17
+ gem install bundler
18
+ fi
19
+
20
+ else
21
+
22
+ # Notify the user to install the desired interpreter before proceeding.
23
+ echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
24
+
25
+ fi
data/config/unicorn.conf.rb CHANGED
@@ -1,15 +1,21 @@
1
+ $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
2
+
3
+ require 'wurfl_device'
1
4
  require 'raindrops'
5
+
2
6
  $stats ||= Raindrops::Middleware::Stats.new
3
7
 
4
- app_env = ENV['RACK_ENV'] || 'development'
8
+ FileUtils.mkdir_p(WurflDevice::Constants::WEBSERVICE_ROOT) unless File.directory?(WurflDevice::Constants::WEBSERVICE_ROOT)
9
+
10
+ app_env = ENV['RACK_ENV'] || 'production'
5
11
  app_root = ::File.expand_path('../..', __FILE__)
6
12
 
7
13
  timeout 60
8
- worker_processes (app_env != 'development' ? 4 : 2)
9
- listen "/tmp/wurfl_device/webservice.sock", :backlog => 64
10
- pid "/tmp/wurfl_device/webservice.pid"
11
- working_directory "#{app_root}"
12
- stderr_path "/tmp/wurfl_device/webservice.log"
13
- stdout_path "/tmp/wurfl_device/webservice.log"
14
+ working_directory app_root
15
+ worker_processes (app_env != 'development' ? WurflDevice::Constants::WEBSERVICE_WORKER : 1)
16
+ listen File.join(WurflDevice::Constants::WEBSERVICE_ROOT, WurflDevice::Constants::WEBSERVICE_SOCKET), :backlog => 64
17
+ pid File.join(WurflDevice::Constants::WEBSERVICE_ROOT, WurflDevice::Constants::WEBSERVICE_PID)
18
+ stderr_path File.join(WurflDevice::Constants::WEBSERVICE_ROOT, WurflDevice::Constants::WEBSERVICE_LOG)
19
+ stdout_path File.join(WurflDevice::Constants::WEBSERVICE_ROOT, WurflDevice::Constants::WEBSERVICE_LOG)
14
20
 
15
21
  preload_app false
data/lib/wurfl_device/cli.rb CHANGED
@@ -26,42 +26,57 @@ module WurflDevice
26
26
  end
27
27
 
28
28
  desc "server [start|stop|restart|status]", "start a wurfl_device server"
29
+ method_option "base-dir", :type => :string, :banner => "set base directory for data files", :aliases => "-d", :default => WurflDevice::Constants::WEBSERVICE_ROOT
29
30
  method_option :host, :type => :string, :banner => "set webservice host", :aliases => "-h", :default => WurflDevice::Constants::WEBSERVICE_HOST
30
31
  method_option :port, :type => :numeric, :banner => "set webservice port", :aliases => "-p", :default => WurflDevice::Constants::WEBSERVICE_PORT
32
+ method_option :socket, :type => :string, :banner => "use unix domain socket", :aliases => "-s", :default => File.join(WurflDevice::Constants::WEBSERVICE_ROOT, WurflDevice::Constants::WEBSERVICE_SOCKET)
33
+ method_option :socket_only, :type => :boolean, :banner => "start as unix domain socket listener only", :aliases => "-t", :default => false
31
34
  def server(action=nil)
32
35
  opts = options.dup
33
36
 
34
37
  action ||= 'status'
35
38
 
36
- tmp_dir = WurflDevice.tmp_dir
39
+ pid_file = File.join(WurflDevice::Constants::WEBSERVICE_ROOT, WurflDevice::Constants::WEBSERVICE_PID)
40
+ base_dir = opts['base-dir']
41
+
42
+ FileUtils.mkdir_p(base_dir) unless File.directory?(base_dir)
37
43
  FileUtils.cd(File.expand_path('../../', File.dirname(__FILE__)))
38
44
  if action == 'start'
39
- WurflDevice.ui.info "starting webservice at #{opts.host}:#{opts.port}"
40
- args = [
41
- File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']),
42
- '-S',
43
- 'bundle', 'exec', 'unicorn',
44
- '-o',
45
- opts.host,
46
- '-p',
47
- opts.port,
48
- '-c',
49
- File.expand_path('../../config/unicorn.conf.rb', File.dirname(__FILE__)),
50
- '-E',
51
- 'production',
52
- '-D'
53
- ].join(' ')
54
-
55
- system(args)
45
+ unless File.exists?(pid_file)
46
+ WurflDevice.ui.info "starting webservice..."
47
+ WurflDevice.ui.info "listening at #{opts.socket}"
48
+ args = [
49
+ File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']),
50
+ '-S',
51
+ 'unicorn',
52
+ '-E',
53
+ 'production',
54
+ '-D',
55
+ '-c',
56
+ File.expand_path('../../config/unicorn.conf.rb', File.dirname(__FILE__)),
57
+ ]
58
+
59
+ unless opts.socket_only?
60
+ WurflDevice.ui.info "listening at #{opts.host}:#{opts.port}"
61
+ args << '-o'
62
+ args << opts.host
63
+ args << '-p'
64
+ args << opts.port
65
+ end
66
+
67
+ system(args.join(' '))
68
+ end
56
69
  elsif action == 'stop'
57
- WurflDevice.ui.info "stopping webservice..."
58
- args = [
59
- 'kill',
60
- '-QUIT',
61
- "`cat #{tmp_dir}/webservice.pid`",
62
- ].join(' ')
63
-
64
- system(args)
70
+ if File.exists?(pid_file)
71
+ WurflDevice.ui.info "stopping webservice..."
72
+ args = [
73
+ 'kill',
74
+ '-QUIT',
75
+ "`cat #{pid_file}`",
76
+ ]
77
+
78
+ system(args.join(' '))
79
+ end
65
80
  elsif action == 'restart'
66
81
  server('stop')
67
82
  server('start')
data/lib/wurfl_device/constants.rb CHANGED
@@ -1,4 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
+ require 'etc'
3
+
2
4
  module WurflDevice
3
5
  class Constants
4
6
  LOCK_TIMEOUT = 3
@@ -7,6 +9,11 @@ module WurflDevice
7
9
 
8
10
  WEBSERVICE_HOST = '127.0.0.1'
9
11
  WEBSERVICE_PORT = 8090
12
+ WEBSERVICE_ROOT = File.join(File.expand_path('~'), '.wurfl_device')
13
+ WEBSERVICE_PID = 'webservice.pid'
14
+ WEBSERVICE_LOG = 'webservice.log'
15
+ WEBSERVICE_SOCKET = 'webservice.sock'
16
+ WEBSERVICE_WORKER = 4
10
17
 
11
18
  DB_INDEX = "7".freeze
12
19
  GENERIC = 'generic'
data/lib/wurfl_device/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
 
3
3
  module WurflDevice
4
- VERSION = "0.1.4".freeze
4
+ VERSION = "0.1.5".freeze
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wurfl_device
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-10-21 00:00:00.000000000Z
12
+ date: 2011-10-22 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thor
16
- requirement: &253572180 !ruby/object:Gem::Requirement
16
+ requirement: &224270260 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *253572180
24
+ version_requirements: *224270260
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: nokogiri
27
- requirement: &253571740 !ruby/object:Gem::Requirement
27
+ requirement: &224269820 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *253571740
35
+ version_requirements: *224269820
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: redis
38
- requirement: &253571320 !ruby/object:Gem::Requirement
38
+ requirement: &224269400 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *253571320
46
+ version_requirements: *224269400
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: text
49
- requirement: &253570900 !ruby/object:Gem::Requirement
49
+ requirement: &224268980 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *253570900
57
+ version_requirements: *224268980
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: sinatra
60
- requirement: &253570480 !ruby/object:Gem::Requirement
60
+ requirement: &224268560 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *253570480
68
+ version_requirements: *224268560
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: unicorn
71
- requirement: &253570060 !ruby/object:Gem::Requirement
71
+ requirement: &224268140 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *253570060
79
+ version_requirements: *224268140
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: bundler
82
- requirement: &253569560 !ruby/object:Gem::Requirement
82
+ requirement: &224267640 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 1.0.10
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *253569560
90
+ version_requirements: *224267640
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rake
93
- requirement: &253569040 !ruby/object:Gem::Requirement
93
+ requirement: &224267120 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.9.2
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *253569040
101
+ version_requirements: *224267120
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rspec-core
104
- requirement: &253568540 !ruby/object:Gem::Requirement
104
+ requirement: &224266620 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '2.0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *253568540
112
+ version_requirements: *224266620
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rspec-expectations
115
- requirement: &253568000 !ruby/object:Gem::Requirement
115
+ requirement: &224266080 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '2.0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *253568000
123
+ version_requirements: *224266080
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rr
126
- requirement: &253567460 !ruby/object:Gem::Requirement
126
+ requirement: &224265540 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '1.0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *253567460
134
+ version_requirements: *224265540
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: faker
137
- requirement: &253566760 !ruby/object:Gem::Requirement
137
+ requirement: &224264820 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0.9'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *253566760
145
+ version_requirements: *224264820
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: simplecov
148
- requirement: &253547780 !ruby/object:Gem::Requirement
148
+ requirement: &224246240 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,7 +153,7 @@ dependencies:
153
153
  version: 0.5.3
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *253547780
156
+ version_requirements: *224246240
157
157
  description: Ruby client library for mobile handset detection
158
158
  email:
159
159
  - ahutalla@gmail.com