xcoed 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec01f4bb9c3beae88d48857747bae4e5d23adb97c0e069bcba80c725b3137eb6
-  data.tar.gz: c24ddac5f8e43d6a04a010f16dee07a74af4207a26fa0a08142b6b5978497b2e
+  metadata.gz: 2a870ba98ff7dfc9c6483e146a15d56f6466c8324439b2c2eb6d400575fff546
+  data.tar.gz: fa06c5be8c1437eb2104bad594260d6126ad0ded6e6b11b05decd0e9c20e3759
 SHA512:
-  metadata.gz: f04b8e12fc2c6f299da83a0a62ee2f761afe361caa2bc35477cec5de4b693c3aff3efcb5d10b2f6585800c50356ef7ecfc6e0fe2554519de7301e7e98886055e
-  data.tar.gz: b3c8840ca193eda9e3ec18767ce039aef2ffdd88d69253b194a01a7de5c7fc50050d9b7dfeaf769bd5d84c864055d9977b00de6c14a1e6d5e845faca2c101dd8
+  metadata.gz: 2e9af4c568068cf0737be18ce32b7f3769c3868847ac1b850dd9dc23798bc008d47170f9b34707c9d37134a6d2083734648dfd46b336dabafd34ed0ebea66095
+  data.tar.gz: b8a790a0ccfebc9535a0bc8571df614f600297daa7cd59f42dfc57d176ecdb51ccbc71c9c653b30c306fb28850f4d30ddad012fda4d842b3dda897d5d8d47b0c

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
 
@@ -32,9 +38,9 @@ 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_range_reference(project, dependency)
@@ -42,20 +48,18 @@ module Xcoed
       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}`"
+      raise "Unsupported package requirement for dependency: `#{dependency}`"
     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 }
+           .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'],
@@ -67,11 +71,11 @@ module Xcoed
 
   def self.add_remote_swift_package_branch_reference(project, dependency)
     project.root_object.package_references
-           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .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' => 'branch',
       'branch' => dependency['requirement']['branch'].first
@@ -82,11 +86,11 @@ module Xcoed
 
   def self.add_remote_swift_package_revision_reference(project, dependency)
     project.root_object.package_references
-           .select { |r| r.repositoryURL.downcase == dependency['url'].downcase }
+           .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' => 'revision',
       'revision' => dependency['requirement']['revision'].first
@@ -98,9 +102,9 @@ module Xcoed
   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 }
+                        .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['url'], :group)
+    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,3 +1,3 @@
 module Xcoed
-  VERSION = '0.0.6'.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.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Igor Makarov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
@@ -243,7 +243,7 @@ homepage: https://github.com/igor-makarov/xcoed/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -258,8 +258,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Add Swift Packages to an Xcode Project
 test_files: []