Commit Graph

1601 Commits

Author SHA1 Message Date
Jordan Sissel 79fdc77d15 Merge pull request #708 from brimstone/patch-1
Cleaned up description for --workdir
2014-07-24 11:28:45 -07:00
Jordan Sissel 66cd277980 Merge pull request #739 from bionix/master
Fix makefile and add the missing 'git fetch' and set building fpm version to 1.1.0
2014-07-24 11:28:11 -07:00
Jordan Sissel e868c34ed3 Merge pull request #719 from leslieianson/master
Specify %attr directive on a per-file basis
2014-07-18 20:48:45 -07:00
Jordan Sissel 6b2ad33e88 Merge pull request #740 from rnelson0/master
Small note on additional package requirements.
2014-07-18 20:47:46 -07:00
Rob Nelson bebc875fae Require compiler for gem install 2014-07-18 15:44:37 -04:00
Rob Nelson 5c308ec028 Small note on additional package requirements. 2014-07-17 08:35:06 -04:00
Markus Rekkenbeil 7208127b2f Fix makefile and add the missing 'git fetch'
To give the makefile the needed git tags information (from source)
2014-07-16 11:55:28 +02:00
Jordan Sissel 360313ca7d Merge pull request #734 from jordansissel/add-debug-workspace
Add --debug-workspace
2014-07-10 08:19:42 -07:00
Jordan Sissel 28c43ac902 Merge pull request #727 from dknecht/master
Don't install dependencies when using pip to download python packages
2014-07-10 08:17:56 -07:00
Jordan Sissel c28b21eeb4 Show full input path if it can't be found.
Before: Cannot package the path 'pganalyze-collector', does it exist?
After: Cannot package the path './build/pganalyze-collector', does it exist?
2014-07-10 15:06:14 +00:00
Dane Knecht e5d3e745be Don't install dependencies when using pip to download python packages 2014-06-22 17:08:24 -07:00
Jordan Sissel 51bc556e78 Add --debug-workspace
Avoids Package#cleanup calls and also prints the paths, if not empty, of
any build or staging directories used for input or output.

Fixes #720
2014-06-19 06:17:37 +00:00
Jordan Sissel 66ccd6de8f Make rpmbuild's _tmppath respect fpm --workdir
Fixes #714
2014-06-19 06:04:21 +00:00
Jordan Sissel b903a5b311 Merge branch 'pr/693' (from #693 + typo patch fix) 2014-06-19 05:59:39 +00:00
Jordan Sissel d3468dacf1 Fix typo 2014-06-19 05:59:09 +00:00
Jordan Sissel c823a393e3 Use rspec 3.0.0
Ran transpec on spec/ directory for automatic and delicious upgrades.

Also removed minitest dependency since fpm doesn't use it.
2014-06-19 05:32:11 +00:00
Jordan Sissel 6d712e2429 Merge branch 'master' of https://github.com/remh/fpm into remh-master
Conflicts:
	lib/fpm/package/rpm.rb
2014-06-18 06:52:42 +00:00
Jordan Sissel b5104f259d Merge pull request #712 from mlafeldt/cpan-metadata-nil
Ignore unset CPAN metadata fields
2014-06-17 23:43:17 -07:00
Jordan Sissel 1cc939bbc0 Merge pull request #724 from jordansissel/new-flag/rpm-verbatim-gem-dependencies
Add --rpm-verbatim-gem-dependencies flag
2014-06-17 23:31:43 -07:00
Jordan Sissel 09b0069725 Add --rpm-verbatim-gem-dependencies flag
This should help folks who want the old-style gem-rpm conversions
* with this flag, old behavior: rubygem-name
* without flag, default behavior: rubygem(name)

The 'default' behavior has been this behavior since 0.4.23 for most
users.
If you changed the package name prefix via --gem-package-prefix or
--gem-package-name-prefix then this behavior was broken.
It was fixed in #585.

But, I don't want folks relying on old behavior to be screwed
when that behavior mysteriously vanishes! This should be a good
enough work around for now.

Reported by Ryan Doherty via the fpm-users mailing list.
2014-06-18 05:46:16 +00:00
Jordan Sissel ebcaf8a6e0 Merge pull request #716 from alanthing/issue707
Fixes jordansissel/fpm#707
2014-06-13 15:42:21 -07:00
Jan Vansteenkiste 85072d2df6 Since #480, no default path is set so we should define one for testing python 2014-06-10 08:21:21 +02:00
Jan Vansteenkiste 08c3649db5 Fixes python tests where python 3.x is installed 2014-06-10 08:21:21 +02:00
Jan Vansteenkiste 1c85308b9d Ignore lsb init scripts warning since we are not providing a proper init script for testing 2014-06-10 08:21:04 +02:00
Jan Vansteenkiste c0f899e0c7 Feeling brave, enable lintian for travis 2014-06-10 08:21:04 +02:00
Jan Vansteenkiste f966a57486 Fix file permissions on deb control files 2014-06-10 08:21:04 +02:00
Jan Vansteenkiste 7a2cca45bb Updated the example gem with as little changes as possible
checksums.yaml.gz has been stripped as in the current gem.

Changes:

```diff
diff --git a/spec/fixtures/gem/example/example-1.0.gem b/spec/fixtures/gem/example/example-1.0.gem
index 0241779..9238a4a 100644
--- a/spec/fixtures/gem/example/example-1.0.gem
+++ b/spec/fixtures/gem/example/example-1.0.gem
@@ -46,10 +46,12 @@ dependencies:
         version: '0'
 description: sample description
 email: sample email
-executables: []
+executables:
+- example
 extensions: []
 extra_rdoc_files: []
-files: []
+files:
+- bin/example
 homepage: http://sample-url/
 licenses: []
 post_install_message:
@@ -78,3 +80,5 @@ test_files: []
 has_rdoc:
 ============== checksums =============
 =============== files ================
+bin/example
+#!/usr/bin/env ruby

```

See http://vstone.eu/diffing-gems-in-git/
2014-06-10 08:19:49 +02:00
Jan Vansteenkiste 66181c6c2f Added tests. Rebuild of example-1.0.0.gem required though 2014-06-10 08:19:49 +02:00
Jan Vansteenkiste b06d470a08 Fixes an issue where gem-version-bins is enabled but there are no binaries 2014-06-10 08:19:49 +02:00
Alan Ivey d299d9d765 Fixes jordansissel/fpm#707
With rpms, if `--architecture` and `--rpm-os` are specified and
different than the host, `--target` would be passed to `rpmbuild` twice,
causing an error.

Example: an OS X host (`uname -s` = "Darwin") with x86_64 architecture
building for `--rpm-os linux` and `--architecture noarch`.

This change only adds `--target` to the `rpmbuild` args once, fixing
this specific error.
2014-06-09 12:32:31 -04:00
vagrant 0063eb6cf8 naive implementation of rpm %attr directive 2014-06-09 04:47:08 +00:00
Mathias Lafeldt 2edcc47b6a Ignore unset CPAN metadata fields
Otherwise this can happen:

    $ fpm -t deb -s cpan --verbose 'Lingua::JA::Romanize::Japanese'
    Asking metacpan about a module {:module=>"Lingua::JA::Romanize::Japanese", :level=>:info}
    Downloading perl module {:distribution=>"Lingua-JA-Romanize-Japanese", :version=>nil, :level=>:info}
    Setting package name from 'name' {:name=>"Lingua-JA-Romanize-Japanese", :level=>:info}
    /usr/lib/ruby/gems/1.9.1/gems/fpm-1.1.0/lib/fpm/package/cpan.rb:86:in `input': undefined method `join' for nil:NilClass (NoMethodError)
	    from /usr/lib/ruby/gems/1.9.1/gems/fpm-1.1.0/lib/fpm/command.rb:299:in `block in execute'
	    from /usr/lib/ruby/gems/1.9.1/gems/fpm-1.1.0/lib/fpm/command.rb:298:in `each'
	    from /usr/lib/ruby/gems/1.9.1/gems/fpm-1.1.0/lib/fpm/command.rb:298:in `execute'
	    from /usr/lib/ruby/gems/1.9.1/gems/clamp-0.6.3/lib/clamp/command.rb:67:in `run'
	    from /usr/lib/ruby/gems/1.9.1/gems/fpm-1.1.0/lib/fpm/command.rb:449:in `run'
	    from /usr/lib/ruby/gems/1.9.1/gems/clamp-0.6.3/lib/clamp/command.rb:125:in `run'
	    from /usr/lib/ruby/gems/1.9.1/gems/fpm-1.1.0/bin/fpm:8:in `<top (required)>'
	    from /usr/bin/fpm:23:in `load'
	    from /usr/bin/fpm:23:in `<main>'
2014-06-02 12:28:57 +02:00
Jordan Sissel 58cfb42bcd Merge pull request #700 from gerbercj/feature/sh_package_bugfixes
Feature/sh package bugfixes
2014-05-20 11:31:24 -07:00
Matt 0e518a6f51 Cleaned up description for --workdir
Added spaces so words didn't run together.
2014-05-20 10:34:19 -04:00
Chris Gerber 9c8c5ac6cb Fix post_install logging; protect previous current dir during clean up 2014-05-08 11:00:42 -04:00
Remi Hakim f362135e04 Fix specs 2014-05-06 18:35:21 -04:00
Tom Duckering 17ed25e23a Merge branch 'master' of https://github.com/jordansissel/fpm 2014-05-06 12:41:45 +01:00
Jordan Sissel 07fff9c9ee Merge pull request #691 from vStone/bugfix/File_directory_on_nil
This fixes an issue introduced by supporting -p <dir>
2014-05-05 09:55:26 -07:00
Jan Vansteenkiste 857eeca13a Added tests for commands without package -p <dir> 2014-05-05 18:51:02 +02:00
Jan Vansteenkiste 59e74d0371 Fixes pessimistic constraint conversion
See jordansissel/fpm#693
2014-05-02 14:26:05 +02:00
Dan Brown cd77e43640 Added support for dpkg triggers (fixes #595) 2014-05-01 14:43:54 +01:00
tduckeri a9504938f1 @tomduckering - adding a fix for the bug in the pessimistic constraint fixing for RPMs converted from Gems. 2014-05-01 14:30:46 +01:00
Jan Vansteenkiste 0266115181 This fixes an issue introduced in afb0dce2
If no package name was given, fpm bailed out.
2014-04-30 18:32:49 +02:00
Dan Brown 622bb5f72c Added support for extra control files for debs (fixes #599) 2014-04-30 16:05:39 +01:00
Jordan Sissel afb0dce244 Support being given a directory for the output path (-p flag)
This should fix #656 and maybe a few other things.
2014-04-29 22:15:41 -07:00
Remi Hakim d2523f590c Move logic in rpm specific places 2014-04-29 23:06:23 +02:00
Jordan Sissel 79da58d64e Merge pull request #685 from yummylogs/master
Update README.md
2014-04-28 16:43:31 -07:00
yummylogs dbe98823ca Update README.md
In order to clear up the confusion with installing FPM as per 

https://github.com/jordansissel/fpm/issues/366
https://github.com/jordansissel/fpm/issues/666
https://github.com/jordansissel/fpm/issues/282
2014-04-28 13:21:04 -07:00
Jordan Sissel cd8ae99d67 Add release date 2014-04-23 14:07:32 -07:00
Jordan Sissel 2d17e59ce9 Don't require full output of a deb package if we're just checking for
tar flags.

The reason for this is that if we do output, it fails like so;

  1) FPM::Package::Deb#tar_flags should set the group for the package's data files
     Failure/Error: @package.output(@target)
     FPM::Util::ProcessFailed:
       tar failed (exit code 2). Full command was:["tar", "-C", "/tmp/package-deb-staging20140423-5427-10uiv96", "-z", "--numeric-owner", "--owner", "0", "--group", "nogroup", "-cf", "/tmp/package-deb-build20140423-5427-19uvbmw/data.tar.gz", "."]

Because 'nogroup' isn't a valid group when tar is run, but we want to check
that 'nogroup' is set in the tar args, not that tar works ;)
2014-04-23 13:49:13 -07:00