Date: Sat, 5 Apr 2014 14:45:53 GMT From: Michael Moll <kvedulv@kvedulv.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188288: [PATCH] sysutils/rubygem-hammer_cli_foreman: update to 0.1.0 Message-ID: <201404051445.s35EjrCe001811@cgiserv.freebsd.org> Resent-Message-ID: <201404051450.s35Eo1pS027628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188288
>Category: ports
>Synopsis: [PATCH] sysutils/rubygem-hammer_cli_foreman: update to 0.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 05 14:50:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Michael Moll
>Release:
>Organization:
>Environment:
>Description:
..and take maintainership.
files/patch-lib__hammer_cli_foreman__commands.rb was removed
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 350222)
+++ Makefile (working copy)
@@ -2,20 +2,27 @@
# $FreeBSD$
PORTNAME= hammer_cli_foreman
-PORTVERSION= 0.0.18
+PORTVERSION= 0.1.0
CATEGORIES= sysutils ruby
MASTER_SITES= RG
-MAINTAINER= ruby@FreeBSD.org
+MAINTAINER= kvedulv@kvedulv.de
COMMENT= Foreman commands for Hammer CLI
LICENSE= GPLv3
-RUN_DEPENDS= rubygem-foreman_api>=0.1.11:${PORTSDIR}/devel/rubygem-foreman_api \
- rubygem-hammer_cli>=0.0.18:${PORTSDIR}/sysutils/rubygem-hammer_cli
+RUN_DEPENDS= rubygem-apipie-bindings>=0.0.6:${PORTSDIR}/devel/rubygem-apipie-bindings \
+ rubygem-hammer_cli=0.1.0:${PORTSDIR}/sysutils/rubygem-hammer_cli
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
+ ${INSTALL_DATA} ${FILESDIR}/foreman.yml.sample ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d/foreman.yml.sample
+
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (revision 350222)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/hammer_cli_foreman-0.0.18.gem) = 97a7310e001726bf8bc0004bb9f08c87650e224fac351b1e3f8b2dc593e05337
-SIZE (rubygem/hammer_cli_foreman-0.0.18.gem) = 48640
+SHA256 (rubygem/hammer_cli_foreman-0.1.0.gem) = 2997c29333415fb8e642108f43b8f4034437290d26b16e149e2457f91f697fd2
+SIZE (rubygem/hammer_cli_foreman-0.1.0.gem) = 82944
Index: files/foreman.yml.sample
===================================================================
--- files/foreman.yml.sample (revision 0)
+++ files/foreman.yml.sample (working copy)
@@ -0,0 +1,11 @@
+:foreman:
+ :enable_module: true
+ :host: 'https://localhost/'
+ :username: 'admin'
+ :password: 'changeme'
+
+ # Check cache status on each request
+ #:refresh_cache: false
+
+ # API request timeout, set -1 for infinity
+ #:request_timeout: 120 #seconds
Property changes on: files/foreman.yml.sample
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-lib__hammer_cli_foreman__commands.rb
===================================================================
--- files/patch-lib__hammer_cli_foreman__commands.rb (revision 350222)
+++ files/patch-lib__hammer_cli_foreman__commands.rb (working copy)
@@ -1,28 +0,0 @@
---- lib/hammer_cli_foreman/commands.rb.orig 2014-03-12 11:03:33.000000000 +0100
-+++ lib/hammer_cli_foreman/commands.rb 2014-03-12 11:03:49.000000000 +0100
-@@ -60,9 +60,9 @@
- end
-
- def execute
-- if respond_to?(:page) && respond_to?(:per_page)
-- self.page ||= 1
-- self.per_page ||= HammerCLI::Settings.get(:ui, :per_page) || DEFAULT_PER_PAGE
-+ if respond_to?(:option_page) && respond_to?(:option_per_page)
-+ self.option_page ||= 1
-+ self.option_per_page ||= HammerCLI::Settings.get(:ui, :per_page) || DEFAULT_PER_PAGE
- browse_collection
- else
- retrieve_and_print
-@@ -79,10 +79,10 @@
- while list_next do
- d = retrieve_and_print
-
-- if (d.size >= self.per_page.to_i) && interactive?
-+ if (d.size >= self.option_per_page.to_i) && interactive?
- answer = ask("List next page? (Y/n): ").downcase
- list_next = (answer == 'y' || answer == '')
-- self.page += 1
-+ self.option_page += 1
- else
- list_next = false
- end
Index: pkg-plist
===================================================================
--- pkg-plist (revision 0)
+++ pkg-plist (working copy)
@@ -0,0 +1,3 @@
+@unexec if cmp -s %D/etc/hammer/cli.modules.d/foreman.yml.sample %D/etc/hammer/cli.modules.d/foreman.yml; then rm -f %D/etc/hammer/cli.modules.d/foreman.yml; fi
+etc/hammer/cli.modules.d/foreman.yml.sample
+@exec if [ ! -f %D/etc/hammer/cli.modules.d/foreman.yml ] ; then cp -p %D/etc/hammer/cli.modules.d/foreman.yml.sample %D/etc/hammer/cli.modules.d/foreman.yml; fi
Property changes on: pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404051445.s35EjrCe001811>