cocoapods-packager-qcloud 1.5.5 → 1.5.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.idea/cocoapods-packager.iml +1 -1
  3. data/.idea/workspace.xml +63 -53
  4. data/lib/cocoapods-packager/spec_builder.rb +16 -1
  5. data/lib/cocoapods_packager.rb +1 -1
  6. data/lib/pod/command/package.rb +1 -3
  7. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 28a4dfcecb50aa74811f445d490d04a2d6427d5d
4
- data.tar.gz: 221fb8c447c38d7a66c72f27660cfd2ff21024b4
3
+ metadata.gz: 7291c82285b0371265ec4717111c664c7dc9c665
4
+ data.tar.gz: 5fee78f36c208f94aa678cb90a351c8de72540b1
5
5
  SHA512:
6
- metadata.gz: a8b62c3902c2c2b0f286a43b0006af618e2b60e4fe859877d33c881c4adf7c2874e670f07389bd2867287a5f0912db349b0fc1aabf17645628e076b7e3d149b6
7
- data.tar.gz: 36a0c32f7c18026b6de1a1878fdf0db0dbb0eea9e6c2424b23d8c8de6abe3ef584d5be0215a91368945d396e3c82230be1c7433a521b93419652b200a8647100
6
+ metadata.gz: 5a4f13fdf0c51b38aafde1fb8ff1f989dbdacc9ec90e071e7ade1249329fa11eea881101cb397efbfc80a106e8a630f9981c9def692851a78ca5f129bd2ecdad
7
+ data.tar.gz: 6a35fc8f22a2defcc665e7ca47bf1ad75f1a158ffdec3321550ba0364dca1fbb29cbbe43bf99ea105cbb3b1c165ab563b8152d253232dd14341b8837c1c6b482
data/.idea/cocoapods-packager.iml CHANGED
@@ -30,7 +30,7 @@
30
30
  <orderEntry type="library" scope="PROVIDED" name="parser (v2.3.1.2, RVM: ruby-2.4.0) [gem]" level="application" />
31
31
  <orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.1, RVM: ruby-2.4.0) [gem]" level="application" />
32
32
  <orderEntry type="library" scope="PROVIDED" name="prettybacon (v0.0.2, RVM: ruby-2.4.0) [gem]" level="application" />
33
- <orderEntry type="library" scope="PROVIDED" name="qricker (v0.0.7, RVM: ruby-2.4.0) [gem]" level="application" />
33
+ <orderEntry type="library" scope="PROVIDED" name="qricker (v0.0.8, RVM: ruby-2.4.0) [gem]" level="application" />
34
34
  <orderEntry type="library" scope="PROVIDED" name="rainbow (v2.1.0, RVM: ruby-2.4.0) [gem]" level="application" />
35
35
  <orderEntry type="library" scope="PROVIDED" name="rake (v12.3.0, RVM: ruby-2.4.0) [gem]" level="application" />
36
36
  <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.8.1, RVM: ruby-2.4.0) [gem]" level="application" />
data/.idea/workspace.xml CHANGED
@@ -1,7 +1,13 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
- <list default="true" id="f9bd0043-1199-46c6-8cec-fbea3d254416" name="Default" comment="" />
4
+ <list default="true" id="f9bd0043-1199-46c6-8cec-fbea3d254416" name="Default" comment="">
5
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/cocoapods-packager.iml" afterPath="$PROJECT_DIR$/.idea/cocoapods-packager.iml" />
6
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/cocoapods-packager/spec_builder.rb" afterPath="$PROJECT_DIR$/lib/cocoapods-packager/spec_builder.rb" />
8
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/cocoapods_packager.rb" afterPath="$PROJECT_DIR$/lib/cocoapods_packager.rb" />
9
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/pod/command/package.rb" afterPath="$PROJECT_DIR$/lib/pod/command/package.rb" />
10
+ </list>
5
11
  <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6
12
  <option name="TRACKING_ENABLED" value="true" />
7
13
  <option name="SHOW_DIALOG" value="false" />
@@ -15,7 +21,7 @@
15
21
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
16
22
  <component name="FileEditorManager">
17
23
  <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
18
- <file leaf-file-name="cocoapods_packager.rb" pinned="false" current-in-tab="false">
24
+ <file leaf-file-name="cocoapods_packager.rb" pinned="false" current-in-tab="true">
19
25
  <entry file="file://$PROJECT_DIR$/lib/cocoapods_packager.rb">
20
26
  <provider selected="true" editor-type-id="text-editor">
21
27
  <state relative-caret-position="180">
@@ -25,11 +31,11 @@
25
31
  </provider>
26
32
  </entry>
27
33
  </file>
28
- <file leaf-file-name="cocoapods-packager.gemspec" pinned="false" current-in-tab="true">
34
+ <file leaf-file-name="cocoapods-packager.gemspec" pinned="false" current-in-tab="false">
29
35
  <entry file="file://$PROJECT_DIR$/cocoapods-packager.gemspec">
30
36
  <provider selected="true" editor-type-id="text-editor">
31
37
  <state relative-caret-position="345">
32
- <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
38
+ <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
33
39
  <folding />
34
40
  </state>
35
41
  </provider>
@@ -48,8 +54,8 @@
48
54
  <file leaf-file-name="framework.rb" pinned="false" current-in-tab="false">
49
55
  <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/framework.rb">
50
56
  <provider selected="true" editor-type-id="text-editor">
51
- <state relative-caret-position="602">
52
- <caret line="48" column="6" lean-forward="false" selection-start-line="48" selection-start-column="6" selection-end-line="48" selection-end-column="6" />
57
+ <state relative-caret-position="450">
58
+ <caret line="30" column="27" lean-forward="false" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
53
59
  <folding />
54
60
  </state>
55
61
  </provider>
@@ -68,11 +74,11 @@
68
74
  <file leaf-file-name="spec_builder.rb" pinned="false" current-in-tab="false">
69
75
  <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/spec_builder.rb">
70
76
  <provider selected="true" editor-type-id="text-editor">
71
- <state relative-caret-position="388">
72
- <caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
77
+ <state relative-caret-position="310">
78
+ <caret line="58" column="17" lean-forward="false" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" />
73
79
  <folding>
74
- <marker date="1513583582000" expanded="true" signature="30:2236" ph=" ... end" />
75
- <marker date="1513583582000" expanded="true" signature="1207:2232" ph=" ... end" />
80
+ <marker date="1513604893000" expanded="true" signature="30:2607" ph=" ... end" />
81
+ <marker date="1513604893000" expanded="true" signature="1268:2603" ph=" ... end" />
76
82
  </folding>
77
83
  </state>
78
84
  </provider>
@@ -111,8 +117,8 @@
111
117
  <file leaf-file-name="package.rb" pinned="false" current-in-tab="false">
112
118
  <entry file="file://$PROJECT_DIR$/lib/pod/command/package.rb">
113
119
  <provider selected="true" editor-type-id="text-editor">
114
- <state relative-caret-position="1185">
115
- <caret line="79" column="42" lean-forward="false" selection-start-line="79" selection-start-column="42" selection-end-line="79" selection-end-column="42" />
120
+ <state relative-caret-position="408">
121
+ <caret line="65" column="8" lean-forward="false" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="8" />
116
122
  <folding />
117
123
  </state>
118
124
  </provider>
@@ -142,9 +148,13 @@
142
148
  <find>@rcltfile</find>
143
149
  <find>rcltfile</find>
144
150
  <find>podfile_from_spec</find>
145
- <find>rc</find>
146
151
  <find>allLocalDependencies</find>
147
152
  <find>@originPath</find>
153
+ <find>rc</find>
154
+ <find>depdenciesPool</find>
155
+ <find>dependenciesPool</find>
156
+ <find>dependen</find>
157
+ <find>@allLocalDependencies</find>
148
158
  </findStrings>
149
159
  </component>
150
160
  <component name="Git.Settings">
@@ -156,8 +166,8 @@
156
166
  <option value="$PROJECT_DIR$/lib/cocoapods-packager/builder.rb" />
157
167
  <option value="$PROJECT_DIR$/Rakefile" />
158
168
  <option value="$PROJECT_DIR$/lib/cocoapods-packager/pod_utils.rb" />
159
- <option value="$PROJECT_DIR$/lib/cocoapods-packager/spec_builder.rb" />
160
169
  <option value="$PROJECT_DIR$/lib/pod/command/package.rb" />
170
+ <option value="$PROJECT_DIR$/lib/cocoapods-packager/spec_builder.rb" />
161
171
  <option value="$PROJECT_DIR$/lib/cocoapods_packager.rb" />
162
172
  </list>
163
173
  </option>
@@ -169,8 +179,8 @@
169
179
  <sorting>DEFINITION_ORDER</sorting>
170
180
  </component>
171
181
  <component name="ProjectFrameBounds">
172
- <option name="x" value="279" />
173
- <option name="y" value="104" />
182
+ <option name="x" value="146" />
183
+ <option name="y" value="177" />
174
184
  <option name="width" value="1786" />
175
185
  <option name="height" value="1276" />
176
186
  </component>
@@ -494,20 +504,20 @@
494
504
  <workItem from="1502963540701" duration="8771000" />
495
505
  <workItem from="1504598467779" duration="3772000" />
496
506
  <workItem from="1513251271905" duration="9186000" />
497
- <workItem from="1513567675114" duration="7696000" />
507
+ <workItem from="1513567675114" duration="9601000" />
498
508
  </task>
499
509
  <servers />
500
510
  </component>
501
511
  <component name="TimeTrackingManager">
502
- <option name="totallyTimeSpent" value="34953000" />
512
+ <option name="totallyTimeSpent" value="36858000" />
503
513
  </component>
504
514
  <component name="ToolWindowManager">
505
- <frame x="279" y="104" width="1786" height="1276" extended-state="0" />
515
+ <frame x="146" y="177" width="1786" height="1276" extended-state="0" />
506
516
  <editor active="true" />
507
517
  <layout>
508
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15901455" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
518
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16284403" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
509
519
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
510
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3297342" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
520
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3361558" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
511
521
  <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
512
522
  <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
513
523
  <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -549,8 +559,8 @@
549
559
  <state relative-caret-position="495">
550
560
  <caret line="33" column="10" lean-forward="false" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="10" />
551
561
  <folding>
552
- <marker date="1513583582000" expanded="true" signature="30:2236" ph=" ... end" />
553
- <marker date="1513583582000" expanded="true" signature="1207:2232" ph=" ... end" />
562
+ <marker date="1513604893000" expanded="true" signature="30:2607" ph=" ... end" />
563
+ <marker date="1513604893000" expanded="true" signature="1268:2603" ph=" ... end" />
554
564
  </folding>
555
565
  </state>
556
566
  </provider>
@@ -669,8 +679,8 @@
669
679
  <state relative-caret-position="870">
670
680
  <caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
671
681
  <folding>
672
- <marker date="1513583582000" expanded="true" signature="30:2236" ph=" ... end" />
673
- <marker date="1513583582000" expanded="true" signature="1207:2232" ph=" ... end" />
682
+ <marker date="1513604893000" expanded="true" signature="30:2607" ph=" ... end" />
683
+ <marker date="1513604893000" expanded="true" signature="1268:2603" ph=" ... end" />
674
684
  </folding>
675
685
  </state>
676
686
  </provider>
@@ -711,8 +721,8 @@
711
721
  <state relative-caret-position="195">
712
722
  <caret line="13" column="31" lean-forward="false" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
713
723
  <folding>
714
- <marker date="1513583582000" expanded="true" signature="30:2236" ph=" ... end" />
715
- <marker date="1513583582000" expanded="true" signature="1207:2232" ph=" ... end" />
724
+ <marker date="1513604893000" expanded="true" signature="30:2607" ph=" ... end" />
725
+ <marker date="1513604893000" expanded="true" signature="1268:2603" ph=" ... end" />
716
726
  </folding>
717
727
  </state>
718
728
  </provider>
@@ -798,8 +808,8 @@
798
808
  <state relative-caret-position="195">
799
809
  <caret line="13" column="31" lean-forward="false" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
800
810
  <folding>
801
- <marker date="1513583582000" expanded="true" signature="30:2236" ph=" ... end" />
802
- <marker date="1513583582000" expanded="true" signature="1207:2232" ph=" ... end" />
811
+ <marker date="1513604893000" expanded="true" signature="30:2607" ph=" ... end" />
812
+ <marker date="1513604893000" expanded="true" signature="1268:2603" ph=" ... end" />
803
813
  </folding>
804
814
  </state>
805
815
  </provider>
@@ -871,14 +881,6 @@
871
881
  </state>
872
882
  </provider>
873
883
  </entry>
874
- <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/builder.rb">
875
- <provider selected="true" editor-type-id="text-editor">
876
- <state relative-caret-position="750">
877
- <caret line="50" column="18" lean-forward="false" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="18" />
878
- <folding />
879
- </state>
880
- </provider>
881
- </entry>
882
884
  <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/pod_utils.rb">
883
885
  <provider selected="true" editor-type-id="text-editor">
884
886
  <state relative-caret-position="251">
@@ -903,6 +905,14 @@
903
905
  </state>
904
906
  </provider>
905
907
  </entry>
908
+ <entry file="file://$PROJECT_DIR$/cocoapods-packager.gemspec">
909
+ <provider selected="true" editor-type-id="text-editor">
910
+ <state relative-caret-position="345">
911
+ <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
912
+ <folding />
913
+ </state>
914
+ </provider>
915
+ </entry>
906
916
  <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/user_interface/build_failed_report.rb">
907
917
  <provider selected="true" editor-type-id="text-editor">
908
918
  <state relative-caret-position="120">
@@ -911,29 +921,37 @@
911
921
  </state>
912
922
  </provider>
913
923
  </entry>
924
+ <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/builder.rb">
925
+ <provider selected="true" editor-type-id="text-editor">
926
+ <state relative-caret-position="750">
927
+ <caret line="50" column="18" lean-forward="false" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="18" />
928
+ <folding />
929
+ </state>
930
+ </provider>
931
+ </entry>
914
932
  <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/framework.rb">
915
933
  <provider selected="true" editor-type-id="text-editor">
916
- <state relative-caret-position="602">
917
- <caret line="48" column="6" lean-forward="false" selection-start-line="48" selection-start-column="6" selection-end-line="48" selection-end-column="6" />
934
+ <state relative-caret-position="450">
935
+ <caret line="30" column="27" lean-forward="false" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
918
936
  <folding />
919
937
  </state>
920
938
  </provider>
921
939
  </entry>
922
940
  <entry file="file://$PROJECT_DIR$/lib/cocoapods-packager/spec_builder.rb">
923
941
  <provider selected="true" editor-type-id="text-editor">
924
- <state relative-caret-position="388">
925
- <caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
942
+ <state relative-caret-position="310">
943
+ <caret line="58" column="17" lean-forward="false" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" />
926
944
  <folding>
927
- <marker date="1513583582000" expanded="true" signature="30:2236" ph=" ... end" />
928
- <marker date="1513583582000" expanded="true" signature="1207:2232" ph=" ... end" />
945
+ <marker date="1513604893000" expanded="true" signature="30:2607" ph=" ... end" />
946
+ <marker date="1513604893000" expanded="true" signature="1268:2603" ph=" ... end" />
929
947
  </folding>
930
948
  </state>
931
949
  </provider>
932
950
  </entry>
933
951
  <entry file="file://$PROJECT_DIR$/lib/pod/command/package.rb">
934
952
  <provider selected="true" editor-type-id="text-editor">
935
- <state relative-caret-position="1185">
936
- <caret line="79" column="42" lean-forward="false" selection-start-line="79" selection-start-column="42" selection-end-line="79" selection-end-column="42" />
953
+ <state relative-caret-position="408">
954
+ <caret line="65" column="8" lean-forward="false" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="8" />
937
955
  <folding />
938
956
  </state>
939
957
  </provider>
@@ -946,13 +964,5 @@
946
964
  </state>
947
965
  </provider>
948
966
  </entry>
949
- <entry file="file://$PROJECT_DIR$/cocoapods-packager.gemspec">
950
- <provider selected="true" editor-type-id="text-editor">
951
- <state relative-caret-position="345">
952
- <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
953
- <folding />
954
- </state>
955
- </provider>
956
- </entry>
957
967
  </component>
958
968
  </project>
data/lib/cocoapods-packager/spec_builder.rb CHANGED
@@ -1,10 +1,11 @@
1
1
  module Pod
2
2
  class SpecBuilder
3
- def initialize(spec, source, embedded, dynamic)
3
+ def initialize(spec, source, embedded, dynamic, dependenciesPool)
4
4
  @spec = spec
5
5
  @source = source.nil? ? '{ :path => \'.\' }' : source
6
6
  @embedded = embedded
7
7
  @dynamic = dynamic
8
+ @dependenciesPool = dependenciesPool
8
9
  end
9
10
 
10
11
  def framework_path
@@ -54,6 +55,20 @@ RB
54
55
  if value.count > 0
55
56
  version = value[0]
56
57
  end
58
+
59
+ puts "POSIBBLE #{@dependenciesPool}"
60
+
61
+ dependencySpec = nil
62
+ for d in @dependenciesPool
63
+ if d.name == key
64
+ dependencySpec = d
65
+ end
66
+ end
67
+
68
+ if not dependencySpec.nil?
69
+ version = dependencySpec.podSpecilication.version.to_s
70
+ end
71
+
57
72
  if version != ""
58
73
  spec += "\n s.dependency '#{key}', '#{version}'"
59
74
  else
data/lib/cocoapods_packager.rb CHANGED
@@ -9,6 +9,6 @@ require 'cocoapods-packager/spec_builder'
9
9
 
10
10
  module Pod
11
11
  module Packager
12
- VERSION = '1.5.5'.freeze
12
+ VERSION = '1.5.7'.freeze
13
13
  end
14
14
  end
data/lib/pod/command/package.rb CHANGED
@@ -46,14 +46,12 @@ module Pod
46
46
 
47
47
  @config = argv.option('configuration', 'Release')
48
48
  @rcltfile = argv.option('rclt')
49
- puts "rclt file is #{@rcltfile}"
50
49
 
51
50
  @source_dir = Dir.pwd
52
51
  @spec = spec_with_path(@name)
53
52
  @spec = spec_with_name(@name) unless @spec
54
53
  if @rcltfile
55
54
  @allLocalDependencies = Qricker.dependency(@rcltfile, [@spec.name])
56
- puts "dependencies #{@allLocalDependencies}"
57
55
  end
58
56
  @targetDir = nil
59
57
  super
@@ -188,7 +186,7 @@ module Pod
188
186
 
189
187
 
190
188
  def build_package
191
- builder = SpecBuilder.new(@spec, @source, @embedded, @dynamic)
189
+ builder = SpecBuilder.new(@spec, @source, @embedded, @dynamic, @allLocalDependencies)
192
190
  newspec = builder.spec_metadata
193
191
 
194
192
  @spec.available_platforms.each do |platform|
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-packager-qcloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.5
4
+ version: 1.5.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kyle Fuller