jettywrapper 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/config/jetty.yml CHANGED
@@ -1,4 +1,5 @@
1
1
  jetty_port: 8983
2
2
  java_opts:
3
- - "-Xmx128m"
3
+ - "-XX:MaxPermSize=128m"
4
+ - "-Xmx256m"
4
5
 
data/jettywrapper.gemspec CHANGED
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
27
27
 
28
28
  # Bundler will install these gems too if you've checked this out from source from git and run 'bundle install'
29
29
  # It will not add these as dependencies if you require lyber-core for other projects
30
- s.add_development_dependency "ruby-debug"
31
30
  s.add_development_dependency "rspec", "< 2.0" # We're not ready to upgrade to rspec 2
32
31
  s.add_development_dependency 'mocha'
33
32
  s.add_development_dependency 'rcov'
data/lib/jettywrapper.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  #require 'logger'
3
3
  require 'loggable'
4
4
  require 'singleton'
5
- require 'ftools'
5
+ require 'fileutils'
6
6
  require 'socket'
7
7
  require 'timeout'
8
8
  require 'childprocess'
@@ -258,7 +258,7 @@ class Jettywrapper
258
258
  process = build_process
259
259
  @pid = process.pid
260
260
  end
261
- File.makedirs(pid_dir) unless File.directory?(pid_dir)
261
+ FileUtils.makedirs(pid_dir) unless File.directory?(pid_dir)
262
262
  begin
263
263
  f = File.new(pid_path, "w")
264
264
  rescue Errno::ENOENT, Errno::EACCES
@@ -1 +1 @@
1
- GEMVERSION = "1.0.1"
1
+ GEMVERSION = "1.0.2"
@@ -1,7 +1,5 @@
1
- require File.join(File.dirname(__FILE__), "/../spec_helper")
2
- require File.join(File.dirname(__FILE__), "/../../lib/jettywrapper")
1
+ require 'spec_helper'
3
2
  require 'rubygems'
4
- require 'ruby-debug'
5
3
  require 'uri'
6
4
  require 'net/http'
7
5
 
@@ -1,7 +1,5 @@
1
- require File.join(File.dirname(__FILE__), "/../spec_helper")
2
- require File.join(File.dirname(__FILE__), "/../../lib/jettywrapper")
1
+ require 'spec_helper'
3
2
  require 'rubygems'
4
- require 'ruby-debug'
5
3
 
6
4
  module Hydra
7
5
  describe Jettywrapper do
@@ -183,7 +181,7 @@ module Hydra
183
181
  Jettywrapper.any_instance.stubs(:stop).returns(true)
184
182
  error = Jettywrapper.wrap(@jetty_params) do
185
183
  ts = Jettywrapper.instance
186
- ts.quiet.should == true
184
+ ts.quiet.should == @jetty_params[:quiet]
187
185
  ts.jetty_home.should == "/path/to/jetty"
188
186
  ts.port.should == 8888
189
187
  ts.solr_home.should == "/path/to/solr"
data/spec/spec_helper.rb CHANGED
@@ -1,7 +1,8 @@
1
1
  $: << File.join(File.dirname(__FILE__), "/../../lib")
2
2
  require 'spec/autorun'
3
3
  # require 'spec/rails'
4
+ require 'jettywrapper'
4
5
 
5
6
  Spec::Runner.configure do |config|
6
7
  config.mock_with :mocha
7
- end
8
+ end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jettywrapper
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 19
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 1
10
- version: 1.0.1
9
+ - 2
10
+ version: 1.0.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Bess Sadler
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-10-11 00:00:00 -05:00
18
+ date: 2011-10-25 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -90,25 +90,11 @@ dependencies:
90
90
  - 0
91
91
  version: 3.0.0
92
92
  requirement: *id005
93
- - !ruby/object:Gem::Dependency
94
- name: ruby-debug
95
- type: :development
96
- prerelease: false
97
- version_requirements: &id006 !ruby/object:Gem::Requirement
98
- none: false
99
- requirements:
100
- - - ">="
101
- - !ruby/object:Gem::Version
102
- hash: 3
103
- segments:
104
- - 0
105
- version: "0"
106
- requirement: *id006
107
93
  - !ruby/object:Gem::Dependency
108
94
  name: rspec
109
95
  type: :development
110
96
  prerelease: false
111
- version_requirements: &id007 !ruby/object:Gem::Requirement
97
+ version_requirements: &id006 !ruby/object:Gem::Requirement
112
98
  none: false
113
99
  requirements:
114
100
  - - <
@@ -118,12 +104,12 @@ dependencies:
118
104
  - 2
119
105
  - 0
120
106
  version: "2.0"
121
- requirement: *id007
107
+ requirement: *id006
122
108
  - !ruby/object:Gem::Dependency
123
109
  name: mocha
124
110
  type: :development
125
111
  prerelease: false
126
- version_requirements: &id008 !ruby/object:Gem::Requirement
112
+ version_requirements: &id007 !ruby/object:Gem::Requirement
127
113
  none: false
128
114
  requirements:
129
115
  - - ">="
@@ -132,12 +118,12 @@ dependencies:
132
118
  segments:
133
119
  - 0
134
120
  version: "0"
135
- requirement: *id008
121
+ requirement: *id007
136
122
  - !ruby/object:Gem::Dependency
137
123
  name: rcov
138
124
  type: :development
139
125
  prerelease: false
140
- version_requirements: &id009 !ruby/object:Gem::Requirement
126
+ version_requirements: &id008 !ruby/object:Gem::Requirement
141
127
  none: false
142
128
  requirements:
143
129
  - - ">="
@@ -146,12 +132,12 @@ dependencies:
146
132
  segments:
147
133
  - 0
148
134
  version: "0"
149
- requirement: *id009
135
+ requirement: *id008
150
136
  - !ruby/object:Gem::Dependency
151
137
  name: yard
152
138
  type: :development
153
139
  prerelease: false
154
- version_requirements: &id010 !ruby/object:Gem::Requirement
140
+ version_requirements: &id009 !ruby/object:Gem::Requirement
155
141
  none: false
156
142
  requirements:
157
143
  - - "="
@@ -162,12 +148,12 @@ dependencies:
162
148
  - 6
163
149
  - 5
164
150
  version: 0.6.5
165
- requirement: *id010
151
+ requirement: *id009
166
152
  - !ruby/object:Gem::Dependency
167
153
  name: RedCloth
168
154
  type: :development
169
155
  prerelease: false
170
- version_requirements: &id011 !ruby/object:Gem::Requirement
156
+ version_requirements: &id010 !ruby/object:Gem::Requirement
171
157
  none: false
172
158
  requirements:
173
159
  - - ">="
@@ -176,7 +162,7 @@ dependencies:
176
162
  segments:
177
163
  - 0
178
164
  version: "0"
179
- requirement: *id011
165
+ requirement: *id010
180
166
  description: Spin up a jetty instance (e.g., the one at https://github.com/projecthydra/hydra-jetty) and wrap test in it. This lets us run tests against a real copy of solr and fedora.
181
167
  email:
182
168
  - bess@stanford.edu