itools 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231409dd71fbd6f84598d2270edc928ad0288089b0bdb9536632cc832ed20bae
-  data.tar.gz: a64240894bfa6a17fcf0d4d63050378cf5c8e9cc4f6239ff0329d0cce0eff302
+  metadata.gz: d2f0c8c5a5b8189fd5561b57ee9fd5ba7b90a8e899cc51569b215409959a0760
+  data.tar.gz: 77127100e3fc43d53d05bf4da8fac3d30c5604b6535477ba0be11ced2fe007b0
 SHA512:
-  metadata.gz: '049cbfd7152daa2944833d1d3f7cae6ef40a00725c2811f02779105919b34a09cf3fe94cf33c034aa1801646e169437eed0808e818282de8d1333b64a1565719'
-  data.tar.gz: d9e790bc02448e7d0c9e0516527333f02ed1a834138a5d35dbfd186e0f83be6ada8e29c83aa1dc0f4733040299f437b2ed0848de8bf0ba69f4e1cd1794c25e44
+  metadata.gz: e321a1cdb2b2fe8c6da17853a45bd94d3edb5e2781e961c4eb4be46a51304e48a2ec5f31ed71b29a8183d3d06d35d04c1610cb2352eb64d297d5b34d4709cdb9
+  data.tar.gz: 8059a806fd284eb1c29cc17d5eb54a657a9303524b11658a3cccd40e29dc2e9746faac936d2b7749192b77433b9ca12fe17dac5efc054f02b542e3a1b7d0ab5c

data/Gemfile.lock

@@ -2,29 +2,29 @@ PATH
   remote: .
   specs:
     itools (1.1.5)
-      bundler (~> 1.17)
+      bundler (>= 2.2.33)
       git (~> 1.5)
       gli (~> 2.17)
-      rake (~> 10.0)
+      rake (>= 12.3.3)
       spreadsheet (~> 1.1, >= 1.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    git (1.7.0)
+    git (1.10.1)
       rchardet (~> 1.8)
-    gli (2.20.0)
-    rake (10.5.0)
+    gli (2.20.1)
+    rake (13.0.6)
     rchardet (1.8.0)
     ruby-ole (1.2.12.2)
-    spreadsheet (1.2.6)
-      ruby-ole (>= 1.0)
+    spreadsheet (1.3.0)
+      ruby-ole
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
   itools!
 
 BUNDLED WITH
-   1.17.3
+   2.3.4

data/itools.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "bundler", "~> 1.17"
-  spec.add_runtime_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency "bundler", ">= 2.2.33"
+  spec.add_runtime_dependency "rake", ">= 12.3.3"
   spec.add_runtime_dependency "gli", "~> 2.17"
   spec.add_runtime_dependency "spreadsheet", '~> 1.1', '>= 1.1.8'
   spec.add_runtime_dependency 'git', '~> 1.5'

data/lib/itools/podfile_tiled.rb

@@ -57,10 +57,9 @@ module Itools
             else
               pod_name = line_string.delete('-').lstrip.rstrip
             end
-  
-            if pod_name.length == 0 || pod_name.include?('/')
-                next
-            end
+            # if pod_name.length == 0 || pod_name.include?('/')
+            #     next
+            # end
             temp_pod = PodInfo.new(pod_name, pod_version)
             if pod_version
                 temp_pod.pod_version = pod_version.delete('=').strip 
@@ -73,7 +72,11 @@ module Itools
         temp_exist_pods = []
         all_pods.each do |all_pod|
           exist_pods.each do |exist_pod|
-            if all_pod.pod_name == exist_pod.pod_name
+            exist_pod_name = exist_pod.pod_name
+            if exist_pod_name.include?('/')
+              exist_pod_name = exist_pod_name.split('/')[0]
+            end
+            if all_pod.pod_name == exist_pod_name
               temp_exist_pods << all_pod
             end
           end

data/lib/itools/version.rb

@@ -1,4 +1,4 @@
 module Itools
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: itools
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - zhanggui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-31 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement