puppet 2.7.17 → 2.7.18

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 2
   - 7
-  - 17
-  version: 2.7.17
+  - 18
+  version: 2.7.18
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-19 00:00:00 Z
+date: 2012-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: facter
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,6 +30,7 @@ dependencies:
         - 5
         version: "1.5"
   type: :runtime
+  name: facter
   version_requirements: *id001
 description: Puppet, an automated configuration management tool
 email: puppet@puppetlabs.com
@@ -175,7 +175,6 @@ files:
 - lib/puppet/feature/stomp.rb
 - lib/puppet/feature/zlib.rb
 - lib/puppet/file_bucket/dipper.rb
-- lib/puppet/file_bucket/file/indirection_hooks.rb
 - lib/puppet/file_bucket/file.rb
 - lib/puppet/file_bucket.rb
 - lib/puppet/file_collection/lookup.rb
@@ -185,13 +184,13 @@ files:
 - lib/puppet/file_serving/configuration.rb
 - lib/puppet/file_serving/content.rb
 - lib/puppet/file_serving/fileset.rb
-- lib/puppet/file_serving/indirection_hooks.rb
 - lib/puppet/file_serving/metadata.rb
 - lib/puppet/file_serving/mount/file.rb
 - lib/puppet/file_serving/mount/modules.rb
 - lib/puppet/file_serving/mount/plugins.rb
 - lib/puppet/file_serving/mount.rb
 - lib/puppet/file_serving/terminus_helper.rb
+- lib/puppet/file_serving/terminus_selector.rb
 - lib/puppet/file_serving.rb
 - lib/puppet/forge/cache.rb
 - lib/puppet/forge/repository.rb
@@ -234,13 +233,16 @@ files:
 - lib/puppet/indirector/facts/yaml.rb
 - lib/puppet/indirector/file_bucket_file/file.rb
 - lib/puppet/indirector/file_bucket_file/rest.rb
+- lib/puppet/indirector/file_bucket_file/selector.rb
 - lib/puppet/indirector/file_content/file.rb
 - lib/puppet/indirector/file_content/file_server.rb
 - lib/puppet/indirector/file_content/rest.rb
+- lib/puppet/indirector/file_content/selector.rb
 - lib/puppet/indirector/file_content.rb
 - lib/puppet/indirector/file_metadata/file.rb
 - lib/puppet/indirector/file_metadata/file_server.rb
 - lib/puppet/indirector/file_metadata/rest.rb
+- lib/puppet/indirector/file_metadata/selector.rb
 - lib/puppet/indirector/file_metadata.rb
 - lib/puppet/indirector/file_server.rb
 - lib/puppet/indirector/indirection.rb
@@ -1254,6 +1256,7 @@ files:
 - spec/integration/configurer_spec.rb
 - spec/integration/defaults_spec.rb
 - spec/integration/faces/documentation_spec.rb
+- spec/integration/file_bucket/file_spec.rb
 - spec/integration/file_serving/content_spec.rb
 - spec/integration/file_serving/fileset_spec.rb
 - spec/integration/file_serving/metadata_spec.rb
@@ -1326,6 +1329,7 @@ files:
 - spec/shared_behaviours/documentation_on_faces.rb
 - spec/shared_behaviours/file_server_terminus.rb
 - spec/shared_behaviours/file_serving.rb
+- spec/shared_behaviours/file_serving_model.rb
 - spec/shared_behaviours/memory_terminus.rb
 - spec/shared_behaviours/path_parameters.rb
 - spec/shared_behaviours/store_configs_terminus.rb
@@ -1397,13 +1401,13 @@ files:
 - spec/unit/file_serving/configuration_spec.rb
 - spec/unit/file_serving/content_spec.rb
 - spec/unit/file_serving/fileset_spec.rb
-- spec/unit/file_serving/indirection_hooks_spec.rb
 - spec/unit/file_serving/metadata_spec.rb
 - spec/unit/file_serving/mount/file_spec.rb
 - spec/unit/file_serving/mount/modules_spec.rb
 - spec/unit/file_serving/mount/plugins_spec.rb
 - spec/unit/file_serving/mount_spec.rb
 - spec/unit/file_serving/terminus_helper_spec.rb
+- spec/unit/file_serving/terminus_selector_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb
 - spec/unit/indirector/active_record_spec.rb
@@ -1440,12 +1444,15 @@ files:
 - spec/unit/indirector/facts/yaml_spec.rb
 - spec/unit/indirector/file_bucket_file/file_spec.rb
 - spec/unit/indirector/file_bucket_file/rest_spec.rb
+- spec/unit/indirector/file_bucket_file/selector_spec.rb
 - spec/unit/indirector/file_content/file_server_spec.rb
 - spec/unit/indirector/file_content/file_spec.rb
 - spec/unit/indirector/file_content/rest_spec.rb
+- spec/unit/indirector/file_content/selector_spec.rb
 - spec/unit/indirector/file_metadata/file_server_spec.rb
 - spec/unit/indirector/file_metadata/file_spec.rb
 - spec/unit/indirector/file_metadata/rest_spec.rb
+- spec/unit/indirector/file_metadata/selector_spec.rb
 - spec/unit/indirector/file_server_spec.rb
 - spec/unit/indirector/indirection_spec.rb
 - spec/unit/indirector/instrumentation_data/local_spec.rb

data/lib/puppet/file_bucket/file/indirection_hooks.rb

@@ -1,9 +0,0 @@
-require 'puppet/file_bucket/file'
-
-# This module is used to pick the appropriate terminus
-# in filebucket indirections.
-module Puppet::FileBucket::File::IndirectionHooks
-  def select_terminus(request)
-    return(request.protocol == 'https' ? :rest : Puppet::FileBucket::File.indirection.terminus_class)
-  end
-end