cocoapods-repo-rsync 1.0.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e91d3380dfba16cac84a4e12156cac5ae0dc5fc9
-  data.tar.gz: ae2d82ab74a9a27f960d005903f8134b54a87689
+  metadata.gz: 2c028c24560bf476c1e1c7f319dee0a99c8fdc9f
+  data.tar.gz: f790c05928f9ea4e1a6ea4e80fee630c3fc284c9
 SHA512:
-  metadata.gz: 7e2edcc01309f01f00fa9ab5e8517cb8ed731df4a3c1c97a11a849e48dcf0df78af441b029fda6f65c07343943a0388235b7049868890195f7422ade98fd252f
-  data.tar.gz: 531457a64837b073c7380938a2f7875cde9f7c1d523f74fe0f0fb7e5af96b1f13492896d8c971629483810732cb6e657f94f58eb0fc7b03a7d6a88a473e907ff
+  metadata.gz: f20a6ebfe60cfa993479729abebe740086f34d020e24b1337090f438901d240d5977efce72eea7c67dd1a358a0f3e792f8058258b59a1ffdbad1d3634f5ef698
+  data.tar.gz: 990ac59f5415ab09f7d249639a065ea8920a08cc16a77551836d092c0ac15bffb9718f3eab3f03d9d08a1567968477bd70d82c6220d245365c099c2f22b1a68e

data/cocoapods-repo-rsync.gemspec

@@ -6,8 +6,8 @@ require 'cocoapods-repo-rsync'
 Gem::Specification.new do |spec|
   spec.name          = 'cocoapods-repo-rsync'
   spec.version       = CocoapodsRepoRsync::VERSION
-  spec.authors       = ['Whirlwind']
-  spec.email         = ['whirlwindjames@foxmail.com']
+  spec.authors       = ['bisheng.dongbs']
+  spec.email         = ['charlesdbs@gmail.com']
   spec.description   = %q{CocoaPod plugin to add rsync support for spec repositories}
   spec.summary       = %q{Rsync support for spec repository}
   spec.homepage      = 'https://github.com/clarkda/cocoapods-repo-rsync'

data/lib/cocoapods-repo-rsync.rb

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

data/lib/cocoapods_plugin.rb

@@ -10,7 +10,7 @@ if Gem::Dependency.new("", '>= 0.39').match?('', Pod::VERSION)
         Pod::UI.message 'cocoapods-repo-rsync received source_provider hook'
         return unless sources = options['sources']
         sources.each do |source|
-            url, ssh_argv = source
+            url, ssh_argv ,skip= source
             url = url + "/" unless url.end_with?("/")
             source = Pod::RsyncSource.rsync_source_by_url(url)
             if source
@@ -19,14 +19,14 @@ 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
                     if File.writable?(source.repo)
-                        argv = CLAide::ARGV.new([source.name, ssh_argv])
+                        argv = CLAide::ARGV.new([source.name, ssh_argv,skip])
                         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, ssh_argv])
+                argv = CLAide::ARGV.new([name_for_url(url), url, ssh_argv,skip])
                 Pod::Command::RepoRsync::Add.new(argv).run()
                 source = Pod::RsyncSource.rsync_source_by_url(url)
             end

data/lib/pod/command/repo_rsync.rb

@@ -3,7 +3,44 @@ require 'cocoapods-repo-rsync'
 
 module Pod
   class Command
+    module Options
+      # Provides support for commands to skip updating the spec repositories.
+      #
+      module RepoUpdate
+        module Options
+          def options
+            [
+                ['--no-repo-update', 'Skip running `pod repo update` before install'],
+            ].concat(super)
+          end
+        end
+
+        def self.included(base)
+          base.extend(Options)
+        end
+
+        def repo_update?(default: false)
+          if @repo_update.nil?
+            default
+          else
+            @repo_update
+          end
+        end
+
+        def initialize(argv)
+          @repo_update = argv.flag?('repo-update')
+          print "@repo_update #{@repo_update} \n"
+          if !@repo_update.nil?
+            ENV["NO_REPO_UPDATE"]="true"
+          end
+          super
+        end
+      end
+    end
+
     class RepoRsync < Command
+
+
       require 'pod/command/repo_rsync/add'
       require 'pod/command/repo_rsync/update'
 

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

@@ -35,14 +35,42 @@ module Pod
             config.repos_dir.mkpath
             dir=config.repos_dir+@name
             Dir.chdir(config.repos_dir) do
-              cmd = "rsync #{@ssh_argv || ""} -rtlz#{config.verbose? ? "v" : ""} --exclude=.rsync_config --delete \"#{@url}\" \"#{dir}\""
-              UI.puts cmd if config.verbose?
-              system(cmd)
+              cmd = "rsync #{@ssh_argv || ""} -rtlz#{config.verbose? ? "v" : ""} --exclude=.rsync_config --exclude=.skip --delete \"#{@url}\" \"#{dir}/\" | grep -v /$"
+
+              source_skip = @name.gsub('-','_') + "_skip"
+              print "source_skip:: #{ENV[source_skip]} ....\n"
+              env_skip =  ENV[source_skip]
+              if "false" == env_skip
+                UI.puts cmd if config.verbose?
+                system(cmd)
+              elsif  "true" == env_skip
+                print " skip update repo \n"
+              else
+                print " update repo  \n"
+                UI.puts cmd if config.verbose?
+                system(cmd)
+              end
+
+              #system(cmd)
+
+=begin
+              if "true" == RsyncSource.new(dir).skip
+                print "!!! skip update repo \n"
+              else
+                print "!!! update repo #{skip} \n"
+                UI.puts cmd if config.verbose?
+
+              end
+=end
+
+
+              source = RsyncSource.new(dir)
+              source.url = @url
+              source.argv = @ssh_argv
+              source.save_config
+              print "source.url:: #{source.url} \n"
               if $?.success?
-                source = RsyncSource.new(dir)
-                source.url = @url
-                source.argv = @ssh_argv
-                source.save_config
+
               end
             end
           end
@@ -50,4 +78,4 @@ module Pod
       end
     end
   end
-end
+end

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

@@ -2,6 +2,9 @@ module Pod
   class Command
     class RepoRsync
       class Update < RepoRsync
+
+
+
         self.summary = 'Update a rsync spec-repo.'
 
         self.description = <<-DESC
@@ -26,7 +29,7 @@ module Pod
         # end
 
         def run
-          update(@name, @ssh_argv) #todo: dusty
+          update(@name, @ssh_argv, $skip) #todo: dusty
         end
 
         #@!group Update helpers
@@ -48,7 +51,7 @@ module Pod
         #
         # @return [void]
         #
-        def update(source_name = nil, argv = nil)
+        def update(source_name = nil, argv = nil, skip = nil)
           if source_name
             sources = [rsync_source_named(source_name)]
           else
@@ -59,9 +62,22 @@ module Pod
             UI.section "Updating spec repo `#{source.name}`" do
               Dir.chdir(source.repo) do
                 begin
-                  cmd = "rsync #{argv || source.argv || ""} -rtl#{config.verbose? ? "v" : ""} --exclude=.rsync_config --delete \"#{source.url}\" \"#{source.repo}\""
-                  UI.puts cmd if config.verbose?
-                  system(cmd)
+                  cmd = "rsync #{argv || source.argv || ""} -rtl#{config.verbose? ? "v" : ""} --exclude=.rsync_config --exclude=.skip --delete \"#{source.url}\" \"#{source.repo}/\" | grep -v /$"
+
+                  source_skip = source.name.gsub('-','_') + "_skip"
+                  env_skip =  ENV[source_skip]
+                  no_repo_update = ENV["NO_REPO_UPDATE"]
+                  if "false" == env_skip
+                    UI.puts cmd if config.verbose?
+                    system(cmd)
+                  elsif "true" == source.skip || "true" == env_skip || "true" == no_repo_update
+                    print " skip update repo \n"
+                  else
+                    print " update repo  \n"
+                    UI.puts cmd if config.verbose?
+                    system(cmd)
+                  end
+                 # system(cmd)
                 rescue Informative => e
                   UI.warn 'CocoaPods was not able to update the ' \
                   "`#{source.name}` repo. If this is an unexpected issue " \

data/lib/rsync_source.rb

@@ -6,6 +6,12 @@ module Pod
         @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
+        if File.exist?(repo + '.skip')
+          @skip = "true"
+        else
+          @skip = "false"
+        end
+
     end
 
     def save_config
@@ -23,6 +29,15 @@ module Pod
       @url = url
     end
 
+    def skip
+      parse_config unless @skip
+      @skip
+    end
+
+    def skip=(skip)
+      @skip = skip
+    end
+
     def argv
       parse_config unless @argv
       @argv
@@ -49,6 +64,7 @@ module Pod
     end
 
     def self.rsync_source_by_url(url)
+      print "url::: #{url}"
       rsync_sources.find do |source|
         source.url == url
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-repo-rsync
 version: !ruby/object:Gem::Version
-  version: 1.0.0.5
+  version: 1.0.6
 platform: ruby
 authors:
-- Whirlwind
+- bisheng.dongbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
 description: CocoaPod plugin to add rsync support for spec repositories
 email:
-- whirlwindjames@foxmail.com
+- charlesdbs@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rsync support for spec repository