Skip to content

Commit

Permalink
[Specification::DSL] frameworks_bundles -> vendored_frameworks; libra…
Browse files Browse the repository at this point in the history
…ry_files -> vendored_libraries
  • Loading branch information
fabiopelosin committed Aug 1, 2013
1 parent e78e972 commit 8a8ace2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions lib/cocoapods-core/specification/consumer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ def self.spec_attr_accessor(name)
# @return [Array<String>] The paths of the framework bundles shipped with
# the Pod.
#
spec_attr_accessor :framework_bundles
spec_attr_accessor :vendored_frameworks

# @return [Array<String>] The paths of the libraries shipped with the
# Pod.
#
spec_attr_accessor :library_files
spec_attr_accessor :vendored_libraries

# @return [Array<String>] The paths of the resource bundles shipped with
# the Pod.
Expand Down
20 changes: 10 additions & 10 deletions lib/cocoapods-core/specification/dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -810,45 +810,45 @@ def dependency(*args)

#------------------#

# @!method framework_bundles=(*frameworks)
# @!method vendored_frameworks=(*frameworks)
#
# The paths of the framework bundles that come shipped with the Pod.
#
# @example
#
# spec.ios.framework_bundles = 'Frameworks/MyFramework.framework'
# spec.ios.vendored_frameworks = 'Frameworks/MyFramework.framework'
#
# @example
#
# spec.framework_bundles = 'MyFramework.framework', 'TheirFramework.framework'
# spec.vendored_frameworks = 'MyFramework.framework', 'TheirFramework.framework'
#
# @param [String, Array<String>] framework_bundles
# @param [String, Array<String>] vendored_frameworks
# A list of framework bundles paths.
#
attribute :framework_bundles, {
attribute :vendored_frameworks, {
:container => Array,
:file_patterns => true,
:singularize => true,
}

#------------------#

# @!method library_files=(*frameworks)
# @!method vendored_libraries=(*frameworks)
#
# The paths of the libraries that come shipped with the Pod.
#
# @example
#
# spec.ios.library_file = 'Libraries/libProj4.a'
# spec.ios.vendored_library = 'Libraries/libProj4.a'
#
# @example
#
# spec.library_files = 'libProj4.a', 'libJavaScriptCore.a'
# spec.vendored_libraries = 'libProj4.a', 'libJavaScriptCore.a'
#
# @param [String, Array<String>] library_files
# @param [String, Array<String>] vendored_libraries
# A list of library paths.
#
attribute :library_files, {
attribute :vendored_libraries, {
:container => Array,
:file_patterns => true,
:singularize => true,
Expand Down
8 changes: 4 additions & 4 deletions spec/specification/consumer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,15 @@ module Pod
#------------------#

it "returns the frameworks bundles" do
@spec.framework_bundles = [ "MyFramework.framework", "MyOtherFramework.framework" ]
@consumer.framework_bundles.should == [ "MyFramework.framework", "MyOtherFramework.framework" ]
@spec.vendored_frameworks = [ "MyFramework.framework", "MyOtherFramework.framework" ]
@consumer.vendored_frameworks.should == [ "MyFramework.framework", "MyOtherFramework.framework" ]
end

#------------------#

it "returns the library files" do
@spec.library_files = ['libProj4.a', 'libJavaScriptCore.a']
@consumer.library_files.should == ['libProj4.a', 'libJavaScriptCore.a']
@spec.vendored_libraries = ['libProj4.a', 'libJavaScriptCore.a']
@consumer.vendored_libraries.should == ['libProj4.a', 'libJavaScriptCore.a']
end

#------------------#
Expand Down
14 changes: 7 additions & 7 deletions spec/specification/dsl_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,14 @@ module Pod
end

it "allows to specify the frameworks bundles shipped with the Pod" do
@spec.framework_bundles = [ "Parse.framework" ]
@spec.attributes_hash["framework_bundles"].should == [ "Parse.framework" ]
@spec.vendored_frameworks = [ "Parse.framework" ]
@spec.attributes_hash["vendored_frameworks"].should == [ "Parse.framework" ]
end


it "allows to specify the libraries shipped with the Pod" do
@spec.library_files = [ "libProj4.a" ]
@spec.attributes_hash["library_files"].should == [ "libProj4.a" ]
@spec.vendored_libraries = [ "libProj4.a" ]
@spec.attributes_hash["vendored_libraries"].should == [ "libProj4.a" ]
end

it "allows to specify the resources bundles shipped with the Pod" do
Expand Down Expand Up @@ -359,9 +359,9 @@ module Pod
spec.should.respond_to(attr.writer_name)
end
singularized.map{ |attr| attr.name.to_s }.sort.should == %w[
authors compiler_flags framework_bundles frameworks libraries
library_files preserve_paths resource_bundles resources screenshots
weak_frameworks
authors compiler_flags frameworks libraries preserve_paths
resource_bundles resources screenshots vendored_frameworks
vendored_libraries weak_frameworks
]
end
end
Expand Down

0 comments on commit 8a8ace2

Please sign in to comment.