cocoapods-hd 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c26eaab0b2fc3b982d42378b155bb3b07d231a6ad39018c68fe97d81d443918
-  data.tar.gz: 58836e38a2235e1d04dda6a4cb1007f65c33ca5af619823d7e5e84600b359471
+  metadata.gz: cbebbaf65a5ed84c38054190ce2122553d9b79b8068ff3b958d2747ad5542fd9
+  data.tar.gz: caad4f5c09f12847ac7909c20959f2e02a14abda509344b2bfae25432ecf81c3
 SHA512:
-  metadata.gz: ebfb8aac3439aec8338846e227c0f1ed60a748bc3f8a3ceb8c5ca65fb8f15d733dec2dd827783f52c8931e3600a447f2fd45e14d98d2dd4c38186164148177cc
-  data.tar.gz: b89c2a8c400f009fcc9566457585ceeabcdfacbce230dd7e6b20d0033f3326c7aaae41b88de2b04059a7b8b677cec3a837512006ea404943f573c5850a65f86d
+  metadata.gz: 37a96008fc62e0f5c3b8d087ebcac385882d0f928b82eee1f67e1df0349f1550f523654deab1096afc4ef1ecb73c41e17d53b22af1418d5290115f8bfa2dee0b
+  data.tar.gz: 349f7aca0788cb4f66e76a6c67a5dda2d13dc0672246be7d3a30fd4ed5e7c4e60252e26779867c869e40e82d41398718b08b9e73c4110344cd12d24faa33c0e2

data/lib/cocoapods-hd/command/tag.rb

@@ -72,14 +72,12 @@ module Pod
           `pod ipc spec #{pod_name}.podspec >>#{podspec_json_name}`
           podspec_json_dir = File.join(Dir.pwd, podspec_json_name)
 
-          source_specs_dir = get_source_specs_dir
-
-          UI.puts("HDSourceSpecs目录:  #{source_specs_dir}")
+          UI.puts("HDSourceSpecs目录:  #{get_source_specs_dir}")
 
-          Dir.chdir(source_specs_dir)
+          Dir.chdir(get_source_specs_dir)
           `git pull`
 
-          dest_dir = File.join(source_specs_dir, pod_name, get_tag)
+          dest_dir = File.join(get_source_specs_dir, pod_name, get_tag)
 
           UI.section("创建目录: #{dest_dir}") do
             FileUtils.mkdir_p(dest_dir) unless File.directory?(dest_dir)
@@ -90,18 +88,12 @@ module Pod
           end
 
           UI.section("✅ #{podspec_json_name} 上传成功") do
-            `git status -s`
-            `git add .`
-            `git commit -m 'add #{pod_name} #{get_tag}'`
-            `git push origin master`
+            TagUtil.upload_origin_sources("添加 #{pod_name}/#{get_tag}")
           end
-
           Dir.chdir(module_dir)
         end
-        unless exist_cocoapods_source_dir
-          module_parent_dir = File.expand_path("..", Dir.pwd) #  ~/debug-cocoapods-hd
-          source_repo_path = File.join(module_parent_dir, "HDSourceSpecs")
-          FileUtils.rm_r(source_repo_path)
+        unless File.directory?(cocoapods_repos_dir)
+          remove_git_source_repo
         end
 
         unless @beta
@@ -111,7 +103,6 @@ module Pod
               delete_tag(beta_tag)
             end
           end
-
         end
       end
 
@@ -136,6 +127,7 @@ module Pod
 
       # 移除tag
       def delete_tag(tag)
+
         UI.puts "🍉 开始删除tag: #{tag}"
         if TagUtil.exist_tag(tag)
           TagUtil.git_delete_tag(tag)
@@ -157,25 +149,19 @@ module Pod
           pod_name = rip.to_s.gsub(".podspec", "")
           UI.puts "pod_name： #{pod_name}"
 
-          unless File.directory?(cocoapods_repos_dir)
-            Pod::UI.puts "本地 HDSourceSpecs not found"
-            break
-          end
+          source_specs_dir = get_source_specs_dir
 
-          full_path = File.join(cocoapods_repos_dir, pod_name, tag_name)
+          pod_tag_path = File.join(source_specs_dir, pod_name, tag_name)
 
-          unless File.exist?(full_path)
+          unless File.exist?(pod_tag_path)
             UI.warn "❌ 本地HDSourceSpecs不包含#{pod_name}的#{tag_name}标签, 请先执行 pod repo update"
+            remove_git_source_repo
             break
           end
-          FileUtils.remove_dir(full_path)
-          Dir.chdir(cocoapods_repos_dir)
-          # UI.puts "切换到：#{Dir.pwd}"
+          FileUtils.remove_dir(pod_tag_path)
+          Dir.chdir(source_specs_dir)
           UI.section("✅ #{pod_name} #{tag_name} 标签删除成功 !!!") do
-            `git pull origin master`
-            `git add .`
-            `git commit -m '删除#{pod_name}/#{tag_name}'`
-            `git push origin master`
+            TagUtil.upload_origin_sources("删除 #{pod_name}/#{tag_name}")
           end
 
         end
@@ -185,8 +171,9 @@ module Pod
         File.join(Dir.home, ".cocoapods/repos/HDSourceSpecs")
       end
 
-      def exist_cocoapods_source_dir
-        File.directory?(cocoapods_repos_dir)
+      def remove_git_source_repo
+        source_repo_path = File.join(File.dirname(Dir.pwd), "HDSourceSpecs")
+        FileUtils.rm_r(source_repo_path)
       end
 
       def run

data/lib/cocoapods-hd/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsHd
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/cocoapods-hd/tag_util.rb

@@ -29,6 +29,14 @@ module Pod
       false
     end
 
+    # 上传Sources
+    def self.upload_origin_sources(commit_desc)
+      `git status -s`
+      `git add .`
+      `git commit -m '#{commit_desc}'`
+      `git push origin master`
+    end
+
     def self.check_branch_include_tag(tag)
       branch_name = `git symbolic-ref --short -q HEAD`
       if branch_name.to_s.strip == "master"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hd
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - xingyong