cocoapods-git2local 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daa3dc5adb1b9c9652fef33c34d417c5e1251f9a743525be7960d0862c6eca13
-  data.tar.gz: d2c3d689ee0a01bcb29405328a7950f6a58568b31ea5a669f4b32d973774736e
+  metadata.gz: 3222223042f537c5f26abdf8a19020c36c51915f6317e186b537ff30d4d7c32b
+  data.tar.gz: 8d0a7a93a1aa5ea102ec2c50c2e08d2cf6a854802dc9e13aaab0bd026310a9ee
 SHA512:
-  metadata.gz: bcb0bafbe72b5e92afb0b4d28ba5d40951d6efdd12b0f05349dba44e9634e43e678986f1617c31a17424b92e33bc9a4ed6cf93751800e7eb66d2a914a4e02966
-  data.tar.gz: 30baef453dfbae00cfb198803b2aedeee43fed92bf1a60cd6da650e6581b3871f93a2d3db60d8441f75237df39e5baa899bc1c466384edbcc5a507e8268c8ef5
+  metadata.gz: 111ce9b2dcf27709543b7eccdc2381baaae2372381ce88c818da87085a2f1c8b1b0a6d41f50f6e1ccc17abc98cf8ceb027cbb48ca65a0b1581aca5a3dd47cee8
+  data.tar.gz: d0f035cc954b4a2f44830ea510ee52d313ba2282d88381bf1ea746d8ed5afc91eb12ba4c243915b5fb75e5cdabc903f6debf3fd7b5102f285f7ba8b23904a5a5

data/lib/cocoapods-git2local/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsGit2local
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/pod/git.rb

@@ -1,18 +1,20 @@
-def gitclone(git, commit)
+def gitclone(git, branch, commit)
     component = git.split("/")[4].split(".")[0]
     pwd = Dir.pwd
     Dir.chdir("..")
     if File.directory?(component)
         Dir.chdir(component)
         p Dir.pwd
-        reset = 'yes'
         unless system("git status | grep 'nothing to commit'") 
-            p component + "有未提交的修改"
-            reset = gets
-        end 
-        if reset == 'yes'
-            system("git reset --hard " + commit)
-            system("git checkout " + commit)
+            puts 'sssss'
+        else
+            system("git reset --hard")
+            if branch
+                system("git checkout " + branch)
+                system("git pull")
+            else
+                system("git checkout " + commit)
+            end
         end
     else
         system("git clone " + git)
@@ -20,6 +22,6 @@ def gitclone(git, commit)
         p Dir.pwd
         system("git checkout " + commit)
     end
-    
+
     Dir.chdir(pwd)
 end

data/lib/pod/pod.rb

@@ -21,13 +21,14 @@ module Pod
         end
         # link = Pod::Command::Links.get_link(linked_name)
         unless requirements[0].instance_of? String
-          unless requirements[0].key?(:git)  && requirements[0].key?(:commit)
+          unless requirements[0].key?(:git)  && (requirements[0].key?(:commit) || requirements[0].key?(:branch))
             real_pod(name, *requirements, &block)
           else
             git = requirements[0].fetch(:git)
-            commit = requirements[0].fetch(:commit)
+            commit = requirements[0].key?(:commit) ? requirements[0].fetch(:commit) : nil
+            branch = requirements[0].key?(:branch) ? requirements[0].fetch(:branch) : nil
             component = git.split("/")[4].split(".")[0]
-            gitclone(git, commit)
+            gitclone(git, branch, commit)
             real_pod(name, :path=>"../"+component+"/", &block)
           end
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-git2local
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- hujunjian
+- account120
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-13 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,9 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A short description of cocoapods-git2local.
+description: clone file for podfile use git.
 email:
-- hujunjian@meituan.com
+- 979812871@qq.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -73,5 +73,5 @@ requirements: []
 rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
-summary: A longer description of cocoapods-git2local.
+summary: clone file for podfile use git.
 test_files: []