Skip to content

Commit

Permalink
Bump to latest git available
Browse files Browse the repository at this point in the history
  • Loading branch information
Kartik Null Cating-Subramanian authored and scottopherson committed Mar 23, 2016
1 parent 1a564cb commit c4770ea
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,21 @@ Currently, there are distinct sets of resource properties, used by the providers
# used by source providers
- `source_prefix` - Defaults to '/usr/local'
- `source_url` - Defaults to a calculated URL based on source_version
- `source_version` - Defaults to 1.9.5
- `source_version` - Defaults to 2.7.4
- `source_use_pcre` - configure option for build. Defaults to false
- `source_checksum` - Defaults to a known value for the 1.9.5 source tarball
- `source_checksum` - Defaults to a known value for the 2.7.4 source tarball

# used by OSX package providers
- `osx_dmg_app_name` - Defaults to 'git-1.9.5-intel-universal-snow-leopard'
- `osx_dmg_package_id` - Defaults to 'GitOSX.Installer.git195.git.pkg'
- `osx_dmg_volumes_dir` - Defaults to 'Git 1.9.5 Snow Leopard Intel Universal'
- `osx_dmg_app_name` - Defaults to 'git-2.7.1-intel-universal-mavericks'
- `osx_dmg_package_id` - Defaults to 'GitOSX.Installer.git271.git.pkg'
- `osx_dmg_volumes_dir` - Defaults to 'Git 2.7.1 Mavericks Intel Universal'
- `osx_dmg_url` - Defaults to Sourceforge
- `osx_dmg_checksum` - Defaults to the value for 1.9.5
- `osx_dmg_checksum` - Defaults to the value for 2.7.1

# used by the Windows package providers
- `windows_display_name` - Windows display name
- `windows_package_url` - Defaults to the Internet
- `windows_package_checksum` - Defaults to the value for 1.9.5
- `windows_package_checksum` - Defaults to the value for 2.7.4

## Recipes
This cookbook ships with ready to use, attribute driven recipes that utilize the `git_client` and `git_service` resources. As of cookbook 4.x, they utilize the same attributes layout scheme from the 3.x. Due to some overlap, it is currently impossible to simultaneously install the Git client as a package and from source by using the "manipulate a the node attributes and run a recipe" technique. If you need both, you'll need to utilize the git_client resource in a recipe.
Expand Down
16 changes: 8 additions & 8 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@

case node['platform_family']
when 'windows'
default['git']['version'] = '2.5.1'
default['git']['version'] = '2.7.4'
default['git']['architecture'] = '32'
default['git']['url'] = 'https://github.com/git-for-windows/git/releases/download/v%{version}.windows.1/Git-%{version}-%{architecture}-bit.exe'
default['git']['checksum'] = 'f1a6a1b96f2497331afbefda7c720995d7deb0ba55caeb7307bcee27dae8e157'
default['git']['checksum'] = '49601d5102df249d6f866ecfa1eea68eb5672acc1dbb7e4051099e792f6da5fc'
default['git']['display_name'] = "Git version #{node['git']['version']}"
when 'mac_os_x'
default['git']['osx_dmg']['app_name'] = 'git-1.9.5-intel-universal-snow-leopard'
default['git']['osx_dmg']['volumes_dir'] = 'Git 1.9.5 Snow Leopard Intel Universal'
default['git']['osx_dmg']['app_name'] = 'git-2.7.1-intel-universal-mavericks'
default['git']['osx_dmg']['volumes_dir'] = 'Git 2.7.1 Mavericks Intel Universal'
default['git']['osx_dmg']['package_id'] = 'GitOSX.Installer.git195Universal.git.pkg'
default['git']['osx_dmg']['url'] = 'http://sourceforge.net/projects/git-osx-installer/files/git-1.9.5-intel-universal-snow-leopard.dmg/download'
default['git']['osx_dmg']['checksum'] = '61b8a9fda547725f6f0996c3d39a62ec3334e4c28a458574bc2aea356ebe94a1'
default['git']['osx_dmg']['url'] = 'http://sourceforge.net/projects/git-osx-installer/files/git-2.7.1-intel-universal-maverick.dmg/download'
default['git']['osx_dmg']['checksum'] = '260b32e8877eb72d07807b26163aeec42e2d98c350f32051ab1ff0cc33626440'
else
default['git']['prefix'] = '/usr/local'
default['git']['version'] = '1.9.5'
default['git']['version'] = '2.7.4'
default['git']['url'] = 'https://nodeload.github.com/git/git/tar.gz/v%{version}'
default['git']['checksum'] = '0f30984828d573da01d9f8e78210d5f4c56da1697fd6d278bad4cfa4c22ba271'
default['git']['checksum'] = '8d53703d75890c03e26a915c7af3b7b98d8cfb94382f685a9bcbee1eeaec47b4'
default['git']['use_pcre'] = false
end

Expand Down
8 changes: 4 additions & 4 deletions libraries/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def parsed_source_url

def parsed_source_checksum
return new_resource.source_checksum if new_resource.source_checksum
'0f30984828d573da01d9f8e78210d5f4c56da1697fd6d278bad4cfa4c22ba271' # 1.9.5 tarball
'8d53703d75890c03e26a915c7af3b7b98d8cfb94382f685a9bcbee1eeaec47b4' # 2.7.4 tarball
end

# windows
Expand All @@ -32,17 +32,17 @@ def parsed_windows_display_name

def parsed_windows_package_version
return new_resource.windows_package_version if new_resource.windows_package_version
'1.9.5-preview20141217'
'2.7.4'
end

def parsed_windows_package_url
return new_resource.windows_package_url if new_resource.windows_package_url
"https://github.com/msysgit/msysgit/releases/download/Git-#{parsed_windows_package_version}/Git-#{parsed_windows_package_version}.exe"
"https://github.com/git-for-windows/git/releases/download/v%#{parsed_windows_package_version}.windows.1/Git-%#{parsed_windows_package_version}-32-bit.exe"
end

def parsed_windows_package_checksum
return new_resource.windows_package_checksum if new_resource.windows_package_checksum
'd7e78da2251a35acd14a932280689c57ff9499a474a448ae86e6c43b882692dd'
'49601d5102df249d6f866ecfa1eea68eb5672acc1dbb7e4051099e792f6da5fc'
end
end
end
10 changes: 5 additions & 5 deletions libraries/resource_git_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ class GitClient < Chef::Resource::LWRPBase
attribute :package_action, kind_of: Symbol, default: :install

# used by OSX package providers
attribute :osx_dmg_app_name, kind_of: String, default: 'git-1.9.5-intel-universal-snow-leopard'
attribute :osx_dmg_package_id, kind_of: String, default: 'GitOSX.Installer.git195.git.pkg'
attribute :osx_dmg_volumes_dir, kind_of: String, default: 'Git 1.9.5 Snow Leopard Intel Universal'
attribute :osx_dmg_url, kind_of: String, default: 'http://sourceforge.net/projects/git-osx-installer/files/git-1.9.5-intel-universal-snow-leopard.dmg/download'
attribute :osx_dmg_checksum, kind_of: String, default: '61b8a9fda547725f6f0996c3d39a62ec3334e4c28a458574bc2aea356ebe94a1' # 1.9.5
attribute :osx_dmg_app_name, kind_of: String, default: 'git-2.7.1-intel-universal-mavericks'
attribute :osx_dmg_package_id, kind_of: String, default: 'GitOSX.Installer.git271.git.pkg'
attribute :osx_dmg_volumes_dir, kind_of: String, default: 'Git 2.7.1 Mavericks Intel Universal'
attribute :osx_dmg_url, kind_of: String, default: 'http://sourceforge.net/projects/git-osx-installer/files/git-2.7.1-intel-universal-mavericks.dmg/download'
attribute :osx_dmg_checksum, kind_of: String, default: '260b32e8877eb72d07807b26163aeec42e2d98c350f32051ab1ff0cc33626440' # 2.7.1

# used by Windows providers
attribute :windows_display_name, kind_of: String, default: nil
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 '4.3.7'
version '4.4.0'
recipe 'git', 'Installs git'
recipe 'git::server', 'Sets up a runit_service for git daemon'
recipe 'git::source', 'Installs git from source'
Expand Down

0 comments on commit c4770ea

Please sign in to comment.