Permalink
Browse files

Merge pull request #7 from Nordstrom/master

[Cook-1943] Update to git 1.8.0
  • Loading branch information...
2 parents 70b663a + 99e80a3 commit 86c50001c16dc68acc15551881af1a2cceb47fd6 @jtimberman jtimberman committed Nov 30, 2012
Showing with 40 additions and 14 deletions.
  1. +5 −0 CHANGELOG.md
  2. +13 −0 README.md
  3. +11 −11 attributes/default.rb
  4. +3 −3 metadata.rb
  5. +4 −0 recipes/server.rb
  6. +4 −0 recipes/source.rb
View
@@ -1,3 +1,8 @@
+## v1.0.3:
+
+* [COOK-1943](http://tickets.opscode.com/browse/COOK-1943) - Update to
+ git 1.8.0
+
## v1.0.2:
* [COOK-1537] - add recipe for source installation
View
@@ -5,16 +5,29 @@ Installs git and optionally sets up a git server as a daemon under runit.
Requirements
============
+## Ohai and Chef:
+
+* Ohai: 6.14.0+
+
+This cookbook makes use of `node['platform_family']` to simplify platform
+selection logic. This attribute was introduced in Ohai v0.6.12.
## Platform:
* Debian/Ubuntu
* ArchLinux
+* Windows
+* Mac OSX
## Cookbooks:
+###
* runit
+### Windows Dependencies
+The `windows_package` resource from the Windows cookbook is required to
+install the git package on Windows.
+
Recipes
=======
View
@@ -19,18 +19,18 @@
case node['platform_family']
when 'windows'
- default['git']['version'] = "1.7.9-preview20120201"
- default['git']['url'] = "http://msysgit.googlecode.com/files/Git-#{node['git']['version']}.exe"
- default['git']['checksum'] = "0627394709375140d1e54e923983d259a60f9d8e"
+ default['git']['version'] = "1.8.0-preview20121022"
+ default['git']['url'] = "http://github.com/downloads/msysgit/git/Git-#{node['git']['version']}.exe"
+ default['git']['checksum'] = "8ec19d04912fd27d7350823c857a4807b550fa63a3744bf6fd2841de8cfa9a0f"
when "mac_os_x"
- default['git']['osx_dmg']['app_name'] = "git-1.7.9.4-intel-universal-snow-leopard"
- default['git']['osx_dmg']['volumes_dir'] = "Git 1.7.9.4 Snow Leopard Intel Universal"
- default['git']['osx_dmg']['package_id'] = "GitOSX.Installer.git1794.git.pkg"
- default['git']['osx_dmg']['url'] = "http://git-osx-installer.googlecode.com/files/git-1.7.9.4-intel-universal-snow-leopard.dmg"
- default['git']['osx_dmg']['checksum'] = "661c3fcf765572d3978df17c7636d59e"
+ default['git']['osx_dmg']['app_name'] = "git-1.8.0-intel-universal-snow-leopard"
+ default['git']['osx_dmg']['volumes_dir'] = "Git 1.8.0 Snow Leopard Intel Universal"
+ default['git']['osx_dmg']['package_id'] = "GitOSX.Installer.git180.git.pkg"
+ default['git']['osx_dmg']['url'] = "https://github.com/downloads/timcharper/git_osx_installer/git-1.8.0-intel-universal-snow-leopard.dmg"
+ default['git']['osx_dmg']['checksum'] = "da83499f3305061792358bec26c20faa997b7ad9990713d1be2b03cbb5fbce12"
else
default['git']['prefix'] = "/usr/local"
- default['git']['version'] = "1.7.11.4"
+ default['git']['version'] = "1.8.0"
default['git']['url'] = "https://github.com/git/git/tarball/v#{node['git']['version']}"
- default['git']['checksum'] = "7a26d9bd0fd3384374bdc1afaae829f406bc123126817d994a460c49a3260ecc"
-end
+ default['git']['checksum'] = "24f1895fa74a23b3d9233fa89a9ef04d83a1cd952d659720d6ea231bbd0c973c"
+end
View
@@ -4,7 +4,7 @@
license "Apache 2.0"
description "Installs git and/or sets up a Git server daemon"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.0.2"
+version "1.0.3"
recipe "git", "Installs git"
recipe "git::server", "Sets up a runit_service for git daemon"
recipe "git::source", "Installs git from source"
@@ -15,6 +15,6 @@
supports "mac_os_x", ">= 10.6.0"
-%w{ build-essential dmg runit yum }.each do |cb|
- depends cb
+%w{ dmg, runit, build-essential, yum, windows }.each do |cookbook|
+ depends cookbook
end
View
@@ -16,6 +16,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+if node["platform"] == "windows"
+ return "#{node['platform']} is not supported by the #{cookbook_name}::#{recipe_name} recipe"
+end
+
include_recipe "git"
directory "/srv/git" do
View
@@ -16,6 +16,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+if node["platform"] == "windows"
+ return "#{node['platform']} is not supported by the #{cookbook_name}::#{recipe_name} recipe"
+end
+
include_recipe "build-essential"
pkgs = value_for_platform_family(

0 comments on commit 86c5000

Please sign in to comment.