cocoapods-repo-svn 0.1.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e737cc20730f3b6e981496b5da75b19bcefe33cf
-  data.tar.gz: 060584f6fd8baa274d79d5a111ba565f1a9f4c4f
+  metadata.gz: a0e85705bfb49fdd94c310abfbcb0ef1eff7656c
+  data.tar.gz: 119a76f6e3520135405ccfd6abca17f210788314
 SHA512:
-  metadata.gz: 20e02a1bd0e57d7231cd18b8e49867627dba274885d926fd4b64660dc1fa21bc5b5d3a2246dd594db3f6dafd2725ade66078638f797ba1d15a33ffab4f0be249
-  data.tar.gz: a152e53a25cc59a3d1dc6df8c5c8ff4dabcf4c298d5dd588bb9ad4c076dbc2eaedbc365bf29b40cf41986f2a4ebf29db3c9eaf3cc835913aa0b2de196cb240c1
+  metadata.gz: 1b22e0739d38dc173badfb7bddd038012fbfa22c36721a93268203c617d62bab0215ae7648cf2235117dfc18f34d9fe40c9e157c04cf722e7cffa01394ea0ff4
+  data.tar.gz: 6e5b77f1b76039e70cf8b3dc3dc64ababbe599d17eb534b2c265f1b678a4cc63ee23e6da4f07072f2b41d8727200eb9a17417359073c53042c2ac60ac117849f

data/Gemfile

@@ -6,4 +6,10 @@ group :development do
   gem 'cocoapods',      :git => 'https://github.com/CocoaPods/CocoaPods.git', :branch => 'master'
   gem 'cocoapods-core', :git => 'https://github.com/CocoaPods/Core.git', :branch => 'master'
   gem 'claide',         :git => 'https://github.com/CocoaPods/CLAide.git', :branch => 'master'
+
+  gem 'bacon'
+  gem 'mocha-on-bacon'
+  gem 'prettybacon'
+
+  gem 'rubocop'
 end

data/Rakefile

@@ -1,58 +1,60 @@
+
+#-----------------------------------------------------------------------#
 # Bootstrap
-#-----------------------------------------------------------------------------#
+#-----------------------------------------------------------------------#
 
+desc 'Initializes your working copy to run the specs'
 task :bootstrap do
   if system('which bundle')
+    title 'Installing gems'
     sh 'bundle install'
   else
     $stderr.puts "\033[0;31m" \
       "[!] Please install the bundler gem manually:\n" \
-      '    $ [sudo] gem install bundler' \
-      "\e[0m"
+      '    $ [sudo] gem install bundler'
+    "\e[0m"
     exit 1
   end
 end
 
 begin
-
   require 'bundler/gem_tasks'
+  task :default => :spec
 
-  task :default => 'spec'
-
-  # Spec
-  #-----------------------------------------------------------------------------#
+  #-----------------------------------------------------------------------#
+  # Specs
+  #-----------------------------------------------------------------------#
 
   desc 'Runs all the specs'
   task :spec do
-    start_time = Time.now
-    sh "bundle exec bacon #{specs('**')}"
-    duration = Time.now - start_time
-    puts "Tests completed in #{duration}s"
-    Rake::Task['rubocop'].invoke
-  end
+    title 'Running Unit Tests'
+    files = FileList['spec/**/*_spec.rb'].shuffle.join(' ')
+    sh "bundle exec bacon #{files}"
 
-  def specs(dir)
-    FileList["spec/#{dir}/*_spec.rb"].shuffle.join(' ')
+    #title 'Checking code style...'
+    #Rake::Task['rubocop'].invoke if RUBY_VERSION >= '1.9.3'
   end
 
+  #-----------------------------------------------------------------------#
   # Rubocop
-  #-----------------------------------------------------------------------------#
-
-  desc 'Checks code style'
-  task :rubocop do
-    if RUBY_VERSION >= '1.9.3'
-      require 'rubocop'
-      cli = RuboCop::CLI.new
-      result = cli.run(FileList['{spec,lib}/**/*.rb'])
-      abort('RuboCop failed!') unless result == 0
-    else
-      puts '[!] Ruby > 1.9 is required to run style checks'
-    end
+  #-----------------------------------------------------------------------#
+
+  if RUBY_VERSION >= '1.9.3'
+    require 'rubocop/rake_task'
+    RuboCop::RakeTask.new
   end
 
-rescue LoadError
-  $stderr.puts "\033[0;31m" \
-    '[!] Some Rake tasks haven been disabled because the environment' \
-    ' couldn’t be loaded. Be sure to run `rake bootstrap` first.' \
-    "\e[0m"
+end
+
+#-----------------------------------------------------------------------#
+# Helpers
+#-----------------------------------------------------------------------#
+
+def title(title)
+  cyan_title = "\033[0;36m#{title}\033[0m"
+  puts
+  puts '-' * 80
+  puts cyan_title
+  puts '-' * 80
+  puts
 end

data/lib/pod/command/repo_svn.rb

@@ -16,8 +16,8 @@ module Pod
         DESC
 
         self.arguments = [
-            CLAide::Argument.new('URL', true),
-            CLAide::Argument.new('NAME', true)
+            CLAide::Argument.new('NAME', true),
+            CLAide::Argument.new('URL', true)
         ]
 
         def initialize(argv)
@@ -94,23 +94,54 @@ module Pod
         #
         def update(source_name = nil, show_output = false)
           if source_name
-            specified_source = SourcesManager.aggregate.all.find { |s| s.name == source_name }
-            raise Informative, "Unable to find the `#{source_name}` spec-repo."    unless specified_source
-            raise Informative, "The `#{source_name}` repo is not a svn spec-repo." unless svn_repo?(specified_source.data_provider.repo)
-            sources = [specified_source]
+            sources = [svn_source_named(source_name)]
+          else
+            sources =  svn_sources
           end
 
           sources.each do |source|
-            UI.section "Updating spec-repo `#{source.name}`" do
-              Dir.chdir(source.data_provider.repo) do
-                output = svn!('up --non-interactive --trust-server-cert')
-                UI.puts output if show_output && !config.verbose?
+            UI.section "Updating spec repo `#{source.name}`" do
+              Dir.chdir(source.repo) do
+                begin
+                  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 ' \
+                  "`#{source.name}` repo. If this is an unexpected issue " \
+                  'and persists you can inspect it running ' \
+                  '`pod repo-svn update --verbose`'
+                end
               end
-              SourcesManager.check_version_information(source.data_provider.repo) #todo: test me
+              SourcesManager.check_version_information(source.repo)
             end
           end
         end
 
+        # @return [Source] The svn source with the given name. If no svn source
+        #         with given name is found it raises.
+        #
+        # @param  [String] name
+        #         The name of the source.
+        #
+        def svn_source_named(name)
+          specified_source = SourcesManager.aggregate.sources.find { |s| s.name == name }
+          unless specified_source
+            raise Informative, "Unable to find the `#{name}` repo."
+          end
+          unless svn_repo?(specified_source.repo)
+            raise Informative, "The `#{name}` repo is not a svn repo."
+          end
+          specified_source
+        end
+
+        # @return [Source] The list of the svn sources.
+        #
+        def svn_sources
+          SourcesManager.all.select do |source|
+            svn_repo?(source.repo)
+          end
+        end
+
         # Returns whether a source is a SVN repo.
         #
         # @param  [Pathname] dir

data/lib/repo_svn_ext/version.rb

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

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

@@ -0,0 +1,14 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+module Pod
+  describe Command::RepoSvn::Add do
+    it 'returns the proper command class' do
+      Command.parse(%w( repo-svn add )).should.be.instance_of Command::RepoSvn::Add
+    end
+
+    it 'fails without a repository url or name' do
+      command = Command.parse(%w( repo-svn add ))
+      lambda { command.validate! }.should.raise CLAide::InformativeError
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+module Pod
+  describe Command::RepoSvn::Remove do
+      it 'returns the proper command class' do
+        Command.parse(%w( repo-svn remove )).should.be.instance_of Command::RepoSvn::Remove
+      end
+
+      it 'fails without a repository name' do
+        command = Command.parse(%w( repo-svn remove ))
+        lambda { command.validate! }.should.raise CLAide::InformativeError
+      end
+  end
+end

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

@@ -0,0 +1,19 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+include CLAide::InformativeError
+
+module Pod
+  describe Command::RepoSvn::Update do
+    it 'returns the proper command class' do
+      Command.parse(%w( repo-svn update )).should.be.instance_of Command::RepoSvn::Update
+    end
+
+    it 'fails without a repository name' do
+      command = Command.parse(%w( repo-svn update ))
+      lambda { command.validate! }.should.raise CLAide::InformativeError
+    end
+
+    it 'updates a repository' do
+      #
+    end
+  end
+end

data/spec/command/repo-svn_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Pod
+  describe Command::RepoSvn do
+    it 'registers itself' do
+      Command.parse(%w(repo-svn)).should.be.instance_of Command::RepoSvn
+    end
+  end
+end

data/spec/fixtures/spec-repos/test-repo/BananaLib/1.0/BananaLib.podspec

@@ -0,0 +1,21 @@
+Pod::Spec.new do |s|
+  s.name         = 'BananaLib'
+  s.version      = '1.0'
+  s.authors      = 'Banana Corp', { 'Monkey Boy' => 'monkey@banana-corp.local' }
+  s.homepage     = 'http://banana-corp.local/banana-lib.html'
+  s.summary      = 'Chunky bananas!'
+  s.description  = 'Full of chunky bananas.'
+  s.platform     = :ios
+
+  s.source       = { :git => 'http://banana-corp.local/banana-lib.git', :tag => 'v1.0' }
+  s.source_files = 'Classes/*.{h,m}', 'Vendor'
+  s.xcconfig     = { 'OTHER_LDFLAGS' => '-framework SystemConfiguration' }
+  s.prefix_header_file = 'Classes/BananaLib.pch'
+  s.resources    = "Resources/*.png"
+  s.dependency   'monkey', '~> 1.0.1', '< 1.0.9'
+  s.license      = {
+    :type => 'MIT',
+    :file => 'LICENSE',
+    :text => 'Permission is hereby granted ...'
+  }
+end

data/spec/fixtures/spec-repos/test-repo/JSONKit/1.4/JSONKit.podspec

@@ -0,0 +1,11 @@
+Pod::Spec.new do |s|
+  s.name     = 'JSONKit'
+  s.version  = '1.4'
+  s.license  = 'BSD / Apache License, Version 2.0'
+  s.summary  = 'A Very High Performance Objective-C JSON Library.'
+  s.homepage = 'https://github.com/johnezang/JSONKit'
+  s.author   = 'John Engelhart'
+  s.source   = { :git => 'https://github.com/johnezang/JSONKit.git', :tag => 'v1.4' }
+
+  s.source_files = 'JSONKit.*'
+end

data/spec/fixtures/spec-repos/test-repo/JSONKit/999.999.999/JSONKit.podspec

@@ -0,0 +1,12 @@
+Pod::Spec.new do |s|
+  s.name     = 'JSONKit'
+  s.version  = '999.999.999'
+  s.license  = 'BSD / Apache License, Version 2.0'
+  s.summary  = 'A Very High Performance Objective-C JSON Library.'
+  s.homepage = 'https://github.com/johnezang/JSONKit'
+  s.author   = 'John Engelhart'
+  s.source   = { :git => 'https://github.com/johnezang/JSONKit.git', :commit => '0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce' }
+
+  s.source_files   = 'JSONKit.*'
+  s.compiler_flags = '-Wno-deprecated-objc-isa-usage', '-Wno-format'
+end

data/spec/fixtures/spec-repos/test-repo/Pod+With+Plus+Signs/1.0/Pod+With+Plus+Signs.podspec

@@ -0,0 +1,17 @@
+Pod::Spec.new do |s|
+  s.name         = 'Pod+With+Plus+Signs'
+  s.version      = '1.0'
+  s.authors      = 'Evil Corp'
+  s.homepage     = 'http://evil-corp.local/pod_with_plus_signs.html'
+  s.summary      = 'Messing with special chars'
+  s.description  = 'I love messing up with special chars in my pod name! Mouahahahahaa (evil laugh)'
+  s.platform     = :ios
+
+  s.source       = { :git => 'http://evil-corp.local/pod_with_plus_signs.git', :tag => '1.0' }
+  s.source_files = 'Classes/*.{h,m}'
+  s.license      = {
+    :type => 'MIT',
+    :file => 'LICENSE',
+    :text => 'Permission is hereby granted ...'
+  }
+end

data/spec/spec_helper.rb

@@ -0,0 +1,53 @@
+ROOT = Pathname.new(File.expand_path('../../', __FILE__))
+$LOAD_PATH.unshift((ROOT + 'lib').to_s)
+$LOAD_PATH.unshift((ROOT + 'spec').to_s)
+
+require 'bundler/setup'
+require 'bacon'
+require 'mocha-on-bacon'
+require 'pretty_bacon'
+require 'cocoapods'
+
+require 'cocoapods_plugin'
+
+#-----------------------------------------------------------------------------#
+
+module Pod
+  # Disable the wrapping so the output is deterministic in the tests.
+  #
+  UI.disable_wrap = true
+
+  # Redirects the messages to an internal store.
+  #
+  module UI
+    @output = ''
+    @warnings = ''
+
+    class << self
+      attr_accessor :output
+      attr_accessor :warnings
+
+      def puts(message = '')
+        @output << "#{message}\n"
+      end
+
+      def warn(message = '', _actions = [])
+        @warnings << "#{message}\n"
+      end
+
+      def print(message)
+        @output << message
+      end
+    end
+  end
+end
+
+#-----------------------------------------------------------------------------#
+
+module SpecHelper
+  def self.temporary_directory
+    ROOT + 'tmp'
+  end
+end
+
+#-----------------------------------------------------------------------------#

data/spec/spec_helper/svn.rb

@@ -0,0 +1,61 @@
+
+#
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-repo-svn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Dustin Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,16 @@ files:
 - lib/repo_svn_ext.rb
 - lib/repo_svn_ext/version.rb
 - repo_svn_ext.gemspec
+- spec/command/repo-svn/add_spec.rb
+- spec/command/repo-svn/remove_spec.rb
+- spec/command/repo-svn/update_spec.rb
+- spec/command/repo-svn_spec.rb
+- spec/fixtures/spec-repos/test-repo/BananaLib/1.0/BananaLib.podspec
+- spec/fixtures/spec-repos/test-repo/JSONKit/1.4/JSONKit.podspec
+- 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
 homepage: https://github.com/clarkda/cocoapods-repo-svn
 licenses:
 - MIT
@@ -76,8 +86,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Subversion support for spec repository
-test_files: []
+test_files:
+- spec/command/repo-svn/add_spec.rb
+- spec/command/repo-svn/remove_spec.rb
+- spec/command/repo-svn/update_spec.rb
+- spec/command/repo-svn_spec.rb
+- spec/fixtures/spec-repos/test-repo/BananaLib/1.0/BananaLib.podspec
+- spec/fixtures/spec-repos/test-repo/JSONKit/1.4/JSONKit.podspec
+- 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