Skip to content

Commit 2b111c0

Browse files
glennsartiglennsarti
committed
(GH-198) Revender Molonillo and Puppfile-Resolver
The new Puppetfile Resolver gem needs to be revendored, and its dependency Molonillo. This will be used to Puppetfile module dependency resoltion.
1 parent 074ad0b commit 2b111c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+9325
-1
lines changed

‎Rakefile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,17 @@ task :gem_revendor do
5555
:directory => 'hiera-eyaml',
5656
:github_repo => 'https://github.com/voxpupuli/hiera-eyaml',
5757
:github_ref => 'v2.1.0',
58-
}
58+
},
59+
{
60+
:directory => 'puppetfile-resolver',
61+
:github_repo => 'https://github.com/lingua-pupuli/puppetfile-resolver.git',
62+
:github_ref => '0.0.3',
63+
},
64+
{
65+
:directory => 'molinillo',
66+
:github_repo => 'https://github.com/CocoaPods/Molinillo.git',
67+
:github_ref => '0.6.6',
68+
},
5969
]
6070

6171
# Clean out the vendor directory first

‎vendor/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ Gem List
1313

1414
* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.4.2)
1515
* hiera-eyaml (https://github.com/voxpupuli/hiera-eyaml ref v2.1.0)
16+
* puppetfile-resolver (https://github.com/lingua-pupuli/puppetfile-resolver.git ref 0.0.3)
17+
* molinillo (https://github.com/CocoaPods/Molinillo.git ref 0.6.6)
1618

‎vendor/molinillo/.gitignore‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
*.gem
2+
*.rbc
3+
/.config
4+
/coverage/
5+
/InstalledFiles
6+
/pkg/
7+
/spec/reports/
8+
/test/tmp/
9+
/test/version_tmp/
10+
/tmp/
11+
12+
## Specific to RubyMotion:
13+
.dat*
14+
.repl_history
15+
build/
16+
17+
## Documentation cache and generated files:
18+
/.yardoc/
19+
/_yardoc/
20+
/doc/
21+
/rdoc/
22+
23+
## Environment normalisation:
24+
/.bundle/
25+
/lib/bundler/man/
26+
27+
# for a library or gem, you might want to ignore these files since the code is
28+
# intended to run in multiple environments; otherwise, check them in:
29+
# Gemfile.lock
30+
# .ruby-version
31+
# .ruby-gemset
32+
33+
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
34+
.rvmrc
35+
36+
# rspec failure tracking
37+
.rspec_status

‎vendor/molinillo/.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "spec/resolver_integration_specs"]
2+
path = spec/resolver_integration_specs
3+
url = https://github.com/CocoaPods/Resolver-Integration-Specs.git

‎vendor/molinillo/.kick‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
recipe :ruby
2+
3+
Kicker::Recipes::Ruby.runner_bin = 'bacon --quiet'
4+
5+
process do |files|
6+
specs = files.take_and_map do |file|
7+
if file =~ %r{(lib|spec)/[^/]*/(.+?).(rb|json)$}
8+
s = Dir.glob("spec/**/#{File.basename(file, '.rb')}_spec.rb") <<
9+
'spec/resolver_spec.rb'
10+
s.uniq unless s.empty?
11+
end
12+
end
13+
Kicker::Recipes::Ruby.run_tests(specs)
14+
end
15+
16+
# Have written this so many times, probably should make a recipe out of it.
17+
process do |files|
18+
files.each do |file|
19+
case file
20+
when 'Gemfile'
21+
files.delete(file)
22+
execute 'bundle install'
23+
end
24+
end
25+
end
26+
27+
recipe :ignore
28+
ignore(/.*\/?tags/)
29+
ignore(/.*\/?\.git/)
30+
ignore(/^tmp/)

‎vendor/molinillo/.rspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
--format documentation
2+
--color
3+
--warnings

‎vendor/molinillo/.rubocop.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
inherit_from:
2+
- .rubocop_cocoapods.yml
3+
- .rubocop_todo.yml
4+
5+
Metrics/BlockLength:
6+
Exclude:
7+
- 'spec/**/*_spec.rb'
8+
9+
Metrics/LineLength:
10+
Max: 120
11+
12+
Metrics/MethodLength:
13+
Max: 15
14+
15+
AllCops:
16+
Exclude:
17+
- 'vendor/**/*'
18+
- 'spec/resolver_integration_specs/**/*'
19+
- 'bin/*'
20+
21+
Style/TrailingCommaInArguments:
22+
Enabled: false
23+
24+
Style/TrailingCommaInLiteral:
25+
Enabled: false
26+
27+
Style/EmptyElse:
28+
EnforcedStyle: empty
29+
30+
RaiseArgs:
31+
Enabled: false
32+
33+
Lint/UnusedMethodArgument:
34+
Exclude:
35+
- 'lib/molinillo/modules/**/*'
36+
37+
Style/FrozenStringLiteralComment:
38+
EnforcedStyle: always
39+
40+
Layout/IndentHeredoc:
41+
Enabled: false
42+
43+
# CocoaPods default overrides
44+
45+
Metrics/CyclomaticComplexity:
46+
Enabled: true

‎vendor/molinillo/.rubocop_cocoapods.yml‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
AllCops:
2+
Include:
3+
- ./Rakefile
4+
- ./Gemfile
5+
- ./*.gemspec
6+
Exclude:
7+
- ./spec/fixtures/**/*
8+
- ./vendor/bundle/**/*
9+
- ./tmp/**/*
10+
11+
# At the moment not ready to be used
12+
# https://github.com/bbatsov/rubocop/issues/947
13+
Documentation:
14+
Enabled: false
15+
16+
#- CocoaPods -----------------------------------------------------------------#
17+
18+
ParameterLists:
19+
CountKeywordArgs: false
20+
21+
# We adopted raise instead of fail.
22+
SignalException:
23+
EnforcedStyle: only_raise
24+
25+
# They are idiomatic
26+
AssignmentInCondition:
27+
Enabled: false
28+
29+
# Allow backticks
30+
AsciiComments:
31+
Enabled: false
32+
33+
# Indentation clarifies logic branches in implementations
34+
IfUnlessModifier:
35+
Enabled: false
36+
37+
# No enforced convention here.
38+
SingleLineBlockParams:
39+
Enabled: false
40+
41+
# We only add the comment when needed.
42+
Encoding:
43+
Enabled: false
44+
45+
# Having these make it easier to *not* forget to add one when adding a new
46+
# value and you can simply copy the previous line.
47+
Style/TrailingCommaInArguments:
48+
EnforcedStyleForMultiline: comma
49+
50+
Style/TrailingCommaInLiteral:
51+
EnforcedStyleForMultiline: comma
52+
53+
Layout/MultilineOperationIndentation:
54+
EnforcedStyle: indented
55+
56+
# Clashes with CLAide Command#validate!
57+
GuardClause:
58+
Enabled: false
59+
60+
# Not always desirable: lib/claide/command/plugins_helper.rb:12:15
61+
Next:
62+
Enabled: false
63+
64+
# Autocorrect makes this cop much more useful, taking away needless guessing
65+
Lint/EndAlignment:
66+
AutoCorrect: true
67+
68+
69+
# Arbitrary max lengths for classes simply do not work and enabling this will
70+
# lead to a never ending stream of annoyance and changes.
71+
Metrics/ClassLength:
72+
Enabled: false
73+
74+
# Arbitrary max lengths for modules simply do not work and enabling this will
75+
# lead to a never ending stream of annoyance and changes.
76+
Metrics/ModuleLength:
77+
Enabled: false
78+
79+
# Arbitrary max lengths for methods simply do not work and enabling this will
80+
# lead to a never ending stream of annoyance and changes.
81+
Metrics/MethodLength:
82+
Enabled: false
83+
84+
# No enforced convention here.
85+
Metrics/BlockNesting:
86+
Enabled: false
87+
88+
# It will be obvious which code is complex, Rubocop should only lint simple
89+
# rules for us.
90+
Metrics/AbcSize:
91+
Enabled: false
92+
93+
# It will be obvious which code is complex, Rubocop should only lint simple
94+
# rules for us.
95+
Metrics/CyclomaticComplexity:
96+
Enabled: false
97+
98+
# It will be obvious which code is complex, Rubocop should only lint simple
99+
# rules for us.
100+
Metrics/PerceivedComplexity:
101+
Enabled: false
102+
103+
#- CocoaPods support for Ruby 1.8.7 ------------------------------------------#
104+
105+
HashSyntax:
106+
EnforcedStyle: hash_rockets
107+
108+
Lambda:
109+
Enabled: false
110+
111+
DotPosition:
112+
EnforcedStyle: trailing
113+
114+
EachWithObject:
115+
Enabled: false
116+
117+
Style/SpecialGlobalVars:
118+
Enabled: false
119+
120+
#- CocoaPods specs -----------------------------------------------------------#
121+
122+
# Allow for `should.match /regexp/`.
123+
AmbiguousRegexpLiteral:
124+
Exclude:
125+
- spec/**/*
126+
127+
Performance/RedundantMatch:
128+
Exclude:
129+
- spec/**/*
130+
131+
# Allow `object.should == object` syntax.
132+
Void:
133+
Exclude:
134+
- spec/**/*
135+
136+
ClassAndModuleChildren:
137+
Exclude:
138+
- spec/**/*
139+
140+
UselessComparison:
141+
Exclude:
142+
- spec/**/*

‎vendor/molinillo/.rubocop_todo.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# This configuration was generated by
2+
# `rubocop --auto-gen-config`
3+
# on 2017-07-19 14:12:13 -0500 using RuboCop version 0.49.1.
4+
# The point is for the user to remove these configuration records
5+
# one by one as the offenses are removed from the code base.
6+
# Note that changes in the inspected code, or installation of new
7+
# versions of RuboCop, may require this file to be generated again.
8+
9+
# Offense count: 10
10+
# Configuration parameters: CountComments, ExcludedMethods.
11+
Metrics/BlockLength:
12+
Max: 124
13+
14+
# Offense count: 2
15+
# Cop supports --auto-correct.
16+
# Configuration parameters: AutoCorrect.
17+
Security/JSONLoad:
18+
Exclude:
19+
- 'spec/resolver_spec.rb'
20+
- 'spec/spec_helper/index.rb'
21+
22+
# Offense count: 1
23+
# Cop supports --auto-correct.
24+
Style/EmptyLiteral:
25+
Exclude:
26+
- 'spec/spec_helper/specification.rb'
27+
28+
# Offense count: 2
29+
# Cop supports --auto-correct.
30+
# Configuration parameters: EnforcedStyle, SupportedStyles.
31+
# SupportedStyles: compact, expanded
32+
Style/EmptyMethod:
33+
Exclude:
34+
- 'lib/molinillo/dependency_graph/tag.rb'
35+
36+
# Offense count: 2
37+
# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
38+
# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
39+
Style/FileName:
40+
Exclude:
41+
- 'Gemfile'
42+
- 'Rakefile'
43+
44+
# Offense count: 1
45+
# Cop supports --auto-correct.
46+
# Configuration parameters: InverseMethods, InverseBlocks.
47+
Style/InverseMethods:
48+
Exclude:
49+
- 'lib/molinillo/resolution.rb'
50+
51+
# Offense count: 1
52+
# Cop supports --auto-correct.
53+
Style/MultilineIfModifier:
54+
Exclude:
55+
- 'spec/fuzz_spec.rb'
56+
57+
# Offense count: 1
58+
# Cop supports --auto-correct.
59+
# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
60+
# SupportedStyles: predicate, comparison
61+
Style/NumericPredicate:
62+
Exclude:
63+
- 'spec/**/*'
64+
- 'lib/molinillo/resolution.rb'
65+
66+
# Offense count: 12
67+
# Cop supports --auto-correct.
68+
# Configuration parameters: PreferredDelimiters.
69+
Style/PercentLiteralDelimiters:
70+
Exclude:
71+
- 'molinillo.gemspec'
72+
- 'spec/dependency_graph/log_spec.rb'
73+
- 'spec/dependency_graph_spec.rb'
74+
- 'spec/errors_spec.rb'
75+
- 'spec/fuzz_spec.rb'
76+
- 'spec/state_spec.rb'
77+
78+
# Offense count: 1
79+
# Cop supports --auto-correct.
80+
# Configuration parameters: MinSize, SupportedStyles.
81+
# SupportedStyles: percent, brackets
82+
Style/SymbolArray:
83+
EnforcedStyle: brackets

0 commit comments

Comments
 (0)