Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
34452eb
)
(maint) - modulesync 384f4c1
maint_modsync_384f4c1
author
tphoney
<tp@puppet.com>
Wed, 13 Dec 2017 10:48:54 +0000
(10:48 +0000)
committer
tphoney
<tp@puppet.com>
Wed, 13 Dec 2017 10:48:54 +0000
(10:48 +0000)
.gitignore
patch
|
blob
|
history
Gemfile
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index f6e8b46c29ee7fb0d148126fec3ff54c4192f676..e5e6f9e8af6d802bb42313fd8f5a5161f9838143 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,24
+1,23
@@
-#This file is generated by ModuleSync, do not edit.
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-log/
-junit/
-.vagrant/
+#This file is generated by ModuleSync, do not edit.Z
+*.iml
+.*.sw[op]
+.DS_Store
.bundle/
.bundle/
-coverage/
-log/
.idea/
.metadata
.idea/
.metadata
-*.iml
-.*.sw[op]
+.vagrant/
.yardoc
.yardwarns
.yardoc
.yardwarns
-.DS_Store
+Gemfile.local
+Gemfile.lock
+bin/
+coverage/
+doc/
+junit/
+log/
+pkg/
+spec/fixtures/manifests/
+spec/fixtures/modules/
tmp/
vendor/
tmp/
vendor/
-doc/
diff --git
a/Gemfile
b/Gemfile
index a9f0161c79e6ba92b7a4f6f7a52750339be2299e..84b23f2b4e84ed3d0dacb63281ca6db53db9df76 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-28,10
+28,19
@@
def location_for(place_or_version, fake_version = nil)
end
# Used for gem conditionals
end
# Used for gem conditionals
-supports_windows = false
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
+# The following gems are not included by default as they require DevKit on Windows.
+# You should probably include them in a Gemfile.local or a ~/.gemfile
+#gem 'pry' #this may already be included in the gemfile
+#gem 'pry-stack_explorer', :require => false
+#if RUBY_VERSION =~ /^2/
+# gem 'pry-byebug'
+#else
+# gem 'pry-debugger'
+#end
+
group :development do
gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
group :development do
gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
@@
-62,7
+71,6
@@
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION']) if ENV['FACTER_GEM_VERSION']
gem 'hiera', *location_for(ENV['HIERA_GEM_VERSION']) if ENV['HIERA_GEM_VERSION']
-
# Evaluate Gemfile.local if it exists
if File.exists? "#{__FILE__}.local"
eval(File.read("#{__FILE__}.local"), binding)
# Evaluate Gemfile.local if it exists
if File.exists? "#{__FILE__}.local"
eval(File.read("#{__FILE__}.local"), binding)