luna-binary-uploader 0.1.2 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf3910fb738057554515aac9ecd91ce6a86f8fce2720e27fd050e9e04216b74
-  data.tar.gz: 4e5efdedf0dd045eb0c591b7242b29aa4c625ce91add1714411909d5ecf61b66
+  metadata.gz: 8eb081de584f9444708a84d7af3953965872eae7254aaa34d1744b7f635778fc
+  data.tar.gz: db0c4458a6b710f0fa9e5973d6b89c84d8bebebf79511df7cda1eda1eff05d08
 SHA512:
-  metadata.gz: 21610a08fefcd450ecc7db97c0fbbd8819f6ca05271a0dad8f1d0d86d7801ac2517a82a303ae3bc8774049cf1cdef0423282e62dac2a7ce5b8d54c9ae838f982
-  data.tar.gz: 0f6b63c16350925aabb3beb53f21e93408d19f8721d740a19c0fbe05f629eb697716397f4da043e973f2fe2e7ec1c47d2ca0f4e0eeb539f253a81b4d80c7c4a3
+  metadata.gz: 90ebddb758d1deaf84b6d9681fd27b3adb9027859c55e53f0aaed7020c7d171fe4ab8fdad1066f358c1fd49054e7c7ddfc63ed8c3258e7c1504e8f8c9e77d717
+  data.tar.gz: 5c3f759c39fbd1f09009b4002bdfb2fd2eec238b76c9e9659f0a1d25711d4bad4ee912683925ffe939c05f399e8daaf2a92538aea37fda0b8c46c8cccfb773d7

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock

data/bin/lbu

@@ -6,7 +6,7 @@ require "luna/binary/delete"
 require "luna/binary/analysis"
 require "luna/binary/refresh"
 require "luna/binary/build"
-require "luna/binary/DSL/uploader_DSL"
+require "luna/binary/update"
 require 'gli'
 
 # You can add fixtures and/or initialization code here to make experimenting
@@ -134,7 +134,7 @@ class App
     arg_name '参数:1.二进制路径(可以不传默认为当前目录下的/temp-luna-uploader/merged)'
     command :update do |c|
       c.action do |global_options,options,args|
-          obj = Luna::Binary::Refresh.new()
+          obj = Luna::Binary::Update.new()
           if args[0] != nil
             obj.binary_path = args[0]  
           else

data/lib/luna/binary/build.rb

@@ -26,29 +26,41 @@ module Luna
             def createFrameworks
                 isNext = true
                 Pod::UserInterface.puts "请将二进制开关关闭，确保每个模块都是源码运行，因为二进制的因素有可能source缓存还是会引入二进制".yellow
-                Luna::Binary::Common.instance.deleteDirectory(Dir.pwd + "/Pods")
+                command("rm -rf #{Dir.pwd}/Pods")
                 isNext = command("pod install")
                 Luna::Binary::Common.instance.deleteDirectory(binary_path_arm)
-                isNext = command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug -derivedDataPath '#{Dir.pwd}/build/arm' CONFIGURATION_BUILD_DIR='#{binary_path_arm}'") if isNext == true
+                tempLunaUploaderPath = Luna::Binary::Common.instance.tempLunaUploaderPath
+                isNext = command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug -derivedDataPath '#{tempLunaUploaderPath}/build/arm/temp'") if isNext == true
+                isNext = command("cp -r #{tempLunaUploaderPath}/build/arm/temp/Build/Products #{binary_path_arm}") if isNext == true #本可以用CONFIGURATION_BUILD_DIR直接指定结果文件夹，结果经常性的编译报错
                 Luna::Binary::Common.instance.deleteDirectory(binary_path_x86)
-                isNext = command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug -derivedDataPath '#{Dir.pwd}/build/x86' CONFIGURATION_BUILD_DIR='#{binary_path_x86}' -destination 'platform=iOS Simulator,name=iPhone 11'") if isNext == true
+                isNext = command("xcodebuild -workspace #{workspace} -scheme #{scheme} -configuration Debug -derivedDataPath '#{tempLunaUploaderPath}/build/x86/temp' -destination 'platform=iOS Simulator,name=iPhone 11'") if isNext == true
+                isNext = command("cp -r #{tempLunaUploaderPath}/build/x86/temp/Build/Products #{binary_path_x86}") if isNext == true
                 mergeFrameWorks(binary_path_arm, binary_path_x86) if isNext == true
             end
     
             def mergeFrameWorks(binary_path_arm, binary_path_x86)
                 Luna::Binary::Common.instance.deleteDirectory(binary_path_merged)
                 dedupingMapper = {}
+                failList = []
                 lockfile.pod_names.each { |item|
                     if item["/"] == nil && dedupingMapper[item] == nil
-                        Pod::UserInterface.puts item.yellow
-                        armPath = findFramework(item,binary_path_arm)
-                        x86Path = findFramework(item,binary_path_x86)
-                        mergeFrameWork(item, armPath, x86Path) if armPath != nil && x86Path != nil
-                        dedupingMapper[item] = item
+                        begin
+                            Pod::UserInterface.puts item.yellow
+                            armPath = findFramework(item,binary_path_arm)
+                            x86Path = findFramework(item,binary_path_x86)
+                            mergeFrameWork(item, armPath, x86Path) if armPath != nil && x86Path != nil
+                            dedupingMapper[item] = item
+                        rescue => exception
+                            failList << "#{item} exception : #{exception}"
+                        ensure
+                            
+                        end
+                       
                     end 
                 }
                 
                 Pod::UserInterface.puts "合并后的framework的路径为:#{binary_path_merged}".yellow
+                Pod::UserInterface.puts "失败的名单为:#{failList}".yellow
             end
 
             def lockfile
@@ -66,7 +78,7 @@ module Luna
             end
     
             def findFramework(moduleName, binary_path)
-                pathArr = Dir.glob("#{binary_path}/**/#{moduleName}.framework")
+                pathArr = Dir.glob("#{binary_path}/**/#{moduleName.sub('-', '_')}.framework")
                 if pathArr != nil
                     return pathArr.first
                 else

data/lib/luna/binary/common/common.rb

@@ -90,8 +90,7 @@ module Luna
             end
 
             def lockfile
-              @lockfile ||= begin
-                  Pod::Lockfile.from_file(podFilePath) if podFilePath.exist?
+              @lockfile ||= Pod::Lockfile.from_file(podFilePath) if podFilePath.exist?
             end
 
             def use_framework_list
@@ -108,18 +107,6 @@ module Luna
                 end
               return list
             end
-            
-
-
-            
-
-          end
-          
-            # def pushInRepo(name, version)
-              
-              
-            # end
-
         end    
     end
 end

data/lib/luna/binary/update.rb

@@ -14,6 +14,7 @@ module Luna
                 Luna::Binary::Common.instance.deleteDirectory("#{rootPath}")
                 system "mkdir -p #{rootPath};"
                 failList = []
+                successList = []
                 dependenciesMapper = lockfile.dependencies.map { |item| [item.name, item]}.to_h
                 spec_repo_binary.each { |k,v|
                     if request_result_hash[k] == nil || request_result_hash[k].include?(v) == false
@@ -34,7 +35,16 @@ module Luna
                                             tag = lockItem.external_source['tag'.parameterize.underscore.to_sym]
                                             path = lockItem.external_source['path'.parameterize.underscore.to_sym]
                                             p "#{moduleName} git: #{gitURL} tag: #{tag} path: #{path}"
-                                            if gitURL && tag && !moduleName["/"]
+                                            if path
+                                                pathArr = Dir.glob("#{Dir.pwd}/#{path}/**/#{moduleName}.podspec")
+                                                if pathArr 
+                                                    uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binary_path)
+                                                    uploader.specification=Pod::Specification.from_file(pathArr.first)
+                                                    uploader.specificationWork
+                                                    localPathMapper[moduleName] = pathArr.first
+                                                end
+                                                
+                                            elsif gitURL && tag && !moduleName["/"]
                                                 uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, gitURL, tag, binary_path)
                                                 uploader.specificationWork
                                                 successList << uploader

data/lib/luna/binary/uploader/version.rb

@@ -1,7 +1,7 @@
 module Luna
   module Binary
     module Uploader
-      VERSION = "0.1.2"
+      VERSION = "0.1.8"
     end
   end
 end

data/luna-binary-uploader.gemspec

@@ -19,11 +19,10 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  # spec.files = `git ls-files`.split("
-  #   ")
+  # spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  #   `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  # end
+  spec.files = `git ls-files`.split("\n")
 
   spec.bindir        = "bin"
   spec.executables << 'lbu'
@@ -35,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cocoapods-imy-bin','0.3.1.3'
   spec.add_dependency "cocoapods-generate",'~>2.0.1'
   spec.add_runtime_dependency('gli','2.19.0')
-  spec.require_paths = ["lib"]
+  spec.require_paths = "lib"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luna-binary-uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.8
 platform: ruby
 authors:
 - 车德超
@@ -133,7 +133,6 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,174 +0,0 @@
-PATH
-  remote: .
-  specs:
-    luna-binary-uploader (0.1.22)
-      cocoapods
-      cocoapods-generate (~> 2.0.1)
-      cocoapods-imy-bin (= 0.3.1.3)
-      gli (= 2.19.0)
-      parallel
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.4)
-      rexml
-    activesupport (6.1.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.5)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    aruba (2.0.0)
-      bundler (>= 1.17, < 3.0)
-      childprocess (>= 2.0, < 5.0)
-      contracts (>= 0.16.0, < 0.18.0)
-      cucumber (>= 4.0, < 8.0)
-      rspec-expectations (~> 3.4)
-      thor (~> 1.0)
-    atomos (0.1.3)
-    builder (3.2.4)
-    childprocess (4.1.0)
-    claide (1.0.3)
-    cocoapods (1.11.2)
-      addressable (~> 2.8)
-      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.2)
-      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
-      cocoapods-plugins (>= 1.0.0, < 2.0)
-      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
-      cocoapods-try (>= 1.1.0, < 2.0)
-      colored2 (~> 3.1)
-      escape (~> 0.0.4)
-      fourflusher (>= 2.3.0, < 3.0)
-      gh_inspector (~> 1.0)
-      molinillo (~> 0.8.0)
-      nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.2)
-      activesupport (>= 5.0, < 7)
-      addressable (~> 2.8)
-      algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.1)
-      fuzzy_match (~> 2.0.4)
-      nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix (~> 4.0)
-      typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.5)
-    cocoapods-disable-podfile-validations (0.1.1)
-    cocoapods-downloader (1.5.1)
-    cocoapods-generate (2.0.1)
-      cocoapods-disable-podfile-validations (~> 0.1.1)
-    cocoapods-imy-bin (0.3.1.3)
-      cocoapods
-      cocoapods-generate (~> 2.0.0)
-      parallel
-    cocoapods-plugins (1.0.0)
-      nap
-    cocoapods-search (1.0.1)
-    cocoapods-trunk (1.6.0)
-      nap (>= 0.8, < 2.0)
-      netrc (~> 0.11)
-    cocoapods-try (1.2.0)
-    colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
-    contracts (0.16.1)
-    cucumber (7.0.0)
-      builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 10.0, >= 10.0.1)
-      cucumber-create-meta (~> 6.0, >= 6.0.1)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-gherkin (~> 20.0, >= 20.0.1)
-      cucumber-html-formatter (~> 16.0, >= 16.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-      cucumber-wire (~> 6.0, >= 6.0.1)
-      diff-lcs (~> 1.4, >= 1.4.4)
-      mime-types (~> 3.3, >= 3.3.1)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-core (10.0.1)
-      cucumber-gherkin (~> 20.0, >= 20.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
-    cucumber-create-meta (6.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-      sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-cucumber-expressions (12.1.3)
-    cucumber-gherkin (20.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-    cucumber-html-formatter (16.0.1)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-    cucumber-messages (17.1.1)
-    cucumber-tag-expressions (3.0.1)
-    cucumber-wire (6.1.1)
-      cucumber-core (~> 10.0, >= 10.0.1)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.2)
-      cucumber-messages (~> 17.0, >= 17.0.1)
-    diff-lcs (1.4.4)
-    escape (0.0.4)
-    ethon (0.14.0)
-      ffi (>= 1.15.0)
-    ffi (1.15.4)
-    fourflusher (2.3.1)
-    fuzzy_match (2.0.4)
-    gh_inspector (1.1.3)
-    gli (2.19.0)
-    httpclient (2.8.3)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
-    minitest (5.14.4)
-    molinillo (0.8.0)
-    multi_test (0.1.2)
-    nanaimo (0.3.0)
-    nap (1.1.0)
-    netrc (0.11.0)
-    parallel (1.21.0)
-    public_suffix (4.0.6)
-    rake (12.3.3)
-    rdoc (6.3.2)
-    rexml (3.2.5)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby-macho (2.5.1)
-    sys-uname (1.2.2)
-      ffi (~> 1.1)
-    thor (1.1.0)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  luna-binary-uploader!
-  rake (~> 12.0)
-  rdoc
-
-BUNDLED WITH
-   2.1.4