Merge branch '3.0.x'

* 3.0.x:
  (maint) Add Travis CI support to active branches

Conflicts:
	.travis.yml
	Gemfile

.gitignore

@@ -11,6 +11,10 @@ doc
 # Now that there is a gemfile, RVM ignores rvmrc in parent directories, so a local one is required
 # to work around that.  Which we don't want committed, so we can ignore it here.
 /.rvmrc
+.bundle/
+ext/packaging/
+pkg/
+vendor/
 Gemfile.lock
 vendor/
 .bundle/

Gemfile

@@ -1,20 +1,10 @@
 source :rubygems
 
-puppet_version_lib = File.expand_path("../lib/puppet/version", __FILE__)
-require puppet_version_lib
-
 def location_for(place)
   if place =~ /^(git:[^#]*)#(.*)/
     [{ :git => $1, :branch => $2, :require => false }]
   elsif place =~ /^file:\/\/(.*)/
-    path = $1
-    puppet_version = Puppet.version
-    if match_data = puppet_version.match(/(\d+\.\d+\.\d+)/)
-      gem_puppet_version = match_data[1]
-    else
-      gem_puppet_version = puppet_version
-    end
-    [gem_puppet_version, { :path => File.expand_path(path), :require => false }]
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
     [place, { :require => false }]
   end

puppet.gemspec

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path("../lib/puppet/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = "puppet"
+  version = Puppet.version
+  if mdata = version.match(/(\d+\.\d+\.\d+)/)
+    s.version = mdata[1]
+  else
+    s.version = version
+  end
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Puppet Labs"]
+  s.date = "2012-08-17"
+  s.description = "Puppet, an automated configuration management tool"
+  s.email = "puppet@puppetlabs.com"
+  s.executables = ["puppet"]
+  s.files = ["bin/puppet"]
+  s.homepage = "http://puppetlabs.com"
+  s.rdoc_options = ["--title", "Puppet - Configuration Management", "--main", "README", "--line-numbers"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "puppet"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Puppet, an automated configuration management tool"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<facter>, ["~> 1.5"])
+    else
+      s.add_dependency(%q<facter>, ["~> 1.5"])
+    end
+  else
+    s.add_dependency(%q<facter>, ["~> 1.5"])
+  end
+end