cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/downloader.rb

@@ -3,7 +3,6 @@ require 'cocoapods-downloader'
 module Pod
   module Downloader
     class Base
-
       override_api do
 
         def execute_command(executable, command, raise_on_failure = false)

data/lib/cocoapods/executable.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # Module which provides support for running executables.
   #
   # In a class it can be used as:
@@ -12,7 +11,6 @@ module Pod
   # output of the command.
   #
   module Executable
-
     # Creates the methods for the executable with the given name.
     #
     # @param  [Symbol] name
@@ -21,12 +19,11 @@ module Pod
     # @return [void]
     #
     def executable(name)
-
       define_method(name) do |command|
         Executable.execute_command(name, command, false)
       end
 
-      define_method(name.to_s + "!") do |command|
+      define_method(name.to_s + '!') do |command|
         Executable.execute_command(name, command, true)
       end
     end
@@ -51,7 +48,6 @@ module Pod
     # @todo   Find a way to display the live output of the commands.
     #
     def self.execute_command(executable, command, raise_on_failure)
-
       bin = `which #{executable}`.strip
       raise Informative, "Unable to locate the executable `#{executable}`" if bin.empty?
 
@@ -66,7 +62,7 @@ module Pod
         stdout, stderr = Indenter.new, Indenter.new
       end
 
-      options = {:stdout => stdout, :stderr => stderr, :status => true}
+      options = { :stdout => stdout, :stderr => stderr, :status => true }
       status  = Open4.spawn(full_command, options)
       output  = stdout.join("\n") + stderr.join("\n")
       unless status.success?
@@ -82,10 +78,9 @@ module Pod
     #-------------------------------------------------------------------------#
 
     # Helper class that allows to write to an {IO} instance taking into account
-    # the UI indentation lever.
+    # the UI indentation level.
     #
     class Indenter < ::Array
-
       # @return [Fixnum] The indentation level of the UI.
       #
       attr_accessor :indent

data/lib/cocoapods/external_sources.rb

@@ -4,12 +4,10 @@ require 'cocoapods/external_sources/path_source'
 require 'cocoapods/external_sources/podspec_source'
 
 module Pod
-
   # Provides support for initializing the correct concrete class of an external
   # source.
   #
   module ExternalSources
-
     # @return [AbstractExternalSource] an initialized instance of the concrete
     #         external source class associated with the option specified in the
     #         hash.
@@ -34,8 +32,8 @@ module Pod
       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."
+        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

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -1,10 +1,8 @@
 module Pod
   module ExternalSources
-
     # Abstract class that defines the common behaviour of external sources.
     #
     class AbstractExternalSource
-
       # @return [String] the name of the Pod described by this external source.
       #
       attr_reader :name
@@ -48,14 +46,14 @@ module Pod
       #
       # @return [void]
       #
-      def fetch(sandbox)
-        raise "Abstract method"
+      def fetch(_sandbox)
+        raise 'Abstract method'
       end
 
       # @return [String] a string representation of the source suitable for UI.
       #
       def description
-        raise "Abstract method"
+        raise 'Abstract method'
       end
 
       protected
@@ -98,12 +96,20 @@ module Pod
       #
       def pre_download(sandbox)
         title = "Pre-downloading: `#{name}` #{description}"
-        UI.titled_section(title, { :verbose_prefix => "-> " }) do
-          target = sandbox.root + name
+        UI.titled_section(title,  :verbose_prefix => '-> ') do
+          target = sandbox.pod_dir(name)
           target.rmtree if target.exist?
-          downloader = Config.instance.downloader(target, params)
+          downloader = Downloader.for_target(target, params)
           downloader.download
-          store_podspec(sandbox, target + "#{name}.podspec")
+
+          podspec_path = target + "#{name}.podspec"
+          json = false
+          unless Pathname(podspec_path).exist?
+            podspec_path = target + "#{name}.podspec.json"
+            json = true
+          end
+
+          store_podspec(sandbox, target + podspec_path, json)
           sandbox.store_pre_downloaded_pod(name)
           if downloader.options_specific?
             source = params
@@ -137,4 +143,3 @@ module Pod
     end
   end
 end
-

data/lib/cocoapods/external_sources/downloader_source.rb

@@ -1,6 +1,5 @@
 module Pod
   module ExternalSources
-
     # Provides support for fetching a specification file from a source handled
     # by the downloader. Supports all the options of the downloader
     #
@@ -8,7 +7,6 @@ module Pod
     #       name matching the one of the dependency.
     #
     class DownloaderSource < AbstractExternalSource
-
       # @see AbstractExternalSource#fetch
       #
       def fetch(sandbox)

data/lib/cocoapods/external_sources/path_source.rb

@@ -1,18 +1,16 @@
 module Pod
   module ExternalSources
-
     # Provides support for fetching a specification file from a path local to
     # the machine running the installation.
     #
     # Works with the {LocalPod::LocalSourcedPod} class.
     #
     class PathSource < AbstractExternalSource
-
       # @see  AbstractExternalSource#fetch
       #
       def fetch(sandbox)
         title = "Fetching podspec for `#{name}` #{description}"
-        UI.titled_section(title, { :verbose_prefix => "-> " }) do
+        UI.titled_section(title,  :verbose_prefix => '-> ') do
           podspec = podspec_path
           unless podspec.exist?
             raise Informative, "No podspec found for `#{name}` in " \
@@ -55,4 +53,3 @@ module Pod
     end
   end
 end
-

data/lib/cocoapods/external_sources/podspec_source.rb

@@ -1,16 +1,14 @@
 module Pod
   module ExternalSources
-
     # Provides support for fetching a specification file from an URL. Can be
     # http, file, etc.
     #
     class PodspecSource < AbstractExternalSource
-
       # @see AbstractExternalSource#fetch
       #
       def fetch(sandbox)
         title = "Fetching podspec for `#{name}` #{description}"
-        UI.titled_section(title, { :verbose_prefix => "-> " }) do
+        UI.titled_section(title,  :verbose_prefix => '-> ') do
           is_json = podspec_uri.split('.').last == 'json'
           require 'open-uri'
           open(podspec_uri) { |io| store_podspec(sandbox, io.read, is_json) }

data/lib/cocoapods/gem_version.rb

@@ -1,6 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.33.1' unless defined? Pod::VERSION
+  VERSION = '0.34.0.rc1' unless defined? Pod::VERSION
 end
-

data/lib/cocoapods/generator/acknowledgements.rb

@@ -1,8 +1,6 @@
 module Pod
   module Generator
-
     class Acknowledgements
-
       # @return [Array<Class>] The classes of the acknowledgements generator
       #         subclasses.
       #
@@ -29,25 +27,25 @@ module Pod
       # @return [String] The title of the acknowledgements file.
       #
       def header_title
-        "Acknowledgements"
+        'Acknowledgements'
       end
 
       # @return [String] A text to present before listing the acknowledgements.
       #
       def header_text
-        "This application makes use of the following third party libraries:"
+        'This application makes use of the following third party libraries:'
       end
 
       # @return [String] The title of the foot notes.
       #
       def footnote_title
-        ""
+        ''
       end
 
       # @return [String] the foot notes.
       #
       def footnote_text
-        "Generated by CocoaPods - http://cocoapods.org"
+        'Generated by CocoaPods - http://cocoapods.org'
       end
 
       #-----------------------------------------------------------------------#
@@ -60,7 +58,7 @@ module Pod
       #         acknowledgements should be generated.
       #
       def specs
-        file_accessors.map{ |accessor| accessor.spec.root }.uniq
+        file_accessors.map { |accessor| accessor.spec.root }.uniq
       end
 
       # Returns the text of the license for the given spec.
@@ -101,7 +99,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/generator/acknowledgements/markdown.rb

@@ -1,21 +1,19 @@
 module Pod
   module Generator
-
     class Markdown < Acknowledgements
-
       def self.path_from_basepath(path)
-        Pathname.new(path.dirname + "#{path.basename.to_s}.markdown")
+        Pathname.new(path.dirname + "#{path.basename}.markdown")
       end
 
       def save_as(path)
-        file = File.new(path, "w")
+        file = File.new(path, 'w')
         file.write(licenses)
         file.close
       end
 
       def title_from_string(string, level)
-        if !string.empty?
-          "#" * level << " #{string}"
+        unless string.empty?
+          '#' * level << " #{string}"
         end
       end
 
@@ -29,7 +27,7 @@ module Pod
         licenses_string = "#{title_from_string(header_title, 1)}\n#{header_text}\n"
         specs.each do |spec|
           if (license = string_for_spec(spec))
-            license = license.force_encoding("UTF-8") if license.respond_to?(:force_encoding)
+            license = license.force_encoding('UTF-8') if license.respond_to?(:force_encoding)
             licenses_string += license
           end
         end

data/lib/cocoapods/generator/acknowledgements/plist.rb

@@ -1,9 +1,8 @@
 module Pod
   module Generator
-
     class Plist < Acknowledgements
       def self.path_from_basepath(path)
-        Pathname.new(path.dirname + "#{path.basename.to_s}.plist")
+        Pathname.new(path.dirname + "#{path.basename}.plist")
       end
 
       def save_as(path)
@@ -15,12 +14,12 @@ module Pod
         {
           :Title => plist_title,
           :StringsTable => plist_title,
-          :PreferenceSpecifiers => licenses
+          :PreferenceSpecifiers => licenses,
         }
       end
 
       def plist_title
-        "Acknowledgements"
+        'Acknowledgements'
       end
 
       def licenses
@@ -36,26 +35,26 @@ module Pod
       def hash_for_spec(spec)
         if (license = license_text(spec))
           {
-            :Type => "PSGroupSpecifier",
+            :Type => 'PSGroupSpecifier',
             :Title => spec.name,
-            :FooterText => license
+            :FooterText => license,
           }
         end
       end
 
       def header_hash
         {
-          :Type => "PSGroupSpecifier",
+          :Type => 'PSGroupSpecifier',
           :Title => header_title,
-          :FooterText => header_text
+          :FooterText => header_text,
         }
       end
 
       def footnote_hash
         {
-          :Type => "PSGroupSpecifier",
+          :Type => 'PSGroupSpecifier',
           :Title => footnote_title,
-          :FooterText => footnote_text
+          :FooterText => footnote_text,
         }
       end
     end

data/lib/cocoapods/generator/bridge_support.rb

@@ -15,7 +15,7 @@ module Pod
       end
 
       def save_as(pathname)
-        gen_bridge_metadata %{-c "#{search_paths.join(' ')}" -o '#{pathname}' '#{headers.join("' '")}'}
+        gen_bridge_metadata %(-c "#{search_paths.join(' ')}" -o '#{pathname}' '#{headers.join("' '")}')
       end
     end
   end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -1,7 +1,6 @@
 module Pod
   module Generator
     class CopyResourcesScript
-
       # @return [Array<#to_s>] A list of files relative to the project pods
       #         root.
       #
@@ -44,7 +43,7 @@ module Pod
       #
       EXTERNAL_STRINGS_FILE_MIMINUM_DEPLOYMENT_TARGET = {
         :ios => Version.new('6.0'),
-        :osx => Version.new('10.8')
+        :osx => Version.new('10.8'),
       }
 
       # @return [Bool] Whether the external strings file is supported by the
@@ -58,11 +57,11 @@ module Pod
       # @return [String] The install resources shell function.
       #
       def install_resources_function
-          if use_external_strings_file?
-            INSTALL_RESOURCES_FUCTION
-          else
-            INSTALL_RESOURCES_FUCTION.gsub(' --reference-external-strings-file', '')
-          end
+        if use_external_strings_file?
+          INSTALL_RESOURCES_FUCTION
+        else
+          INSTALL_RESOURCES_FUCTION.gsub(' --reference-external-strings-file', '')
+        end
       end
 
       # @return [String] The contents of the copy resources script.
@@ -70,14 +69,13 @@ module Pod
       def script
         script = install_resources_function
         resources.each do |resource|
-          script += %Q[install_resource "#{resource}"\n]
+          script += %(          install_resource "#{resource}"\n          )
         end
         script += RSYNC_CALL
         script += XCASSETS_COMPILE
         script
       end
 
-
       INSTALL_RESOURCES_FUCTION = <<EOS
 #!/bin/sh
 set -e
@@ -124,7 +122,6 @@ install_resource()
 }
 EOS
 
-
       RSYNC_CALL = <<EOS
 
 rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
@@ -134,12 +131,11 @@ fi
 rm -f "$RESOURCES_TO_COPY"
 EOS
 
-
       XCASSETS_COMPILE = <<EOS
 
 if [[ -n "${WRAPPER_EXTENSION}" ]] && [ `xcrun --find actool` ] && [ `find . -name '*.xcassets' | wc -l` -ne 0 ]
 then
-  case "${TARGETED_DEVICE_FAMILY}" in 
+  case "${TARGETED_DEVICE_FAMILY}" in
     1,2)
       TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
       ;;
@@ -151,8 +147,8 @@ then
       ;;
     *)
       TARGET_DEVICE_ARGS="--target-device mac"
-      ;;  
-  esac 
+      ;;
+  esac
   find "${PWD}" -name "*.xcassets" -print0 | xargs -0 actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
 EOS