lib/big_keeper/util/podfile_operator.rb in bigkeeper-0.8.0 vs lib/big_keeper/util/podfile_operator.rb in bigkeeper-0.8.1

@@ -15,11 +15,11 @@
         end
       end
       false
     end
 
-    def generate_pod_config(pod_name, version,comment)
+    def generate_pod_config(pod_name, version, comment)
       module_config = ''
       if comment != nil
         module_config = "  pod '#{pod_name}' , '#{version}' # #{comment}"
       else
         module_config =  "  pod '#{pod_name}' , '#{version}'"
@@ -28,24 +28,24 @@
 
     def replace_all_module_release(path, user, module_names, version)
       module_names.each do |module_name|
         DepService.dep_operator(path, user).update_module_config(
                                              module_name,
-                                             ModuleType::GIT,
-                                             GitInfo.new(BigkeeperParser.module_git(module_name), GitType::TAG, version))
+                                             ModuleOperateType::RELEASE)
       end
+
     end
 
     def find_and_lock(podfile, dictionary)
       temp_file = Tempfile.new('.Podfile.tmp')
       begin
         File.open(podfile, 'r') do |file|
           file.each_line do |line|
             pod_model = PodfileDetector.get_pod_model(line)
             if pod_model != nil && pod_model.name != nil && dictionary[pod_model.name] != nil
                 # p "#{pod_name},#{dictionary[pod_name]}"
-                temp_file.puts generate_pod_config(pod_model.name,dictionary[pod_model.name],pod_model.comment)
+                temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
             else
                 temp_file.puts line
             end
           end
         end
@@ -62,11 +62,11 @@
       begin
         File.open(podfile, 'r') do |file|
           file.each_line do |line|
             pod_model = PodfileDetector.get_pod_model(line)
             if pod_model != nil && pod_model.name != nil && dictionary[pod_model.name] != nil
-                temp_file.puts generate_pod_config(pod_model.name,dictionary[pod_model.name],pod_model.comment)
+                temp_file.puts generate_pod_config(pod_model.name, dictionary[pod_model.name], pod_model.comment)
             else
                 temp_file.puts line
             end
           end
         end
@@ -78,17 +78,25 @@
       end
     end
 
     def podspec_change(podspec_file, version, module_name)
       temp_file = Tempfile.new(".#{module_name}.podspec")
+      has_change = false
       begin
         File.open(podspec_file, 'r') do |file|
           file.each_line do |line|
             if line.include?("s.version")
               temp_line = line
-              if temp_line.split("=")[0].delete(" ") == "s.version"
-                temp_file.puts "s.version = '#{version}'"
+              temp_line_arr = temp_line.split("=")
+              if temp_line_arr[0].delete(" ") == "s.version"
+                unless temp_line_arr[temp_line_arr.length - 1].include? "#{version}"
+                    temp_file.puts "s.version = '#{version}'"
+                    has_change = true
+                else
+                    temp_file.puts line
+                    Logger.highlight("The version in PodSpec is equal your input version")
+                end
               else
                 temp_file.puts line
               end
             else
                 temp_file.puts line
@@ -99,9 +107,10 @@
         FileUtils.mv(temp_file.path, podspec_file)
       ensure
         temp_file.close
         temp_file.unlink
       end
+      has_change
     end
 
     private :generate_pod_config
   end
 end