jenkins-plugin 0.1.14 → 0.1.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/jenkins-plugin.gemspec +1 -1
  2. data/lib/jenkins/plugin/tools/bundle.rb +7 -41
  3. data/lib/jenkins/plugin/tools/package.rb +10 -3
  4. data/lib/jenkins/plugin/version.rb +1 -1
  5. metadata +118 -158
data/jenkins-plugin.gemspec CHANGED
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
22
22
  s.add_dependency "rubyzip"
23
23
  s.add_dependency "thor"
24
24
  s.add_dependency "jenkins-war", ">= 1.427"
25
- s.add_dependency "bundler"
25
+ s.add_dependency "bundler", "~> 1.1.rc"
26
26
  s.add_dependency "jenkins-plugin-runtime", "~> 0.1.6"
27
27
 
28
28
  s.add_development_dependency "rspec", "~> 2.0"
data/lib/jenkins/plugin/tools/bundle.rb CHANGED
@@ -11,53 +11,19 @@ module Jenkins
11
11
  def install
12
12
  require 'java'
13
13
  require 'bundler'
14
- require 'bundler/cli'
15
14
  puts "bundling..."
16
15
 
17
16
  # We set these in ENV instead of passing the --without and --path
18
17
  # options because the CLI options are remembered in .bundle/config and
19
18
  # will interfere with regular usage of bundle exec / install.
20
- ENV['BUNDLE_APP_CONFIG'] = "#{@target}/vendor/bundle"
21
- ENV['BUNDLE_WITHOUT'] = "development"
22
- ENV['BUNDLE_PATH'] = "#{@target}/vendor/gems"
23
- Bundler::CLI.start
24
-
25
- generate_standalone([])
19
+ Bundler.with_clean_env {
20
+ ENV['BUNDLE_APP_CONFIG'] = "#{@target}/vendor/bundle"
21
+ ENV['BUNDLE_WITHOUT'] = "development"
22
+ ENV['BUNDLE_PATH'] = "#{@target}/vendor/gems"
23
+ ENV.delete 'RUBYOPT'
24
+ system('bundle --standalone')
25
+ }
26
26
  end
27
-
28
- # this code lifted from Bundler::Installer v1.1, so that it will work with 1.0
29
- def generate_standalone(groups)
30
- standalone_path = Bundler.settings[:path]
31
- bundler_path = File.join(standalone_path, "bundler")
32
- FileUtils.mkdir_p(bundler_path)
33
-
34
- paths = []
35
-
36
- if groups.empty?
37
- specs = Bundler.definition.requested_specs
38
- else
39
- specs = Bundler.definition.specs_for groups.map { |g| g.to_sym }
40
- end
41
-
42
- specs.each do |spec|
43
- next if spec.name == "bundler"
44
-
45
- spec.require_paths.each do |path|
46
- full_path = File.join(spec.full_gem_path, path)
47
- paths << Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path))
48
- end
49
- end
50
-
51
-
52
- File.open File.join(bundler_path, "setup.rb"), "w" do |file|
53
- file.puts "path = File.expand_path('..', __FILE__)"
54
- paths.each do |path|
55
- file.puts %{$:.unshift File.expand_path("\#{path}/#{path}")}
56
- end
57
- end
58
- end
59
-
60
-
61
27
  end
62
28
  end
63
29
  end
data/lib/jenkins/plugin/tools/package.rb CHANGED
@@ -29,16 +29,23 @@ module Jenkins
29
29
  end
30
30
  zipfile.mkdir("WEB-INF/classes")
31
31
 
32
- ["lib","models","views", "#{@target}/vendor"].each do |d|
32
+ ["lib","models","#{@target}/vendor"].each do |d|
33
33
  Dir.glob("#{d}/**/*") do |f|
34
34
  if !File.directory? f
35
35
  p = f.gsub("#{@target}/",'')
36
- if !(p =~ /vendor\/gems\/jruby\/1.[0-9]+\/cache\/.*/)
36
+ if p !~ %r{/cache/}
37
37
  zipfile.add("WEB-INF/classes/#{p}",f)
38
38
  end
39
39
  end
40
40
  end
41
41
  end
42
+
43
+ # stapler expects views to be directly in the classpath without any prefix
44
+ Dir.glob("views/**/*") do |f|
45
+ if !File.directory? f
46
+ zipfile.add("WEB-INF/classes/#{f[6..-1]}",f)
47
+ end
48
+ end
42
49
  end
43
50
  puts "#{spec.name} plugin #{spec.version} built to #{file_name}"
44
51
 
@@ -46,4 +53,4 @@ module Jenkins
46
53
  end
47
54
  end
48
55
  end
49
- end
56
+ end
data/lib/jenkins/plugin/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Jenkins
2
2
  class Plugin
3
- VERSION = "0.1.14"
3
+ VERSION = "0.1.15"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,162 +1,131 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jenkins-plugin
3
3
  version: !ruby/object:Gem::Version
4
- hash: 7
5
4
  prerelease:
6
- segments:
7
- - 0
8
- - 1
9
- - 14
10
- version: 0.1.14
5
+ version: 0.1.15
11
6
  platform: ruby
12
7
  authors:
13
- - Charles Lowell
8
+ - Charles Lowell
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
12
 
18
- date: 2011-11-01 00:00:00 -05:00
13
+ date: 2011-11-10 00:00:00 -08:00
19
14
  default_executable:
20
15
  dependencies:
21
- - !ruby/object:Gem::Dependency
22
- name: rubyzip
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- hash: 3
30
- segments:
31
- - 0
32
- version: "0"
33
- type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: thor
37
- prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- hash: 3
44
- segments:
45
- - 0
46
- version: "0"
47
- type: :runtime
48
- version_requirements: *id002
49
- - !ruby/object:Gem::Dependency
50
- name: jenkins-war
51
- prerelease: false
52
- requirement: &id003 !ruby/object:Gem::Requirement
53
- none: false
54
- requirements:
55
- - - ">="
56
- - !ruby/object:Gem::Version
57
- hash: 857
58
- segments:
59
- - 1
60
- - 427
61
- version: "1.427"
62
- type: :runtime
63
- version_requirements: *id003
64
- - !ruby/object:Gem::Dependency
65
- name: bundler
66
- prerelease: false
67
- requirement: &id004 !ruby/object:Gem::Requirement
68
- none: false
69
- requirements:
70
- - - ">="
71
- - !ruby/object:Gem::Version
72
- hash: 3
73
- segments:
74
- - 0
75
- version: "0"
76
- type: :runtime
77
- version_requirements: *id004
78
- - !ruby/object:Gem::Dependency
79
- name: jenkins-plugin-runtime
80
- prerelease: false
81
- requirement: &id005 !ruby/object:Gem::Requirement
82
- none: false
83
- requirements:
84
- - - ~>
85
- - !ruby/object:Gem::Version
86
- hash: 23
87
- segments:
88
- - 0
89
- - 1
90
- - 6
91
- version: 0.1.6
92
- type: :runtime
93
- version_requirements: *id005
94
- - !ruby/object:Gem::Dependency
95
- name: rspec
96
- prerelease: false
97
- requirement: &id006 !ruby/object:Gem::Requirement
98
- none: false
99
- requirements:
100
- - - ~>
101
- - !ruby/object:Gem::Version
102
- hash: 3
103
- segments:
104
- - 2
105
- - 0
106
- version: "2.0"
107
- type: :development
108
- version_requirements: *id006
109
- - !ruby/object:Gem::Dependency
110
- name: cucumber
111
- prerelease: false
112
- requirement: &id007 !ruby/object:Gem::Requirement
113
- none: false
114
- requirements:
115
- - - ~>
116
- - !ruby/object:Gem::Version
117
- hash: 15
118
- segments:
119
- - 1
120
- - 0
121
- version: "1.0"
122
- type: :development
123
- version_requirements: *id007
16
+ - !ruby/object:Gem::Dependency
17
+ name: rubyzip
18
+ prerelease: false
19
+ requirement: &id001 !ruby/object:Gem::Requirement
20
+ none: false
21
+ requirements:
22
+ - - ">="
23
+ - !ruby/object:Gem::Version
24
+ version: "0"
25
+ type: :runtime
26
+ version_requirements: *id001
27
+ - !ruby/object:Gem::Dependency
28
+ name: thor
29
+ prerelease: false
30
+ requirement: &id002 !ruby/object:Gem::Requirement
31
+ none: false
32
+ requirements:
33
+ - - ">="
34
+ - !ruby/object:Gem::Version
35
+ version: "0"
36
+ type: :runtime
37
+ version_requirements: *id002
38
+ - !ruby/object:Gem::Dependency
39
+ name: jenkins-war
40
+ prerelease: false
41
+ requirement: &id003 !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ">="
45
+ - !ruby/object:Gem::Version
46
+ version: "1.427"
47
+ type: :runtime
48
+ version_requirements: *id003
49
+ - !ruby/object:Gem::Dependency
50
+ name: bundler
51
+ prerelease: false
52
+ requirement: &id004 !ruby/object:Gem::Requirement
53
+ none: false
54
+ requirements:
55
+ - - ~>
56
+ - !ruby/object:Gem::Version
57
+ version: 1.1.rc
58
+ type: :runtime
59
+ version_requirements: *id004
60
+ - !ruby/object:Gem::Dependency
61
+ name: jenkins-plugin-runtime
62
+ prerelease: false
63
+ requirement: &id005 !ruby/object:Gem::Requirement
64
+ none: false
65
+ requirements:
66
+ - - ~>
67
+ - !ruby/object:Gem::Version
68
+ version: 0.1.6
69
+ type: :runtime
70
+ version_requirements: *id005
71
+ - !ruby/object:Gem::Dependency
72
+ name: rspec
73
+ prerelease: false
74
+ requirement: &id006 !ruby/object:Gem::Requirement
75
+ none: false
76
+ requirements:
77
+ - - ~>
78
+ - !ruby/object:Gem::Version
79
+ version: "2.0"
80
+ type: :development
81
+ version_requirements: *id006
82
+ - !ruby/object:Gem::Dependency
83
+ name: cucumber
84
+ prerelease: false
85
+ requirement: &id007 !ruby/object:Gem::Requirement
86
+ none: false
87
+ requirements:
88
+ - - ~>
89
+ - !ruby/object:Gem::Version
90
+ version: "1.0"
91
+ type: :development
92
+ version_requirements: *id007
124
93
  description: I'll think of a better description later, but if you're reading this, then I haven't
125
94
  email:
126
- - cowboyd@thefrontside.net
95
+ - cowboyd@thefrontside.net
127
96
  executables:
128
- - jpi
97
+ - jpi
129
98
  extensions: []
130
99
 
131
100
  extra_rdoc_files: []
132
101
 
133
102
  files:
134
- - .gitignore
135
- - Gemfile
136
- - README.md
137
- - Rakefile
138
- - bin/jpi
139
- - features/create-new-plugin.feature
140
- - features/support/create_new_plugin_steps.rb
141
- - features/support/directory_structure.rb
142
- - features/support/work.rb
143
- - jenkins-plugin.gemspec
144
- - lib/jenkins/plugin/cli.rb
145
- - lib/jenkins/plugin/cli/formatting.rb
146
- - lib/jenkins/plugin/cli/generate.rb
147
- - lib/jenkins/plugin/cli/new.rb
148
- - lib/jenkins/plugin/cli/templates/Gemfile.tt
149
- - lib/jenkins/plugin/cli/templates/build_step.tt
150
- - lib/jenkins/plugin/cli/templates/pluginspec.tt
151
- - lib/jenkins/plugin/tools/bundle.rb
152
- - lib/jenkins/plugin/tools/hpi.rb
153
- - lib/jenkins/plugin/tools/loadpath.rb
154
- - lib/jenkins/plugin/tools/manifest.rb
155
- - lib/jenkins/plugin/tools/package.rb
156
- - lib/jenkins/plugin/tools/resolver.rb
157
- - lib/jenkins/plugin/tools/server.rb
158
- - lib/jenkins/plugin/version.rb
159
- - lib/jenkins/rake.rb
103
+ - .gitignore
104
+ - Gemfile
105
+ - README.md
106
+ - Rakefile
107
+ - bin/jpi
108
+ - features/create-new-plugin.feature
109
+ - features/support/create_new_plugin_steps.rb
110
+ - features/support/directory_structure.rb
111
+ - features/support/work.rb
112
+ - jenkins-plugin.gemspec
113
+ - lib/jenkins/plugin/cli.rb
114
+ - lib/jenkins/plugin/cli/formatting.rb
115
+ - lib/jenkins/plugin/cli/generate.rb
116
+ - lib/jenkins/plugin/cli/new.rb
117
+ - lib/jenkins/plugin/cli/templates/Gemfile.tt
118
+ - lib/jenkins/plugin/cli/templates/build_step.tt
119
+ - lib/jenkins/plugin/cli/templates/pluginspec.tt
120
+ - lib/jenkins/plugin/tools/bundle.rb
121
+ - lib/jenkins/plugin/tools/hpi.rb
122
+ - lib/jenkins/plugin/tools/loadpath.rb
123
+ - lib/jenkins/plugin/tools/manifest.rb
124
+ - lib/jenkins/plugin/tools/package.rb
125
+ - lib/jenkins/plugin/tools/resolver.rb
126
+ - lib/jenkins/plugin/tools/server.rb
127
+ - lib/jenkins/plugin/version.rb
128
+ - lib/jenkins/rake.rb
160
129
  has_rdoc: true
161
130
  homepage: http://github.com/cowboyd/jenkins-plugin
162
131
  licenses: []
@@ -165,34 +134,25 @@ post_install_message:
165
134
  rdoc_options: []
166
135
 
167
136
  require_paths:
168
- - lib
137
+ - lib
169
138
  required_ruby_version: !ruby/object:Gem::Requirement
170
139
  none: false
171
140
  requirements:
172
- - - ">="
173
- - !ruby/object:Gem::Version
174
- hash: 3
175
- segments:
176
- - 0
177
- version: "0"
141
+ - - ">="
142
+ - !ruby/object:Gem::Version
143
+ version: "0"
178
144
  required_rubygems_version: !ruby/object:Gem::Requirement
179
145
  none: false
180
146
  requirements:
181
- - - ">="
182
- - !ruby/object:Gem::Version
183
- hash: 3
184
- segments:
185
- - 0
186
- version: "0"
147
+ - - ">="
148
+ - !ruby/object:Gem::Version
149
+ version: "0"
187
150
  requirements: []
188
151
 
189
152
  rubyforge_project: jenkins-plugin
190
- rubygems_version: 1.6.0
153
+ rubygems_version: 1.5.1
191
154
  signing_key:
192
155
  specification_version: 3
193
156
  summary: Tools for creating and building Jenkins Ruby plugins
194
- test_files:
195
- - features/create-new-plugin.feature
196
- - features/support/create_new_plugin_steps.rb
197
- - features/support/directory_structure.rb
198
- - features/support/work.rb
157
+ test_files: []
158
+