xcoed 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5575b8dacfa25d57fe1143a288653ad09ac8eb34d8690223259c021788253a6f
-  data.tar.gz: aeeeb1953d378a1e74d29a16e3f720d21f253b128647829545bf79886b5fda89
+  metadata.gz: 82a2f0dbe9c4bce9cf5f5be560b0da2f4ca986d64ea8953a2a50a3f83588ab8c
+  data.tar.gz: '0916221f57884e23ddf1813b4b3fffb93ebf92a0d9a5e2a9b5009410962a028f'
 SHA512:
-  metadata.gz: fa23771a18d4885e6f0fe89f95b7b9112f76f78b6edfba18787eec5696e3167a03a9ae57c163ab792eb08048b531ce011965a5d64ed84ef08fe541129ddba35c
-  data.tar.gz: 71927fe47719762ed6a5723d7f26ffed02f726cddd26afc4f8db69db656ec3673064ed8013bb0ad945f1a6896906276750392bc68f8c51a3f86d471c6322e37b
+  metadata.gz: a5c28b654a7640d371a2c70040a07817ea9dd7e8c8241fceb6ecd559ebe754c11274546f02b157dc9e9b4a4b2077d591a475aa2386fa9d6be2cdba20d730b878
+  data.tar.gz: bcd2a9a24cda75cadc55103164d48ff440b28bb5fdd5be6f4ab145574cd0c6a2400c663b39dbb85c77e39a297a7a9e5354804f92558decfcc8165b4c25c482d6

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

@@ -20,6 +20,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
 
@@ -42,6 +46,10 @@ module Xcoed
   end
 
   def self.add_remote_swift_package_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 = {
@@ -55,6 +63,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 }
+                        .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

data/lib/xcoed/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcoed
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Igor Makarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
@@ -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