Merge pull request #1632 from fmccann/bzr

[Bazaar] Add Bazaar support

.travis.yml

 language: objective-c
 env:
   # This is what 10.8.x comes with and we want to support that.
-  - RVM_RUBY_VERSION=system NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo gem install bundler --no-ri --no-rdoc' GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com
-  - RVM_RUBY_VERSION=1.8.7-p358 NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo ln -s /usr/bin/llvm-gcc-4.2 /usr/bin/gcc-4.2 && curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem' SSL_CERT_FILE=/usr/local/share/cacert.pem GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com
+  - RVM_RUBY_VERSION=system NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo gem install bundler --no-ri --no-rdoc' GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com PYTHONPATH=/usr/local/lib/python2.7/site-packages
+  - RVM_RUBY_VERSION=1.8.7-p358 NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo ln -s /usr/bin/llvm-gcc-4.2 /usr/bin/gcc-4.2' SSL_CERT_FILE=/usr/local/share/cacert.pem GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com PYTHONPATH=/usr/local/lib/python2.7/site-packages
 before_install:
-  - sh -c 'if [ "$RVM_RUBY_VERSION" != "system" ]; then rvm install $RVM_RUBY_VERSION; fi'
+  - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
+  - sh -c 'if [ "$RVM_RUBY_VERSION" != "system" ]; then rvm install $RVM_RUBY_VERSION --without-tcl --without-tk; fi'
   - source ~/.rvm/scripts/rvm && rvm use $RVM_RUBY_VERSION
+  - brew update && brew install bzr 
 install: eval $RUBY_VERSION_SPECIFIC && rake bootstrap[use_bundle_dir]
 script: bundle exec rake spec:ci
 notifications:

CHANGELOG.md

@@ -16,6 +16,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 * Support LZMA2 compressed tarballs in the downloader  
   [Kyle Fuller](https://github.com/kylef)
   [cocoapods-downloader#5](https://github.com/CocoaPods/cocoapods-downloader/pull/5)
+  
+* Add Bazaar support for installing directly from a repo  
+  [Fred McCann](https://github.com/fmccann)
+  [#1632](https://github.com/CocoaPods/CocoaPods/pull/1632)  
 
 ###### Bug Fixes
 
@@ -28,7 +32,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   `$(SDKROOT)/Developer/Library/Frameworks` is used for iOS and
   `$(DEVELOPER_LIBRARY_DIR)/Frameworks` is used for OS X  
   [Kevin Wales](https://github.com/kwales)
-  [#1562](https://github.com/CocoaPods/pull/1562)
+  [#1562](https://github.com/CocoaPods/CocoaPods/pull/1562)
 
 * When updating the pod repos, repositories with unreachable remotes
   are now ignored. This fixes an issue with certain private repositories.

lib/cocoapods/command/spec.rb

@@ -512,7 +512,7 @@ Pod::Spec.new do |s|
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
   #  Specify the location from where the source should be retrieved.
-  #  Supports git, hg, svn and HTTP.
+  #  Supports git, hg, bzr, svn and HTTP.
   #
 
   s.source       = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }

lib/cocoapods/external_sources.rb

@@ -16,6 +16,7 @@ module Pod
       klass  =  if params.key?(:git)          then GitSource
                 elsif params.key?(:svn)       then SvnSource
                 elsif params.key?(:hg)        then MercurialSource
+                elsif params.key?(:bzr)       then BazaarSource                  
                 elsif params.key?(:podspec)   then PodspecSource
                 elsif params.key?(:path)      then PathSource
                 end
@@ -261,6 +262,35 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
+    # Provides support for fetching a specification file from a Bazaar
+    # source remote.
+    #
+    # Supports all the options of the downloader (is similar to the git key of
+    # `source` attribute of a specification).
+    #
+    # @note The podspec must be in the root of the repository and should have a
+    #       name matching the one of the dependency.
+    #
+    class BazaarSource < AbstractExternalSource
+
+      # @see AbstractExternalSource#fetch
+      #
+      def fetch(sandbox)
+        pre_download(sandbox)
+      end
+
+      # @see AbstractExternalSource#description
+      #
+      def description
+        "from `#{params[:bzr]}`".tap do |description|
+          description << ", tag `#{params[:tag]}`" if params[:tag]
+          description << ", revision `#{params[:revision]}`" if params[:revision]
+        end
+      end
+    end
+
+    #-------------------------------------------------------------------------#
+
     # Provides support for fetching a specification file from an URL. Can be
     # http, file, etc.
     #

spec/fixtures/bzr-repo/.bzr/README

+This is a Bazaar control directory.
+Do not change any files in this directory.
+See http://bazaar.canonical.com/ for more information about Bazaar.

spec/fixtures/bzr-repo/.bzr/branch-format

+Bazaar-NG meta directory, format 1

spec/fixtures/bzr-repo/.bzr/branch/format

+Bazaar Branch Format 7 (needs bzr 1.6)

spec/fixtures/bzr-repo/.bzr/branch/last-revision

+2 fred@sharpnoodles.com-20131030202140-gg5dfrrtaotfxlrh

spec/fixtures/bzr-repo/.bzr/checkout/conflicts

+BZR conflict list format 1

spec/fixtures/bzr-repo/.bzr/checkout/format

+Bazaar Working Tree Format 6 (bzr 1.14)

spec/fixtures/bzr-repo/.bzr/repository/format

+Bazaar repository format 2a (needs bzr 1.16 or later)

spec/fixtures/bzr-repo/.bzr/repository/indices/5b3f31ef63699074fdad6fa3b0e55305.rix

+B+Tree Graph Index 2
+node_ref_lists=1
+key_elements=1
+len=1
+row_lengths=1
+xQ
+ ;0޺tK-R4n?'oCwK;l-W.6l
+"ǰ^c:BMF@,B
\ No newline at end of file

spec/fixtures/bzr-repo/.bzr/repository/indices/5b3f31ef63699074fdad6fa3b0e55305.six

+B+Tree Graph Index 2
+node_ref_lists=0
+key_elements=1
+len=0
+row_lengths=

spec/fixtures/bzr-repo/.bzr/repository/indices/5b3f31ef63699074fdad6fa3b0e55305.tix

+B+Tree Graph Index 2
+node_ref_lists=1
+key_elements=2
+len=3
+row_lengths=1
+xM0@a֜Lg ԅ71P,ȏ-+M W'ܦ5CH>xi&
("ükA
boax{oļ#PB][а^IR`2
+4i,FE;;t
+"tJ57sL:*7}ve
\ No newline at end of file

spec/fixtures/bzr-repo/.bzr/repository/indices/c70a743dc767dc376699c48c5e9cf925.cix

+B+Tree Graph Index 2
+node_ref_lists=0
+key_elements=1
+len=1
+row_lengths=1
+x
 PLZ
+8'@8x0ы&V|6Hcr7eyhZCbr"&s?-
\ No newline at end of file

spec/fixtures/bzr-repo/.bzr/repository/indices/c70a743dc767dc376699c48c5e9cf925.six

+B+Tree Graph Index 2
+node_ref_lists=0
+key_elements=1
+len=0
+row_lengths=

spec/fixtures/bzr-repo/BazaarSource.podspec

+Pod::Spec.new do |s|
+  s.name         = "BazaarSource"
+  s.version      = "0.0.1"
+  s.summary      = "A short description of BazaarSource."
+  s.homepage     = "http://EXAMPLE/BazaarSource"
+  s.license      = 'MIT (example)'
+  s.author       = { "Fred McCann" => "fred@sharpnoodles.com" }
+  s.source       = { :git => "http://EXAMPLE/BazaarSource.git", :tag => "0.0.1" }
+  s.source_files = 'Classes', 'Classes/**/*.{h,m}'
+end

spec/fixtures/bzr-repo/README

+second commit

spec/unit/external_sources_spec.rb

@@ -148,6 +148,31 @@ module Pod
 
   #---------------------------------------------------------------------------#
 
+  describe ExternalSources::BazaarSource do
+
+    before do
+      dependency = Dependency.new("BazaarSource", :bzr => fixture('bzr-repo'))
+      @external_source = ExternalSources.from_dependency(dependency, nil)
+    end
+
+    it "creates a copy of the podspec" do
+      @external_source.fetch(config.sandbox)
+      path = config.sandbox.root + 'Local Podspecs/BazaarSource.podspec'
+      path.should.exist?
+    end
+
+    it "marks a LocalPod as downloaded" do
+      @external_source.fetch(config.sandbox)
+      config.sandbox.predownloaded_pods.should == ["BazaarSource"]
+    end
+
+    it "returns the description" do
+      @external_source.description.should.match %r|from `.*/bzr-repo`|
+    end
+  end
+
+  #---------------------------------------------------------------------------#
+
   describe ExternalSources::PodspecSource do
 
     before do