xcoed 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca2a14ee26b4f0cc547b5035c1af7ac2d10b8ce005e45d73d996b3e981047d83
-  data.tar.gz: 97a00b24719c18140e30d4a4db8bfb7b4f8639be76a47fa06287283798b06337
+  metadata.gz: ec01f4bb9c3beae88d48857747bae4e5d23adb97c0e069bcba80c725b3137eb6
+  data.tar.gz: c24ddac5f8e43d6a04a010f16dee07a74af4207a26fa0a08142b6b5978497b2e
 SHA512:
-  metadata.gz: b8e8a6aafcdc1ab7eafc217da6942c0170ce65903a9b916b75ec56ecdfff55bd68919cf82a6d95593cf3eb3e72bf57e9adb31fcdc14d3d1c541edfe4426479fd
-  data.tar.gz: 79a7ca8c776c91984ff80b65a5b741faf65f9423a2195c559789256582938bfcff00b54e80333544dd575ba9faddf6adee649dbe8aac350bb3752bd169dcfe5d
+  metadata.gz: f04b8e12fc2c6f299da83a0a62ee2f761afe361caa2bc35477cec5de4b693c3aff3efcb5d10b2f6585800c50356ef7ecfc6e0fe2554519de7301e7e98886055e
+  data.tar.gz: b3c8840ca193eda9e3ec18767ce039aef2ffdd88d69253b194a01a7de5c7fc50050d9b7dfeaf769bd5d84c864055d9977b00de6c14a1e6d5e845faca2c101dd8

data/bin/xcoed

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require 'xcodeproj'
+require 'xcoed'
+
+def exit_with_message(message)
+  STDERR.puts message
+  STDERR.puts 'Usage: xcake [project.xcodeproj]'
+  STDERR.puts 'If there\'s only one project in the directory, the parameter can be omitted.'
+  exit 1
+end
+
+if ARGV[1].nil?
+  potential_names = Dir['*.xcodeproj']
+  if potential_names.empty?
+    exit_with_message 'Could not find a project in current directory!'
+  elsif potential_names.count > 1
+    exit_with_message "Multiple project found in current directory!\nPotential projects: `#{potential_names}`"
+  else
+    project_name = potential_names.first
+  end
+else
+  project_name = ARGV[1]
+end
+
+project = Xcodeproj::Project.open(project_name)
+Xcoed.integrate_package_swift!(project)
+project.save

data/lib/xcoed.rb

@@ -9,15 +9,7 @@ module Xcoed
 
     packages = {}
     package_json['dependencies'].each do |dependency|
-      STDERR.puts dependency
-      package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
-      package_ref.repositoryURL = dependency['url']
-      package_ref.requirement = {
-        'kind' => 'versionRange',
-        'minimumVersion' => dependency['requirement']['range'][0]['lowerBound'],
-        'maximumVersion' => dependency['requirement']['range'][0]['upperBound']
-      }
-      project.root_object.package_references << package_ref
+      package_ref = add_swift_package_reference(project, dependency)
       packages[dependency['name']] = package_ref
     end
 
@@ -27,15 +19,95 @@ module Xcoed
 
       target['dependencies'].each do |dependency|
         by_name = dependency['byName'].first
-        package_ref = packages[by_name]
-        raise "Product `#{by_name}` not found in package references" if package_ref.nil?
+
+        target_ref.package_product_dependencies
+                  .select { |p| p.product_name == by_name }
+                  .each(&:remove_from_project)
 
         package_dep = Xcodeproj::Project::Object::XCSwiftPackageProductDependency.new(project, project.generate_uuid)
-        package_dep.package = package_ref
         package_dep.product_name = by_name
 
         target_ref.package_product_dependencies << package_dep
       end
     end
   end
+
+  def self.add_swift_package_reference(project, dependency)
+    STDERR.puts dependency
+    requirement_type = dependency['requirement'].keys.first
+    case requirement_type
+    when 'range'
+      add_remote_swift_package_range_reference(project, dependency)
+    when 'branch'
+      add_remote_swift_package_branch_reference(project, dependency)
+    when 'revision'
+      add_remote_swift_package_revision_reference(project, dependency)
+    when 'localPackage'
+      add_local_swift_package_reference(project, dependency)
+    else
+      raise "Unsupported package requirement `#{requirement_type}`"
+    end
+  end
+
+  def self.add_remote_swift_package_range_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['url']
+    package_ref.requirement = {
+      'kind' => 'versionRange',
+      'minimumVersion' => dependency['requirement']['range'][0]['lowerBound'],
+      'maximumVersion' => dependency['requirement']['range'][0]['upperBound']
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
+  def self.add_remote_swift_package_branch_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['url']
+    package_ref.requirement = {
+      'kind' => 'branch',
+      'branch' => dependency['requirement']['branch'].first
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
+  def self.add_remote_swift_package_revision_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['url']
+    package_ref.requirement = {
+      'kind' => 'revision',
+      'revision' => dependency['requirement']['revision'].first
+    }
+    project.root_object.package_references << package_ref
+    package_ref
+  end
+
+  def self.add_local_swift_package_reference(project, dependency)
+    local_packages_group = local_packages_group(project)
+    local_packages_group.children
+                        .select { |c| File.expand_path(c.path).downcase == dependency['url'].downcase }
+                        .each(&:remove_from_project)
+    package_ref = Xcodeproj::Project::Object::FileReferencesFactory.new_reference(local_packages_group, dependency['url'], :group)
+    package_ref.last_known_file_type = 'folder'
+    package_ref
+  end
+
+  def self.local_packages_group(project)
+    name = 'Local Packages'
+    project.main_group.groups.select { |g| g.name == name }.first ||
+      project.main_group.new_group(name)
+  end
 end

data/lib/xcoed/version.rb

@@ -1,4 +1,3 @@
 module Xcoed
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.6'.freeze
 end
-  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcoed
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Igor Makarov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -230,10 +230,12 @@ description: Automate adding Swift PM packages to an Xcode project using a regul
   `Package.swift` file.
 email:
 - igormaka@gmail.com
-executables: []
+executables:
+- xcoed
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/xcoed
 - lib/xcoed.rb
 - lib/xcoed/constants.rb
 - lib/xcoed/version.rb
@@ -241,7 +243,7 @@ homepage: https://github.com/igor-makarov/xcoed/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -257,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Add Swift Packages to an Xcode Project
 test_files: []