[Specification::DSL] frameworks_bundles -> vendored_frameworks; library_files -> vendored_libraries

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: e78e9726126271d083d855c58ff3c9b30f360170
+  revision: 8a8ace23f5e6ecd4a32b26192d8f1be138a39604
   branch: feature-frameworks-bundles
   specs:
     cocoapods-core (0.22.3)

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -54,11 +54,11 @@ module Pod
         target.pod_targets.each do |pod_target|
           pod_target.file_accessors.each do |file_accessor|
             XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, @xcconfig)
-            file_accessor.framework_bundles.each do |framework_bundle|
-              XCConfigHelper.add_framework_build_settings(framework_bundle, @xcconfig, target.sandbox.root)
+            file_accessor.vendored_frameworks.each do |vendored_framework|
+              XCConfigHelper.add_framework_build_settings(vendored_framework, @xcconfig, target.sandbox.root)
             end
-            file_accessor.library_files.each do |library_file|
-              XCConfigHelper.add_library_build_settings(library_file, @xcconfig, target.sandbox.root)
+            file_accessor.vendored_libraries.each do |vendored_library|
+              XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root)
             end
           end
         end

lib/cocoapods/generator/xcconfig/public_pod_xcconfig.rb

@@ -44,11 +44,11 @@ module Pod
         @xcconfig = Xcodeproj::Config.new
         target.file_accessors.each do |file_accessor|
           XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, @xcconfig)
-          file_accessor.framework_bundles.each do |framework_bundle|
-            XCConfigHelper.add_framework_build_settings(framework_bundle, @xcconfig, target.sandbox.root)
+          file_accessor.vendored_frameworks.each do |vendored_framework|
+            XCConfigHelper.add_framework_build_settings(vendored_framework, @xcconfig, target.sandbox.root)
           end
-          file_accessor.library_files.each do |library_file|
-            XCConfigHelper.add_library_build_settings(library_file, @xcconfig, target.sandbox.root)
+          file_accessor.vendored_libraries.each do |vendored_library|
+            XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root)
           end
         end
         @xcconfig

lib/cocoapods/installer/file_references_installer.rb

@@ -36,7 +36,7 @@ module Pod
         refresh_file_accessors
         add_source_files_references
         add_frameworks_bundles
-        add_library_files
+        add_vendored_libraries
         add_resources
         link_headers
       end
@@ -83,7 +83,7 @@ module Pod
       #
       def add_frameworks_bundles
         UI.message "- Adding frameworks to Pods project" do
-          add_file_acessors_paths_to_pods_group(:framework_bundles, :frameworks_and_libraries)
+          add_file_acessors_paths_to_pods_group(:vendored_frameworks, :frameworks_and_libraries)
         end
       end
 
@@ -91,9 +91,9 @@ module Pod
       #
       # @return [void]
       #
-      def add_library_files
+      def add_vendored_libraries
         UI.message "- Adding frameworks to Pods project" do
-          add_file_acessors_paths_to_pods_group(:library_files, :frameworks_and_libraries)
+          add_file_acessors_paths_to_pods_group(:vendored_libraries, :frameworks_and_libraries)
         end
       end
 

lib/cocoapods/installer/pod_source_installer.rb

@@ -229,8 +229,8 @@ module Pod
       #
       def used_files
         files = [
-          file_accessors.map(&:framework_bundles),
-          file_accessors.map(&:library_files),
+          file_accessors.map(&:vendored_frameworks),
+          file_accessors.map(&:vendored_libraries),
           file_accessors.map(&:resource_bundle_files),
           file_accessors.map(&:license),
           file_accessors.map(&:prefix_header),

lib/cocoapods/sandbox/file_accessor.rb

@@ -109,15 +109,15 @@ module Pod
       # @return [Array<Pathname>] The paths of the framework bundles that come
       #         shipped with the Pod.
       #
-      def framework_bundles
-        paths_for_attribute(:framework_bundles, true)
+      def vendored_frameworks
+        paths_for_attribute(:vendored_frameworks, true)
       end
 
       # @return [Array<Pathname>] The paths of the library bundles that come
       #         shipped with the Pod.
       #
-      def library_files
-        paths_for_attribute(:library_files)
+      def vendored_libraries
+        paths_for_attribute(:vendored_libraries)
       end
 
       # @return [Hash{String => Array<Pathname>}] A hash that describes the

spec/unit/generator/xcconfig/public_pod_xcconfig_spec.rb

@@ -18,8 +18,8 @@ module Pod
           @spec.weak_frameworks = ['iAd']
           @spec.libraries = ['xml2']
           file_accessors = [Sandbox::FileAccessor.new(fixture('banana-lib'), @spec.consumer(:ios))]
-          # framework_bundle_paths = [config.sandbox.root + 'BananaLib/BananaLib.framework']
-          # Sandbox::FileAccessor.any_instance.stubs(:framework_bundles).returns(framework_bundle_paths)
+          # vendored_framework_paths = [config.sandbox.root + 'BananaLib/BananaLib.framework']
+          # Sandbox::FileAccessor.any_instance.stubs(:vendored_frameworks).returns(vendored_framework_paths)
 
           @pod_target.target_definition.stubs(:podfile).returns(@podfile)
           @pod_target.stubs(:file_accessors).returns(file_accessors)

spec/unit/installer/pod_source_installer_spec.rb

@@ -171,13 +171,13 @@ module Pod
 
       it "compacts the used files as nil would be converted to the empty string" do
         Sandbox::FileAccessor.any_instance.stubs(:source_files)
-        Sandbox::FileAccessor.any_instance.stubs(:library_files)
+        Sandbox::FileAccessor.any_instance.stubs(:vendored_libraries)
         Sandbox::FileAccessor.any_instance.stubs(:resources).returns(nil)
         Sandbox::FileAccessor.any_instance.stubs(:preserve_paths)
         Sandbox::FileAccessor.any_instance.stubs(:prefix_header)
         Sandbox::FileAccessor.any_instance.stubs(:readme)
         Sandbox::FileAccessor.any_instance.stubs(:license)
-        Sandbox::FileAccessor.any_instance.stubs(:framework_bundles)
+        Sandbox::FileAccessor.any_instance.stubs(:vendored_frameworks)
         paths = @installer.send(:used_files)
         paths.should == []
       end

spec/unit/sandbox/file_accessor_spec.rb

@@ -104,11 +104,11 @@ module Pod
       end
 
       it "returns the paths of the framework bundles" do
-        @accessor.framework_bundles.should.include?(@root + "Bananalib.framework")
+        @accessor.vendored_frameworks.should.include?(@root + "Bananalib.framework")
       end
 
       it "returns the paths of the library files" do
-        @accessor.library_files.should.include?(@root + "libBananalib.a")
+        @accessor.vendored_libraries.should.include?(@root + "libBananalib.a")
       end
 
       it "returns the resource bundles of the pod" do