cocoapods-repo-rsync 1.0.0.1 → 1.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6853d30e34d94b06eb32519df0cd4682cc2c72
-  data.tar.gz: 2a629795edd05f646f866b5271af6de9b1d76a3f
+  metadata.gz: c013a09c55fbd315e76d6a0014df1c123693a15f
+  data.tar.gz: b6586c230eb7e1606c4fd495af118dc658f95d30
 SHA512:
-  metadata.gz: f5b672fc3300eb23a5c0cad9fb996fe7d49a9b998a07c536d5211669c2a00b22d87873a103ec99eb6497cbdfd5532fb6f1428a1fc396e73f6f3bac48919bfb36
-  data.tar.gz: fe21b7cfff7604ecd274fb886024efa3aadf8f4120870644e5d4369fce08ac21c19c9dc34149849e6e0c773a98b5ccac5591540deb09b5ccb2d62a8b6fbe7317
+  metadata.gz: a20493c6de981cdfce96e5ead31f1c84988b3b67dd1f206eaaf8b474732d86f4da5fba1537985016cff6e58cf8b3a9bcd32d94069dd8cfcfd029681c2ed65e29
+  data.tar.gz: 02894bbfc3a30257c3446a46b966a8054c25c6b6b1bea48cded8532fa5e96c377d025d4917fe020e7472bf6ff800f28d3c904aaeeafcc7fdd6b6ff6b1522ae7f

data/lib/cocoapods-repo-rsync.rb

@@ -2,5 +2,5 @@
 # The namespace of the Cocoapods repo rsync plugin.
 #
 module CocoapodsRepoRsync
-  VERSION = '1.0.0.1'
+  VERSION = '1.0.0.3'
 end

data/lib/cocoapods_plugin.rb

@@ -9,23 +9,28 @@ if Gem::Dependency.new("", '>= 0.39').match?('', Pod::VERSION)
     Pod::HooksManager.register('cocoapods-repo-rsync', :source_provider) do |context, options|
         Pod::UI.message 'cocoapods-repo-rsync received source_provider hook'
         return unless sources = options['sources']
-        sources.each do |url|
+        sources.each do |source|
+            url, ssh_argv = source
             url = url + "/" unless url.end_with?("/")
             source = Pod::RsyncSource.rsync_source_by_url(url)
             if source
                 update = true
                 # CP 1.0.0 not support
-                update = Pod::Config.instance.skip_repo_update if Gem::Dependency.new("", '~> 0.39').match?('', Pod::VERSION)
+                update = !Pod::Config.instance.skip_repo_update if Gem::Dependency.new("", '~> 0.39').match?('', Pod::VERSION)
                 if update
-                    argv = CLAide::ARGV.new([source.name])
-                    Pod::Command::RepoRsync::Update.new(argv).run()
+                    if File.writable?(source.repo)
+                        argv = CLAide::ARGV.new([source.name, ssh_argv])
+                        Pod::Command::RepoRsync::Update.new(argv).run()
+                    else
+                        Pod::UI.puts "#{source.name} is readonly, skip update."
+                    end
                 end
             else
-                argv = CLAide::ARGV.new([name_for_url(url), url])
+                argv = CLAide::ARGV.new([name_for_url(url), url, ssh_argv])
                 Pod::Command::RepoRsync::Add.new(argv).run()
                 source = Pod::RsyncSource.rsync_source_by_url(url)
             end
-            context.add_source(source)
+            context.add_source(source) if source
         end
     end
 

data/lib/pod/command/repo_rsync/add.rb

@@ -11,11 +11,12 @@ module Pod
 
         self.arguments = [
             CLAide::Argument.new('NAME', true),
-            CLAide::Argument.new('URL', true)
+            CLAide::Argument.new('URL', true),
+            CLAide::Argument.new('SSHARGV', false)
         ]
 
         def initialize(argv)
-          @name, @url = argv.shift_argument, argv.shift_argument
+          @name, @url, @ssh_argv = argv.shift_argument, argv.shift_argument, argv.shift_argument
           if @url && !@url.end_with?("/")
             @url = @url+"/"
           end
@@ -34,13 +35,14 @@ module Pod
             config.repos_dir.mkpath
             dir=config.repos_dir+@name
             Dir.chdir(config.repos_dir) do
-              cmd = "rsync -rtlz#{config.verbose? ? "v" : ""} \"#{@url}\" \"#{dir}\""
+              cmd = "rsync #{@ssh_argv || ""} -rtlz#{config.verbose? ? "v" : ""} --exclude=.rsync_config \"#{@url}\" \"#{dir}\""
               UI.puts cmd if config.verbose?
               system(cmd)
               if $?.success?
-                File.open(dir+".rsync_config", "w:UTF-8") do |f|
-                  f.write @url
-                end
+                source = RsyncSource.new(dir)
+                source.url = @url
+                source.argv = @ssh_argv
+                source.save_config
               end
             end
           end

data/lib/pod/command/repo_rsync/update.rb

@@ -9,11 +9,12 @@ module Pod
         DESC
 
         self.arguments = [
-            CLAide::Argument.new('NAME', true)
+            CLAide::Argument.new('NAME', true),
+            CLAide::Argument.new('ARGV', false)
         ]
 
         def initialize(argv)
-          @name = argv.shift_argument
+          @name, @ssh_argv = argv.shift_argument, argv.shift_argument
           super
         end
 
@@ -25,7 +26,7 @@ module Pod
         # end
 
         def run
-          update(@name, true) #todo: dusty
+          update(@name, @ssh_argv) #todo: dusty
         end
 
         #@!group Update helpers
@@ -47,7 +48,7 @@ module Pod
         #
         # @return [void]
         #
-        def update(source_name = nil, show_output = false)
+        def update(source_name = nil, argv = nil)
           if source_name
             sources = [rsync_source_named(source_name)]
           else
@@ -58,7 +59,7 @@ module Pod
             UI.section "Updating spec repo `#{source.name}`" do
               Dir.chdir(source.repo) do
                 begin
-                  cmd = "rsync -rtl#{config.verbose? ? "v" : ""} \"#{source.url}\" \"#{source.repo}\""
+                  cmd = "rsync #{argv || source.argv || ""} -rtl#{config.verbose? ? "v" : ""} --exclude=.rsync_config \"#{source.url}\" \"#{source.repo}\""
                   UI.puts cmd if config.verbose?
                   system(cmd)
                 rescue Informative => e

data/lib/pod/podfile/dsl.rb

@@ -1,10 +1,13 @@
 module Pod
   class Podfile
     module DSL
-      def rsync_source(source)
+      def rsync_source(source, argv=nil)
         hash_plugins = get_hash_value('plugins') || {"cocoapods-repo-rsync"=>{"sources"=>[]}}
-        hash_plugins["cocoapods-repo-rsync"]["sources"] << source
-        set_hash_value('plugins', hash_plugins)
+        sources = hash_plugins["cocoapods-repo-rsync"]["sources"]
+		    unless sources.map { |s| s.class == Array ? s[0] : s }.include?(source)
+	        sources << (argv.nil? ? source : [source, argv])
+        	set_hash_value('plugins', hash_plugins)
+        end
       end
     end
   end

data/lib/rsync_source.rb

@@ -2,12 +2,35 @@ module Pod
   # Subclass of Pod::Source to provide support for RSYNC Specs repositories
   #
   class RsyncSource < Source
+    def parse_config
+        @url, @argv = File.open(repo + '.rsync_config', "r:UTF-8", &:read).split("\n").map { |c| c.strip }
+        @url + "/" unless @url.end_with?("/")
+        @argv ||= "" unless @argv
+    end
+
+    def save_config
+      File.open(repo+".rsync_config", "w:UTF-8") do |f|
+        f.write "#{@url}\n#{@argv}"
+      end
+    end
+
     def url
-        u = File.open(repo + '.rsync_config', "r:UTF-8", &:read).strip
-        u = u+"/" unless u.end_with?("/")
-        u
+      parse_config unless @url
+      @url
     end
 
+    def url=(url)
+      @url = url
+    end
+
+    def argv
+      parse_config unless @argv
+      @argv
+    end
+
+    def argv=(argv)
+      @argv = argv
+    end
 
     def self.rsync_repo?(dir)
       (dir+".rsync_config").exist?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-repo-rsync
 version: !ruby/object:Gem::Version
-  version: 1.0.0.1
+  version: 1.0.0.3
 platform: ruby
 authors:
 - Whirlwind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler