warbler 1.3.0 → 1.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/Gemfile +3 -1
  2. data/History.txt +5 -0
  3. data/Rakefile +7 -6
  4. data/lib/warbler/jar.rb +1 -0
  5. data/lib/warbler/version.rb +1 -1
  6. data/lib/warbler_jar.jar +0 -0
  7. data/spec/spec_helper.rb +1 -0
  8. metadata +175 -179
data/Gemfile CHANGED
@@ -1,14 +1,16 @@
1
1
  source "http://rubygems.org/"
2
2
 
3
- gem "rake", ">= 0.8.7"
3
+ gem "rake", "~> 0.8.7"
4
4
  gem "rubyzip"
5
5
  gem "jruby-jars"
6
6
  gem "jruby-rack"
7
7
 
8
8
  group :development do
9
+ gem "jruby-openssl"
9
10
  gem "rspec", "~> 1.3"
10
11
  gem "diff-lcs"
11
12
  gem "rcov", ">= 0.9.8"
13
+ gem "rubyforge"
12
14
  gem "hoe", ">= 2.3.2"
13
15
  gem "rdoc"
14
16
  end
data/History.txt CHANGED
@@ -1,3 +1,8 @@
1
+ == 1.3.1
2
+
3
+ - Pin rake version to ~> 0.8.7 for now. Rake 0.9.0 compatibility will
4
+ follow in a future release.
5
+
1
6
  == 1.3.0
2
7
 
3
8
  - Warbler can now package regular Ruby projects as executable jar
data/Rakefile CHANGED
@@ -23,6 +23,7 @@ begin
23
23
  File.open("Manifest.txt", "wb") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
24
24
  require 'hoe'
25
25
  require File.dirname(__FILE__) + '/lib/warbler/version'
26
+ Hoe.plugin :rubyforge
26
27
  hoe = Hoe.spec("warbler") do |p|
27
28
  p.version = Warbler::VERSION
28
29
  p.rubyforge_name = "caldersphere"
@@ -32,11 +33,10 @@ begin
32
33
  p.summary = "Warbler chirpily constructs .war files of your Rails applications."
33
34
  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
34
35
  p.description = p.paragraphs_of('README.txt', 1...2).join("\n\n")
35
- p.extra_deps += [['rake', '>= 0.8.7'], ['jruby-jars', '>= 1.4.0'], ['jruby-rack', '>= 1.0.0'], ['rubyzip', '>= 0.9.4']]
36
+ p.extra_deps += [['rake', '~> 0.8.7'], ['jruby-jars', '>= 1.4.0'], ['jruby-rack', '>= 1.0.0'], ['rubyzip', '>= 0.9.4']]
36
37
  p.clean_globs += %w(MANIFEST web.xml init.rb).map{|f| "spec/sample*/#{f}*" }
37
38
  end
38
39
  hoe.spec.files = MANIFEST
39
- hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
40
40
  hoe.spec.rdoc_options += ["-SHN", "-f", "darkfish"]
41
41
 
42
42
  task :gemspec do
@@ -72,8 +72,13 @@ end
72
72
 
73
73
  task :default => :spec
74
74
 
75
+ desc "Compile and jar the Warbler Java helper classes"
75
76
  begin
76
77
  require 'ant'
78
+ task :jar => :compile do
79
+ ant.jar :basedir => "pkg/classes", :destfile => "lib/warbler_jar.jar", :includes => "*.class"
80
+ end
81
+
77
82
  directory "pkg/classes"
78
83
  task :compile => "pkg/classes" do |t|
79
84
  ant.javac :srcdir => "ext", :destdir => t.prerequisites.first,
@@ -81,10 +86,6 @@ begin
81
86
  :classpath => "${java.class.path}:${sun.boot.class.path}",
82
87
  :includeantRuntime => false
83
88
  end
84
-
85
- task :jar => :compile do
86
- ant.jar :basedir => "pkg/classes", :destfile => "lib/warbler_jar.jar", :includes => "*.class"
87
- end
88
89
  rescue LoadError
89
90
  task :jar do
90
91
  puts "Run 'jar' with JRuby >= 1.5 to re-compile the java jar booster"
data/lib/warbler/jar.rb CHANGED
@@ -7,6 +7,7 @@
7
7
 
8
8
  require 'zip/zip'
9
9
  require 'stringio'
10
+ require 'pathname'
10
11
 
11
12
  module Warbler
12
13
  # Class that holds the files that will be stored in the jar file.
data/lib/warbler/version.rb CHANGED
@@ -6,5 +6,5 @@
6
6
  #++
7
7
 
8
8
  module Warbler
9
- VERSION = "1.3.0"
9
+ VERSION = "1.3.1"
10
10
  end
data/lib/warbler_jar.jar CHANGED
Binary file
data/spec/spec_helper.rb CHANGED
@@ -38,6 +38,7 @@ module Spec::Example::ExampleGroupMethods
38
38
  before :each do
39
39
  (@pwd ||= []) << Dir.getwd
40
40
  Dir.chdir(@pwd.first) # let directory always be relative to project root
41
+ mkdir_p(dir, :verbose => false)
41
42
  Dir.chdir(dir)
42
43
  end
43
44
 
metadata CHANGED
@@ -1,86 +1,84 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: warbler
3
3
  version: !ruby/object:Gem::Version
4
- hash: 27
5
4
  prerelease:
6
- segments:
7
- - 1
8
- - 3
9
- - 0
10
- version: 1.3.0
5
+ version: 1.3.1
11
6
  platform: ruby
12
7
  authors:
13
- - Nick Sieger
8
+ - Nick Sieger
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
12
 
18
- date: 2011-04-18 00:00:00 Z
13
+ date: 2011-05-24 00:00:00 -05:00
14
+ default_executable:
19
15
  dependencies:
20
- - !ruby/object:Gem::Dependency
21
- type: :runtime
22
- requirement: &id001 !ruby/object:Gem::Requirement
23
- none: false
24
- requirements:
25
- - - ">="
26
- - !ruby/object:Gem::Version
27
- hash: 49
28
- segments:
29
- - 0
30
- - 8
31
- - 7
32
- version: 0.8.7
33
- version_requirements: *id001
34
- name: rake
35
- prerelease: false
36
- - !ruby/object:Gem::Dependency
37
- type: :runtime
38
- requirement: &id002 !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- hash: 7
44
- segments:
45
- - 1
46
- - 4
47
- - 0
48
- version: 1.4.0
49
- version_requirements: *id002
50
- name: jruby-jars
51
- prerelease: false
52
- - !ruby/object:Gem::Dependency
53
- type: :runtime
54
- requirement: &id003 !ruby/object:Gem::Requirement
55
- none: false
56
- requirements:
57
- - - ">="
58
- - !ruby/object:Gem::Version
59
- hash: 23
60
- segments:
61
- - 1
62
- - 0
63
- - 0
64
- version: 1.0.0
65
- version_requirements: *id003
66
- name: jruby-rack
67
- prerelease: false
68
- - !ruby/object:Gem::Dependency
69
- type: :runtime
70
- requirement: &id004 !ruby/object:Gem::Requirement
71
- none: false
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- hash: 51
76
- segments:
77
- - 0
78
- - 9
79
- - 4
80
- version: 0.9.4
81
- version_requirements: *id004
82
- name: rubyzip
83
- prerelease: false
16
+ - !ruby/object:Gem::Dependency
17
+ name: rake
18
+ version_requirements: &id001 !ruby/object:Gem::Requirement
19
+ none: false
20
+ requirements:
21
+ - - ~>
22
+ - !ruby/object:Gem::Version
23
+ version: 0.8.7
24
+ requirement: *id001
25
+ prerelease: false
26
+ type: :runtime
27
+ - !ruby/object:Gem::Dependency
28
+ name: jruby-jars
29
+ version_requirements: &id002 !ruby/object:Gem::Requirement
30
+ none: false
31
+ requirements:
32
+ - - ">="
33
+ - !ruby/object:Gem::Version
34
+ version: 1.4.0
35
+ requirement: *id002
36
+ prerelease: false
37
+ type: :runtime
38
+ - !ruby/object:Gem::Dependency
39
+ name: jruby-rack
40
+ version_requirements: &id003 !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ">="
44
+ - !ruby/object:Gem::Version
45
+ version: 1.0.0
46
+ requirement: *id003
47
+ prerelease: false
48
+ type: :runtime
49
+ - !ruby/object:Gem::Dependency
50
+ name: rubyzip
51
+ version_requirements: &id004 !ruby/object:Gem::Requirement
52
+ none: false
53
+ requirements:
54
+ - - ">="
55
+ - !ruby/object:Gem::Version
56
+ version: 0.9.4
57
+ requirement: *id004
58
+ prerelease: false
59
+ type: :runtime
60
+ - !ruby/object:Gem::Dependency
61
+ name: rubyforge
62
+ version_requirements: &id005 !ruby/object:Gem::Requirement
63
+ none: false
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ version: 2.0.4
68
+ requirement: *id005
69
+ prerelease: false
70
+ type: :development
71
+ - !ruby/object:Gem::Dependency
72
+ name: hoe
73
+ version_requirements: &id006 !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ">="
77
+ - !ruby/object:Gem::Version
78
+ version: 2.9.1
79
+ requirement: *id006
80
+ prerelease: false
81
+ type: :development
84
82
  description: |-
85
83
  Warbler is a gem to make a Java jar or war file out of any Ruby,
86
84
  Rails, Merb, or Rack application. Warbler provides a minimal,
@@ -88,132 +86,130 @@ description: |-
88
86
  deployment to a Java environment.
89
87
  email: nick@nicksieger.com
90
88
  executables:
91
- - warble
89
+ - warble
92
90
  extensions: []
93
91
 
94
92
  extra_rdoc_files:
95
- - History.txt
96
- - LICENSE.txt
97
- - Manifest.txt
98
- - README.txt
93
+ - History.txt
94
+ - LICENSE.txt
95
+ - Manifest.txt
96
+ - README.txt
99
97
  files:
100
- - Gemfile
101
- - History.txt
102
- - LICENSE.txt
103
- - Manifest.txt
104
- - README.txt
105
- - Rakefile
106
- - bin/warble
107
- - ext/JarMain.java
108
- - ext/WarMain.java
109
- - ext/WarblerJar.java
110
- - ext/WarblerJarService.java
111
- - lib/warbler.rb
112
- - lib/warbler/application.rb
113
- - lib/warbler/config.rb
114
- - lib/warbler/gems.rb
115
- - lib/warbler/jar.rb
116
- - lib/warbler/task.rb
117
- - lib/warbler/templates/bundler.erb
118
- - lib/warbler/templates/config.erb
119
- - lib/warbler/templates/jar.erb
120
- - lib/warbler/templates/rack.erb
121
- - lib/warbler/templates/rails.erb
122
- - lib/warbler/templates/war.erb
123
- - lib/warbler/traits.rb
124
- - lib/warbler/traits/bundler.rb
125
- - lib/warbler/traits/gemspec.rb
126
- - lib/warbler/traits/jar.rb
127
- - lib/warbler/traits/merb.rb
128
- - lib/warbler/traits/nogemspec.rb
129
- - lib/warbler/traits/rack.rb
130
- - lib/warbler/traits/rails.rb
131
- - lib/warbler/traits/war.rb
132
- - lib/warbler/version.rb
133
- - lib/warbler/war.rb
134
- - lib/warbler_jar.jar
135
- - spec/drb_helper.rb
136
- - spec/sample_bundler/Gemfile.lock
137
- - spec/sample_bundler/config.ru
138
- - spec/sample_bundler/vendor/bundle/jruby/1.8/cache/rake-0.8.7.gem
139
- - spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/lib/rake.rb
140
- - spec/sample_bundler/vendor/bundle/jruby/1.8/specifications/rake-0.8.7.gemspec
141
- - spec/sample_bundler/vendor/bundle/ruby/1.8/cache/rake-0.8.7.gem
142
- - spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/lib/rake.rb
143
- - spec/sample_bundler/vendor/bundle/ruby/1.8/specifications/rake-0.8.7.gemspec
144
- - spec/sample_bundler/vendor/bundle/ruby/1.9.1/cache/rake-0.8.7.gem
145
- - spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/lib/rake.rb
146
- - spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec
147
- - spec/sample_jar/History.txt
148
- - spec/sample_jar/Manifest.txt
149
- - spec/sample_jar/README.txt
150
- - spec/sample_jar/lib/sample_jar.rb
151
- - spec/sample_jar/sample_jar.gemspec
152
- - spec/sample_jar/test/test_sample_jar.rb
153
- - spec/sample_war/app/controllers/application.rb
154
- - spec/sample_war/app/helpers/application_helper.rb
155
- - spec/sample_war/config/boot.rb
156
- - spec/sample_war/config/database.yml
157
- - spec/sample_war/config/environment.rb
158
- - spec/sample_war/config/environments/development.rb
159
- - spec/sample_war/config/environments/production.rb
160
- - spec/sample_war/config/environments/test.rb
161
- - spec/sample_war/config/initializers/inflections.rb
162
- - spec/sample_war/config/initializers/mime_types.rb
163
- - spec/sample_war/config/initializers/new_rails_defaults.rb
164
- - spec/sample_war/config/routes.rb
165
- - spec/sample_war/lib/tasks/utils.rake
166
- - spec/sample_war/public/404.html
167
- - spec/sample_war/public/422.html
168
- - spec/sample_war/public/500.html
169
- - spec/sample_war/public/favicon.ico
170
- - spec/sample_war/public/index.html
171
- - spec/sample_war/public/robots.txt
172
- - spec/spec_helper.rb
173
- - spec/warbler/application_spec.rb
174
- - spec/warbler/bundler_spec.rb
175
- - spec/warbler/config_spec.rb
176
- - spec/warbler/gems_spec.rb
177
- - spec/warbler/jar_spec.rb
178
- - spec/warbler/task_spec.rb
179
- - spec/warbler/traits_spec.rb
180
- - spec/warbler/war_spec.rb
181
- - warble.rb
182
- - web.xml.erb
98
+ - Gemfile
99
+ - History.txt
100
+ - LICENSE.txt
101
+ - Manifest.txt
102
+ - README.txt
103
+ - Rakefile
104
+ - bin/warble
105
+ - ext/JarMain.java
106
+ - ext/WarMain.java
107
+ - ext/WarblerJar.java
108
+ - ext/WarblerJarService.java
109
+ - lib/warbler.rb
110
+ - lib/warbler/application.rb
111
+ - lib/warbler/config.rb
112
+ - lib/warbler/gems.rb
113
+ - lib/warbler/jar.rb
114
+ - lib/warbler/task.rb
115
+ - lib/warbler/templates/bundler.erb
116
+ - lib/warbler/templates/config.erb
117
+ - lib/warbler/templates/jar.erb
118
+ - lib/warbler/templates/rack.erb
119
+ - lib/warbler/templates/rails.erb
120
+ - lib/warbler/templates/war.erb
121
+ - lib/warbler/traits.rb
122
+ - lib/warbler/traits/bundler.rb
123
+ - lib/warbler/traits/gemspec.rb
124
+ - lib/warbler/traits/jar.rb
125
+ - lib/warbler/traits/merb.rb
126
+ - lib/warbler/traits/nogemspec.rb
127
+ - lib/warbler/traits/rack.rb
128
+ - lib/warbler/traits/rails.rb
129
+ - lib/warbler/traits/war.rb
130
+ - lib/warbler/version.rb
131
+ - lib/warbler/war.rb
132
+ - lib/warbler_jar.jar
133
+ - spec/drb_helper.rb
134
+ - spec/sample_bundler/Gemfile.lock
135
+ - spec/sample_bundler/config.ru
136
+ - spec/sample_bundler/vendor/bundle/jruby/1.8/cache/rake-0.8.7.gem
137
+ - spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/lib/rake.rb
138
+ - spec/sample_bundler/vendor/bundle/jruby/1.8/specifications/rake-0.8.7.gemspec
139
+ - spec/sample_bundler/vendor/bundle/ruby/1.8/cache/rake-0.8.7.gem
140
+ - spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/lib/rake.rb
141
+ - spec/sample_bundler/vendor/bundle/ruby/1.8/specifications/rake-0.8.7.gemspec
142
+ - spec/sample_bundler/vendor/bundle/ruby/1.9.1/cache/rake-0.8.7.gem
143
+ - spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/lib/rake.rb
144
+ - spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec
145
+ - spec/sample_jar/History.txt
146
+ - spec/sample_jar/Manifest.txt
147
+ - spec/sample_jar/README.txt
148
+ - spec/sample_jar/lib/sample_jar.rb
149
+ - spec/sample_jar/sample_jar.gemspec
150
+ - spec/sample_jar/test/test_sample_jar.rb
151
+ - spec/sample_war/app/controllers/application.rb
152
+ - spec/sample_war/app/helpers/application_helper.rb
153
+ - spec/sample_war/config/boot.rb
154
+ - spec/sample_war/config/database.yml
155
+ - spec/sample_war/config/environment.rb
156
+ - spec/sample_war/config/environments/development.rb
157
+ - spec/sample_war/config/environments/production.rb
158
+ - spec/sample_war/config/environments/test.rb
159
+ - spec/sample_war/config/initializers/inflections.rb
160
+ - spec/sample_war/config/initializers/mime_types.rb
161
+ - spec/sample_war/config/initializers/new_rails_defaults.rb
162
+ - spec/sample_war/config/routes.rb
163
+ - spec/sample_war/lib/tasks/utils.rake
164
+ - spec/sample_war/public/404.html
165
+ - spec/sample_war/public/422.html
166
+ - spec/sample_war/public/500.html
167
+ - spec/sample_war/public/favicon.ico
168
+ - spec/sample_war/public/index.html
169
+ - spec/sample_war/public/robots.txt
170
+ - spec/spec_helper.rb
171
+ - spec/warbler/application_spec.rb
172
+ - spec/warbler/bundler_spec.rb
173
+ - spec/warbler/config_spec.rb
174
+ - spec/warbler/gems_spec.rb
175
+ - spec/warbler/jar_spec.rb
176
+ - spec/warbler/task_spec.rb
177
+ - spec/warbler/traits_spec.rb
178
+ - spec/warbler/war_spec.rb
179
+ - warble.rb
180
+ - web.xml.erb
181
+ has_rdoc: true
183
182
  homepage: http://caldersphere.rubyforge.org/warbler
184
183
  licenses: []
185
184
 
186
185
  post_install_message:
187
186
  rdoc_options:
188
- - --main
189
- - README.txt
190
- - -SHN
191
- - -f
192
- - darkfish
187
+ - --main
188
+ - README.txt
189
+ - -SHN
190
+ - -f
191
+ - darkfish
193
192
  require_paths:
194
- - lib
193
+ - lib
195
194
  required_ruby_version: !ruby/object:Gem::Requirement
196
195
  none: false
197
196
  requirements:
198
- - - ">="
199
- - !ruby/object:Gem::Version
200
- hash: 3
201
- segments:
202
- - 0
203
- version: "0"
197
+ - - ">="
198
+ - !ruby/object:Gem::Version
199
+ hash: 2
200
+ segments:
201
+ - 0
202
+ version: "0"
204
203
  required_rubygems_version: !ruby/object:Gem::Requirement
205
204
  none: false
206
205
  requirements:
207
- - - ">="
208
- - !ruby/object:Gem::Version
209
- hash: 3
210
- segments:
211
- - 0
212
- version: "0"
206
+ - - ">="
207
+ - !ruby/object:Gem::Version
208
+ version: "0"
213
209
  requirements: []
214
210
 
215
211
  rubyforge_project: caldersphere
216
- rubygems_version: 1.7.2
212
+ rubygems_version: 1.5.1
217
213
  signing_key:
218
214
  specification_version: 3
219
215
  summary: Warbler chirpily constructs .war files of your Rails applications.