ey_snaplock 0.0.11.pre.2 → 0.0.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/lib/ey_snaplock/database/mysql.rb +1 -1
  2. data/lib/ey_snaplock/database/postgresql9.rb +1 -1
  3. data/lib/ey_snaplock/version.rb +1 -1
  4. data/lib/ey_snaplock.rb +2 -2
  5. metadata +122 -63
  6. data/lib/ey_snaplock/timer.rb +0 -15
data/lib/ey_snaplock/database/mysql.rb CHANGED
@@ -31,7 +31,7 @@ module EY
31
31
  pipe = IO.popen(@mysql, 'w')
32
32
  @read_lock_pid = pipe.pid
33
33
  pipe.puts('flush tables with read lock;')
34
- EY::Snaplock::Timer.timeout(timeout) do
34
+ SystemTimer.timeout_after(timeout) do
35
35
  until locked?
36
36
  sleep 1
37
37
  end
data/lib/ey_snaplock/database/postgresql9.rb CHANGED
@@ -8,7 +8,7 @@ module EY
8
8
  end
9
9
 
10
10
  def lock_filename
11
- ENV["POSTGRES_LOCK_FILENAME"] || "/db/postgres/.ey_snaplock.pid"
11
+ ENV["POSTGRES_LOCK_FILENAME"] || "/db/postgresql/.ey_snaplock.pid"
12
12
  end
13
13
 
14
14
  # Default function being called (e.g. database.with_lock)
data/lib/ey_snaplock/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module EY
2
2
  class Snaplock
3
- VERSION = '0.0.11.pre.2'
3
+ VERSION = '0.0.11'
4
4
  end
5
5
  end
data/lib/ey_snaplock.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'net/http'
2
2
  require 'net/https'
3
3
  require 'ey_snaplock/database'
4
- require 'ey_snaplock/timer'
4
+ require 'system_timer'
5
5
 
6
6
  module EY
7
7
  class Snaplock
@@ -52,7 +52,7 @@ module EY
52
52
  def timeout
53
53
  lambda do
54
54
  begin
55
- EY::Snaplock::Timer.timeout(REQUEST_TIMEOUT) { yield }
55
+ SystemTimer.timeout_after(REQUEST_TIMEOUT) { yield }
56
56
  rescue Timeout::Error
57
57
  $stderr.puts "Timeout Exceeded: Callback request took longer than #{REQUEST_TIMEOUT} seconds."
58
58
  raise
metadata CHANGED
@@ -1,121 +1,180 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: ey_snaplock
3
- version: !ruby/object:Gem::Version
4
- version: 0.0.11.pre.2
5
- prerelease: 7
3
+ version: !ruby/object:Gem::Version
4
+ hash: 9
5
+ prerelease:
6
+ segments:
7
+ - 0
8
+ - 0
9
+ - 11
10
+ version: 0.0.11
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Engine Yard
9
14
  autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
- date: 2012-02-10 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
17
+
18
+ date: 2012-03-30 00:00:00 Z
19
+ dependencies:
20
+ - !ruby/object:Gem::Dependency
15
21
  name: addressable
16
- requirement: &2152162500 !ruby/object:Gem::Requirement
22
+ prerelease: false
23
+ requirement: &id001 !ruby/object:Gem::Requirement
17
24
  none: false
18
- requirements:
25
+ requirements:
19
26
  - - ~>
20
- - !ruby/object:Gem::Version
27
+ - !ruby/object:Gem::Version
28
+ hash: 3
29
+ segments:
30
+ - 2
31
+ - 2
32
+ - 2
21
33
  version: 2.2.2
22
34
  type: :runtime
35
+ version_requirements: *id001
36
+ - !ruby/object:Gem::Dependency
37
+ name: SystemTimer
23
38
  prerelease: false
24
- version_requirements: *2152162500
25
- - !ruby/object:Gem::Dependency
39
+ requirement: &id002 !ruby/object:Gem::Requirement
40
+ none: false
41
+ requirements:
42
+ - - ~>
43
+ - !ruby/object:Gem::Version
44
+ hash: 29
45
+ segments:
46
+ - 1
47
+ - 2
48
+ - 1
49
+ version: 1.2.1
50
+ type: :runtime
51
+ version_requirements: *id002
52
+ - !ruby/object:Gem::Dependency
26
53
  name: rake
27
- requirement: &2152021020 !ruby/object:Gem::Requirement
54
+ prerelease: false
55
+ requirement: &id003 !ruby/object:Gem::Requirement
28
56
  none: false
29
- requirements:
30
- - - =
31
- - !ruby/object:Gem::Version
32
- version: 0.9.2.2
57
+ requirements:
58
+ - - "="
59
+ - !ruby/object:Gem::Version
60
+ hash: 49
61
+ segments:
62
+ - 0
63
+ - 8
64
+ - 7
65
+ version: 0.8.7
33
66
  type: :development
34
- prerelease: false
35
- version_requirements: *2152021020
36
- - !ruby/object:Gem::Dependency
67
+ version_requirements: *id003
68
+ - !ruby/object:Gem::Dependency
37
69
  name: realweb
38
- requirement: &2152018560 !ruby/object:Gem::Requirement
70
+ prerelease: false
71
+ requirement: &id004 !ruby/object:Gem::Requirement
39
72
  none: false
40
- requirements:
73
+ requirements:
41
74
  - - ~>
42
- - !ruby/object:Gem::Version
75
+ - !ruby/object:Gem::Version
76
+ hash: 21
77
+ segments:
78
+ - 0
79
+ - 2
80
+ - 1
43
81
  version: 0.2.1
44
82
  type: :development
45
- prerelease: false
46
- version_requirements: *2152018560
47
- - !ruby/object:Gem::Dependency
83
+ version_requirements: *id004
84
+ - !ruby/object:Gem::Dependency
48
85
  name: cucumber
49
- requirement: &2152014620 !ruby/object:Gem::Requirement
86
+ prerelease: false
87
+ requirement: &id005 !ruby/object:Gem::Requirement
50
88
  none: false
51
- requirements:
89
+ requirements:
52
90
  - - ~>
53
- - !ruby/object:Gem::Version
91
+ - !ruby/object:Gem::Version
92
+ hash: 55
93
+ segments:
94
+ - 0
95
+ - 10
96
+ - 0
54
97
  version: 0.10.0
55
98
  type: :development
56
- prerelease: false
57
- version_requirements: *2152014620
58
- - !ruby/object:Gem::Dependency
99
+ version_requirements: *id005
100
+ - !ruby/object:Gem::Dependency
59
101
  name: aruba
60
- requirement: &2152173460 !ruby/object:Gem::Requirement
102
+ prerelease: false
103
+ requirement: &id006 !ruby/object:Gem::Requirement
61
104
  none: false
62
- requirements:
105
+ requirements:
63
106
  - - ~>
64
- - !ruby/object:Gem::Version
65
- version: '0.3'
107
+ - !ruby/object:Gem::Version
108
+ hash: 13
109
+ segments:
110
+ - 0
111
+ - 3
112
+ version: "0.3"
66
113
  type: :development
67
- prerelease: false
68
- version_requirements: *2152173460
69
- - !ruby/object:Gem::Dependency
114
+ version_requirements: *id006
115
+ - !ruby/object:Gem::Dependency
70
116
  name: sinatra
71
- requirement: &2152171000 !ruby/object:Gem::Requirement
117
+ prerelease: false
118
+ requirement: &id007 !ruby/object:Gem::Requirement
72
119
  none: false
73
- requirements:
74
- - - ! '>='
75
- - !ruby/object:Gem::Version
76
- version: '0'
120
+ requirements:
121
+ - - ">="
122
+ - !ruby/object:Gem::Version
123
+ hash: 3
124
+ segments:
125
+ - 0
126
+ version: "0"
77
127
  type: :development
78
- prerelease: false
79
- version_requirements: *2152171000
128
+ version_requirements: *id007
80
129
  description: Server side components for Engine Yard's snapshotting process
81
130
  email:
82
- executables:
131
+ executables:
83
132
  - ey-snaplock
84
133
  extensions: []
134
+
85
135
  extra_rdoc_files: []
86
- files:
136
+
137
+ files:
87
138
  - bin/ey-snaplock
88
139
  - lib/ey_snaplock/database/mysql.rb
89
140
  - lib/ey_snaplock/database/postgresql9.rb
90
141
  - lib/ey_snaplock/database.rb
91
- - lib/ey_snaplock/timer.rb
92
142
  - lib/ey_snaplock/version.rb
93
143
  - lib/ey_snaplock.rb
94
144
  - LICENSE
95
145
  - README.md
96
146
  homepage:
97
147
  licenses: []
148
+
98
149
  post_install_message:
99
150
  rdoc_options: []
100
- require_paths:
151
+
152
+ require_paths:
101
153
  - lib
102
- required_ruby_version: !ruby/object:Gem::Requirement
154
+ required_ruby_version: !ruby/object:Gem::Requirement
103
155
  none: false
104
- requirements:
105
- - - ! '>='
106
- - !ruby/object:Gem::Version
107
- version: '0'
108
- required_rubygems_version: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - ">="
158
+ - !ruby/object:Gem::Version
159
+ hash: 3
160
+ segments:
161
+ - 0
162
+ version: "0"
163
+ required_rubygems_version: !ruby/object:Gem::Requirement
109
164
  none: false
110
- requirements:
111
- - - ! '>'
112
- - !ruby/object:Gem::Version
113
- version: 1.3.1
165
+ requirements:
166
+ - - ">="
167
+ - !ruby/object:Gem::Version
168
+ hash: 3
169
+ segments:
170
+ - 0
171
+ version: "0"
114
172
  requirements: []
173
+
115
174
  rubyforge_project:
116
- rubygems_version: 1.8.10
175
+ rubygems_version: 1.8.19
117
176
  signing_key:
118
177
  specification_version: 3
119
178
  summary: Server side components for Engine Yard's snapshotting process
120
179
  test_files: []
121
- has_rdoc:
180
+
data/lib/ey_snaplock/timer.rb DELETED
@@ -1,15 +0,0 @@
1
- module EY
2
- class Snaplock
3
- class Timer
4
- def self.timeout(sec)
5
- if RUBY_VERSION =~ /^1\.8/
6
- require 'system_timer'
7
- SystemTimer.timeout_after(sec) { yield }
8
- else
9
- require 'timeout'
10
- Timeout.timeout(sec) { yield }
11
- end
12
- end
13
- end
14
- end
15
- end