Commit2d05c7c

Joshua Timberman

committed

Merge pull requestpoise#10 from rody/COOK-1311

[COOK-1311] Added 'options' for virtualenv command.

2 parents210a502 +5c8019a commit2d05c7cCopy full SHA for 2d05c7c

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -101,6 +101,7 @@ Install packages using the new hotness in Python package management...[`pip`](ht
`101`	`101`	- interpreter: The Python interpreter to use. default is`python2.6`
`102`	`102`	`- owner: The owner for the virtualenv`
`103`	`103`	`- group: The group owner of the file (string or id)`
	`104`	`+- options : Command line options (string)`
`104`	`105`
`105`	`106`	`#Example`
`106`	`107`
@@ -119,6 +120,14 @@ Install packages using the new hotness in Python package management...[`pip`](ht
`119`	`120`	`action :create`
`120`	`121`	`end`
`121`	`122`
	`123`	`+# create a Python 2.6 virtualenv with access to the global packages owned by ubuntu user`
	`124`	`+python_virtualenv "/home/ubuntu/my_old_ve" do`
	`125`	`+ owner "ubuntu"`
	`126`	`+ group "ubuntu"`
	`127`	`+ options "--system-site-packages"`
	`128`	`+ action :create`
	`129`	`+end`
	`130`	`+`
`122`	`131`	`Usage`
`123`	`132`	`=====`
`124`	`133`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`action:createdo`
`26`	`26`	`unlessexists?`
`27`	`27`	`Chef::Log.info("Creating virtualenv#{@new_resource} at#{@new_resource.path}")`
`28`		`-execute"#{virtualenv_cmd} --python=#{@new_resource.interpreter}#{@new_resource.path}"do`
	`28`	`+execute"#{virtualenv_cmd} --python=#{@new_resource.interpreter}#{@new_resource.options}#{@new_resource.path}"do`
`29`	`29`	`usernew_resource.ownerifnew_resource.owner`
`30`	`30`	`groupnew_resource.groupifnew_resource.group`
`31`	`31`	`end`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,3 +24,4 @@`
`24`	`24`	`attribute:interpreter,:default=>'python2.6'`
`25`	`25`	`attribute:owner,:regex=>Chef::Config[:user_valid_regex]`
`26`	`26`	`attribute:group,:regex=>Chef::Config[:group_valid_regex]`
	`27`	`+attribute:options,:kind_of=>String`

Comments

(0)