bundle2rpm 1.0.3 → 1.0.4

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.
Files changed (3) hide show
  1. data/bin/bundle2rpm +3 -3
  2. data/bundle2rpm.gemspec +1 -1
  3. metadata +3 -3
data/bin/bundle2rpm CHANGED
@@ -59,7 +59,7 @@ def main
59
59
  @options[:bundler_version] = ov
60
60
  end
61
61
  o.on("--custom-rpm-spec SPECFILE", "If specified, use this RPM spec file to construct the RPM.") do |ov|
62
- @rpm_spec_file = normalize_path(ov)
62
+ @options[:custom_rpm_spec] = normalize_path(ov)
63
63
  end
64
64
  o.on("--save-rpm-to DIR", "If specified, the RPM built for you will be written to this directory. Defaults to your working directory.") do |ov|
65
65
  @options[:save_rpm_to] = ov
@@ -115,7 +115,7 @@ def main
115
115
  @package_full_name << @variable_map[:package_release][:value]
116
116
  @package_full_name = @package_full_name.join("-")
117
117
  @working_dir = setup_working_dir
118
- @rpm_spec_file ||= write_rpm_spec("#{@working_dir}/rpmbuild/SPECS/#{@package_full_name}.spec")
118
+ @rpm_spec_file = write_rpm_spec("#{@working_dir}/rpmbuild/SPECS/#{@package_full_name}.spec")
119
119
  prepare_bundle
120
120
  build_rpm
121
121
  end
@@ -123,7 +123,7 @@ end
123
123
  def write_rpm_spec(to_file)
124
124
  puts "Generating RPM spec file."
125
125
 
126
- template_path = File.expand_path(File.dirname(__FILE__) + "/../etc/template.spec")
126
+ template_path = @options[:custom_rpm_spec] || File.expand_path(File.dirname(__FILE__) + "/../etc/template.spec")
127
127
  spec_file = File.read(template_path)
128
128
 
129
129
  # Replace all |xxx| variables in our template with the mapped
data/bundle2rpm.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  spec = Gem::Specification.new do |s|
2
2
  s.name = "bundle2rpm"
3
- s.version = "1.0.3"
3
+ s.version = "1.0.4"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.date = "2011-07-12"
6
6
  s.rubyforge_project = "bundle2rpm"
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundle2rpm
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
4
+ hash: 31
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 3
10
- version: 1.0.3
9
+ - 4
10
+ version: 1.0.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Matt Savona