fpm 0.2.9 → 0.2.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/fpm/source/gem.rb +9 -4
  2. metadata +11 -11
@@ -60,7 +60,7 @@ class FPM::Source::Gem < FPM::Source
60
60
  summary
61
61
  version
62
62
  ).each do |field|
63
- self[field] = spec.send(field)
63
+ self[field.to_sym] = spec.send(field) rescue "unknown"
64
64
  end
65
65
 
66
66
  self[:name] = "rubygem#{self[:suffix]}-#{spec.name}"
@@ -71,15 +71,20 @@ class FPM::Source::Gem < FPM::Source
71
71
  # package managers. Need to decide how to handle this.
72
72
  self[:category] = 'Languages/Development/Ruby'
73
73
 
74
- self[:dependencies] = spec.runtime_dependencies.map do |dep|
74
+ self[:dependencies] = []
75
+ spec.runtime_dependencies.map do |dep|
75
76
  # rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'
76
77
  if dep.respond_to?(:requirement)
77
78
  reqs = dep.requirement.to_s.gsub(/,/, '')
78
79
  else
79
80
  reqs = dep.version_requirements
80
81
  end
81
- "rubygem#{self[:suffix]}-#{dep.name} #{reqs}"
82
- end
82
+
83
+ # Some reqs can be ">= a, < b" versions, let's handle that.
84
+ reqs.to_s.split(/, */).each do |req|
85
+ self[:dependencies] << "rubygem#{self[:suffix]}-#{dep.name} #{req}"
86
+ end
87
+ end # runtime_dependencies
83
88
  end # ::Gem::Package
84
89
  end # File.open (the gem)
85
90
  end # def get_metadata
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fpm
3
3
  version: !ruby/object:Gem::Version
4
- hash: 5
5
- prerelease:
4
+ hash: 3
5
+ prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 2
9
- - 9
10
- version: 0.2.9
9
+ - 10
10
+ version: 0.2.10
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-03-21 00:00:00 -07:00
18
+ date: 2011-03-29 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -43,15 +43,15 @@ extra_rdoc_files: []
43
43
 
44
44
  files:
45
45
  - lib/fpm/builder.rb
46
- - lib/fpm/namespace.rb
47
46
  - lib/fpm/source.rb
48
- - lib/fpm/source/npm.rb
49
- - lib/fpm/source/dir.rb
50
- - lib/fpm/source/rpm.rb
51
- - lib/fpm/source/gem.rb
52
47
  - lib/fpm/target/deb.rb
53
48
  - lib/fpm/target/rpm.rb
54
49
  - lib/fpm/package.rb
50
+ - lib/fpm/namespace.rb
51
+ - lib/fpm/source/dir.rb
52
+ - lib/fpm/source/rpm.rb
53
+ - lib/fpm/source/npm.rb
54
+ - lib/fpm/source/gem.rb
55
55
  - lib/fpm.rb
56
56
  - bin/fpm
57
57
  - bin/fpm-npm
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
88
88
  requirements: []
89
89
 
90
90
  rubyforge_project:
91
- rubygems_version: 1.5.1
91
+ rubygems_version: 1.3.7
92
92
  signing_key:
93
93
  specification_version: 3
94
94
  summary: fpm - package building and mangling