Cross package maker. DEB/RPM generation or conversion. Derived from jordansissel/fpm.

⌈⌋ ⎇ branch:  cross package maker


Check-in [31c6be4489]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Move logic in rpm specific places
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 31c6be4489edc41e298d75ae308012455cf2c453
User & Date: remi@datadoghq.com 2014-04-29 21:06:23
Context
2014-05-06
22:35
Fix specs check-in: 62f8f2c835 user: remi@datadoghq.com tags: trunk
2014-04-29
21:06
Move logic in rpm specific places check-in: 31c6be4489 user: remi@datadoghq.com tags: trunk
2014-04-14
13:32
Fix specs for new rpms scripts support check-in: 225fe04582 user: remi@datadoghq.com tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to lib/fpm/command.rb.

︙︙
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374

      input.scripts[scriptname] = File.read(path)
    end

    setscript.call(:before_install)
    setscript.call(:after_install)
    setscript.call(:before_remove)
    setscript.call(:after_remove)
    setscript.call(:rpm_verifyscript)
    setscript.call(:rpm_posttrans)
    setscript.call(:rpm_pretrans)

    # Bail if any setscript calls had errors. We don't need to log
    # anything because we've already logged the error(s) above.
    return 1 if script_errors.any?

    # Validate the package
    if input.name.nil? or input.name.empty?








<
<
<








358
359
360
361
362
363
364



365
366
367
368
369
370
371

      input.scripts[scriptname] = File.read(path)
    end

    setscript.call(:before_install)
    setscript.call(:after_install)
    setscript.call(:before_remove)
    setscript.call(:after_remove)




    # Bail if any setscript calls had errors. We don't need to log
    # anything because we've already logged the error(s) above.
    return 1 if script_errors.any?

    # Validate the package
    if input.name.nil? or input.name.empty?
︙︙

Changes to lib/fpm/package/rpm.rb.

︙︙
251
252
253
254
255
256
257















258
259
260
261
262
263
264

          ["#{name} >= #{version}", "#{name} < #{nextversion}"]
        else
          dep
        end
      end.flatten
    end
















  end # def converted

  def input(path)
    rpm = ::RPM::File.new(path)

    tags = {}
    rpm.header.tags.each do |tag|








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279

          ["#{name} >= #{version}", "#{name} < #{nextversion}"]
        else
          dep
        end
      end.flatten
    end

  setscript = proc do |scriptname|
      script_path = self.attributes[scriptname]
      # Skip scripts not set
      next if script_path.nil?
      if !File.exists?(script_path)
        @logger.error("No such file (for #{scriptname.to_s}): #{script_path.inspect}")
        script_errors	 << script_path
      end
      # Load the script into memory.
      scripts[scriptname] = File.read(script_path)
    end

  setscript.call(:rpm_verifyscript)
  setscript.call(:rpm_posttrans)
  setscript.call(:rpm_pretrans)
  end # def converted

  def input(path)
    rpm = ::RPM::File.new(path)

    tags = {}
    rpm.header.tags.each do |tag|
︙︙

Changes to spec/fpm/package_spec.rb.

︙︙
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208


  context "#script (internal method)" do
    it "should template when :template_scripts? is true" do
      subject.scripts[:after_install] = "<%= name %>"
      subject.scripts[:before_install] = "<%= name %>"
      subject.scripts[:after_remove] = "<%= name %>"
      subject.scripts[:before_remove] = "<%= name %>"
      subject.scripts[:rpm_verifyscript] = "<%= name %>"
      subject.scripts[:rpm_posttrans] = "<%= name %>"
      subject.scripts[:rpm_pretrans] = "<%= name %>"
      subject.attributes[:template_scripts?] = true
      subject.name = "Example"
      insist { subject.script(:after_install) } == subject.name
      insist { subject.script(:before_install) } == subject.name
      insist { subject.script(:after_remove) } == subject.name
      insist { subject.script(:before_remove) } == subject.name
      insist { subject.script(:rpm_verifyscript) } == subject.name
      insist { subject.script(:rpm_posttrans) } == subject.name
      insist { subject.script(:rpm_pretrans) } == subject.name
    end

    it "should not template when :template_scripts? is false" do
      subject.scripts[:after_install] = "<%= name %>"
      subject.scripts[:before_install] = "<%= name %>"
      subject.scripts[:after_remove] = "<%= name %>"
      subject.scripts[:after_install] = "<%= name %>"
      subkect.scripts[:rpm_verify_script] = "<%= name %>"
      subject.scripts[:rpm_posttrans] = "<%= name %>"
      subject.scripts[:rpm_pretrans] = "<%= name %>"
      subject.attributes[:template_scripts?] = false
      insist { subject.script(:after_install) } == subject.scripts[:after_install]
      insist { subject.script(:before_install) } == subject.scripts[:before_install]
      insist { subject.script(:after_remove) } == subject.scripts[:after_remove]
      insist { subject.script(:before_remove) } == subject.scripts[:before_remove]
      insist { subject.script(:rpm_verifyscript) } == subject.scripts[:rpm_verifyscript]
      insist { subject.script(:rpm_posttrans) } == subject.scripts[:rpm_posttrans]
      insist { subject.script(:rpm_pretrans) } == subject.scripts[:rpm_pretrans]
    end

    it "should not template by default" do
      subject.scripts[:after_install] = "<%= name %>"
      insist { subject.script(:after_install) } == subject.scripts[:after_install]
    end
  end
end # describe FPM::Package








<
<
<






<
<
<







<
<
<





<
<
<









164
165
166
167
168
169
170



171
172
173
174
175
176



177
178
179
180
181
182
183



184
185
186
187
188



189
190
191
192
193
194
195
196


  context "#script (internal method)" do
    it "should template when :template_scripts? is true" do
      subject.scripts[:after_install] = "<%= name %>"
      subject.scripts[:before_install] = "<%= name %>"
      subject.scripts[:after_remove] = "<%= name %>"
      subject.scripts[:before_remove] = "<%= name %>"



      subject.attributes[:template_scripts?] = true
      subject.name = "Example"
      insist { subject.script(:after_install) } == subject.name
      insist { subject.script(:before_install) } == subject.name
      insist { subject.script(:after_remove) } == subject.name
      insist { subject.script(:before_remove) } == subject.name



    end

    it "should not template when :template_scripts? is false" do
      subject.scripts[:after_install] = "<%= name %>"
      subject.scripts[:before_install] = "<%= name %>"
      subject.scripts[:after_remove] = "<%= name %>"
      subject.scripts[:after_install] = "<%= name %>"



      subject.attributes[:template_scripts?] = false
      insist { subject.script(:after_install) } == subject.scripts[:after_install]
      insist { subject.script(:before_install) } == subject.scripts[:before_install]
      insist { subject.script(:after_remove) } == subject.scripts[:after_remove]
      insist { subject.script(:before_remove) } == subject.scripts[:before_remove]



    end

    it "should not template by default" do
      subject.scripts[:after_install] = "<%= name %>"
      insist { subject.script(:after_install) } == subject.scripts[:after_install]
    end
  end
end # describe FPM::Package