xcodeproj 0.26.2 → 0.26.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5f58263d9fc69394301cbdc6fa9584511556d934
4
- data.tar.gz: 151af3ef28dead3309b7812046e134c678b2b601
3
+ metadata.gz: b3ffe9ba21a5d156f491061b65e4a600ada8c653
4
+ data.tar.gz: b4327d4cdbbd7036dcd891c478f850ac19fdd8ea
5
5
  SHA512:
6
- metadata.gz: 85241ebe570205c883765c3b13b0871cd03c2246150990649a0e4c7a90cd9e4596ed5708b08df62fbc92ed2dc9748a09d7080272e7effbb9c19ca66a17e4c454
7
- data.tar.gz: adf59d7e4cf162c0965f6c6c92398261ddbda976dfb8adc61b29e2bdf3ef615ea65b5e3877e8a24fac657157c051aa6aa6799a867f22a42cb32201665dc07656
6
+ metadata.gz: 86aa2035f0857282fa84bc0bc13827d4523ce0724f25b4f31883c693e8724478555d85404d437de96ae54efae2720c20724b3c5e8685a7eaf60fafd8f422c1c7
7
+ data.tar.gz: 0f5707dee287885c37cb5fbafe17ae3832f4556a645e8b354486ab1f9b48976047511a323c77eff50aac3154cec536ed167510167397e0725a27972470351820
@@ -23,17 +23,15 @@ module Xcodeproj
23
23
 
24
24
  def initialize(argv)
25
25
  self.xcodeproj_path = argv.shift_argument
26
-
27
26
  @output_path = Pathname(argv.shift_argument || '.')
28
- unless @output_path.directory?
29
- raise Informative, 'The output path must be a directory.'
30
- end
31
27
 
32
- super unless argv.empty?
28
+ super
33
29
  end
34
30
 
35
31
  def validate!
36
32
  super
33
+
34
+ raise Informative, 'The output path must be a directory.' unless @output_path.directory?
37
35
  open_project!
38
36
  end
39
37
 
@@ -1,5 +1,5 @@
1
1
  module Xcodeproj
2
2
  # The version of the xcodeproj gem.
3
3
  #
4
- VERSION = '0.26.2' unless defined? Xcodeproj::VERSION
4
+ VERSION = '0.26.3' unless defined? Xcodeproj::VERSION
5
5
  end
@@ -47,7 +47,9 @@ module Xcodeproj
47
47
  #
48
48
  def hierarchy_path(object)
49
49
  unless main_group?(object)
50
- "#{parent(object).hierarchy_path}/#{object.display_name}"
50
+ parent = parent(object)
51
+ parent = parent.hierarchy_path if parent.respond_to?(:hierarchy_path)
52
+ "#{parent}/#{object.display_name}"
51
53
  end
52
54
  end
53
55
 
@@ -89,6 +89,7 @@ module Xcodeproj
89
89
  # @return [Symbol] the name of the platform of the target.
90
90
  #
91
91
  def platform_name
92
+ return unless sdk
92
93
  if sdk.include? 'iphoneos'
93
94
  :ios
94
95
  elsif sdk.include? 'macosx'
@@ -101,9 +102,8 @@ module Xcodeproj
101
102
  # @return [String] the version of the SDK.
102
103
  #
103
104
  def sdk_version
104
- if sdk
105
- sdk.scan(/[0-9.]+/).first
106
- end
105
+ return unless sdk
106
+ sdk.scan(/[0-9.]+/).first
107
107
  end
108
108
 
109
109
  # @return [String] the deployment target of the target according to its
@@ -21,7 +21,7 @@ module Xcodeproj
21
21
 
22
22
  def verify_no_duplicates!(all_objects)
23
23
  duplicates = all_objects - @new_objects_by_uuid.values
24
- raise "[Xcodeproj] Generated duplicate UUIDs:\n\n" <<
24
+ UserInterface.warn "[Xcodeproj] Generated duplicate UUIDs:\n\n" <<
25
25
  duplicates.map { |d| "#{d.isa} -- #{@paths_by_object[d]}" }.join("\n") unless duplicates.empty?
26
26
  end
27
27
 
@@ -76,10 +76,12 @@ module Xcodeproj
76
76
 
77
77
  def path_component_for_object(object)
78
78
  hash = object.to_tree_hash
79
- tree_hash_to_path(hash)
79
+ component = tree_hash_to_path(hash)
80
+ component << object.hierarchy_path.to_s if object.respond_to?(:hierarchy_path)
81
+ component
80
82
  end
81
83
 
82
- def tree_hash_to_path(object, depth = 3)
84
+ def tree_hash_to_path(object, depth = 4)
83
85
  return '|' if depth.zero?
84
86
  case object
85
87
  when Hash
@@ -90,10 +92,8 @@ module Xcodeproj
90
92
  object.map do |value|
91
93
  tree_hash_to_path(value, depth - 1)
92
94
  end.join(',')
93
- when String
94
- object
95
95
  else
96
- raise "[Xcodeproj] Unrecognized object `#{hash}` in #tree_hash_to_path"
96
+ object.to_s
97
97
  end
98
98
  end
99
99
  end
metadata CHANGED
@@ -1,55 +1,55 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xcodeproj
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.2
4
+ version: 0.26.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eloy Duran
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-18 00:00:00.000000000 Z
11
+ date: 2015-07-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '3'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '3'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: colored
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '1.2'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '1.2'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: claide
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: 0.9.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: 0.9.1
55
55
  description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
@@ -115,12 +115,12 @@ require_paths:
115
115
  - lib
116
116
  required_ruby_version: !ruby/object:Gem::Requirement
117
117
  requirements:
118
- - - ">="
118
+ - - '>='
119
119
  - !ruby/object:Gem::Version
120
120
  version: 2.0.0
121
121
  required_rubygems_version: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - ">="
123
+ - - '>='
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
126
  requirements: []