xcoed 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5575b8dacfa25d57fe1143a288653ad09ac8eb34d8690223259c021788253a6f
-  data.tar.gz: aeeeb1953d378a1e74d29a16e3f720d21f253b128647829545bf79886b5fda89
+  metadata.gz: 2a870ba98ff7dfc9c6483e146a15d56f6466c8324439b2c2eb6d400575fff546
+  data.tar.gz: fa06c5be8c1437eb2104bad594260d6126ad0ded6e6b11b05decd0e9c20e3759
 SHA512:
-  metadata.gz: fa23771a18d4885e6f0fe89f95b7b9112f76f78b6edfba18787eec5696e3167a03a9ae57c163ab792eb08048b531ce011965a5d64ed84ef08fe541129ddba35c
-  data.tar.gz: 71927fe47719762ed6a5723d7f26ffed02f726cddd26afc4f8db69db656ec3673064ed8013bb0ad945f1a6896906276750392bc68f8c51a3f86d471c6322e37b
+  metadata.gz: 2e9af4c568068cf0737be18ce32b7f3769c3868847ac1b850dd9dc23798bc008d47170f9b34707c9d37134a6d2083734648dfd46b336dabafd34ed0ebea66095
+  data.tar.gz: b8a790a0ccfebc9535a0bc8571df614f600297daa7cd59f42dfc57d176ecdb51ccbc71c9c653b30c306fb28850f4d30ddad012fda4d842b3dda897d5d8d47b0c

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,7 +9,13 @@ module Xcoed
 
     packages = {}
     package_json['dependencies'].each do |dependency|
-      package_ref = add_swift_package_reference(project, dependency)
+      if dependency.key?('local')
+        package_ref = add_local_swift_package_reference(project, dependency['local'].first)
+      else
+        dependency = dependency['scm'].first if dependency.key?('scm')
+        package_ref = add_remote_swift_package_reference(project, dependency)
+      end
+       
       packages[dependency['name']] = package_ref
     end
 
@@ -20,6 +26,10 @@ module Xcoed
       target['dependencies'].each do |dependency|
         by_name = dependency['byName'].first
 
+        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.product_name = by_name
 
@@ -28,22 +38,28 @@ module Xcoed
     end
   end
 
-  def self.add_swift_package_reference(project, dependency)
+  def self.add_remote_swift_package_reference(project, dependency)
     STDERR.puts dependency
-    requirement_type = dependency['requirement'].keys.first
+    requirement_type = dependency['requirement']&.keys&.first
     case requirement_type
     when 'range'
-      add_remote_swift_package_reference(project, dependency)
-    when 'localPackage'
-      add_local_swift_package_reference(project, dependency)
+      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)
     else
-      raise "Unsupported package requirement `#{requirement_type}`"
+      raise "Unsupported package requirement for dependency: `#{dependency}`"
     end
   end
 
-  def self.add_remote_swift_package_reference(project, dependency)
+  def self.add_remote_swift_package_range_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['location'].downcase }
+           .each(&:remove_from_project)
+
     package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
-    package_ref.repositoryURL = dependency['url']
+    package_ref.repositoryURL = dependency['location']
     package_ref.requirement = {
       'kind' => 'versionRange',
       'minimumVersion' => dependency['requirement']['range'][0]['lowerBound'],
@@ -53,9 +69,42 @@ module Xcoed
     package_ref
   end
 
+  def self.add_remote_swift_package_branch_reference(project, dependency)
+    project.root_object.package_references
+           .select { |r| r.repositoryURL.downcase == dependency['location'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['location']
+    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['location'].downcase }
+           .each(&:remove_from_project)
+
+    package_ref = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference.new(project, project.generate_uuid)
+    package_ref.repositoryURL = dependency['location']
+    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)
-    package_ref = Xcodeproj::Project::Object::FileReferencesFactory.new_reference(local_packages_group, dependency['url'], :group)
+    local_packages_group.children
+                        .select { |c| File.expand_path(c.path).downcase == dependency['path'].downcase }
+                        .each(&:remove_from_project)
+    package_ref = Xcodeproj::Project::Object::FileReferencesFactory.new_reference(local_packages_group, dependency['path'], :group)
     package_ref.last_known_file_type = 'folder'
     package_ref
   end

data/lib/xcoed/version.rb

@@ -1,4 +1,3 @@
 module Xcoed
-  VERSION = '0.0.3'.freeze
+  VERSION = '1.0.0'.freeze
 end
-  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcoed
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2021-07-26 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
@@ -256,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Add Swift Packages to an Xcode Project