cocoapods 1.0.0 → 1.1.0

data/lib/cocoapods/command/lib/create.rb

@@ -0,0 +1,105 @@
+module Pod
+  class Command
+    class Lib < Command
+      class Create < Lib
+        self.summary = 'Creates a new Pod'
+
+        self.description = <<-DESC
+          Creates a scaffold for the development of a new Pod named `NAME`
+          according to the CocoaPods best practices.
+          If a `TEMPLATE_URL`, pointing to a git repo containing a compatible
+          template, is specified, it will be used in place of the default one.
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('NAME', true),
+        ]
+
+        def self.options
+          [
+            ['--template-url=URL', 'The URL of the git repo containing a ' \
+                                  'compatible template'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @template_url = argv.option('template-url', TEMPLATE_REPO)
+          super
+          @additional_args = argv.remainder!
+        end
+
+        def validate!
+          super
+          help! 'A name for the Pod is required.' unless @name
+          help! 'The Pod name cannot contain spaces.' if @name =~ /\s/
+          help! 'The Pod name cannot contain plusses.' if @name =~ /\+/
+          help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
+        end
+
+        def run
+          clone_template
+          configure_template
+          print_info
+        end
+
+        private
+
+        #----------------------------------------#
+
+        # !@group Private helpers
+
+        extend Executable
+        executable :git
+
+        TEMPLATE_REPO = 'https://github.com/CocoaPods/pod-template.git'.freeze
+        TEMPLATE_INFO_URL = 'https://github.com/CocoaPods/pod-template'.freeze
+        CREATE_NEW_POD_INFO_URL = 'http://guides.cocoapods.org/making/making-a-cocoapod'.freeze
+
+        # Clones the template from the remote in the working directory using
+        # the name of the Pod.
+        #
+        # @return [void]
+        #
+        def clone_template
+          UI.section("Cloning `#{template_repo_url}` into `#{@name}`.") do
+            git! ['clone', template_repo_url, @name]
+          end
+        end
+
+        # Runs the template configuration utilities.
+        #
+        # @return [void]
+        #
+        def configure_template
+          UI.section("Configuring #{@name} template.") do
+            Dir.chdir(@name) do
+              if File.exist?('configure')
+                system({ 'COCOAPODS_VERSION' => Pod::VERSION }, './configure', @name, *@additional_args)
+              else
+                UI.warn 'Template does not have a configure file.'
+              end
+            end
+          end
+        end
+
+        # Runs the template configuration utilities.
+        #
+        # @return [void]
+        #
+        def print_info
+          UI.puts "\nTo learn more about the template see `#{template_repo_url}`."
+          UI.puts "To learn more about creating a new pod, see `#{CREATE_NEW_POD_INFO_URL}`."
+        end
+
+        # Checks if a template URL is given else returns the TEMPLATE_REPO URL
+        #
+        # @return String
+        #
+        def template_repo_url
+          @template_url || TEMPLATE_REPO
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/lib/lint.rb

@@ -0,0 +1,111 @@
+module Pod
+  class Command
+    class Lib < Command
+      class Lint < Lib
+        self.summary = 'Validates a Pod'
+
+        self.description = <<-DESC
+          Validates the Pod using the files in the working directory.
+        DESC
+
+        def self.options
+          [
+            ['--quick', 'Lint skips checks that would require to download and build the spec'],
+            ['--allow-warnings', 'Lint validates even if warnings are present'],
+            ['--subspec=NAME', 'Lint validates only the given subspec'],
+            ['--no-subspecs', 'Lint skips validation of subspecs'],
+            ['--no-clean', 'Lint leaves the build directory intact for inspection'],
+            ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
+            ['--use-libraries', 'Lint uses static libraries to install the spec'],
+            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
+             '(defaults to https://github.com/CocoaPods/Specs.git). ' \
+             'Multiple sources must be comma-delimited.'],
+            ['--private', 'Lint skips checks that apply only to public specs'],
+            ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
+             'This takes precedence over a .swift-version file.'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @quick           = argv.flag?('quick')
+          @allow_warnings  = argv.flag?('allow-warnings')
+          @clean           = argv.flag?('clean', true)
+          @fail_fast       = argv.flag?('fail-fast', false)
+          @subspecs        = argv.flag?('subspecs', true)
+          @only_subspec    = argv.option('subspec')
+          @use_frameworks  = !argv.flag?('use-libraries')
+          @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
+          @private         = argv.flag?('private', false)
+          @swift_version   = argv.option('swift-version', nil)
+          @podspecs_paths  = argv.arguments!
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          UI.puts
+          podspecs_to_lint.each do |podspec|
+            validator                = Validator.new(podspec, @source_urls)
+            validator.local          = true
+            validator.quick          = @quick
+            validator.no_clean       = !@clean
+            validator.fail_fast      = @fail_fast
+            validator.allow_warnings = @allow_warnings
+            validator.no_subspecs    = !@subspecs || @only_subspec
+            validator.only_subspec   = @only_subspec
+            validator.use_frameworks = @use_frameworks
+            validator.ignore_public_only_results = @private
+            validator.swift_version = @swift_version
+            validator.validate
+
+            unless @clean
+              UI.puts "Pods workspace available at `#{validator.validation_dir}/App.xcworkspace` for inspection."
+              UI.puts
+            end
+            if validator.validated?
+              UI.puts "#{validator.spec.name} passed validation.".green
+            else
+              spec_name = podspec
+              spec_name = validator.spec.name if validator.spec
+              message = "#{spec_name} did not pass validation, due to #{validator.failure_reason}."
+
+              if @clean
+                message << "\nYou can use the `--no-clean` option to inspect " \
+                  'any issue.'
+              end
+              raise Informative, message
+            end
+          end
+        end
+
+        private
+
+        #----------------------------------------#
+
+        # !@group Private helpers
+
+        # @return [Pathname] The path of the podspec found in the current
+        #         working directory.
+        #
+        # @raise  If no podspec is found.
+        # @raise  If multiple podspecs are found.
+        #
+        def podspecs_to_lint
+          if !@podspecs_paths.empty?
+            Array(@podspecs_paths)
+          else
+            podspecs = Pathname.glob(Pathname.pwd + '*.podspec{.json,}')
+            if podspecs.count.zero?
+              raise Informative, 'Unable to find a podspec in the working ' \
+                'directory'
+            end
+            podspecs
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/command/lib.rb

@@ -1,215 +1,11 @@
+require 'cocoapods/command/lib/create'
+require 'cocoapods/command/lib/lint'
+
 module Pod
   class Command
     class Lib < Command
       self.abstract_command = true
       self.summary = 'Develop pods'
-
-      #-----------------------------------------------------------------------#
-
-      class Create < Lib
-        self.summary = 'Creates a new Pod'
-
-        self.description = <<-DESC
-          Creates a scaffold for the development of a new Pod named `NAME`
-          according to the CocoaPods best practices.
-          If a `TEMPLATE_URL`, pointing to a git repo containing a compatible
-          template, is specified, it will be used in place of the default one.
-        DESC
-
-        self.arguments = [
-          CLAide::Argument.new('NAME', true),
-        ]
-
-        def self.options
-          [
-            ['--template-url=URL', 'The URL of the git repo containing a ' \
-                                  'compatible template'],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @name = argv.shift_argument
-          @template_url = argv.option('template-url', TEMPLATE_REPO)
-          super
-          @additional_args = argv.remainder!
-        end
-
-        def validate!
-          super
-          help! 'A name for the Pod is required.' unless @name
-          help! 'The Pod name cannot contain spaces.' if @name =~ /\s/
-          help! "The Pod name cannot begin with a '.'" if @name[0, 1] == '.'
-        end
-
-        def run
-          clone_template
-          configure_template
-          print_info
-        end
-
-        private
-
-        #----------------------------------------#
-
-        # !@group Private helpers
-
-        extend Executable
-        executable :git
-
-        TEMPLATE_REPO = 'https://github.com/CocoaPods/pod-template.git'
-        TEMPLATE_INFO_URL = 'https://github.com/CocoaPods/pod-template'
-        CREATE_NEW_POD_INFO_URL = 'http://guides.cocoapods.org/making/making-a-cocoapod'
-
-        # Clones the template from the remote in the working directory using
-        # the name of the Pod.
-        #
-        # @return [void]
-        #
-        def clone_template
-          UI.section("Cloning `#{template_repo_url}` into `#{@name}`.") do
-            git! ['clone', template_repo_url, @name]
-          end
-        end
-
-        # Runs the template configuration utilities.
-        #
-        # @return [void]
-        #
-        def configure_template
-          UI.section("Configuring #{@name} template.") do
-            Dir.chdir(@name) do
-              if File.exist?('configure')
-                system('./configure', @name, *@additional_args)
-              else
-                UI.warn 'Template does not have a configure file.'
-              end
-            end
-          end
-        end
-
-        # Runs the template configuration utilities.
-        #
-        # @return [void]
-        #
-        def print_info
-          UI.puts "\nTo learn more about the template see `#{template_repo_url}`."
-          UI.puts "To learn more about creating a new pod, see `#{CREATE_NEW_POD_INFO_URL}`."
-        end
-
-        # Checks if a template URL is given else returns the TEMPLATE_REPO URL
-        #
-        # @return String
-        #
-        def template_repo_url
-          @template_url || TEMPLATE_REPO
-        end
-      end
-
-      #-----------------------------------------------------------------------#
-
-      class Lint < Lib
-        self.summary = 'Validates a Pod'
-
-        self.description = <<-DESC
-          Validates the Pod using the files in the working directory.
-        DESC
-
-        def self.options
-          [
-            ['--quick', 'Lint skips checks that would require to download and build the spec'],
-            ['--allow-warnings', 'Lint validates even if warnings are present'],
-            ['--subspec=NAME', 'Lint validates only the given subspec'],
-            ['--no-subspecs', 'Lint skips validation of subspecs'],
-            ['--no-clean', 'Lint leaves the build directory intact for inspection'],
-            ['--fail-fast', 'Lint stops on the first failing platform or subspec'],
-            ['--use-libraries', 'Lint uses static libraries to install the spec'],
-            ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to pull dependent pods ' \
-             '(defaults to https://github.com/CocoaPods/Specs.git). ' \
-             'Multiple sources must be comma-delimited.'],
-            ['--private', 'Lint skips checks that apply only to public specs'],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @quick           = argv.flag?('quick')
-          @allow_warnings  = argv.flag?('allow-warnings')
-          @clean           = argv.flag?('clean', true)
-          @fail_fast       = argv.flag?('fail-fast', false)
-          @subspecs        = argv.flag?('subspecs', true)
-          @only_subspec    = argv.option('subspec')
-          @use_frameworks  = !argv.flag?('use-libraries')
-          @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
-          @private         = argv.flag?('private', false)
-          @podspecs_paths  = argv.arguments!
-          super
-        end
-
-        def validate!
-          super
-        end
-
-        def run
-          UI.puts
-          podspecs_to_lint.each do |podspec|
-            validator                = Validator.new(podspec, @source_urls)
-            validator.local          = true
-            validator.quick          = @quick
-            validator.no_clean       = !@clean
-            validator.fail_fast      = @fail_fast
-            validator.allow_warnings = @allow_warnings
-            validator.no_subspecs    = !@subspecs || @only_subspec
-            validator.only_subspec   = @only_subspec
-            validator.use_frameworks = @use_frameworks
-            validator.ignore_public_only_results = @private
-            validator.validate
-
-            unless @clean
-              UI.puts "Pods workspace available at `#{validator.validation_dir}/App.xcworkspace` for inspection."
-              UI.puts
-            end
-            if validator.validated?
-              UI.puts "#{validator.spec.name} passed validation.".green
-            else
-              spec_name = podspec
-              spec_name = validator.spec.name if validator.spec
-              message = "#{spec_name} did not pass validation, due to #{validator.failure_reason}."
-
-              if @clean
-                message << "\nYou can use the `--no-clean` option to inspect " \
-                  'any issue.'
-              end
-              raise Informative, message
-            end
-          end
-        end
-
-        private
-
-        #----------------------------------------#
-
-        # !@group Private helpers
-
-        # @return [Pathname] The path of the podspec found in the current
-        #         working directory.
-        #
-        # @raise  If no podspec is found.
-        # @raise  If multiple podspecs are found.
-        #
-        def podspecs_to_lint
-          if !@podspecs_paths.empty?
-            Array(@podspecs_paths)
-          else
-            podspecs = Pathname.glob(Pathname.pwd + '*.podspec{.json,}')
-            if podspecs.count.zero?
-              raise Informative, 'Unable to find a podspec in the working ' \
-                'directory'
-            end
-            podspecs
-          end
-        end
-      end
-
-      #-----------------------------------------------------------------------#
     end
   end
 end

data/lib/cocoapods/command/repo/push.rb

@@ -31,6 +31,7 @@ module Pod
             ['--no-private', 'Lint includes checks that apply only to public repos'],
             ['--commit-message="Fix bug in pod"', 'Add custom commit message. ' \
             'Opens default editor if no commit message is specified.'],
+            ['--use-json', 'Push JSON spec to repo'],
           ].concat(super)
         end
 
@@ -38,25 +39,25 @@ module Pod
           @allow_warnings = argv.flag?('allow-warnings')
           @local_only = argv.flag?('local-only')
           @repo = argv.shift_argument
-          @source = config.sources_manager.sources([@repo]).first unless @repo.nil?
+          @source = source_for_repo
           @source_urls = argv.option('sources', config.sources_manager.all.map(&:url).join(',')).split(',')
           @podspec = argv.shift_argument
           @use_frameworks = !argv.flag?('use-libraries')
           @private = argv.flag?('private', true)
           @message = argv.option('commit-message')
           @commit_message = argv.flag?('commit-message', false)
+          @use_json = argv.flag?('use-json')
           super
         end
 
         def validate!
-          help! 'A spec-repo name is required.' unless @repo
-          unless @source.repo.directory?
+          super
+          help! 'A spec-repo name or url is required.' unless @repo
+          unless @source && @source.repo.directory?
             raise Informative,
                   "Unable to find the `#{@repo}` repo. " \
                   'If it has not yet been cloned, add it via `pod repo add`.'
           end
-
-          super
         end
 
         def run
@@ -95,7 +96,7 @@ module Pod
         # specs to the master repo.
         #
         def check_if_master_repo
-          remotes = Dir.chdir(repo_dir) { `git remote -v 2>&1` }
+          remotes = `git -C "#{repo_dir}" remote -v 2>&1`
           master_repo_urls = [
             'git@github.com:CocoaPods/Specs.git',
             'https://github.com/CocoaPods/Specs.git',
@@ -144,7 +145,7 @@ module Pod
         # @return [void]
         #
         def check_repo_status
-          clean = Dir.chdir(repo_dir) { `git status --porcelain  2>&1` } == ''
+          clean = `git -C "#{repo_dir}" status --porcelain  2>&1` == ''
           raise Informative, "The repo `#{@repo}` at #{UI.path repo_dir} is not clean" unless clean
         end
 
@@ -154,7 +155,7 @@ module Pod
         #
         def update_repo
           UI.puts "Updating the `#{@repo}' repo\n".yellow
-          Dir.chdir(repo_dir) { UI.puts `git pull 2>&1` }
+          UI.puts `git -C "#{repo_dir}" pull 2>&1`
         end
 
         # Commits the podspecs to the source, which should be a git repo.
@@ -178,18 +179,23 @@ module Pod
             else
               message = "[Add] #{spec}"
             end
-
             FileUtils.mkdir_p(output_path)
-            FileUtils.cp(spec_file, output_path)
-            Dir.chdir(repo_dir) do
-              # only commit if modified
-              if git!('status', '--porcelain').include?(spec.name)
-                UI.puts " - #{message}"
-                git!('add', spec.name)
-                git!('commit', '--no-verify', '-m', message)
-              else
-                UI.puts " - [No change] #{spec}"
-              end
+
+            if @use_json
+              json_file_name = "#{spec.name}.podspec.json"
+              json_file = File.join(output_path, json_file_name)
+              File.open(json_file, 'w') { |file| file.write(spec.to_pretty_json) }
+            else
+              FileUtils.cp(spec_file, output_path)
+            end
+
+            # only commit if modified
+            if repo_git('status', '--porcelain').include?(spec.name)
+              UI.puts " - #{message}"
+              repo_git('add', spec.name)
+              repo_git('commit', '--no-verify', '-m', message)
+            else
+              UI.puts " - [No change] #{spec}"
             end
           end
         end
@@ -200,7 +206,7 @@ module Pod
         #
         def push_repo
           UI.puts "\nPushing the `#{@repo}' repo\n".yellow
-          Dir.chdir(repo_dir) { UI.puts `git push origin master 2>&1` }
+          UI.puts `git -C "#{repo_dir}" push origin master 2>&1`
         end
 
         #---------------------------------------------------------------------#
@@ -209,6 +215,12 @@ module Pod
 
         # @!group Private helpers
 
+        # @return result of calling the git! with args in repo_dir
+        #
+        def repo_git(*args)
+          git!(['-C', repo_dir] + args)
+        end
+
         # @return [Pathname] The directory of the repository.
         #
         def repo_dir
@@ -235,6 +247,18 @@ module Pod
           podspec_files.count
         end
 
+        # Returns source for @repo
+        #
+        # @note If URL is invalid or repo doesn't exist, validate! will throw the error
+        #
+        # @return [Source]
+        #
+        def source_for_repo
+          config.sources_manager.source_with_name_or_url(@repo) unless @repo.nil?
+        rescue
+          nil
+        end
+
         #---------------------------------------------------------------------#
       end
     end

data/lib/cocoapods/command/setup.rb

@@ -59,7 +59,8 @@ module Pod
       # @return [void]
       #
       def update_master_repo
-        config.sources_manager.update('master', true)
+        show_output = !config.silent?
+        config.sources_manager.update('master', show_output)
       end
 
       # Sets the repo to the master branch.

data/lib/cocoapods/command/spec/lint.rb

@@ -27,6 +27,8 @@ module Pod
              '(defaults to https://github.com/CocoaPods/Specs.git). ' \
              'Multiple sources must be comma-delimited.'],
             ['--private', 'Lint skips checks that apply only to public specs'],
+            ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
+             'This takes precedence over a .swift-version file.'],
           ].concat(super)
         end
 
@@ -40,6 +42,7 @@ module Pod
           @use_frameworks  = !argv.flag?('use-libraries')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @private         = argv.flag?('private', false)
+          @swift_version   = argv.option('swift-version', nil)
           @podspecs_paths  = argv.arguments!
           super
         end
@@ -57,6 +60,7 @@ module Pod
             validator.only_subspec   = @only_subspec
             validator.use_frameworks = @use_frameworks
             validator.ignore_public_only_results = @private
+            validator.swift_version = @swift_version
             validator.validate
             failure_reasons << validator.failure_reason
 

data/lib/cocoapods/command.rb

@@ -22,7 +22,7 @@ module Pod
     require 'cocoapods/command/env'
     require 'cocoapods/command/init'
     require 'cocoapods/command/install'
-    require 'cocoapods/command/inter_process_communication'
+    require 'cocoapods/command/ipc'
     require 'cocoapods/command/lib'
     require 'cocoapods/command/list'
     require 'cocoapods/command/outdated'
@@ -62,6 +62,7 @@ module Pod
       else
         if ENV['COCOA_PODS_ENV'] != 'development'
           puts UI::ErrorReport.report(exception)
+          UI::ErrorReport.search_for_exceptions(exception)
           exit 1
         else
           raise exception

data/lib/cocoapods/config.rb

@@ -1,3 +1,5 @@
+require 'active_support/multibyte/unicode'
+
 module Pod
   # Stores the global configuration of CocoaPods.
   #
@@ -145,7 +147,8 @@ module Pod
     #         Podfile is located.
     #
     def installation_root
-      current_path = Pathname.pwd
+      current_dir = ActiveSupport::Multibyte::Unicode.normalize(Dir.pwd)
+      current_path = Pathname.new(current_dir)
       unless @installation_root
         until current_path.root?
           if podfile_path_in_dir(current_path)

data/lib/cocoapods/downloader/cache.rb

@@ -124,6 +124,7 @@ module Pod
       def cached_pod(request)
         cached_spec = cached_spec(request)
         path = path_for_pod(request)
+
         return unless cached_spec && path.directory?
         spec = request.spec || cached_spec
         Response.new(path, spec, request.params)