d4a717c793
WIP of recursive packaging
2015-05-07 14:49:56 -07:00
b749673aaf
Merge pull request #816 from wrigby/unittest2-fix
...
pyfpm: Fall back to __str__ when encoding package metadata as JSON
2015-05-07 13:52:16 -07:00
4855b5394c
Remove python_install_bin setting; this was causing the tests to fail on OSX
2015-05-07 13:32:39 -07:00
25770de977
Merge pull request #844 from cure/master
...
Add --python-disable-dependency option to disable specific python dependencies
2015-05-07 13:20:20 -07:00
d76b567ebb
Merge pull request #828 from gerbercj/feature/sh_metadata
...
Add package metadata to slug file format
2015-05-07 13:17:31 -07:00
d8be400a33
Merge pull request #911 from djhaskin987/feature/empty-output-package
...
Feature: empty output package target
2015-05-07 12:57:16 -07:00
5dfed96598
Merge pull request #913 from djhaskin987/feature/sh-before-install-script
...
Feature: sh before-install script
2015-05-07 12:29:52 -07:00
eef85cb69e
Merge pull request #912 from djhaskin987/feature/make-rpm-removal-scripts-safer
...
Add `:` to pre- and post- removal scripts to make them safer
2015-05-07 11:47:57 -07:00
85671983bc
Whitespace
2015-05-06 22:39:10 -06:00
a654613339
Revert unintentional change
2015-05-06 21:24:50 -06:00
f787e7409a
Remove unnecessary requires lines from spec
2015-05-06 21:17:26 -06:00
9917586e51
Add empty as output target for testing purposes
2015-05-06 21:13:48 -06:00
dedbb97207
Add before-install script to sh package type
2015-05-06 20:06:42 -06:00
267319e696
Add to pre- and post- removal scripts to make them safer
2015-05-02 11:50:41 -06:00
8d7edc2b11
Merge pull request #908 from setempler/help-fix
...
fixed typo in command.rb
2015-04-27 10:42:40 -07:00
20b67b491b
fixed typo in command.rb
2015-04-26 22:42:58 +02:00
f2bdc2f804
Merge pull request #877 from vincentbernat/fix/debian-etc-in-conffiles
...
For Debian packages, register files in `/etc` as conf files
2015-04-24 16:47:17 -07:00
121b93b3d4
Merge pull request #894 from kowal/patch-1
...
Fixed github link title in RAEDME
2015-04-24 16:46:49 -07:00
0bc923b7a3
Merge pull request #896 from djhaskin987/feature/list-package-types
...
List loaded package types on the help screen
2015-04-24 16:46:35 -07:00
433c0afdd7
Merge pull request #897 from djhaskin987/feature/deb-scripts-via-input
...
Feature/deb scripts via input
2015-04-24 16:44:05 -07:00
5531d127b9
Merge pull request #906 from AnchorFree/master
...
fix typos in pr 874
2015-04-24 16:39:02 -07:00
a88027e831
fix exclude-file to exclude_file issue
2015-04-24 13:35:22 -07:00
541185d806
Merge remote-tracking branch 'jal/master'
2015-04-24 13:25:11 -07:00
71f7ea24d3
For Debian packages, register files in `/etc` as conf files
...
When building Debian packages with debhelper, files in `/etc` are
automatically marked as configuration files (this is done since
compatibility level 3 which was introduced in 2000). Therefore, packages
built with fpm may come as a surprise since they don't do that. A user
can still add `--config-files /etc` but they have to know that (usually
after a valuable modification has been erased).
This change add `/etc` to the list of configuration files for Debian
unless fpm is invoked with `--deb-no-config-files`.
Closes : #873
2015-04-15 17:26:17 +02:00
92d76cb303
Merge branch 'master' into feature/deb-scripts-via-input
...
* Bring the branch into compliance with the master branch
* Fix the bzip2 compression case
Conflicts:
lib/fpm/package/deb.rb
2015-04-14 23:39:07 -06:00
42cdf1ad90
List loaded package types on the help screen
2015-04-14 23:14:06 -06:00
9866c6d940
Merge pull request #892 from jbcraig/feature/ips
...
Add support for Solaris 11 style IPS packages using *.p5p format
2015-04-14 08:47:39 -07:00
d8c70038f7
Cleaned up the p5p code and revised work-flow
2015-04-14 10:27:03 -04:00
cacf2c98ab
Fixed github link title in RAEDME
...
Here's simple fix: jira -> github.
2015-04-14 14:11:58 +02:00
c53e741b98
rpm v5 changes the name of the file digest macro
...
This sets both macros (rpm v4.9, rpm v5.4) now just in case.
This fixes test failures on OSX when setting --rpm-digest sha1
2015-04-14 00:05:49 -07:00
03a5c60427
Bump arr-pm version for a small bugfix in RPM::File#config_files
2015-04-13 23:00:24 -07:00
ee11b661b5
Add RPM input tests
2015-04-13 22:56:34 -07:00
155390b115
Remove debugging output when using rpm triggers
2015-04-13 22:56:34 -07:00
7b39a3e59a
change deprecated 'File.exists?' to 'File.exist?'
...
Closes #795
2015-04-13 22:34:59 -07:00
00a00d1bf5
Strip trailing whitespace
...
This was accomlished with this sed invocation (OSX):
sed -Ei "" -e 's/ +$//' {lib,spec}/**/*.rb
(It would be `-r` instead of `-E` on systems with GNU sed)
Anyway. I did this because I'm frustrated folks unintentionally submit
patches with tons of whitespace changes done automatically by their
editor and without confirmation. The whitespace changes make `git blame`
lie, and it also makes doing the code review more difficult. While
Github is capable of showing a code diff that ignores whitespace (via
`?w=1`), that view does not permit commenting on the code change.
2015-04-13 22:32:31 -07:00
ab06f11506
Merge pull request #890 from vincentbernat/fix/lintian-rspec
...
rspec: fix lintian test
2015-04-13 16:22:20 -07:00
73bcb0070f
Merge pull request #893 from jneen/doc.update-name
...
update name in CONTRIBUTORS
2015-04-10 22:17:51 -07:00
b08a28341a
update name in CONTRIBUTORS
2015-04-10 22:02:29 -07:00
eeb9b8b898
Add rubocop config.
...
Resolving rubocop complaints will be a long-running task, but adding
the config here is a good first step.
2015-04-10 16:55:44 -07:00
e7f5241027
Continuation of efforts to improve how fpm uses rspec.
...
This makes use of shared examples, rspec's expect (instead of my
insist), and cleans up some longer tests that had complex 'it' blocks
into before/let/it.
2015-04-10 16:52:06 -07:00
eb681e8aae
Add support for Solaris 11 style IPS packages using *.p5p format
2015-04-10 17:45:18 -04:00
a2e02d1a50
rspec: fix lintian test
...
lintian expects the package name to ends with ".deb". Also, rspec
disallows the use of a let variable in an `after(:context)` hook. Also
fix the name of instance variable `@staging_path`.
2015-04-10 13:49:38 +02:00
07c9ba30ee
Merge pull request #889 from jordansissel/update-rspec-style
...
Update rspec style
Over the years, I learn new things about rspec and I find ways of writing specs that feels better. This is step 1 of a long-needed upgrade to how rspec is used in fpm.
2015-04-09 23:45:46 -07:00
a84c42c647
Grand refactor to use my newer rspec style
...
* Resolve any ruby warnings (ruby -wc)
* Use expect().to(...) instead of insist { ... }
* Avoid `:all` in hooks
* Use `let` instead of instance variables
* Use Stud::Temporary instead of Tempfile
2015-04-09 23:42:41 -07:00
746a3154e4
First whack at translating deb scripts/conffiles into rpm
2015-04-10 00:21:39 -06:00
94d04e5ec7
Fix a failing test on OSX that required 'dpkg-deb'
...
Switched to using `ar p ... | tar -zx` instead. Test passes on OSX.
I also took this as an opportunity to update the style to use rspec a
bit better. Using `let` and avoiding `before :all` and such.
2015-04-09 23:13:43 -07:00
0cff0a5dee
Merge pull request #888 from djhaskin987/feature/875
...
Feature/875
2015-04-09 22:36:29 -07:00
dfc3fac5be
Fix for *debian* packages for #875
2015-04-09 23:17:54 -06:00
7bbfff9309
Merge branch 'master' of github.com:jordansissel/fpm into feature/875
2015-04-09 23:01:23 -06:00
b23b24a90c
#875 Fix cases where upgrade or install scripts are specified, but not both
2015-04-09 23:00:25 -06:00
Jordan Sissel
Daniel Haskin
Sven E. Templer
Andrew Hammond
Vincent Bernat
Jonathan Craig
Marek Kowalcze
Maxime Caumartin
Guy Halperin
http://jneen.net/