puppet-library 0.10.0 → 0.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (58) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.yml +11 -0
  3. data/README.md +16 -7
  4. data/Rakefile +21 -21
  5. data/TODO.yml +10 -6
  6. data/bin/puppet-library +0 -1
  7. data/config.ru +14 -16
  8. data/features/step_definitions/sinatra_steps.rb +3 -12
  9. data/lib/puppet_library/forge.rb +1 -0
  10. data/lib/puppet_library/forge/abstract.rb +2 -1
  11. data/lib/puppet_library/forge/cache.rb +11 -7
  12. data/lib/puppet_library/forge/directory.rb +15 -13
  13. data/lib/puppet_library/forge/forge.rb +25 -0
  14. data/lib/puppet_library/forge/git_repository.rb +42 -17
  15. data/lib/puppet_library/forge/multi.rb +11 -1
  16. data/lib/puppet_library/forge/proxy.rb +14 -9
  17. data/lib/puppet_library/forge/source.rb +12 -13
  18. data/lib/puppet_library/http/cache/disk.rb +26 -8
  19. data/lib/puppet_library/http/cache/in_memory.rb +13 -10
  20. data/lib/puppet_library/http/cache/noop.rb +4 -1
  21. data/lib/puppet_library/puppet_library.rb +10 -7
  22. data/lib/puppet_library/puppet_module/modulefile.rb +5 -1
  23. data/lib/puppet_library/server.rb +13 -9
  24. data/lib/puppet_library/util.rb +1 -0
  25. data/lib/puppet_library/util/config_api.rb +115 -0
  26. data/lib/puppet_library/util/git.rb +36 -8
  27. data/lib/puppet_library/util/logging.rb +49 -0
  28. data/lib/puppet_library/util/patches.rb +21 -0
  29. data/lib/puppet_library/util/temp_dir.rb +20 -5
  30. data/lib/puppet_library/version.rb +1 -1
  31. data/puppet-library.gemspec +2 -0
  32. data/spec/archive/archive_reader_spec.rb +2 -6
  33. data/spec/archive/archiver_spec.rb +5 -9
  34. data/spec/forge/cache_spec.rb +13 -7
  35. data/spec/forge/directory_spec.rb +31 -18
  36. data/spec/forge/git_repository_spec.rb +60 -13
  37. data/spec/forge/multi_spec.rb +16 -0
  38. data/spec/forge/proxy_spec.rb +18 -0
  39. data/spec/forge/source_spec.rb +14 -9
  40. data/spec/http/cache/disk_spec.rb +11 -6
  41. data/spec/http/cache/in_memory_spec.rb +12 -0
  42. data/spec/http/cache/noop_spec.rb +6 -0
  43. data/spec/integration_test_helper.rb +3 -3
  44. data/spec/module_spec_helper.rb +2 -2
  45. data/spec/puppet_library_spec.rb +34 -16
  46. data/spec/puppet_module/modulefile_spec.rb +48 -9
  47. data/spec/server_spec.rb +28 -1
  48. data/spec/spec_helper.rb +2 -14
  49. data/spec/util/config_api_spec.rb +77 -0
  50. data/spec/util/git_spec.rb +20 -20
  51. data/spec/util/patches_spec.rb +18 -0
  52. data/test/directory_forge_integration_test.rb +6 -8
  53. data/test/offline_git_repo_forge_integration_test.rb +9 -14
  54. data/test/offline_proxy_forge_integration_test.rb +11 -14
  55. data/test/online_git_repo_forge_integration_test.rb +7 -8
  56. data/test/online_proxy_forge_integration_test.rb +10 -13
  57. data/test/source_forge_integration_test.rb +7 -8
  58. metadata +35 -2
data/test/online_proxy_forge_integration_test.rb CHANGED
@@ -24,18 +24,18 @@ module PuppetLibrary
24
24
  include ModuleSpecHelper
25
25
 
26
26
  let(:port) { Ports.next! }
27
- let(:project_dir) { Tempdir.create("project_dir") }
28
- let(:module_dir) { Tempdir.create("module_dir") }
29
- let(:cache_dir) { Tempdir.create("cache_dir") }
27
+ let(:project_dir) { Tempdir.new("project_dir") }
28
+ let(:module_dir) { Tempdir.new("module_dir") }
29
+ let(:cache_dir) { Tempdir.new("cache_dir") }
30
30
  let(:start_dir) { pwd }
31
31
  let(:proxy_server) do
32
- Server.configure do |server|
33
- server.forge Forge::Directory do |forge|
34
- forge.path = module_dir
32
+ Server.configure do
33
+ forge :directory do
34
+ path module_dir.path
35
35
  end
36
- server.forge Forge::Cache do |forge|
37
- forge.url = "http://forge.puppetlabs.com"
38
- forge.path = cache_dir
36
+ forge :cache do
37
+ url "http://forge.puppetlabs.com"
38
+ path cache_dir.path
39
39
  end
40
40
  end
41
41
  end
@@ -60,13 +60,10 @@ module PuppetLibrary
60
60
  # Start the server
61
61
  proxy_server_runner
62
62
  start_dir
63
- cd project_dir
63
+ cd project_dir.path
64
64
  end
65
65
 
66
66
  after do
67
- rm_rf module_dir
68
- rm_rf project_dir
69
- rm_rf cache_dir
70
67
  cd start_dir
71
68
  end
72
69
 
data/test/source_forge_integration_test.rb CHANGED
@@ -24,13 +24,14 @@ module PuppetLibrary
24
24
  include ModuleSpecHelper
25
25
 
26
26
  let(:port) { Ports.next! }
27
- let(:module_dir) { Tempdir.create("module_dir") }
28
- let(:project_dir) { Tempdir.create("project_dir") }
27
+ let(:module_dir) { Tempdir.new("module_dir") }
28
+ let(:project_dir) { Tempdir.new("project_dir") }
29
29
  let(:start_dir) { pwd }
30
- let(:source_forge) { Forge::Source.new(module_dir) }
31
30
  let(:source_server) do
32
- Server.configure do |server|
33
- server.forge source_forge
31
+ Server.configure do
32
+ forge :source do
33
+ path module_dir.path
34
+ end
34
35
  end
35
36
  end
36
37
  let(:source_rack_server) do
@@ -54,12 +55,10 @@ module PuppetLibrary
54
55
  # Start the servers
55
56
  source_server_runner
56
57
  start_dir
57
- cd project_dir
58
+ cd project_dir.path
58
59
  end
59
60
 
60
61
  after do
61
- rm_rf module_dir
62
- rm_rf project_dir
63
62
  cd start_dir
64
63
  end
65
64
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet-library
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.0
4
+ version: 0.11.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - drrb
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-25 00:00:00.000000000 Z
11
+ date: 2014-03-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sinatra
@@ -52,6 +52,34 @@ dependencies:
52
52
  - - '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: docile
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - '>='
60
+ - !ruby/object:Gem::Version
61
+ version: 1.0.0
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - '>='
67
+ - !ruby/object:Gem::Version
68
+ version: 1.0.0
69
+ - !ruby/object:Gem::Dependency
70
+ name: open4
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - '>='
74
+ - !ruby/object:Gem::Version
75
+ version: '0'
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - '>='
81
+ - !ruby/object:Gem::Version
82
+ version: '0'
55
83
  - !ruby/object:Gem::Dependency
56
84
  name: bundler
57
85
  requirement: !ruby/object:Gem::Requirement
@@ -328,6 +356,7 @@ files:
328
356
  - lib/puppet_library/forge/abstract.rb
329
357
  - lib/puppet_library/forge/cache.rb
330
358
  - lib/puppet_library/forge/directory.rb
359
+ - lib/puppet_library/forge/forge.rb
331
360
  - lib/puppet_library/forge/git_repository.rb
332
361
  - lib/puppet_library/forge/multi.rb
333
362
  - lib/puppet_library/forge/proxy.rb
@@ -345,7 +374,9 @@ files:
345
374
  - lib/puppet_library/puppet_module/modulefile.rb
346
375
  - lib/puppet_library/server.rb
347
376
  - lib/puppet_library/util.rb
377
+ - lib/puppet_library/util/config_api.rb
348
378
  - lib/puppet_library/util/git.rb
379
+ - lib/puppet_library/util/logging.rb
349
380
  - lib/puppet_library/util/patches.rb
350
381
  - lib/puppet_library/util/temp_dir.rb
351
382
  - lib/puppet_library/version.rb
@@ -370,6 +401,7 @@ files:
370
401
  - spec/puppet_module/modulefile_spec.rb
371
402
  - spec/server_spec.rb
372
403
  - spec/spec_helper.rb
404
+ - spec/util/config_api_spec.rb
373
405
  - spec/util/git_spec.rb
374
406
  - spec/util/patches_spec.rb
375
407
  - spec/util/temp_dir_spec.rb
@@ -429,6 +461,7 @@ test_files:
429
461
  - spec/puppet_module/modulefile_spec.rb
430
462
  - spec/server_spec.rb
431
463
  - spec/spec_helper.rb
464
+ - spec/util/config_api_spec.rb
432
465
  - spec/util/git_spec.rb
433
466
  - spec/util/patches_spec.rb
434
467
  - spec/util/temp_dir_spec.rb