cocoapods 0.39.0 → 1.0.0.beta.1

data/lib/cocoapods/command/init.rb

@@ -62,7 +62,7 @@ module Pod
           # use_frameworks!
         PLATFORM
 
-        project.targets.each do |target|
+        project.native_targets.each do |target|
           podfile << target_module(target)
         end
         podfile << "\n"

data/lib/cocoapods/command/lib.rb

@@ -164,7 +164,7 @@ module Pod
             validator.validate
 
             unless @clean
-              UI.puts "Pods project available at `#{validator.validation_dir}/Pods/Pods.xcodeproj` for inspection."
+              UI.puts "Pods workspace available at `#{validator.validation_dir}/App.xcworkspace` for inspection."
               UI.puts
             end
             if validator.validated?

data/lib/cocoapods/command/project.rb

@@ -39,8 +39,6 @@ module Pod
       module Options
         def options
           [
-            ['--no-clean',       'Leave SCM dirs like `.git` and `.svn` intact after downloading'],
-            ['--no-integrate',   'Skip integration of the Pods libraries in the Xcode project(s)'],
             ['--no-repo-update', 'Skip running `pod repo update` before install'],
           ].concat(super)
         end
@@ -51,8 +49,6 @@ module Pod
       end
 
       def initialize(argv)
-        config.clean = argv.flag?('clean', config.clean)
-        config.integrate_targets = argv.flag?('integrate', config.integrate_targets)
         config.skip_repo_update = !argv.flag?('repo-update', !config.skip_repo_update)
         super
       end

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

@@ -35,15 +35,16 @@ module Pod
         #
         def run
           if @name
-            dirs = File.exist?(@name) ? [Pathname.new(@name)] : [dir]
+            sources = SourcesManager.sources([@name])
           else
-            dirs = config.repos_dir.children.select(&:directory?)
+            sources = SourcesManager.aggregate.sources
           end
-          dirs.each do |dir|
-            SourcesManager.check_version_information(dir)
-            UI.puts "\nLinting spec repo `#{dir.realpath.basename}`\n".yellow
 
-            validator = Source::HealthReporter.new(dir)
+          sources.each do |source|
+            SourcesManager.check_version_information(source.repo)
+            UI.puts "\nLinting spec repo `#{source.repo.basename}`\n".yellow
+
+            validator = Source::HealthReporter.new(source.repo)
             validator.pre_check do |_name, _version|
               UI.print '.'
             end

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

@@ -1,3 +1,4 @@
+require 'tempfile'
 require 'fileutils'
 require 'active_support/core_ext/string/inflections'
 
@@ -28,6 +29,8 @@ module Pod
              'Multiple sources must be comma-delimited.'],
             ['--local-only', 'Does not perform the step of pushing REPO to its remote'],
             ['--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.'],
           ].concat(super)
         end
 
@@ -39,6 +42,8 @@ module Pod
           @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)
           super
         end
 
@@ -48,6 +53,7 @@ module Pod
         end
 
         def run
+          open_editor if @commit_message && @message.nil?
           check_if_master_repo
           validate_podspec_files
           check_repo_status
@@ -65,6 +71,19 @@ module Pod
         extend Executable
         executable :git
 
+        # Open default editor to allow users to enter commit message
+        #
+        def open_editor
+          return if ENV['EDITOR'].nil?
+
+          file = Tempfile.new('cocoapods')
+          File.chmod(0777, file.path)
+          file.close
+
+          system("#{ENV['EDITOR']} #{file.path}")
+          @message = File.read file.path
+        end
+
         # Temporary check to ensure that users do not push accidentally private
         # specs to the master repo.
         #
@@ -143,7 +162,9 @@ module Pod
           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?
+            if @message && !@message.empty?
+              message = @message
+            elsif Pathname.new(output_path).exist?
               message = "[Fix] #{spec}"
             elsif Pathname.new(File.join(repo_dir, spec.name)).exist?
               message = "[Update] #{spec}"

data/lib/cocoapods/command/setup.rb

@@ -34,8 +34,6 @@ module Pod
             set_master_repo_url
             set_master_repo_branch
             update_master_repo
-          elsif old_master_repo_dir.exist?
-            migrate_repos
           else
             add_master_repo
           end
@@ -48,22 +46,6 @@ module Pod
 
       # @!group Setup steps
 
-      # Migrates any repos from the old directory structure to the new
-      # directory structure.
-      #
-      # @todo: Remove by 1.0
-      #
-      def migrate_repos
-        config.repos_dir.mkpath
-        Dir.foreach old_master_repo_dir.parent do |repo_dir|
-          source_repo_dir = old_master_repo_dir.parent + repo_dir
-          target_repo_dir = config.repos_dir + repo_dir
-          if repo_dir !~ /\.+/ && source_repo_dir != config.repos_dir
-            FileUtils.mv source_repo_dir, target_repo_dir
-          end
-        end
-      end
-
       # Sets the url of the master repo according to whether it is push.
       #
       # @return [void]
@@ -127,12 +109,6 @@ module Pod
       def master_repo_dir
         SourcesManager.master_repo_dir
       end
-
-      # @return [Pathname] the directory of the old master repo.
-      #
-      def old_master_repo_dir
-        Pathname.new('~/.cocoapods/master').expand_path
-      end
     end
   end
 end

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

@@ -60,7 +60,7 @@ module Pod
           data[:author_email]  = `git config --get user.email`.strip
           data[:source_url]    = "http://EXAMPLE/#{name}.git"
           data[:ref_type]      = ':tag'
-          data[:ref]           = '0.0.1'
+          data[:ref]           = '#{s.version}'
           data
         end
 
@@ -100,6 +100,8 @@ module Pod
           else
             data[:ref_type] = ':tag'
             data[:ref]      = versions_tags[version]
+            data[:ref]      = '#{s.version}' if "#{version}" == versions_tags[version]
+            data[:ref]      = 'v#{s.version}' if "v#{version}" == versions_tags[version]
           end
           data
         end

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

@@ -48,32 +48,25 @@ module Pod
           raise Informative, "#{filepath} doesn't exist."
         end
 
-        # Looks up an executable in the search paths
-        #
-        # @note
-        # Thank you homebrew
-        #
-        # @param [String] cmd
-        #        the executable to look up
-        #
-        def which(cmd)
-          dir = ENV['PATH'].split(':').find { |p| File.executable? File.join(p, cmd) }
-          Pathname.new(File.join(dir, cmd)) unless dir.nil?
-        end
-
         def which_editor
           editor = ENV['EDITOR']
           # If an editor wasn't set, try to pick a sane default
           return editor unless editor.nil?
 
-          # Find Sublime Text 2
-          return 'subl' if which 'subl'
-          # Find Textmate
-          return 'mate' if which 'mate'
-          # Find # BBEdit / TextWrangler
-          return 'edit' if which 'edit'
-          # Default to vim
-          return 'vim' if which 'vim'
+          editors = [
+            # Find Sublime Text 2
+            'subl',
+            # Find Textmate
+            'mate',
+            # Find BBEdit / TextWrangler
+            'edit',
+            # Find Atom
+            'atom',
+            # Default to vim
+            'vim',
+          ]
+          editor = editors.find { |e| Pod::Executable.which(e) }
+          return editor if editor
 
           raise Informative, "Failed to open editor. Set your 'EDITOR' environment variable."
         end

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

@@ -0,0 +1,53 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Pod
+  describe Command::Env do
+    describe 'In general' do
+      before do
+        @report = Command::Env
+      end
+
+      it 'returns a well-structured environment report' do
+        expected = <<-EOS
+
+### Stack
+
+```
+   CocoaPods : #{Pod::VERSION}
+        Ruby : #{RUBY_DESCRIPTION}
+    RubyGems : #{Gem::VERSION}
+        Host : :host_information
+       Xcode : :xcode_information
+         Git : :git_information
+Ruby lib dir : #{RbConfig::CONFIG['libdir']}
+Repositories : repo_1
+               repo_2
+```
+
+### Installation Source
+
+```
+Executable Path: /usr/bin/command
+```
+
+### Plugins
+
+```
+cocoapods         : #{Pod::VERSION}
+cocoapods-core    : #{Pod::VERSION}
+cocoapods-plugins : 1.2.3
+```
+
+### Podfile
+
+```ruby
+
+```
+EOS
+
+        @report.stubs(:actual_path).returns('/usr/bin/command')
+        report.should == expected
+      end
+    end
+  end
+end

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

@@ -61,7 +61,7 @@ module Pod
             failure_reasons << validator.failure_reason
 
             unless @clean
-              UI.puts "Pods project available at `#{validator.validation_dir}/Pods/Pods.xcodeproj` for inspection."
+              UI.puts "Pods workspace available at `#{validator.validation_dir}/App.xcworkspace` for inspection."
               UI.puts
             end
           end

data/lib/cocoapods/config.rb

@@ -17,11 +17,6 @@ module Pod
       :skip_repo_update    => false,
       :skip_download_cache => !ENV['COCOAPODS_SKIP_CACHE'].nil?,
 
-      :clean               => true,
-      :integrate_targets   => true,
-      :deduplicate_targets => true,
-      :deterministic_uuids => ENV['COCOAPODS_DISABLE_DETERMINISTIC_UUIDS'].nil?,
-      :lock_pod_source     => true,
       :new_version_message => ENV['COCOAPODS_SKIP_UPDATE_MESSAGE'].nil?,
 
       :cache_root          => Pathname.new(Dir.home) + 'Library/Caches/CocoaPods',
@@ -74,34 +69,6 @@ module Pod
 
     # @!group Installation
 
-    # @return [Bool] Whether the installer should clean after the installation.
-    #
-    attr_accessor :clean
-    alias_method :clean?, :clean
-
-    # @return [Bool] Whether the installer should remove write permissions for
-    #                installed pod source files after the installation.
-    #
-    attr_accessor :lock_pod_source
-    alias_method :lock_pod_source?, :lock_pod_source
-
-    # @return [Bool] Whether CocoaPods should integrate a user target and build
-    #         the workspace or just create the Pods project.
-    #
-    attr_accessor :integrate_targets
-    alias_method :integrate_targets?, :integrate_targets
-
-    # @return [Bool] Whether CocoaPods should deduplicate pod targets.
-    #
-    attr_accessor :deduplicate_targets
-    alias_method :deduplicate_targets?, :deduplicate_targets
-
-    # @return [Bool] Whether CocoaPods should give the pods project
-    #                deterministic UUIDs.
-    #
-    attr_accessor :deterministic_uuids
-    alias_method :deterministic_uuids?, :deterministic_uuids
-
     # @return [Bool] Whether the installer should skip the repos update.
     #
     attr_accessor :skip_repo_update
@@ -274,7 +241,7 @@ module Pod
     # @return [Pathname] The file to use to cache the search data.
     #
     def search_index_file
-      cache_root + 'search_index.yaml'
+      cache_root + 'search_index.json'
     end
 
     private

data/lib/cocoapods/downloader.rb

@@ -20,16 +20,21 @@ module Pod
     #         the location to which this pod should be downloaded. If `nil`,
     #         then the pod will only be cached.
     #
+    # @param  [Boolean] can_cache
+    #         whether caching is allowed.
+    #
     # @param  [Pathname,Nil] cache_path
-    #         the path used to cache pod downloads. If `nil`, then no caching
-    #         will be done.
+    #         the path used to cache pod downloads.
     #
     def self.download(
       request,
       target,
-      cache_path: !Config.instance.skip_download_cache && Config.instance.clean? && Config.instance.cache_root + 'Pods'
+      can_cache: true,
+      cache_path: Config.instance.cache_root + 'Pods'
     )
-      if cache_path
+      can_cache &&= !Config.instance.skip_download_cache
+      if can_cache
+        raise ArgumentError, 'Must provide a `cache_path` when caching.' unless cache_path
         cache = Cache.new(cache_path)
         result = cache.download_pod(request)
       else

data/lib/cocoapods/external_sources.rb

@@ -46,10 +46,6 @@ module Pod
         PodspecSource
       elsif params.key?(:path)
         PathSource
-      elsif params.key?(:local)
-        UI.warn 'The `:local` option of the Podfile has been ' \
-          'renamed to `:path` and it is deprecated.'
-        PathSource
       elsif Downloader.strategy_from_options(params)
         DownloaderSource
       end

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -17,6 +17,11 @@ module Pod
       #
       attr_reader :podfile_path
 
+      # @return [Boolean] Whether the source is allowed to touch the cache.
+      #
+      attr_accessor :can_cache
+      alias_method :can_cache?, :can_cache
+
       # Initialize a new instance
       #
       # @param [String] name @see name
@@ -27,6 +32,7 @@ module Pod
         @name = name
         @params = params
         @podfile_path = podfile_path
+        @can_cache = true
       end
 
       # @return [Bool] whether an external source source is equal to another
@@ -105,7 +111,7 @@ module Pod
         title = "Pre-downloading: `#{name}` #{description}"
         UI.titled_section(title,  :verbose_prefix => '-> ') do
           target = sandbox.pod_dir(name)
-          download_result = Downloader.download(download_request, target)
+          download_result = Downloader.download(download_request, target, :can_cache => can_cache)
           spec = download_result.spec
 
           raise Informative, "Unable to find a specification for '#{name}'." unless spec
@@ -141,17 +147,38 @@ module Pod
       # @return [void]
       #
       def store_podspec(sandbox, spec, json = false)
-        if spec.is_a? Pathname
-          spec = Specification.from_file(spec).to_pretty_json
-          json = true
-        elsif spec.is_a?(String) && !json
-          spec = Specification.from_string(spec, 'spec.podspec').to_pretty_json
-          json = true
-        elsif spec.is_a?(Specification)
-          spec = spec.to_pretty_json
-          json = true
+        spec = case spec
+               when Pathname
+                 Specification.from_file(spec)
+               when String
+                 path = "#{name}.podspec"
+                 path << '.json' if json
+                 Specification.from_string(spec, path)
+               when Specification
+                 spec.dup
+               else
+                 raise "Unknown spec type: #{spec}"
+        end
+        spec.defined_in_file = nil
+        validate_podspec(spec)
+        sandbox.store_podspec(name, spec.to_pretty_json, true, true)
+      end
+
+      def validate_podspec(podspec)
+        validator = validator_for_podspec(podspec)
+        validator.quick = true
+        validator.allow_warnings = true
+        validator.ignore_public_only_results = true
+        Config.instance.with_changes(:silent => true) do
+          validator.validate
+        end
+        unless validator.validated?
+          raise Informative, "The `#{name}` pod failed to validate due to #{validator.failure_reason}:\n#{validator.results_message}"
         end
-        sandbox.store_podspec(name, spec, true, json)
+      end
+
+      def validator_for_podspec(podspec)
+        Validator.new(podspec, [])
       end
     end
   end