cint 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d93cc8deb725d074a3cbaa5134820bc6c95095
-  data.tar.gz: 71fe765d2f25892469023eed70fe395a133866f1
+  metadata.gz: affdf44f9c627e7021bea7c252316a4a00dcd03e
+  data.tar.gz: 6e8bc2e0b5dafa8530edc6f2f6e98afba023e775
 SHA512:
-  metadata.gz: 906eebe5e24e27aee5382ee7b403003e477d211881dbe591b76ed69a151033223e377adcbaa3ae3158ade217b0aca7887a30cbc4e1344d175d2f80ddd9ec66f7
-  data.tar.gz: 236b49e362bb0001a52f8321daeb4757369fdb5ae4be62d4394a7207e4ac99a1307b767764f176f885268df4c2cedd1977976ed1af0e9eef196c993db0f89edb
+  metadata.gz: d2b7c76c14b543399a7a26f04c9c65a7d0b75e9f0a2cfc55f657a5b3ed4436ed677277ce39ec2b0135c1f88735b5bf72357fdf44981bf04aeb702d7456f78ddd
+  data.tar.gz: 1943e0cb0b2b5feb08965a3f453fa07ea2b2516f3a7a0a943c0c47b1df931fb66065c2603277bfdb49a9274cf806917ad6fdd34753c390afe1ce18e6146d919b

data/bin/cint

@@ -11,7 +11,7 @@ require 'lib/xcodeproj'
 require 'lib/cint'
 
 program :name, 'integrator'
-program :version, '0.0.1'
+program :version, '0.1.6'
 program :description, 'Integrates Carthage Frameworks'
 program :help, 'Author', 'Alex Antonyuk <alex@antonyuk.me>'
 
@@ -59,9 +59,25 @@ def prepare_frameworks(frameworks)
   end
 end
 
-def print_report(frameworks)
+def print_report(target, all, integrated)
+  all.map! { |f| File.basename(f) }
+  integrated.map! { |f| File.basename(f) }
+  
+  puts "Target ".green + target.name.yellow
+  puts
+  
+  old = all - integrated
+  unless old.empty?
+    info 'Existed:'
+    puts old.join("\n").yellow
+  end
+  puts
   info 'Integrated:'
-  puts frameworks.map { |f| File.basename(f) }.join("\n").yellow
+  if integrated.empty?
+    puts 'None'.yellow
+  else
+    puts integrated.join("\n").yellow
+  end
 end
 
 def find_project
@@ -82,6 +98,33 @@ def get_project_name(args)
   project_name
 end
 
+def intergate_frameworks(target, project)
+  platform = SDK_TO_PLATFORM[target.sdk]
+  frameworks = CarthageFiles.frameworks(platform)
+
+  if frameworks.empty?
+    warning 'No frameworks found'
+    return
+  end
+
+  # Add Framework Files
+  added_frameworks = project.add_missing_frameworks_to_target(target, frameworks)
+
+  # Add Frameworks Search Path (FRAMEWORK_SEARCH_PATHS)
+  fw_search_path = "$(PROJECT_DIR)/Carthage/Build/#{platform}"
+  project.add_path(fw_search_path)
+
+  # Integrate Shell Script
+  phase = target.carthage_build_phase
+  prepared_frameworks = prepare_frameworks(frameworks)
+  phase.setup_with_frameworks(prepared_frameworks) unless target.sdk == 'macosx'
+  
+  # footer
+  say "\n"
+  print_report(target, frameworks, added_frameworks)
+  say "\n"
+end
+
 # Commands
 command :install do |c|
   c.syntax = 'cint install <project_name>'
@@ -98,30 +141,13 @@ command :install do |c|
     # choose target
     choice = choose("Choose target:\n", *project.targets.map(&:name))
     target = project.target_by_name(choice)
-    platform = SDK_TO_PLATFORM[target.sdk]
-    frameworks = CarthageFiles.frameworks(platform)
-
-    warning 'No frameworks found' if frameworks.empty?
-
-    # Add Framework Files
-    project.add_missing_frameworks_to_target(target, frameworks)
-
-    # Add Frameworks Search Path (FRAMEWORK_SEARCH_PATHS)
-    fw_search_path = "$(PROJECT_DIR)/Carthage/Build/#{platform}"
-    project.add_path(fw_search_path)
-
-    # Integrate Shell Script
-    phase = target.carthage_build_phase
-    prepared_frameworks = prepare_frameworks(frameworks)
-    phase.setup_with_frameworks(prepared_frameworks) unless target.sdk == 'macosx'
-
+    
+    # integrate
+    intergate_frameworks(target, project)
+    
     # Save Project
     project.save
 
-    # footer
-    say "\n"
-    print_report(frameworks)
-    say "\n"
     info 'Done. Re-open Project'
   end
 end

data/lib/cint/project.rb

@@ -25,15 +25,22 @@ module Cint
       fs = _fix_frameworks_paths(frameworks)
       fs -= target.frameworks_build_phase.files.map { |f| f.file_ref.path }
 
+      added_frameworks = []
       files = fs.map do |f|
         file = @project.frameworks_group.files.find { |ff| ff.path == f}
-        file = @project.frameworks_group.new_file(f) if file.nil?
+        if file.nil?
+          file = @project.frameworks_group.new_file(f) if file.nil?
+          added_frameworks << f
+        end
+        
         file
       end
 
       files.each do |f|
         target.frameworks_build_phase.add_file_reference(f)
       end
+      
+      return added_frameworks
     end
 
     def _fix_frameworks_paths(frameworks)

data/lib/cint/version.rb

@@ -1,3 +1,3 @@
 module Cint
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cint
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Alex Antonyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -72,20 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Simplifies all routines with adding Frameworks built with Carthage into a