pod-builder 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab2edb1bbd7e199f72160e2751fd324763890823b8060b6733971f4dccd912a
-  data.tar.gz: c9b4c1adc763130f9a7a3ef772c287c2305d167ddb7bf062cab6d9844cb0fe04
+  metadata.gz: 70632176b753ecce7d6ffa8e968546ba88cce99df5d5810f6ed5d9802e2c99f4
+  data.tar.gz: 639533ae3bd2fe6ac792f3330e1c4e73c3dbb4918da5b8609bc762dfe27c4e88
 SHA512:
-  metadata.gz: afcf5f69a0341469e51d5eb069f661d2b7d2712085210f51d5b10b42ad2be3fc0e5cad1e3a612e13ade1c4fcb18d31fb630ee568a4b7fdc692e202d504739675
-  data.tar.gz: 7ce11733c073a9706f32be8434017da369e0ad9a1d502cba176de0e8527439aa1c7108937ee185d8b4a433777c76d704156dbcbd3b07b9fb543226f50b87173c
+  metadata.gz: 01f54c0a1b3eeecce57dabfea2e1dec294e3cc120f61e60c6294010ac964572bf52baa7211a2213c5aaca8c9d75fadcb16d5f5e1da758bffebad3150a6b0f8d3
+  data.tar.gz: e5dd822174febbeb36d59014532ae443bb7323241e96ed36ada123a453dfca1e0e39ebdf126c53b488ff02d44888aa006ec8bab020422b2e5e6d8efbd2bc664c

data/README.md

@@ -1,5 +1,3 @@
-## Beta tool: distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
 # What is PodBuilder
 
 PodBuilder is a complementary tool to [CocoaPods](https://github.com/CocoaPods/CocoaPods) that allows to prebuild pods into frameworks which can then be included into a project’s repo. Instead of committing pod’s source code you add its compiled counterpart. While there is a size penalty in doing so, which can be overcome by using [Git-LFS](#git-lfs), compilation times will decrease significantly because pod's source files no longer need to be recompiled _very often_. Additionally frameworks contain all architecture so they’re ready to be used both on any device and simulator.

data/exe/pod_builder

@@ -57,8 +57,8 @@ Usage:
         
 Options:
 "        
-        opts.on("-u", "--update", "Update CocoaPods repos") do |o|
-          OPTIONS[:update_repos] = o
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
         end
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
@@ -83,8 +83,8 @@ Usage:
         
 Options:
 "        
-        opts.on("-u", "--update", "Update CocoaPods repos") do |o|
-          OPTIONS[:update_repos] = o
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
         end
         opts.on("-w", "--allow-warnings", "Allow warnings") do |o|
           OPTIONS[:allow_warnings] = o
@@ -109,8 +109,8 @@ Usage:
         
 Options:
 "          
-        opts.on("-u", "--update", "Update CocoaPods repos") do |o|
-          OPTIONS[:update_repos] = o
+        opts.on("-u", "--skip-repo-update", "Skip CocoaPods repo update") do |o|
+          OPTIONS[:update_repos] = false
         end
         opts.on("-d", "--debug", "Don't clean build folder") do |o|
           OPTIONS[:debug] = o

data/lib/pod_builder/command/build.rb

@@ -16,8 +16,8 @@ module PodBuilder
 
         check_not_building_subspecs(argument_pods)
 
-        update_repo = options[:update_repos] || false
-        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, update_repo)
+        install_update_repo = options[:update_repos] || true
+        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
 
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
         prebuilt_items = all_buildable_items.select { |x| x.is_prebuilt }

data/lib/pod_builder/command/clean.rb

@@ -8,8 +8,8 @@ module PodBuilder
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
-        update_repo = options[:update_repos] || false
-        installer, analyzer = Analyze.installer_at(PodBuilder::basepath)
+        install_update_repo = options[:update_repos] || true
+        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
 
         podspec_names = all_buildable_items.map(&:podspec_name)

data/lib/pod_builder/command/install_sources.rb

@@ -7,8 +7,8 @@ module PodBuilder
         Configuration.check_inited
         PodBuilder::prepare_basepath
 
-        update_repo = options[:update_repos] || false
-        installer, analyzer = Analyze.installer_at(PodBuilder::basepath)
+        install_update_repo = options[:update_repos] || true
+        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
         framework_items = Analyze.podfile_items(installer, analyzer).select { |x| !x.is_prebuilt }
         podspec_names = framework_items.map(&:podspec_name)
 

data/lib/pod_builder/command/switch.rb

@@ -84,6 +84,7 @@ module PodBuilder
               line = indentation + podfile_item.prebuilt_entry + "\n"
             when "development"
               podfile_item.path = find_podspec(podfile_item)
+              podfile_item.is_external = true
 
               line = indentation + podfile_item.entry + "\n"
             when "default"
@@ -113,6 +114,7 @@ module PodBuilder
         Configuration.development_pods_paths.each do |path|
           podspec = Dir.glob(File.expand_path("#{path}/**/#{podfile_item.root_name}*.podspec*"))
           podspec.select! { |x| !x.include?("/Local Podspecs/") }
+          podspec.select! { |x| Dir.glob(File.join(File.dirname(x), "*")).count > 1 } # exclude podspec folder (which has one file per folder)
           if podspec.count > 0
             podspec_path = Pathname.new(podspec.first).dirname.to_s
             break
@@ -127,12 +129,12 @@ module PodBuilder
       end
       
       def self.request_switch_mode(pod_name, podfile_item)
-        matches = podfile_item.entry.match(/(pod '.*?',)(.*)/)
-        unless matches&.size == 3 
+        matches = podfile_item.entry.match(/(pod '.*?',)(.*)('.*')/)
+        unless matches&.size == 4
           raise "\n\nFailed matching pod name\n".red
         end
 
-        default_entry = matches[2].strip
+        default_entry = matches[3].strip
 
         modes = ["prebuilt", "development", "default"]
         mode_indx = ask("\n\nSwitch #{pod_name} to:\n1) Prebuilt\n2) Development pod\n3) Default (#{default_entry})\n\n") { |x| x.limit = 1, x.validate = /[1-3]/ }

data/lib/pod_builder/command/sync_podfile.rb

@@ -7,8 +7,8 @@ module PodBuilder
         Configuration.check_inited
         PodBuilder::prepare_basepath
         
-        update_repo = options[:update_repos] || false
-        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, update_repo)
+        install_update_repo = options[:update_repos] || true
+        installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
 
         all_buildable_items = Analyze.podfile_items(installer, analyzer)
 

data/lib/pod_builder/podfile.rb

@@ -89,13 +89,13 @@ module PodBuilder
       podfile_path = PodBuilder::basepath("Podfile")
 
       if File.exist?(podfile_restore_path)
-        restore_podfile_items = podfile_items_at(podfile_restore_path)
+        restore_podfile_items = podfile_items_at(podfile_restore_path, include_prebuilt = true)
 
         podfile_items.map! { |podfile_item|
           if updated_pod = updated_pods.detect { |x| x.name == podfile_item.name } then
             updated_pod
           elsif updated_pods.any? { |x| podfile_item.root_name == x.root_name } == false && # podfile_item shouldn't be among those being updated (including root specification)
-            restored_pod = restore_podfile_items.detect { |x| x.name == podfile_item.name }
+                restored_pod = restore_podfile_items.detect { |x| x.name == podfile_item.name }
             restored_pod
           else
             podfile_item
@@ -289,7 +289,7 @@ module PodBuilder
       return swift_versions.first
     end
 
-    def self.podfile_items_at(podfile_path)
+    def self.podfile_items_at(podfile_path, include_prebuilt = false)
       raise "Expecting basepath folder!" if !File.exist?(PodBuilder::basepath("Podfile"))
 
       if File.basename(podfile_path) != "Podfile"
@@ -305,7 +305,7 @@ module PodBuilder
         installer, analyzer = Analyze.installer_at(PodBuilder::basepath)
       
         podfile_items = Analyze.podfile_items(installer, analyzer)
-        buildable_items = podfile_items.select { |item| !item.is_prebuilt }   
+        buildable_items = podfile_items.select { |item| include_prebuilt || !item.is_prebuilt }   
       rescue Exception => e
         raise e
       ensure

data/lib/pod_builder/podfile_item.rb

@@ -60,7 +60,7 @@ module PodBuilder
 
     # @return [Bool] Is external pod
     #
-    attr_reader :is_external
+    attr_accessor :is_external
 
     # @return [String] The pod's build configuration
     #

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler