braid 1.0.22 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (54) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -2
  3. data/README.md +48 -0
  4. data/_config.yml +1 -0
  5. data/bin/braid +44 -7
  6. data/braid.gemspec +4 -0
  7. data/config_versions.md +58 -0
  8. data/lib/braid.rb +7 -0
  9. data/lib/braid/command.rb +7 -7
  10. data/lib/braid/commands/add.rb +3 -3
  11. data/lib/braid/commands/diff.rb +7 -14
  12. data/lib/braid/commands/push.rb +10 -4
  13. data/lib/braid/commands/setup.rb +5 -1
  14. data/lib/braid/commands/status.rb +5 -1
  15. data/lib/braid/commands/update.rb +6 -15
  16. data/lib/braid/commands/upgrade_config.rb +56 -0
  17. data/lib/braid/config.rb +166 -27
  18. data/lib/braid/mirror.rb +111 -11
  19. data/lib/braid/operations.rb +51 -35
  20. data/lib/braid/version.rb +1 -1
  21. data/spec/config_spec.rb +2 -2
  22. data/spec/fixtures/shiny-conf-1.0.9-lock/.braids.json +10 -0
  23. data/spec/fixtures/shiny-conf-1.0.9-lock/expected.braids.json +9 -0
  24. data/spec/fixtures/shiny-conf-1.0.9-lock/skit1/layouts/layout.liquid +219 -0
  25. data/spec/fixtures/shiny-conf-1.0.9-lock/skit1/preview.png +0 -0
  26. data/spec/fixtures/shiny-conf-breaking-changes/.braids +14 -0
  27. data/spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/README.md +9 -0
  28. data/spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/index.html +20 -0
  29. data/spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/styles.css +17 -0
  30. data/spec/fixtures/shiny-conf-breaking-changes/expected.braids.json +10 -0
  31. data/spec/fixtures/shiny-conf-breaking-changes/skit1/layouts/layout.liquid +219 -0
  32. data/spec/fixtures/shiny-conf-breaking-changes/skit1/preview.png +0 -0
  33. data/spec/fixtures/shiny-conf-future/.braids.json +10 -0
  34. data/spec/fixtures/shiny-conf-future/skit1/layouts/layout.liquid +219 -0
  35. data/spec/fixtures/shiny-conf-future/skit1/preview.png +0 -0
  36. data/spec/fixtures/shiny-conf-json-old-name/.braids +9 -0
  37. data/spec/fixtures/shiny-conf-json-old-name/expected.braids.json +10 -0
  38. data/spec/fixtures/shiny-conf-json-old-name/skit1/layouts/layout.liquid +219 -0
  39. data/spec/fixtures/shiny-conf-json-old-name/skit1/preview.png +0 -0
  40. data/spec/fixtures/shiny-conf-yaml/.braids +8 -0
  41. data/spec/fixtures/shiny-conf-yaml/expected.braids.json +10 -0
  42. data/spec/fixtures/shiny-conf-yaml/skit1/layouts/layout.liquid +219 -0
  43. data/spec/fixtures/shiny-conf-yaml/skit1/preview.png +0 -0
  44. data/spec/fixtures/shiny/skit-layout.liquid.test +2 -0
  45. data/spec/fixtures/shiny/skit1.test +2 -0
  46. data/spec/fixtures/skit1.1x/layouts/layout.liquid +219 -0
  47. data/spec/integration/adding_spec.rb +82 -34
  48. data/spec/integration/config_versioning_spec.rb +222 -0
  49. data/spec/integration/diff_spec.rb +173 -9
  50. data/spec/integration/integration_helper.rb +23 -5
  51. data/spec/integration/push_spec.rb +57 -4
  52. data/spec/integration/remove_spec.rb +27 -5
  53. data/spec/integration/updating_spec.rb +104 -19
  54. metadata +73 -2
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: braid
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.22
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Cristi Balan
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-12-30 00:00:00.000000000 Z
13
+ date: 2018-02-22 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: main
@@ -26,6 +26,20 @@ dependencies:
26
26
  - - ">="
27
27
  - !ruby/object:Gem::Version
28
28
  version: 4.7.3
29
+ - !ruby/object:Gem::Dependency
30
+ name: json
31
+ requirement: !ruby/object:Gem::Requirement
32
+ requirements:
33
+ - - ">="
34
+ - !ruby/object:Gem::Version
35
+ version: '0'
36
+ type: :runtime
37
+ prerelease: false
38
+ version_requirements: !ruby/object:Gem::Requirement
39
+ requirements:
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: '0'
29
43
  - !ruby/object:Gem::Dependency
30
44
  name: rspec
31
45
  requirement: !ruby/object:Gem::Requirement
@@ -54,6 +68,34 @@ dependencies:
54
68
  - - ">="
55
69
  - !ruby/object:Gem::Version
56
70
  version: 0.9.11
71
+ - !ruby/object:Gem::Dependency
72
+ name: rake
73
+ requirement: !ruby/object:Gem::Requirement
74
+ requirements:
75
+ - - ">="
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
78
+ type: :development
79
+ prerelease: false
80
+ version_requirements: !ruby/object:Gem::Requirement
81
+ requirements:
82
+ - - ">="
83
+ - !ruby/object:Gem::Version
84
+ version: '0'
85
+ - !ruby/object:Gem::Dependency
86
+ name: bundler
87
+ requirement: !ruby/object:Gem::Requirement
88
+ requirements:
89
+ - - ">="
90
+ - !ruby/object:Gem::Version
91
+ version: '0'
92
+ type: :development
93
+ prerelease: false
94
+ version_requirements: !ruby/object:Gem::Requirement
95
+ requirements:
96
+ - - ">="
97
+ - !ruby/object:Gem::Version
98
+ version: '0'
57
99
  description: A simple tool for tracking vendor branches in git.
58
100
  email: evil@che.lu norbert.crombach@primetheory.org peter@realityforge.org
59
101
  executables:
@@ -69,8 +111,10 @@ files:
69
111
  - LICENSE
70
112
  - README.md
71
113
  - Rakefile
114
+ - _config.yml
72
115
  - bin/braid
73
116
  - braid.gemspec
117
+ - config_versions.md
74
118
  - lib/braid.rb
75
119
  - lib/braid/command.rb
76
120
  - lib/braid/commands/add.rb
@@ -80,14 +124,39 @@ files:
80
124
  - lib/braid/commands/setup.rb
81
125
  - lib/braid/commands/status.rb
82
126
  - lib/braid/commands/update.rb
127
+ - lib/braid/commands/upgrade_config.rb
83
128
  - lib/braid/config.rb
84
129
  - lib/braid/mirror.rb
85
130
  - lib/braid/operations.rb
86
131
  - lib/braid/operations_lite.rb
87
132
  - lib/braid/version.rb
88
133
  - spec/config_spec.rb
134
+ - spec/fixtures/shiny-conf-1.0.9-lock/.braids.json
135
+ - spec/fixtures/shiny-conf-1.0.9-lock/expected.braids.json
136
+ - spec/fixtures/shiny-conf-1.0.9-lock/skit1/layouts/layout.liquid
137
+ - spec/fixtures/shiny-conf-1.0.9-lock/skit1/preview.png
138
+ - spec/fixtures/shiny-conf-breaking-changes/.braids
139
+ - spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/README.md
140
+ - spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/index.html
141
+ - spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/styles.css
142
+ - spec/fixtures/shiny-conf-breaking-changes/expected.braids.json
143
+ - spec/fixtures/shiny-conf-breaking-changes/skit1/layouts/layout.liquid
144
+ - spec/fixtures/shiny-conf-breaking-changes/skit1/preview.png
145
+ - spec/fixtures/shiny-conf-future/.braids.json
146
+ - spec/fixtures/shiny-conf-future/skit1/layouts/layout.liquid
147
+ - spec/fixtures/shiny-conf-future/skit1/preview.png
148
+ - spec/fixtures/shiny-conf-json-old-name/.braids
149
+ - spec/fixtures/shiny-conf-json-old-name/expected.braids.json
150
+ - spec/fixtures/shiny-conf-json-old-name/skit1/layouts/layout.liquid
151
+ - spec/fixtures/shiny-conf-json-old-name/skit1/preview.png
152
+ - spec/fixtures/shiny-conf-yaml/.braids
153
+ - spec/fixtures/shiny-conf-yaml/expected.braids.json
154
+ - spec/fixtures/shiny-conf-yaml/skit1/layouts/layout.liquid
155
+ - spec/fixtures/shiny-conf-yaml/skit1/preview.png
89
156
  - spec/fixtures/shiny/README
90
157
  - spec/fixtures/shiny/other-skit/layout.liquid
158
+ - spec/fixtures/shiny/skit-layout.liquid.test
159
+ - spec/fixtures/shiny/skit1.test
91
160
  - spec/fixtures/shiny_skit1.2_merged/layouts/layout.liquid
92
161
  - spec/fixtures/shiny_skit1.2_merged/preview.png
93
162
  - spec/fixtures/shiny_skit1_conflicting/layouts/layout.liquid
@@ -95,12 +164,14 @@ files:
95
164
  - spec/fixtures/shiny_skit1_mergeable/layouts/layout.liquid
96
165
  - spec/fixtures/shiny_skit1_mergeable/preview.png
97
166
  - spec/fixtures/skit1.1/layouts/layout.liquid
167
+ - spec/fixtures/skit1.1x/layouts/layout.liquid
98
168
  - spec/fixtures/skit1.2/layouts/layout.liquid
99
169
  - spec/fixtures/skit1.3/layouts/README.md
100
170
  - spec/fixtures/skit1.3/layouts/layout.liquid
101
171
  - spec/fixtures/skit1/layouts/layout.liquid
102
172
  - spec/fixtures/skit1/preview.png
103
173
  - spec/integration/adding_spec.rb
174
+ - spec/integration/config_versioning_spec.rb
104
175
  - spec/integration/diff_spec.rb
105
176
  - spec/integration/integration_helper.rb
106
177
  - spec/integration/push_spec.rb