Fix group ownership on directory

.fixtures.yml

@@ -0,0 +1,5 @@
+fixtures:
+  repositories:
+    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+  symlinks:
+    git: "#{source_dir}"

.gitignore

@@ -26,5 +26,9 @@ Thumbs.db
 obj/
 [Rr]elease*/
 _ReSharper*/
+pkg/*
 [Tt]est[Rr]esult*
-*~
+.project
+*~
+*.sublime-project
+*.sublime-workspace

.travis.yml

@@ -0,0 +1,35 @@
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+before_install:
+  - sudo apt-get install -qq augeas-tools augeas-lenses libaugeas-dev libaugeas-ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+env:
+  matrix:
+  - PUPPET_GEM_VERSION="~> 2.6.0"
+  - PUPPET_GEM_VERSION="~> 2.7.0"
+  - PUPPET_GEM_VERSION="~> 3.0.0"
+  - PUPPET_GEM_VERSION="~> 3.1.0"
+  - PUPPET_GEM_VERSION="~> 3.2.0"
+  - PUPPET_GEM_VERSION="~> 3.3.1"
+matrix:
+  allow_failures:
+    - env: PUPPET_GEM_VERSION="~> 2.6.0"
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.6.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.6.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+notifications:
+  email: false

Gemfile

@@ -0,0 +1,20 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake',                   :require => false
+  gem 'rspec-puppet',           :require => false
+  gem 'puppetlabs_spec_helper', :require => false
+  gem 'ruby-augeas',            :require => false
+  gem 'rspec-puppet-augeas',    :require => false
+  gem 'rspec-system',           :require => false
+  gem 'rspec-system-puppet',    :require => false
+  gem 'puppet-lint',            :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion,  :require => false
+else
+  gem 'puppet',                 :require => false
+end
+
+# vim:ft=ruby

Modulefile

@@ -1,5 +1,5 @@
-name    'nesi-git'
-version '0.0.1'
+name    'Aethylred-git'
+version '0.1.2'
 source 'https://github.com/nesi/puppet-git'
 author 'Aaron Hicks'
 license 'GPL3'

README.markdown

@@ -1,81 +1,97 @@
 # puppet-git
 ============
 
-A puppet module for managing git resources
+[![Build Status](https://travis-ci.org/nesi/puppet-git.png?branch=master)](https://travis-ci.org/nesi/puppet-git)
 
-# To install into puppet
+A puppet module for managing the installation and configuration of [git](http://git-scm.com/).
 
-Clone into your puppet configuration in your `puppet/modules` directory:
+**WARNING** Changes to how Puppet sets up the environment variables with `exec` resources means this module no longer works as intended when managing repositories as any user other than root. It is recommended that the [Puppetlabs vcsrepo module](https://github.com/puppetlabs/puppetlabs-vcsrepo) is used manage repositories.
 
- git clone git://github.com/nesi/puppet-git.git git
+## Feature Roadmap
 
-Or if you're managing your Puppet configuration with git, in your `puppet` directory:
+This module is going to be refactored to operate in conjunction to the vcsrepo module. It will manage the installation of git, the configuration of git specific settings, executing git commands, and eventually the management of git hook scripts.
 
-    git submodule add git://github.com/nesi/puppet-git.git modules/git --init --recursive
-    cd modules/git
-    git checkout master
-    git pull
-    cd ../..
-    git commit -m "added git submodule from https://github.com/nesi/puppet-git"
+#### Implemented Features:
+* Installs git from packages
+* Optionally installs git-svn from packages (defaults installed)
+* Optionally installs git-gui from packages (defaults not installed)
 
-It might seem bit excessive, but it will make sure the submodule isn't headless...
+#### Features not yet updated
+* Initialising user accounts with git configurations
+
+#### Features to be Implemented
+* Sets git user's globals settings
+* Sets git repository local settings
+* Executes git commands
+* Pushes hook scripts into git repositories
 
 # Usage
 
 ## To install git
 
-A basic install with the defaults would be:
-
-     include git
+A basic install with the defaults would be:  
+```puppet
+include git
+```
 
-Otherwise using the parametrs:
-
-    class{git:
-      svn => true,
-      gui => true,
-    }
+Otherwise using the parametrs:  
+```puppet
+class{git:
+  svn => 'installed',
+  gui => 'installed',
+}
+```
 
 ### Parameters
 
-* *svn* if true the git-svn package will also be installed
-* *gui* if true the git-gui package will also be installed
+* **ensure**: Sets the ensure parameter passed to the git package. The default is `installed`.
+* **svn**: Sets the ensure paramater passed to the git-svn package. The default is `installed`.
+* **gui**: Sets the ensure parameter passed to the git-gui package. The default is `absent`.
+* **package**: Specifies a custom package. The default is `git`, except for older versions of Debian and Ubuntu where the default is `git-core`.
+* **git_root**: Currently does nothing, it's functionality is to be reviewed.
 
 ## To set up git for a user
 
 This basically sets the users name and email as git global variables, and should allow them to just use git. The username should be a valid user account.
 
-With default settings just use:
-
-    git::user{'username':}
+With default settings just use:  
+```puppet
+git::user{'username':}
+```
 
-Otherwise using parameters:
-
-    git::user{'username':
-     user_name  => 'Some User',
-     user_email => '[email protected]',
-    }
+Otherwise using parameters:  
+```puppet
+git::user{'username':
+ user_name  => 'Some User',
+ user_email => '[email protected]',
+}
+```
 
 ### Parameters
 
 * *user_name* sets the user's name to the specified string, and not the default of `${name} on ${fqdn}`, where fqdn is the fully qualified domain name as discovered by facter.
 * *user_email* sets the user's email address to the specified string, and not the default of `${name}@${fqdn}`, where fqdn is the fully qualified domain name as discovered by facter.
 
-## To specify a git repository
-
-This will clone a git repository from a vaild git URI to a specified path on the target server. It is **strongly** recommended that *read-only* git URIs are used. If no source is given, the target path will simply be initialised as a git repository.
+## To specify a git repository 
 
-With minimum parameters, should create the directory `/usr/src/repo` and run `git init` in it:
+**Using the `git::repo` class is depreciated and `vcsrepo` should be considered instead.**
 
-    git::repo{'repo_name':
-      path => '/usr/src/repo',
-    }
-
-With minimum parameters to clone from a remote source:
+This will clone a git repository from a vaild git URI to a specified path on the target server. It is **strongly** recommended that *read-only* git URIs are used. If no source is given, the target path will simply be initialised as a git repository.
 
-    git::repo{'repo_name':
-     path   => '/usr/src/repo',
-     source => 'git://example.org/example/repo.git'
-    }
+With minimum parameters, should create the directory `/usr/src/repo` and run `git init` in it:  
+```puppet
+git::repo{'repo_name':
+  path => '/usr/src/repo',
+}
+```
+
+With minimum parameters to clone from a remote source:  
+```puppet
+git::repo{'repo_name':
+ path   => '/usr/src/repo',
+ source => 'git://example.org/example/repo.git'
+}
+```
 
 ### Parameters
 
@@ -96,6 +112,8 @@ With minimum parameters to clone from a remote source:
 
 # Attribution
 
+## puppet-blank
+
 This module is derived from the puppet-blank module by Aaron Hicks ([email protected])
 
 * https://github.com/Aethylred/puppet-blank
@@ -104,6 +122,19 @@ This module has been developed for the use with Open Source Puppet (Apache 2.0 l
 
 * http://puppetlabs.com/puppet/puppet-open-source/
 
+## rspec-puppet-augeas
+
+This module includes the [Travis](https://travis-ci.org) configuration to use [`rspec-puppet-augeas`](https://github.com/domcleal/rspec-puppet-augeas) to test and verify changes made to files using the [`augeas` resource](http://docs.puppetlabs.com/references/latest/type.html#augeas) available in Puppet. Check the `rspec-puppet-augeas` [documentation](https://github.com/domcleal/rspec-puppet-augeas/blob/master/README.md) for usage.
+
+This will require a copy of the original input files to `spec/fixtures/augeas` using the same filesystem layout that the resource expects:  
+```
+$ tree spec/fixtures/augeas/
+spec/fixtures/augeas/
+`-- etc
+    `-- ssh
+        `-- sshd_config
+```
+
 # Gnu General Public License
 
 This file is part of the git Puppet module.

Rakefile

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'rspec-system/rake_task'
+require 'puppet-lint/tasks/puppet-lint'
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_class_parameter_defaults')
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+
+desc "Check for puppet and ruby syntax errors."
+task :validate do
+  if ENV['PUPPET_GEM_VERSION'] == '~> 2.6.0'
+    puppet_parse_command = 'puppet --parseonly --ignoreimport'
+  else
+    puppet_parse_command = 'puppet parser validate --noop'
+  end
+  Dir['manifests/**/*.pp'].each do |path|
+   sh "#{puppet_parse_command} #{path}"
+  end
+  ruby_parse_command = 'ruby -c'
+  Dir['spec/**/*.rb'].each do |path|
+   sh "#{ruby_parse_command} #{path}"
+  end
+end

manifests/init.pp

@@ -31,13 +31,45 @@
 #
 # Somewhat derived from https://github.com/theforeman/puppet-git
 class git(
-  $gui      = false,
-  $svn      = true,
+  $ensure   = 'installed',
+  $package  = $git::params::package,
+  $gui      = 'absent',
+  $svn      = 'installed',
   $git_root = false
 ) inherits git::params {
-  class{'git::install':
-    gui       => $gui,
-    svn       => $svn,
-    git_root  => $git_root,
+
+  # ensure statement for the git package overrides svn and gui ensure.
+  case $ensure {
+    /^installed$|^(\d+)?(\.(x|\*|\d+))?(\.(x|\*|\d+))?(|-(\S+))$/: {
+      $ensure_svn = $svn
+      $ensure_gui = $gui
+    }
+    default: {
+      $ensure_svn = 'absent'
+      $ensure_gui = 'absent'
+    }
+  }
+
+  package{'git':
+    ensure  => $ensure,
+    name    => $package,
+  }
+
+  package{'git-svn':
+    ensure  => $ensure_svn,
+    name    => $git::params::svn_package,
   }
+
+  package{'git-gui':
+    ensure  => $ensure_gui,
+    name    => $git::params::gui_package,
+  }
+
+  # Need to consider if this should happen or not.
+  # if $git_root {
+  #   $root_name    = "root on ${::fqdn}"
+  #   $root_email   = "root@${::fqdn}"
+  #   git::user{'root':}
+  # }
+
 }