cocoapods-repo-svn 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e85705bfb49fdd94c310abfbcb0ef1eff7656c
-  data.tar.gz: 119a76f6e3520135405ccfd6abca17f210788314
+  metadata.gz: ef72244ce3690f9819e04929b626cad1550b8cc6
+  data.tar.gz: 5e457b5c8da32545f90a15b8b421c8635e8c8b0f
 SHA512:
-  metadata.gz: 1b22e0739d38dc173badfb7bddd038012fbfa22c36721a93268203c617d62bab0215ae7648cf2235117dfc18f34d9fe40c9e157c04cf722e7cffa01394ea0ff4
-  data.tar.gz: 6e5b77f1b76039e70cf8b3dc3dc64ababbe599d17eb534b2c265f1b678a4cc63ee23e6da4f07072f2b41d8727200eb9a17417359073c53042c2ac60ac117849f
+  metadata.gz: 3323845179ad5cd7b25cae6acf571f3e375d86c8c6792037464be0df585de19e0d1de7060642b60e05717027cf8c4e0839f501b67fac550b44aa0bd08cf8f76a
+  data.tar.gz: ceeb04bc980c4cf2529f43b114451c9c675c5c598a2c1452ea16808fd1018ac67e96f7f26c1a8e1fb693c55ee6e053da1629922b276d84624c62195e5e7357f1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Cocoapods::repo-svn changelog
 
+# Master
+
+* Add support for new source provider plugin hook (CocoaPods [#3792](https://github.com/CocoaPods/CocoaPods/pull/3792))
+
 ## 0.1.1
 
 * Migrating to new CLAide::Arguments (CocoaPods/CLAide#33)

data/README.md

@@ -13,7 +13,9 @@ Our team had been using a in house fork of Cocoapods with svn, bzr, and hg spec-
 
     $ gem install cocoapods-repo-svn 
 
-## Usage
+# Usage
+
+## Commands
 
 Add
 
@@ -27,6 +29,15 @@ Remove
 
     $ pod repo-svn remove my-svn-repo 
 
+## Podfile integration
+
+To include your sources in the install phase of your project, do the following:
+```ruby
+plugin 'cocoapods-repo-svn', :sources => [
+        'https://svn.myrepository.com'
+    ]
+```
+
     
 ## Contributing
     

data/lib/cocoapods_plugin.rb

@@ -1 +1,54 @@
-require 'pod/command/repo_svn'
+require 'pod/command/repo_svn'
+require 'svn_source'
+
+# This pre_install hook requires cocoapods v. 0.38.0.beta.2 or higher
+Pod::HooksManager.register('cocoapods-repo-svn', :source_provider) do |context, options|
+    Pod::UI.message 'cocoapods-repo-svn received source_provider hook'
+    return unless sources = options['sources']
+    sources.each do |url|
+        source = create_source_with_url(url)
+        update_or_add_source(source)
+        context.add_source(source)
+    end
+end
+
+# @param [Source] source The source to add or update
+#
+# @return [Void]
+#
+def update_or_add_source(source)
+    name = source.name
+    url = source.url
+    dir = source.repo
+
+    if dir.exist?
+        argv = CLAide::ARGV.new([name])
+        cmd = Pod::Command::RepoSvn::Update.new(argv)
+    else
+        argv = CLAide::ARGV.new([name, url])
+        cmd = Pod::Command::RepoSvn::Add.new(argv)
+    end
+
+    cmd.run() 
+end
+
+# @param [String] url The URL of the SVN repository
+#
+# @return [String] a name for the repository
+#
+# For now, this uses the last component of the URL as the name
+# So https://my.server.com/somedir/Specs will return Specs
+def name_for_url(url)
+    return nil unless url
+    delim = '/'
+    components = url.split(delim)
+    components.last
+end
+
+
+def create_source_with_url(url)
+    name = name_for_url(url)
+    repos_dir = Pod::Config.instance.repos_dir
+    repo = repos_dir + name
+    Pod::SvnSource.new(repo,url)
+end

data/lib/pod/command/repo_svn.rb

@@ -37,7 +37,8 @@ module Pod
             config.repos_dir.mkpath
             Dir.chdir(config.repos_dir) do
               command = "checkout --non-interactive --trust-server-cert '#{@url}' #{@name}"
-              !svn(command)
+              #!svn(command)
+              `svn #{command}`
             end
             SourcesManager.check_version_information(dir) #todo: TEST ME
           end
@@ -103,7 +104,8 @@ module Pod
             UI.section "Updating spec repo `#{source.name}`" do
               Dir.chdir(source.repo) do
                 begin
-                  output = svn!('up --non-interactive --trust-server-cert')
+                  #output = svn('up --non-interactive --trust-server-cert')
+                  output = `svn up --non-interactive --trust-server-cert`
                   UI.puts output if show_output && !config.verbose?
                 rescue Informative => e
                   UI.warn 'CocoaPods was not able to update the ' \
@@ -150,7 +152,7 @@ module Pod
         # @return [Bool] Whether the given source is a SVN repo.
         #
         def svn_repo?(dir)
-          Dir.chdir(dir) { svn('info  >/dev/null 2>&1') }
+          Dir.chdir(dir) { `svn info > /dev/null` }
           $?.success?
         end
       end
@@ -278,6 +280,115 @@ module Pod
         end
       end
 
+      #-----------------------------------------------------------------------#
+      #
+      # Pushes a podspec to the specified repo
+      #
+      # Most of this was taken directly from the CocoaPods `push` command
+      
+      class Push < RepoSvn
+        self.summary = 'Push a podspec'
+
+        self.description = <<-DESC
+          Validates `NAME.podspec` or `*.podspec` in the current working dir, creates a
+          directory and version folder for the pod in the local copy of `REPO`
+          (~/.cocoapods/repos/[REPO]), copies the podspec file into the version directory,
+          and finally it commits the changes to `REPO`
+          DESC
+
+        self.arguments = [
+          CLAide::Argument.new('REPO', true),
+          CLAide::Argument.new('NAME.podspec', false)
+        ]
+
+        def self.options
+          [['--local-only', 'Does not perform the step of committing changes to REPO']].concat(super)
+        end
+
+        def initialize(argv)
+          @local_only = argv.flag?('local-only')
+          @repo = argv.shift_argument
+          @podspec = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! 'A spec-repo name is required.' unless @repo
+        end
+
+        def run
+          update_repo
+          add_specs_to_repo
+        end
+
+        # Updates the git repo against the remote.
+        #
+        # @return [void]
+        #
+        def update_repo
+          UI.puts "Updating the `#{@repo}' repo\n".yellow
+          Dir.chdir(repo_dir) { UI.puts `svn update .` }
+        end
+
+        def add_specs_to_repo
+          UI.puts "\nAdding the #{'spec'.pluralize(podspec_files.count)} to the `#{@repo}' repo\n".yellow
+          podspec_files.each do |spec_file|
+            spec = Pod::Specification.from_file(spec_file)
+            output_path = File.join(repo_dir, spec.name, spec.version.to_s)
+            if Pathname.new(output_path).exist?
+              message = "[Fix] #{spec}"
+            elsif Pathname.new(File.join(repo_dir, spec.name)).exist?
+              message = "[Update] #{spec}"
+            else
+              message = "[Add] #{spec}"
+            end
+
+            FileUtils.mkdir_p(output_path)
+            FileUtils.cp(spec_file, output_path)
+            if !@local_only
+              Dir.chdir(repo_dir) do
+                # only commit if modified
+                UI.puts "Committing changes"
+                UI.puts `svn add #{spec.name} 2> /dev/null`
+                UI.puts `svn commit -m "#{message}"`
+              end
+            end
+          end
+        end
+
+        private
+
+        # @return [Array<Pathname>] The path of the specifications to push.
+        #
+        def podspec_files
+          if @podspec
+            path = Pathname(@podspec)
+            raise Informative, "Couldn't find #{@podspec}" unless path.exist?
+            [path]
+          else
+            files = Pathname.glob('*.podspec{,.json}')
+            raise Informative, "Couldn't find any podspec files in current directory" if files.empty?
+            files
+          end
+        end
+
+        # @return [Pathname] The directory of the repository.
+        #
+        def repo_dir
+          specs_dir = Pathname.new(File.join(config.repos_dir, @repo, 'Specs'))
+          dir = config.repos_dir + @repo
+          if specs_dir.exist?
+            dir = specs_dir
+          elsif dir.exist?
+            dir
+          else
+            raise Informative, "`#{@repo}` repo not found either in #{specs_dir} or #{dir}"
+          end
+          dir
+        end
+      end
+
       extend Executable
       executable :svn
 

data/lib/repo_svn_ext/version.rb

@@ -1,3 +1,3 @@
 module RepoSvnExt
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

data/lib/svn_source.rb

@@ -0,0 +1,18 @@
+module Pod
+  # Subclass of Pod::Source to provide support for SVN Specs repositories
+  #
+  class SvnSource < Source
+    # @return [String] The remote URL of the repository
+    #
+    attr_accessor :url
+
+    # @param [String] repo The name of the repository (aka. directory name)
+    #
+    # @param [String] url see {#url}
+    #
+    def initialize(repo, url)
+      super(repo)
+      @url = url
+    end
+  end
+end

data/spec/command/repo-svn/add_spec.rb

@@ -1,7 +1,12 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
+# https://github.com/clarkda/CocoaPods/blob/master/spec/functional/command/repo/add_spec.rb
+
 module Pod
   describe Command::RepoSvn::Add do
+    extend SpecHelper::Command
+    extend SpecHelper::TemporaryRepos
+
     it 'returns the proper command class' do
       Command.parse(%w( repo-svn add )).should.be.instance_of Command::RepoSvn::Add
     end
@@ -10,5 +15,11 @@ module Pod
       command = Command.parse(%w( repo-svn add ))
       lambda { command.validate! }.should.raise CLAide::InformativeError
     end
+
+    it 'adds a svn spec repo' do
+      set_up_test_repo
+      puts tmp_svn_path
+      run_command('repo-svn', 'add', 'private', tmp_svn_path)
+    end
   end
-end
+end

data/spec/command/repo-svn/update_spec.rb

@@ -12,8 +12,8 @@ module Pod
       lambda { command.validate! }.should.raise CLAide::InformativeError
     end
 
-    it 'updates a repository' do
-      #
-    end
+    # it 'updates a repository' do
+    #   #
+    # end
   end
-end
+end

data/spec/spec_helper.rb

@@ -4,12 +4,15 @@ $LOAD_PATH.unshift((ROOT + 'spec').to_s)
 
 require 'bundler/setup'
 require 'bacon'
+require 'fileutils'
 require 'mocha-on-bacon'
 require 'pretty_bacon'
 require 'cocoapods'
 
 require 'cocoapods_plugin'
 
+require 'spec_helper/command'
+require 'spec_helper/temporary_repos'
 #-----------------------------------------------------------------------------#
 
 module Pod

data/spec/spec_helper/command.rb

@@ -0,0 +1,30 @@
+
+# spec/spec_helper/command.rb
+
+module SpecHelper
+  module Command
+    def argv(*argv)
+      CLAide::ARGV.new(argv)
+    end
+
+    def command(*argv)
+      argv << '--no-ansi'
+      Pod::Command.parse(argv)
+    end
+
+    def run_command(*args)
+      Dir.chdir(SpecHelper.temporary_directory) do
+        Pod::UI.output = ''
+        # @todo Remove this once all cocoapods has
+        # been converted to use the UI.puts
+        # config_silent = config.silent?
+        # config.silent = false
+        cmd = command(*args)
+        cmd.validate!
+        cmd.run
+        # config.silent = config_silent
+        Pod::UI.output
+      end
+    end
+  end
+end

data/spec/spec_helper/temporary_repos.rb

@@ -0,0 +1,49 @@
+module SpecHelper
+  def self.tmp_repos_path
+    TemporaryRepos.tmp_repos_path
+  end
+
+  module TemporaryRepos
+    extend Pod::Executable
+    executable :svn
+
+    # ..
+
+    def make_svn_repo
+      return unless !File.directory?(tmp_svn_path)
+        `svnadmin create #{tmp_svn_path}`
+        `svn import #{tmp_repos_path} file://#{tmp_svn_path} -m "import"`
+    end
+
+    # ..
+
+    def set_up_test_repo()
+        tmp_repos_path.mkpath
+        origin = ROOT + 'spec/fixtures/spec-repos/test-repo/'
+        destination = tmp_repos_path
+        FileUtils.cp_r(origin, destination)
+        make_svn_repo
+    end
+
+    # ..
+
+    def tmp_repos_path
+      SpecHelper.temporary_directory + 'cocoapods/repos/master'
+    end
+
+    # ..
+
+    def tmp_svn_path
+      SpecHelper.temporary_directory + 'svn'
+    end
+
+    module_function :tmp_repos_path
+
+    def self.extended(base)
+      base.before do
+        tmp_repos_path.mkpath
+      end
+    end
+
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-repo-svn
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Dustin Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: CocoaPod plugin to add subversion support for spec repositories
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -55,6 +55,7 @@ files:
 - lib/pod/command/repo_svn.rb
 - lib/repo_svn_ext.rb
 - lib/repo_svn_ext/version.rb
+- lib/svn_source.rb
 - repo_svn_ext.gemspec
 - spec/command/repo-svn/add_spec.rb
 - spec/command/repo-svn/remove_spec.rb
@@ -65,7 +66,8 @@ files:
 - spec/fixtures/spec-repos/test-repo/JSONKit/999.999.999/JSONKit.podspec
 - spec/fixtures/spec-repos/test-repo/Pod+With+Plus+Signs/1.0/Pod+With+Plus+Signs.podspec
 - spec/spec_helper.rb
-- spec/spec_helper/svn.rb
+- spec/spec_helper/command.rb
+- spec/spec_helper/temporary_repos.rb
 homepage: https://github.com/clarkda/cocoapods-repo-svn
 licenses:
 - MIT
@@ -76,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Subversion support for spec repository
@@ -100,4 +102,6 @@ test_files:
 - spec/fixtures/spec-repos/test-repo/JSONKit/999.999.999/JSONKit.podspec
 - spec/fixtures/spec-repos/test-repo/Pod+With+Plus+Signs/1.0/Pod+With+Plus+Signs.podspec
 - spec/spec_helper.rb
-- spec/spec_helper/svn.rb
+- spec/spec_helper/command.rb
+- spec/spec_helper/temporary_repos.rb
+has_rdoc: 

data/spec/spec_helper/svn.rb

@@ -1,61 +0,0 @@
-
-#
-# https://github.com/CocoaPods/CocoaPods/blob/master/spec/spec_helper/temporary_repos.rb
-#
-
-module SpecHelper
-  def self.tmp_repos_path
-    TempSvnRepo.tmp_repos_path
-  end
-
-  module TempSvnRepo
-    extend Pod::Executable
-    executable :svn
-
-    #
-    # Copy test-repo to temp location and initialize local svn repository
-    #
-    def repo_make(name)
-      path = repo_path(name)
-      path.mkpath
-      Dir.chdir(path) do
-        `echo stuff`
-      end
-      path
-    end
-
-    #
-    # @return [Pathname] The path for the repo with the given name.
-    #
-    def repo_path(name)
-      tmp_repos_path + name
-    end
-
-    # Sets up a lightweight svn master repo in `tmp/cocoapods/repos/master` with the
-    # contents of `spec/fixtures/spec-repos/test_repo`.
-    #
-    def set_up_test_repo
-      # require 'fileutils'
-      # test_repo_path.mkpath
-      # origin = ROOT + 'spec/fixtures/spec-repos/test_repo/.'
-      # destination = tmp_repos_path + 'master'
-      # FileUtils.cp_r(origin, destination)
-      # repo_make('master')
-    end
-
-    #--------------------------------------#
-
-    def tmp_repos_path
-      SpecHelper.temporary_directory + 'cocoapods/repos'
-    end
-
-    module_function :tmp_repos_path
-
-    def self.extended(base)
-      base.before do
-        tmp_repos_path.mkpath
-      end
-    end
-
-  end
-end