luna-binary-uploader 0.1.16 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eabb8cf60ac1ae91b7f1bcdf005fd59b885ee60627307c4aa3ac0f6150c759b3
-  data.tar.gz: 04d6b4672865935bcc3d204e4b4657e6351ceaca39687f58909580fb45aeb179
+  metadata.gz: 4ef5b62bf685747e70e13f3ea5480f37cb303dfe1b37cb66690baa8beee4ec3e
+  data.tar.gz: 9366ecb00ae20f321afce1b2ccc319793be0f4291c7e4ba4d900f0ad983f5f80
 SHA512:
-  metadata.gz: '0422488449593c2e144358cf2c98a116af7800675c8e6c97667120bca995a7eeaf9b3421f3fc5c1efa17c28efa82e733f66995ea397eee146da64d3f9de1bbb3'
-  data.tar.gz: 201e7660cfacc4d82ba60fb7d561de626e3841787ef5f122bce557a435213dd25ece50059d168e0cb98f9ab375f334b358b42ce58ea835416d0f662b5857856c
+  metadata.gz: 253788b801070db954121214fb1c9f1cbf4363350dfd2861716d8aeb68ff29f1fcffe1910b86b5ecd29f5b53d6966ab7b6db7481f837379a15d5d06f1b5af9ca
+  data.tar.gz: 2d6038f930cb1ded0bc343f7d747a913fd7a7d3d1e6c21b4b11808c118a5311bb7b41163f1c8f91fdd9a3be47f1afd6af13be78bbdd0ea43212bd175a2170039

data/.gitignore

@@ -6,7 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-Gemfile.lock
 Podfile
 Podfile.lock
 temp-luna-uploader/

data/Gemfile.lock

@@ -0,0 +1,174 @@
+PATH
+  remote: .
+  specs:
+    luna-binary-uploader (0.1.17)
+      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.1.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
+      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.1.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.0, >= 4.0.2)
+    cucumber-create-meta (6.0.2)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.0)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    diff-lcs (1.4.4)
+    escape (0.0.4)
+    ethon (0.15.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.6.0)
+    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.5.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  luna-binary-uploader!
+  rake (~> 12.0)
+  rdoc
+
+BUNDLED WITH
+   2.1.4

data/bin/lbu

@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "luna/binary/uploader"
-require "luna/binary/delete"
-require "luna/binary/analysis"
-require "luna/binary/refresh"
-require "luna/binary/build"
-require "luna/binary/update"
+require "luna-binary-uploader"
 require 'gli'
 
 # You can add fixtures and/or initialization code here to make experimenting
@@ -19,7 +14,7 @@ require 'gli'
 class App
     extend GLI::App
   
-    program_desc 'luna cocopods-imy-bin自定义二进制上传'
+    program_desc 'luna-binary-uploader 自定义二进制上传'
   
     version Luna::Binary::Uploader::VERSION
   
@@ -54,8 +49,35 @@ class App
       end
     end
   
+    desc '初始化二进制配置repo代码'
+    arg_name 'url地址'
+    command :init do |c|
+      c.action do |global_options,options,args|
+        if args[0]
+          Luna::Binary::Init.new(args[0])
+        else
+          raise "添加url地址"
+        end
+      end
+    end
+
+
+    desc '对pod install封装，一键开关二进制'
+    arg_name '只接参数n, 表示不用二进制 '
+    command :install do |c|
+      c.action do |global_options,options,args|
+        is_open = "false"
+        if args[0] && args[0] != "n"
+          raise "只接参数n, 表示不用二进制"
+        else
+          is_open = "true"
+        end
+        Luna::Binary::Install.new(is_open)     
+      end
+    end
+
     desc '单个上传二进制文件'
-    arg_name '1.模块名 git地址 git节点 xcode编译的缓存地址 \n 2.模块名 版本号 xcode编译的缓存地址 \n 3.模块名 本地podspec地址 xcode编译的缓存地址'
+    arg_name 'a.模块名 git地址 git节点 xcode编译的缓存地址 \n b.模块名 版本号 xcode编译的缓存地址 \n c.模块名 本地podspec地址 xcode编译的缓存地址'
     command :single do |c|
       c.action do |global_options,options,args|
         if args[3] #模式1
@@ -94,10 +116,14 @@ class App
     end
 
     desc '单个删除repo 里的podspec & 服务二进制文件'
-    arg_name '模块名 版本号'
+    arg_name '1.模块名 2.版本号'
     command :del do |c|
       c.action do |global_options,options,args|
-        Luna::Binary::Delete.new(args[0],args[1]).delete
+        if args[0] && args[1]
+          Luna::Binary::Delete.new(args[0],args[1]).delete
+        else
+          raise "缺少参数：1.模块名 2.版本号"
+        end
       end
     end
 
@@ -148,10 +174,14 @@ class App
     arg_name '1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject'
     command :build do |c|
       c.action do |global_options,options,args|
+        if args[0] && args[1]
           obj = Luna::Binary::Build.new()
           obj.workspace=args[0]
           obj.scheme=args[1]
           obj.run
+        else
+         raise "缺少参数：1.xcworkspace 名称 eg:MyWorkSpace.xcworkspace 2.scheme eg: MyProject"
+        end
       end
     end
 
@@ -159,8 +189,12 @@ class App
     arg_name '1.armPath 2.x86path'
     command :merge do |c|
       c.action do |global_options,options,args|
+        if args[0] &&  args[1]
           obj = Luna::Binary::Build.new()
           obj.mergeFrameWorks(args[0], args[1])
+        else
+          raise "缺少参数：1.armPath 2.x86path"
+        end
       end
     end
 

data/lib/luna/binary/analysis.rb

@@ -20,88 +20,58 @@ module Luna
         end
 
         def validate!
-            arr = Dir.glob(Luna::Binary::Common.instance.podFilePath)
+            arr = Dir.glob(Common.instance.podFilePath)
             if arr == nil 
                 raise '当前路径下没有Podfile'
             end
         end
 
         def lockfile
-            return Luna::Binary::Common.instance.lockfile
+            return Common.instance.lockfile
         end
 
         def run
-            
             failList = []
             successList = []
-            localPathMapper = {}
     
-            dependenciesMapper = lockfile.dependencies.map { |item| [item.name, item]}.to_h
+            dependenciesMapper = Common.instance.dependenciesMapper
             dedupingMapper = {}
             lockfile.pod_names.each { |item|
                     moduleName = item.split('/').first
                     if !moduleName["/"] && dedupingMapper[moduleName] == nil
                         dedupingMapper[moduleName] = moduleName
-                        Pod::UserInterface.puts moduleName.yellow
-                        if dependenciesMapper[moduleName]
-                            lockContent = lockfile.dependencies_to_lock_pod_named(moduleName)
-                            if lockContent  #dependencies 应该拿不到所有的spec的依赖，我理解只能拿到podfile里面标明的,词典碰到dependency 没有bonmot的情况
-                                lockContent.each { |lockItem|
-                                    begin
-                                        if lockItem.external_source == nil
-                                            uploader = uploadLintPodSpec(moduleName, lockItem.specific_version, binary_path) 
-                                            if uploader != nil
-                                                successList << uploader
-                                            end
-                                        else 
-                                            p lockItem.external_source
-                                            gitURL = lockItem.external_source['git'.parameterize.underscore.to_sym]
-                                            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 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
-                                            end
-                                        end
-                                    rescue => exception
-                                        failList << exception
-                                    ensure
-                                        
-                                    end
-                                }   
-                            end
-                        else
-                            begin
-                                uploader = uploadLintPodSpec(moduleName, lockfile.version(moduleName), binary_path) 
-                                if uploader != nil
-                                    successList << uploader
-                                end
-                            rescue => exception
-                                failList << exception
-                            ensure
-                                
+                        puts moduleName.yellow
+                        begin
+                            uploader = Common.instance.upload_lockitem(dependenciesMapper, moduleName, binary_path)
+                            if uploader != nil
+                                successList << uploader
+                            else
+                                failList << "#{moduleName} 为空"
                             end
+                            
+                        rescue => exception
+                            failList << "#{moduleName} exception: #{exception}"
+                        ensure
+                            
                         end
                     end
             }
-            p "-=-=-=-=-=-=-=-=-=-=-=-命令生成=-=-=-=-=-=-=-=-=-=-=-=-=-="
+            puts "-=-=-=-=-=-=-=-=-=-=-=-打印错误信息=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow if failList.length > 0
+            puts "请查看下时候存在影响，如怀疑程序错误请联系作者".yellow if failList.length > 0
+            failList.each{ |item|
+                puts item.red
+            }
+
+            puts "-=-=-=-=-=-=-=-=-=-=-=-命令生成=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
             hasInCocopodsSpec = []
             externalSpec = []
+            local_spec = []
             failPrint = []
         
             successList.each { |item|
-                if item.gitUrl.length > 0
+                if item.local_path
+                    local_spec << item
+                elsif item.gitUrl.length > 0
                     externalSpec << item
                 else
                     hasInCocopodsSpec << item
@@ -111,8 +81,7 @@ module Luna
                 begin
                     item.printPreUploadCommand
                 rescue => exception
-                    # p exception
-                    failPrint << "#{exception}"
+                    failPrint << "#{item.podspecName} exception: #{exception}"
                 ensure
                     
                 end   
@@ -121,57 +90,50 @@ module Luna
                 begin
                     item.printPreUploadCommand
                 rescue => exception
-                    # p exception
-                    failPrint << "#{exception}"
+                    failPrint << "#{item.podspecName} exception: #{exception}"
                 ensure
                     
                 end 
             }
 
-            localPathMapper.each { |k,v|
-                p "lbu single #{k} #{v} #{binary_path}"
+            local_spec.each { |item|
+                begin
+                    item.printPreUploadCommand
+                rescue => exception
+                    failPrint << "#{item.podspecName} exception: #{exception}"
+                ensure
+                    
+                end 
             }
 
-            p "-=-=-=-=-=-=-=-=-=-=-=-命令生成end=-=-=-=-=-=-=-=-=-=-=-=-=-="
-            p "错误信息:#{failPrint}"
-            execUpload(hasInCocopodsSpec)
-            execUpload(externalSpec)
-        end
+            puts "-=-=-=-=-=-=-=-=-=-=-=-命令生成end=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
 
-        def findLintPodspec(moduleName)
-            return Luna::Binary::Common.instance.findLintPodspec(moduleName) 
-        end
+            failPrint.each{ |item|
+                puts item.red
+            }
 
-        def uploadLintPodSpec(moduleName, specificVersion, binaryPath) 
-            set = findLintPodspec(moduleName)
-            if set 
-                pathArr = set.specification_paths_for_version(specificVersion)
-                if pathArr.length > 0
-                    uploader = Luna::Binary::Uploader::SingleUploader.new(moduleName, "", "", binaryPath)
-                    uploader.specification=Pod::Specification.from_file(pathArr.first)
-                    uploader.specificationWork
-                end
-            end
-            return uploader
+            execUpload(successList)
         end
-
+        
         def execUpload(items)
             if need_upload != nil && need_upload == "upload"
+                puts "-=-=-=-=-=-=-=-=-=-=-=-开始上传=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
                 items.each { |item|
                     begin
                         item.upload
                     rescue => exception
-                        p "异常上传过程中出现了:#{exception}"
+                        puts "异常上传过程中出现了:#{exception}".red
                     else
                         
                     end
                     
                 }
+                puts "-=-=-=-=-=-=-=-=-=-=-=-上传结束=-=-=-=-=-=-=-=-=-=-=-=-=-=".yellow
             end
         end
 
         def command(c)
-            return Luna::Binary::Common.instance.command(c)
+            return Common.instance.command(c)
         end
 
     end

data/lib/luna/binary/build.rb

@@ -20,36 +20,40 @@ module Luna
             end
 
             def command(c)
-                return Luna::Binary::Common.instance.command(c)
+                return Common.instance.command(c)
             end
 
             def createFrameworks
                 isNext = true
-                Pod::UserInterface.puts "请将二进制开关关闭，确保每个模块都是源码运行，因为二进制的因素有可能source缓存还是会引入二进制".yellow
-                command("rm -rf #{Dir.pwd}/Pods")
-
-                isNext = command("pod install")
-                Luna::Binary::Common.instance.deleteDirectory(binary_path_arm)
-                tempLunaUploaderPath = Luna::Binary::Common.instance.tempLunaUploaderPath
+                puts "请将二进制开关关闭，确保每个模块都是源码运行，因为二进制的因素有可能source缓存还是会引入二进制".yellow
+                Install.new(false)
+                Common.instance.deleteDirectory(binary_path_arm)
+                tempLunaUploaderPath = 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("cp -r #{tempLunaUploaderPath}/build/arm/temp/Build/Products/Debug-iphoneos #{binary_path_arm}") if isNext == true #本可以用CONFIGURATION_BUILD_DIR直接指定结果文件夹，结果经常性的编译报错
+                Common.instance.deleteDirectory(binary_path_x86)
                 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
+                isNext = command("cp -r #{tempLunaUploaderPath}/build/x86/temp/Build/Products/Debug-iphonesimulator #{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)
+                Common.instance.deleteDirectory(binary_path_merged)
                 dedupingMapper = {}
                 failList = []
-                lockfile.pod_names.each { |item|
-                    if item["/"] == nil && dedupingMapper[item] == nil
+                p lockfile.pod_names
+                lockfile.pod_names.each { |i|
+                    item = i.split("/").first
+                    if dedupingMapper[item] == nil
                         begin
-                            Pod::UserInterface.puts item.yellow
+                            puts item.yellow
                             armPath = findFramework(item,binary_path_arm)
                             x86Path = findFramework(item,binary_path_x86)
-                            mergeFrameWork(item, armPath, x86Path) if armPath != nil && x86Path != nil
+
+                            is_merge = mergeFrameWork(item, armPath, x86Path) if armPath != nil && x86Path != nil
+                            trasher_path = "#{Common.instance.tempLunaUploaderPath}/trasher"
+                            failList << "#{item} 存在问题，已搬到#{trasher_path}" if is_merge == false
+                            command("mkdir #{trasher_path}; mv #{binary_path_merged}/#{item} #{trasher_path}") if is_merge == false
                             dedupingMapper[item] = item
                         rescue => exception
                             failList << "#{item} exception : #{exception}"
@@ -60,12 +64,15 @@ module Luna
                     end 
                 }
                 
-                Pod::UserInterface.puts "合并后的framework的路径为:#{binary_path_merged}".yellow
-                Pod::UserInterface.puts "失败的名单为:#{failList}".yellow
+                puts "合并后的framework的路径为:#{binary_path_merged}".green
+                puts "-=-=-=-=-=-=-=-=merge 失败名单-=-=-=-=-=-=-=-=-=-=" if failList.length > 0
+                failList.each { |item|
+                    puts item.red
+                }
             end
 
             def lockfile
-                return Luna::Binary::Common.instance.lockfile
+                return Common.instance.lockfile
             end
     
             def xcodeSimulators
@@ -74,9 +81,9 @@ module Luna
             end
     
             def mergeFrameWork(moduleName, path1, path2)
-                command("mkdir -p #{binary_path_merged}; cp -r #{File.dirname(path1)} #{binary_path_merged}; mv #{binary_path_merged}/#{File.basename(File.dirname(path1))} #{binary_path_merged}/#{moduleName};")
-                command("lipo -create #{path2}/#{moduleName} #{path1}/#{moduleName} -output #{binary_path_merged}/#{moduleName}/#{moduleName}.framework/#{moduleName}")
-                command("cp -r #{path2}/Modules/#{moduleName}.swiftmodule  #{binary_path_merged}/#{moduleName}/#{moduleName}.framework/Modules")
+                command("mkdir -p #{binary_path_merged}; cp -r #{File.dirname(path1)} #{binary_path_merged}; cp -r #{File.dirname(path2)} #{binary_path_merged}; mv #{binary_path_merged}/#{File.basename(File.dirname(path1))} #{binary_path_merged}/#{moduleName};")
+                framework_name = moduleName.gsub("-", "_")
+                return command("lipo -create #{path2}/#{framework_name} #{path1}/#{framework_name} -output #{binary_path_merged}/#{moduleName}/#{framework_name}.framework/#{framework_name}")
             end
     
             def findFramework(moduleName, binary_path)
@@ -90,15 +97,15 @@ module Luna
     
     
             def binary_path_merged
-                return Luna::Binary::Common.instance.binary_path_merged
+                return Common.instance.binary_path_merged
             end
     
             def binary_path_arm
-                return Luna::Binary::Common.instance.binary_path_arm
+                return Common.instance.binary_path_arm
             end
     
             def binary_path_x86
-                return Luna::Binary::Common.instance.binary_path_x86
+                return Common.instance.binary_path_x86
             end
         end
     end