pod-builder 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4482b9b27c940312353d43961f6f6295d10690bcdf1c13cad503058ed09b6db3
-  data.tar.gz: c95ecae1dcbef118f09bf0409050d6a7e8fcb9549f63d453d021099c4b6b0391
+  metadata.gz: bf0fd6c7fa3523935f376b8a1c9cd375a86ef13da1d81762c9c1b678ca81581b
+  data.tar.gz: 28781b306ed31e7346d152f57069cd9883ea0f00bacca94a8f4a03c57039f47f
 SHA512:
-  metadata.gz: f6bca5110b2ece5df63e49cb105034b7494ebbedf0206dca8b9e6c4a2cf043659683347c03e20c84de5b5645b7dbe38cfed9acdbf641e9a6e41bccfed3a21eb0
-  data.tar.gz: fe8f9450bd522f13161d8cdd56f37a4dd134d029b1390c2457574e4bad8dfa82d501f485e48227c0cad4709c98f3e39f8cad66ae5a6730db90edfeefa12373ce
+  metadata.gz: 897c953a6bb6e73d8d1293328a90ca146d6a824d0df7c59b560acba01c7505d81119f787129101df116cbfec60997acb2389eab9fdeaa73c95c927f8c680241f
+  data.tar.gz: f2d58bc71c28c990474e6f289242f3b67d31f7bf39cc6ec354421facb6c072b44ce8ca8308c3eb414be860adb4d025011f09ac10683657fa04755dc3a14d723f

data/exe/pod_builder

@@ -332,6 +332,8 @@ begin
     raise "\n\nFor safety do not run this as root\n".red
   end
 
+  PodBuilder::add_lock_file
+  valid_lock_file = true
   command_ret = parse_commandline
 rescue Exception => e
   error = e.to_s
@@ -341,17 +343,21 @@ rescue Exception => e
     puts e.backtrace.join("\n\t").red
     puts "\n\nCommand failed!".red
   else
-    error_log = "/tmp/pod_builder.err"
+    error_log = File.join(PodBuilder::Configuration.build_path, "pod_builder.err")
     puts "\n\nCommand failed, check #{error_log}!".red
     File.write(error_log, error)
   end
 ensure
   if command_ret == 0
     PodBuilder::clean_basepath
+    
     if !OPTIONS.has_key?(:debug)
       PodBuilder::safe_rm_rf(PodBuilder::Configuration.build_path)
     end    
   end
+  if valid_lock_file
+    PodBuilder::remove_lock_file
+  end
 
   exit(command_ret)
 end

data/lib/pod_builder/command/build.rb

@@ -132,6 +132,7 @@ module PodBuilder
       end
 
       def self.expected_common_dependencies(pods_to_build, buildable_items)
+        warned_expected_pod_list = []
         expected_pod_list = []
         errors = []
 
@@ -145,8 +146,13 @@ module PodBuilder
               if buildable_pod.dependency_names.include?(dependency) && !buildable_pod.has_subspec(dependency) && !buildable_pod.has_common_spec(dependency) then
                 expected_pod_list += pods_to_build.map(&:root_name) + [buildable_pod.root_name]
                 expected_pod_list.uniq!
-                errors.push("Can't build #{pod_to_build.name} because it has common dependencies (#{dependency}) with #{buildable_pod.name}.\n\nUse `pod_builder build #{expected_pod_list.join(" ")}` instead\n\n")
-                errors.uniq!
+
+                expected_list = expected_pod_list.join(" ")
+                if !warned_expected_pod_list.include?(expected_list)
+                  errors.push("Can't build #{pod_to_build.name} because it has common dependencies (#{dependency}) with #{buildable_pod.name}.\n\nUse `pod_builder build #{expected_list}` instead or use `pod_builder build -a #{pod_to_build.name}` to automatically resolve missing dependencies\n\n")
+                  errors.uniq!
+                  warned_expected_pod_list.push(expected_list)
+                end
               end
             end
           end

data/lib/pod_builder/configuration.rb

@@ -41,6 +41,7 @@ module PodBuilder
       attr_accessor :project_name
       attr_accessor :restore_enabled
       attr_accessor :framework_plist_filename
+      attr_accessor :lock_filename
     end
     
     @build_settings = DEFAULT_BUILD_SETTINGS
@@ -53,7 +54,7 @@ module PodBuilder
     @license_filename = "Pods-acknowledgements"
     @subspecs_to_split = []
     @development_pods_paths = []
-    @build_path = "/tmp/pod_builder".freeze
+    @build_path = "/tmp/pod_builder_#{(Time.now.to_f * 1000).to_i}".freeze
     @configuration_filename = "PodBuilder.json".freeze
     @dev_pods_configuration_filename = "PodBuilderDevPodsPaths.json".freeze
     @lfs_min_file_size = MIN_LFS_SIZE_KB
@@ -62,6 +63,7 @@ module PodBuilder
     @project_name = ""
     @restore_enabled = true
     @framework_plist_filename = "PodBuilder.plist"
+    @lock_filename = "PodBuilder.lock"
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -79,7 +81,11 @@ module PodBuilder
       Configuration.base_path = podbuilder_path
       
       if exists
-        json = JSON.parse(File.read(config_path))
+        begin
+          json = JSON.parse(File.read(config_path))
+        rescue => exception
+          raise "\n\n#{File.basename(config_path)} is an invalid JSON\n".red
+        end
 
         if value = json["spec_overrides"]
           if value.is_a?(Hash) && value.keys.count > 0
@@ -150,7 +156,12 @@ module PodBuilder
       dev_pods_configuration_path = File.join(Configuration.base_path, Configuration.dev_pods_configuration_filename)
       
       if File.exist?(dev_pods_configuration_path)
-        json = JSON.parse(File.read(dev_pods_configuration_path))
+        begin
+          json = JSON.parse(File.read(dev_pods_configuration_path))  
+        rescue => exception
+          raise "\n\n#{File.basename(dev_pods_configuration_path)} is an invalid JSON\n".red
+        end
+
         Configuration.development_pods_paths = json || []
         Configuration.development_pods_paths.freeze
       end

data/lib/pod_builder/core.rb

@@ -91,6 +91,30 @@ module PodBuilder
     return swift_version
   end
 
+  def self.add_lock_file
+    lockfile_path = File.join(home, Configuration.lock_filename)
+
+    if File.exist?(lockfile_path)
+      if pid = File.read(lockfile_path)
+        begin
+          if Process.getpgid(pid)
+              raise "\n\nAnother PodBuilder pending task is running on this project\n".red    
+          end
+        rescue
+        end
+      end  
+    end
+
+    File.write(lockfile_path, Process.pid, mode: "w")
+  end
+
+  def self.remove_lock_file
+    lockfile_path = File.join(home, Configuration.lock_filename)
+    if File.exist?(lockfile_path)
+      FileUtils.rm(lockfile_path)
+    end
+  end
+
   private 
   
   def self.home
@@ -98,4 +122,4 @@ module PodBuilder
     raise "\n\nNo git repository found in current folder `#{Dir.pwd}`!\n".red if h.empty?
     return h
   end
-end
+end

data/lib/pod_builder/podfile_item.rb

@@ -105,7 +105,7 @@ module PodBuilder
       @name = spec.name
       @root_name = spec.name.split("/").first
 
-      checkout_options_keys = [@name, @root_name]
+      checkout_options_keys = [@root_name, @name]
 
       if opts_key = checkout_options_keys.detect { |x| checkout_options.has_key?(x) }
         @repo = checkout_options[opts_key][:git]

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler