pod-synchronize 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6288b55116cdfdb8a04f3b06eabe2320bfc392d
-  data.tar.gz: 9c249fc28882c1483e12b16f74cd6a17a313f000
+  metadata.gz: b16be6a9a8e7d320e48e029f941e6d7d5941467d
+  data.tar.gz: d9dae73dbfa6cfeb9daaec790d7dbeccc295c71d
 SHA512:
-  metadata.gz: dec682b97a93a85d19150619d773a9586bc6a523cc203104fedc2129870e029f8ec65d1cc4b9bdbf28760070643f9b0ce2238ffafd501bd5763d3f4b33e7b164
-  data.tar.gz: 99239344243132f015e9bdfa994aa77a0eb0fb88db1f4341f5d8a05ecbfdbe844afa10489f63d7c8b6560154f477854cebfccd94d9aa2d41bee122299014efde
+  metadata.gz: f0e675a437ef7d068e9f451b912dcee3bf1907f3dd6c56c351398ff576540e2addba6546a16db2fb1a33b06735e2069ea8246751efb4fa659e1033d36c9634b4
+  data.tar.gz: 48d606004c288529d3b4b404a242abffea79c946eec764cbe46b5d6b7eac0c565f1eae0d7850d43d3ba9b02171eba3bef48b777bebfbcf4d73c2fc0a6f13d724

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pod-synchronize (0.4.0)
+    pod-synchronize (0.5.0)
       claide (~> 0.8.1)
       colored (~> 1.2)
 
@@ -67,4 +67,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.12.5
+   1.15.1

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/xing/XNGPodsSynchronizer.svg?branch=master)](https://travis-ci.org/xing/XNGPodSynchronizer)
 [![Coverage Status](https://coveralls.io/repos/xing/XNGPodsSynchronizer/badge.svg?branch=master)](https://coveralls.io/r/xing/XNGPodSynchronizer?branch=master)
 
-XNGPodSynchronizer reads `Podfile.locks` of your projects, copies the `.podspec`s from the CocoaPods master repository and mirrors it to your own `git` repository (e.g. GitHub Enterprise). This helps you get independent from `github.com`.
+XNGPodSynchronizer reads `Podfile.locks` of your projects, copies the `.podspec`s from the CocoaPods master repository and mirrors it to your own `git` repository (e.g. GitHub Enterprise). This helps you get independent from `github.com` and avoids the need of cloning the full CocoaPods master repository, which might speed up your builds on CI.
 
 ## Installation
 
@@ -58,6 +58,10 @@ We use Jenkins to run the synchronize process twice daily. To do that use the fo
 $ pod-synchronize synchronize config.yml
 ```
 
+## Known issues
+
+At the moment this gem only handles `git` [sources](https://guides.cocoapods.org/syntax/podspec.html#source) correctly. `HTTP` sources are partly supported (see [#12](https://github.com/xing/XNGPodsSynchronizer/pull/12)) and `svn`, `hg` support is missing.
+
 ## TODO
 
 * Support Gitlab [#1](https://github.com/xing/XNGPodSynchronizer/issue/1)

data/lib/updater/configuration.rb

@@ -5,7 +5,7 @@ class Configuration
   Mirror = Struct.new(:specs_push_url, :source_push_url, :source_clone_url, :github)
   Github = Struct.new(:access_token, :organisation, :endpoint)
 
-  def initialize(path:)
+  def initialize(path)
     @yaml = YAML.load_file(path)
   end
 

data/lib/updater/git.rb

@@ -1,28 +1,28 @@
 class Git
   attr_accessor :path
 
-  def initialize(path: Dir.pwd)
+  def initialize(path = Dir.pwd)
     @path = path
   end
 
-  def commit(message:)
+  def commit(message)
     execute('git add', '--all')
     execute('git commit', '-m', "'#{message}'")
   end
 
-  def push(remote: 'origin master', options: nil)
+  def push(remote = 'origin master', options = nil)
     execute('git push', remote, options)
   end
 
-  def clone(url:, options: '.')
+  def clone(url, options = '.')
     execute('git clone', url, options)
   end
 
-  def set_origin(url:)
+  def set_origin(url)
     execute('git remote', 'set-url origin', url)
   end
 
-  def create_github_repo(access_token:, org:, name:, endpoint:)
+  def create_github_repo(access_token, org, name, endpoint)
     execute('curl',
     "#{endpoint}/orgs/#{org}/repos?access_token=#{access_token}",
     '-d', "'{\"name\":\"#{name}\"}'")
@@ -37,4 +37,4 @@ class Git
       end
     end
 
-end
+end

data/lib/updater/pod.rb

@@ -1,19 +1,29 @@
+require 'uri'
+
 class Pod
   attr_reader :path, :name
 
-  def initialize(path:)
+  def initialize(path)
     @path = path
     @name = @path.split(File::SEPARATOR).last
   end
 
   def versions
     @versions ||= Dir.glob(File.join(@path, '*')).map do |version_path| 
-      Version.new(path: version_path)
+      Version.new(version_path)
     end
   end
 
   def git_source
-    versions.sort.last.contents["source"]["git"]
+    source = versions.sort.last.contents["source"]["git"]
+    source ||= begin
+      http_source = versions.sort.last.contents["source"]["http"]
+      uri = URI.parse(http_source)
+      host = uri.host.match(/www.(.*)/).captures.first
+      scheme = "git"
+      path = uri.path.split("/").take(3).join("/").concat(".git")
+      URI::Generic.build({scheme: scheme, host: host, path: path}).to_s
+    end
   end
 
   def save
@@ -21,7 +31,7 @@ class Pod
   end
 
   def git
-    @git ||= Git.new(path: @path)
+    @git ||= Git.new(@path)
   end
 
-end
+end

data/lib/updater/specs.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 class Specs
   attr_reader :path, :whitelist, :specs_root
 
-  def initialize(path:, whitelist: [], specs_root: '')
+  def initialize(path, whitelist = [], specs_root = '')
     @path = path
     @whitelist = whitelist
     @specs_root = File.join(@path, specs_root)
@@ -11,7 +11,7 @@ class Specs
 
   def pods
     @pods ||= traverse(@specs_root).flatten.map do |pod_path|
-      pod = Pod.new(path: pod_path)
+      pod = Pod.new(pod_path)
       @whitelist.any? && !@whitelist.include?(pod.name) ? nil : pod
     end.compact
   end
@@ -24,7 +24,7 @@ class Specs
   end
 
   def git
-    @git ||= Git.new(path: @path)
+    @git ||= Git.new(@path)
   end
 
   private
@@ -43,4 +43,4 @@ class Specs
     pods
   end
 
-end
+end

data/lib/updater/synchronize.rb

@@ -1,4 +1,5 @@
 require 'open-uri'
+require 'openssl'
 
 module PodSynchronize
   class Command
@@ -18,15 +19,15 @@ module PodSynchronize
         raise Informative, "Please specify a valid CONFIG path" unless @yml_path
       end
 
-      def setup(temp_path:)
-        @config = Configuration.new(path: @yml_path)
-        @master_specs = Specs.new(path: File.join(temp_path, 'master'), whitelist: dependencies, specs_root: 'Specs')
-        @internal_specs = Specs.new(path: File.join(temp_path, 'local'), specs_root: '.')
+      def setup(temp_path)
+        @config = Configuration.new(@yml_path)
+        @master_specs = Specs.new(File.join(temp_path, 'master'), dependencies, 'Specs')
+        @internal_specs = Specs.new(File.join(temp_path, 'local'), [], '.')
       end
 
       def bootstrap
-        @internal_specs.git.clone(url: @config.mirror.specs_push_url)
-        @master_specs.git.clone(url: @config.master_repo, options: '. --depth 1')
+        @internal_specs.git.clone(@config.mirror.specs_push_url)
+        @master_specs.git.clone(@config.master_repo, '. --depth 1')
       end
 
       def update_specs
@@ -40,7 +41,7 @@ module PodSynchronize
           end
           pod.save
         end
-        @internal_specs.git.commit(message: commit_message)
+        @internal_specs.git.commit(commit_message)
         @internal_specs.git.push
       end
 
@@ -49,18 +50,18 @@ module PodSynchronize
         "Update #{time_str}"
       end
 
-      def update_sources(temp_path:)
+      def update_sources(temp_path)
         @master_specs.pods.each do |pod|
           pod.git.path = File.join(temp_path, 'source_cache', pod.name)
-          pod.git.clone(url: pod.git_source, options: ". --bare")
+          pod.git.clone(pod.git_source, ". --bare")
           pod.git.create_github_repo(
-            access_token: @config.mirror.github.access_token,
-            org: @config.mirror.github.organisation,
-            name: pod.name,
-            endpoint: @config.mirror.github.endpoint
+            @config.mirror.github.access_token,
+            @config.mirror.github.organisation,
+            pod.name,
+            @config.mirror.github.endpoint
           )
-          pod.git.set_origin(url: "#{@config.mirror.source_push_url}/#{pod.name}.git")
-          pod.git.push(remote: nil, options: '--mirror')
+          pod.git.set_origin("#{@config.mirror.source_push_url}/#{pod.name}.git")
+          pod.git.push(nil, '--mirror')
         end
       end
 
@@ -75,15 +76,17 @@ module PodSynchronize
         
         pods_dependencies.flatten!.uniq!
 
-        pods_dependencies.reject! { |dependency| @config.excluded_pods.include? dependency }
+        pods_dependencies.reject! { |dependency| @config.excluded_pods.include? dependency } unless @config.excluded_pods.nil?
+
+        pods_dependencies
       end
 
       def run
         Dir.mktmpdir do |dir|
-          self.setup(temp_path: dir)
+          self.setup(dir)
           self.bootstrap
           self.update_specs
-          self.update_sources(temp_path: dir)
+          self.update_sources(dir)
         end
       end
     end

data/lib/updater/version.rb

@@ -4,7 +4,7 @@ class Version
   attr_reader :path, :version
   attr_accessor :contents
 
-  def initialize(path:)
+  def initialize(path)
     @path = path
     @version = @path.split(File::SEPARATOR).last
     @contents = fetch_podspec
@@ -35,4 +35,4 @@ class Version
       JSON.parse(file)
     end
 
-end
+end

data/pod-synchronize.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name         = "pod-synchronize"
-  spec.version      = "0.4.0"
+  spec.version      = "0.5.0"
   spec.authors      = ["Matthias Männich", "Piet Brauer", "Renzo Crisostomo"]
   spec.email        = ["matthias.maennich@xing.com", "piet.brauer@xing.com", "renzo.crisostomo@xing.com"]
   spec.summary      = %q{Mirrors CocoaPods specs}
@@ -19,4 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.required_ruby_version = '>= 2.0.0'
 end

data/spec/configuration_spec.rb

@@ -2,17 +2,17 @@ describe Configuration do
 
   describe "#initialize" do
     it "loads the yaml config at the specified path" do
-      config = Configuration.new(path: File.join('spec', 'fixtures', 'config.yml'))
+      config = Configuration.new(File.join('spec', 'fixtures', 'config.yml'))
       expect(config.yaml).to_not be_empty
     end
 
     it "throws an exception if the file at the path does not exist" do
-      expect { Configuration.new(path: 'invalid/path') }.to raise_exception
+      expect { Configuration.new('invalid/path') }.to raise_exception
     end
   end
 
   before :all do
-    @config = Configuration.new(path: 'spec/fixtures/config.yml')
+    @config = Configuration.new('spec/fixtures/config.yml')
   end
 
   it '#master_repo should exist' do

data/spec/git_spec.rb

@@ -3,7 +3,7 @@ describe Git do
 
     before :all do
       @specs_path = File.join('spec', 'fixtures', 'specs')
-      @specs = Specs.new(path: @specs_path)
+      @specs = Specs.new(@specs_path)
     end
 
     describe "::commit" do
@@ -13,7 +13,7 @@ describe Git do
         message = "Become a programmer, they said. It'll be fun, they said."
         expect(class_under_test).to receive(:system).with("git add --all")
         expect(class_under_test).to receive(:system).with("git commit -m '#{message}'")
-        class_under_test.commit(message: message)
+        class_under_test.commit(message)
       end
     end
 
@@ -22,10 +22,10 @@ describe Git do
         class_under_test = @specs.git
         expect(class_under_test).to receive(:system).with("curl https://github.com/api/v3/orgs/ios-pods-external/repos?access_token=123 -d '{\"name\":\"mega-pod\"}'")
         class_under_test.create_github_repo(
-            access_token: '123',
-            org: 'ios-pods-external',
-            name: 'mega-pod',
-            endpoint: 'https://github.com/api/v3'
+            '123',
+            'ios-pods-external',
+            'mega-pod',
+            'https://github.com/api/v3'
           )
       end
     end
@@ -40,21 +40,21 @@ describe Git do
       it 'push on custom remote "production"' do
         class_under_test = @specs.git
         expect(class_under_test).to receive(:system).with("git push production")
-        class_under_test.push(remote: 'production')
+        class_under_test.push('production')
       end
 
       it 'push on custom remote with options' do
         class_under_test = @specs.git
         expect(class_under_test).to receive(:system).with("git push develop --force")
-        class_under_test.push(remote: 'develop', options: '--force')
+        class_under_test.push('develop', '--force')
       end
 
       it 'push on default remote with options' do
         class_under_test = @specs.git
         expect(class_under_test).to receive(:system).with("git push origin master --force")
-        class_under_test.push(options: '--force')
+        class_under_test.push('origin master', '--force')
       end
     end
   end
 
-end
+end

data/spec/pod_spec.rb

@@ -5,28 +5,28 @@ describe Pod do
 
   describe '::new' do
     it 'init with podspec dir' do
-      class_under_test = Pod.new(path: @path_to_podspecs_dir)
+      class_under_test = Pod.new(@path_to_podspecs_dir)
       expect(class_under_test.path).to eql(@path_to_podspecs_dir)
     end
   end
 
   describe '#name' do
     it 'gets the correct pod name' do
-      class_under_test = Pod.new(path: @path_to_podspecs_dir)
+      class_under_test = Pod.new(@path_to_podspecs_dir)
       expect(class_under_test.name).to eql("XNGAPIClient")
     end
   end
 
   describe '#source' do
     it 'gets the correct source url' do
-      class_under_test = Pod.new(path: @path_to_podspecs_dir)
+      class_under_test = Pod.new(@path_to_podspecs_dir)
       expect(class_under_test.git_source).to eql("https://github.com/xing/XNGAPIClient.git")
     end
   end
 
   describe '#versions' do
     it 'should return all versions for that pod' do
-      class_under_test = Pod.new(path: @path_to_podspecs_dir)
+      class_under_test = Pod.new(@path_to_podspecs_dir)
       versions = class_under_test.versions
       expected_versions = [
         '0.1.0', '0.2.0', '0.2.1', '0.2.2', '0.3.0', '0.3.1',
@@ -40,15 +40,15 @@ describe Pod do
 
   describe '#git' do
     it 'should add the pod path as the default git path' do
-      class_under_test = Pod.new(path: @path_to_podspecs_dir)
+      class_under_test = Pod.new(@path_to_podspecs_dir)
       expect(class_under_test.git.path).to eql(@path_to_podspecs_dir)
     end
 
     it 'should be able to set a custom path' do
-      class_under_test = Pod.new(path: @path_to_podspecs_dir)
+      class_under_test = Pod.new(@path_to_podspecs_dir)
       expected_path = "./some/other/path"
       class_under_test.git.path = expected_path
       expect(class_under_test.git.path).to eql(expected_path)
     end
   end
-end
+end

data/spec/specs_spec.rb

@@ -7,40 +7,40 @@ describe Specs do
 
   describe '::new' do
     it 'should init with a path' do
-      class_under_test = Specs.new(path: @specs_path)
+      class_under_test = Specs.new(@specs_path)
       expect(class_under_test.path).to eql(@specs_path)
     end
   end
 
   describe '#pods' do
     it 'should fetch all pods' do
-      class_under_test = Specs.new(path: @specs_path)
+      class_under_test = Specs.new(@specs_path)
       expect(class_under_test.pods.count).to eql(3)
       expect(class_under_test.pods.map(&:name)).to eql(['NBNRealmBrowser', 'XNGAPIClient', 'XNGOAuth1Client'])
     end
 
     it 'should fetch 1 pod from whitelist' do
-      class_under_test = Specs.new(path: @specs_path, whitelist: ['XNGAPIClient'])
+      class_under_test = Specs.new(@specs_path, ['XNGAPIClient'])
       expect(class_under_test.pods.count).to eql(1)
       expect(class_under_test.pods.map(&:name)).to eql(['XNGAPIClient'])
     end
 
     it 'should fetch 2 pods from whitelist' do
-      class_under_test = Specs.new(path: @specs_path, whitelist: ['XNGAPIClient', 'XNGOAuth1Client'])
+      class_under_test = Specs.new(@specs_path, ['XNGAPIClient', 'XNGOAuth1Client'])
       expect(class_under_test.pods.count).to eql(2)
       expect(class_under_test.pods.map(&:name)).to eql(['XNGAPIClient', 'XNGOAuth1Client'])
     end
 
     it 'should fetch no pods that are not on the whitelist' do
-      class_under_test = Specs.new(path: @specs_path, whitelist: ['PodThatDoesntExist'])
+      class_under_test = Specs.new(@specs_path, ['PodThatDoesntExist'])
       expect(class_under_test.pods.count).to eql(0)
     end
   end
 
   describe '#merge_pods' do
     it 'should add all pods from one spec to another' do
-      specs = Specs.new(path: @specs_path)
-      other_specs = Specs.new(path: @other_specs_path, whitelist: ['NBNPhotoChooser'])
+      specs = Specs.new(@specs_path)
+      other_specs = Specs.new(@other_specs_path, ['NBNPhotoChooser'])
       expected_path = File.join(@other_specs_path, 'NBNPhotoChooser')
 
       expect(FileUtils).to receive(:cp_r).with(expected_path, specs.path)
@@ -48,4 +48,4 @@ describe Specs do
     end
   end
 
-end
+end

data/spec/synchronize_spec.rb

@@ -2,7 +2,7 @@ describe PodSynchronize::Command::Synchronize do
 
   before :all do
     @sync = PodSynchronize::Command::Synchronize.new(CLAide::ARGV.new(['./spec/fixtures/api_client_config.yml']))
-    Dir.mktmpdir { |dir| @sync.setup(temp_path: dir) }
+    Dir.mktmpdir { |dir| @sync.setup(dir) }
   end
 
   describe "#dependencies" do

data/spec/version_spec.rb

@@ -5,7 +5,7 @@ describe Version do
 
   describe '::new' do
     it 'initializes with a versions dir' do
-      version = Version.new(path: @path_to_version_dir)
+      version = Version.new(@path_to_version_dir)
 
       expect(version.path).to eql(@path_to_version_dir)
     end
@@ -13,7 +13,7 @@ describe Version do
 
   describe '#podspec_path' do
     it 'gets the corred podspec filepath' do
-      version = Version.new(path: @path_to_version_dir)
+      version = Version.new(@path_to_version_dir)
       expected_path = File.join(@path_to_version_dir, 'XNGAPIClient.podspec.json')
       actual_path = version.send(:podspec_path)
       expect(actual_path).to eql(expected_path)
@@ -22,7 +22,7 @@ describe Version do
 
   describe '#contents' do
     it 'gets the fetches the podspec correctly' do
-      version = Version.new(path: @path_to_version_dir)
+      version = Version.new(@path_to_version_dir)
       expected_contents = {
        "name"=>"XNGAPIClient",
        "version"=>"1.2.0",
@@ -42,4 +42,4 @@ describe Version do
       expect(version.contents).to eql(expected_contents)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pod-synchronize
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthias Männich
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Synchronizes the public CocoaPods Specs repo with your internal mirror.
@@ -78,10 +78,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".simplecov"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .simplecov
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -141,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Mirrors CocoaPods specs