react_native_util 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2425c426f2431713e38ebe51543ae8437ff6953ea0aac68a04560ea655c4aa5b
-  data.tar.gz: 064b49be7fa5e472a052a9c157bffea0c075e1f03fe7fee9bea3c312b0dfdc9b
+  metadata.gz: aa319e0b3ab7bd33e291b6419ca22f7bd242232ab76ee8092ddb8a8c431efcfa
+  data.tar.gz: 5344825ec01dfd74ac223a49dc4967baac3ed11ed1681725771280f3d143f316
 SHA512:
-  metadata.gz: c61350888eb02504d33771ef2c5bb7acd2be43b80b58586cff707833123bd19e203e3a1d71851cbbefc8e3e7e2d2c6af9d45e3983d1d069627b712eeb764bf08
-  data.tar.gz: 7783d98436a76f26c6c1619ff970eee5475c6730c67981cfec9293a4bfed8f514dc67478fbf09261a1009d2ff43d3948323a880f44024e2c4bc4e3ad01bf724a
+  metadata.gz: f8e5d7f9bff4dc2588a67514404ef1dec9c4a3969ed8f2dd0e4823f01b093ed4a5580cba81c9fb456b50b27301886afec7c33c6a45bb48a2a2d2e697bb66115d
+  data.tar.gz: dce01aeb806ecefeeabb787cd698ff63197e8a3c3b3eaf426ee4229eee9b1c86fcddbd8f3f8ae2f7580f55103ab8f89dc52145a787f8a69a6877cbfbb44def1d

data/README.md

@@ -135,52 +135,75 @@ git status
 
 _Typical command output:_
 ```
-2019-05-15T12:04:44-07:00 react_native_util react_pod v0.5.2
-2019-05-15T12:04:46-07:00  Darwin 18.5.0 x86_64
-2019-05-15T12:04:46-07:00  Ruby 2.6.3: ~/.rvm/rubies/ruby-2.6.3/bin/ruby
-2019-05-15T12:04:46-07:00  RubyGems 3.0.3: ~/.rvm/rubies/ruby-2.6.3/bin/gem
-2019-05-15T12:04:46-07:00  Bundler 2.0.1: ~/.rvm/gems/ruby-2.6.3/bin/bundle
-2019-05-15T12:04:46-07:00  react-native-cli: ~/.nvm/versions/node/v10.15.0/bin/react-native
-2019-05-15T12:04:46-07:00   react-native-cli: 2.0.1
-2019-05-15T12:04:46-07:00   react-native: 0.59.8
-2019-05-15T12:04:46-07:00  yarn 1.16.0: /usr/local/bin/yarn
-2019-05-15T12:04:47-07:00  cocoapods 1.6.1: ~/.rvm/gems/ruby-2.6.3/bin/pod
-2019-05-15T12:04:47-07:00  cocoapods-core: 1.6.1
-2019-05-15T12:04:47-07:00 package.json:
-2019-05-15T12:04:47-07:00  app name: "TestApp"
-2019-05-15T12:04:47-07:00 Found Xcode project at ~/github/$USER/react_native_util/examples/TestApp/ios/TestApp.xcodeproj
-2019-05-15T12:04:47-07:00 Dependencies:
-2019-05-15T12:04:47-07:00  react-native-webview
-2019-05-15T12:04:47-07:00 Unlinking dependencies
-[✔] react-native unlink react-native-webview success in 0.5 s
-2019-05-15T12:04:47-07:00 Generating ios/Podfile
-2019-05-15T12:04:47-07:00 Removing Libraries from TestApp
-2019-05-15T12:04:47-07:00  Removing libRCTBlob.a
-2019-05-15T12:04:47-07:00  Removing libRCTAnimation.a
-2019-05-15T12:04:47-07:00  Removing libReact.a
-2019-05-15T12:04:47-07:00  Removing libRCTActionSheet.a
-2019-05-15T12:04:47-07:00  Removing libRCTGeolocation.a
-2019-05-15T12:04:47-07:00  Removing libRCTImage.a
-2019-05-15T12:04:47-07:00  Removing libRCTLinking.a
-2019-05-15T12:04:47-07:00  Removing libRCTNetwork.a
-2019-05-15T12:04:47-07:00  Removing libRCTSettings.a
-2019-05-15T12:04:47-07:00  Removing libRCTText.a
-2019-05-15T12:04:47-07:00  Removing libRCTVibration.a
-2019-05-15T12:04:47-07:00  Removing libRCTWebSocket.a
-2019-05-15T12:04:47-07:00 Removing Libraries from TestAppTests
-2019-05-15T12:04:47-07:00  Removing libReact.a
-2019-05-15T12:04:47-07:00 Removing Libraries group
-2019-05-15T12:04:47-07:00 Linking dependencies
-[✔] react-native link react-native-webview success in 0.6 s
-2019-05-15T12:04:48-07:00 Generating Pods project and ios/TestApp.xcworkspace
-2019-05-15T12:04:48-07:00 Once pod install is complete, your project will be part of this workspace.
-2019-05-15T12:04:48-07:00 From now on, you should build the workspace with Xcode instead of the project.
-2019-05-15T12:04:48-07:00 Always add the workspace and Podfile.lock to SCM.
-2019-05-15T12:04:48-07:00 It is common practice also to add the Pods directory.
-2019-05-15T12:04:48-07:00 The workspace will be automatically opened when pod install completes.
-[✔] pod install success in 9.2 s
-2019-05-15T12:04:57-07:00 Conversion complete ✅
-2019-05-15T12:04:57-07:00 $ open ios/TestApp.xcworkspace
+2019-05-15T19:48:43-07:00 react_native_util react_pod v0.6.0
+2019-05-15T19:48:46-07:00  Darwin 18.5.0 x86_64
+2019-05-15T19:48:46-07:00  Ruby 2.6.3: ~/.rvm/rubies/ruby-2.6.3/bin/ruby
+2019-05-15T19:48:46-07:00  RubyGems 3.0.3: ~/.rvm/rubies/ruby-2.6.3/bin/gem
+2019-05-15T19:48:46-07:00  Bundler 2.0.1: ~/.rvm/gems/ruby-2.6.3/bin/bundle
+2019-05-15T19:48:46-07:00  react-native-cli: ~/.nvm/versions/node/v10.15.0/bin/react-native
+2019-05-15T19:48:46-07:00   react-native-cli: 2.0.1
+2019-05-15T19:48:46-07:00   react-native: 0.59.8
+2019-05-15T19:48:46-07:00  yarn 1.16.0: /usr/local/bin/yarn
+2019-05-15T19:48:47-07:00  cocoapods 1.6.2: ~/.rvm/gems/ruby-2.6.3/bin/pod
+2019-05-15T19:48:47-07:00  cocoapods-core: 1.6.2
+2019-05-15T19:48:47-07:00 package.json:
+2019-05-15T19:48:47-07:00  app name: "TestApp"
+2019-05-15T19:48:47-07:00 Found Xcode project at ~/github/$USER/react_native_util/examples/TestApp/ios/TestApp.xcodeproj
+2019-05-15T19:48:47-07:00 Dependencies:
+2019-05-15T19:48:47-07:00  react-native-webview
+2019-05-15T19:48:47-07:00 Unlinking dependencies
+[✔] react-native unlink react-native-webview success in 0.7 s
+2019-05-15T19:48:48-07:00 Generating ios/Podfile
+2019-05-15T19:48:48-07:00 Removing Libraries from TestApp
+2019-05-15T19:48:48-07:00  Removing libRCTBlob.a
+2019-05-15T19:48:48-07:00  Removing libRCTAnimation.a
+2019-05-15T19:48:48-07:00  Removing libReact.a
+2019-05-15T19:48:48-07:00  Removing libRCTActionSheet.a
+2019-05-15T19:48:48-07:00  Removing libRCTGeolocation.a
+2019-05-15T19:48:48-07:00  Removing libRCTImage.a
+2019-05-15T19:48:48-07:00  Removing libRCTLinking.a
+2019-05-15T19:48:48-07:00  Removing libRCTNetwork.a
+2019-05-15T19:48:48-07:00  Removing libRCTSettings.a
+2019-05-15T19:48:48-07:00  Removing libRCTText.a
+2019-05-15T19:48:48-07:00  Removing libRCTVibration.a
+2019-05-15T19:48:48-07:00  Removing libRCTWebSocket.a
+2019-05-15T19:48:48-07:00 Removing Libraries from TestAppTests
+2019-05-15T19:48:48-07:00  Removing libReact.a
+2019-05-15T19:48:48-07:00 Removing Libraries from TestApp-tvOS
+2019-05-15T19:48:48-07:00  Removing libReact.a
+2019-05-15T19:48:48-07:00  Removing libRCTAnimation.a
+2019-05-15T19:48:48-07:00  Removing libRCTImage-tvOS.a
+2019-05-15T19:48:48-07:00  Removing libRCTLinking-tvOS.a
+2019-05-15T19:48:48-07:00  Removing libRCTNetwork-tvOS.a
+2019-05-15T19:48:48-07:00  Removing libRCTSettings-tvOS.a
+2019-05-15T19:48:48-07:00  Removing libRCTText-tvOS.a
+2019-05-15T19:48:48-07:00  Removing libRCTWebSocket-tvOS.a
+2019-05-15T19:48:48-07:00 Removing Libraries from TestApp-tvOSTests
+2019-05-15T19:48:48-07:00  Removing libReact.a
+2019-05-15T19:48:48-07:00 Removing RCTAnimation.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing React.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTActionSheet.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTBlob.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTGeolocation.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTImage.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTLinking.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTNetwork.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTSettings.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTText.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTVibration.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing RCTWebSocket.xcodeproj from Libraries group.
+2019-05-15T19:48:48-07:00 Removing Libraries group.
+2019-05-15T19:48:48-07:00 Linking dependencies
+[✔] react-native link react-native-webview success in 0.5 s
+2019-05-15T19:48:48-07:00 Generating Pods project and ios/TestApp.xcworkspace
+2019-05-15T19:48:48-07:00 Once pod install is complete, your project will be part of this workspace.
+2019-05-15T19:48:48-07:00 From now on, you should build the workspace with Xcode instead of the project.
+2019-05-15T19:48:48-07:00 Always add the workspace and Podfile.lock to SCM.
+2019-05-15T19:48:48-07:00 It is common practice also to add the Pods directory.
+2019-05-15T19:48:48-07:00 The workspace will be automatically opened when pod install completes.
+[✔] pod install success in 10.6 s
+2019-05-15T19:48:59-07:00 Conversion complete ✅
+2019-05-15T19:48:59-07:00 $ open ios/TestApp.xcworkspace
 ```
 
 ## Convert your own app with Rake
@@ -253,4 +276,5 @@ https://www.rubydoc.info/gems/react_native_util.
 
 ## Successfully converted apps:
 
-- https://github.com/azhavrid/movie-swiper
+https://github.com/azhavrid/movie-swiper
+([gist](https://gist.github.com/jdee/58746c8484d508fa318df8642ec99da8))

data/lib/assets/templates/Podfile-target.erb

@@ -0,0 +1,5 @@
+  pod 'React',
+    path: '../node_modules/react-native',
+    subspecs: %w[
+      <%= subspecs_from_libraries.join("\n      ") + "\n" -%>
+    ]

data/lib/assets/templates/Podfile.erb

@@ -1,25 +1,37 @@
-platform :ios, '<%= app_target.deployment_target %>'
+# Generated by <%= NAME %> react_pod v<%= VERSION %> at <%= Time.now %>
+# <%= GITHUB_REPO %>
 
-target '<%= app_name %>' do
-  pod 'React',
-    path: '../node_modules/react-native',
-    subspecs: %w[
-      Core
-      CxxBridge
-      DevSupport
-      <%= app_target.subspecs_from_libraries.join("\n      ") %>
-    ]
-  pod 'yoga', path: '../node_modules/react-native/ReactCommon/yoga'
-  pod 'Folly', podspec: '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
+# use_frameworks!
 
+pod 'yoga', path: '../node_modules/react-native/ReactCommon/yoga'
+pod 'Folly', podspec: '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+
+target '<%= app_target.name %>' do
+  platform :ios, '<%= app_target.deployment_target %>'
+<%= app_target.podfile_excerpt %>
   # --- react-native link adds pods below this line. ---
 
 end
 
 <% if test_target %>
 target '<%= test_target.name %>' do
-  pod 'React', path: '../node_modules/react-native', subspecs: <%= (%w[Core CxxBridge] + test_target.subspecs_from_libraries).inspect %>
-  pod 'yoga', path: '../node_modules/react-native/ReactCommon/yoga'
-  pod 'Folly', podspec: '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+  platform :ios, '<%= app_target.deployment_target %>'
+<%= test_target.podfile_excerpt %>
+end
+<% end %>
+
+# As of 0.59.8, the React pod does not compile for tvOS
+<% if app_target :tvos %>
+target '<%= app_target(:tvos).name %>' do
+  platform :tvos, '<%= app_target(:tvos).deployment_target %>'
+<%= app_target(:tvos).podfile_excerpt %>
+end
+<% end %>
+
+<% if test_target :tvos %>
+target '<%= test_target(:tvos).name %>' do
+  platform :tvos, '<%= app_target(:tvos).deployment_target %>'
+<%= test_target(:tvos).podfile_excerpt %>
 end
 <% end %>

data/lib/react_native_util/converter.rb

@@ -281,8 +281,8 @@ module ReactNativeUtil
     end
 
     def load_react_podspec!
-      podspec_dir = 'node_modules/react-native'
-      podspec_contents = File.read "#{podspec_dir}/React.podspec"
+      podspec_dir = File.dirname react_podspec_path
+      podspec_contents = File.read react_podspec_path
       podspec_contents.gsub!(/__dir__/, podspec_dir.inspect)
 
       require 'cocoapods-core'
@@ -291,18 +291,22 @@ module ReactNativeUtil
       # rubocop: enable Security/Eval
     end
 
+    def react_podspec_path
+      File.expand_path 'node_modules/react-native/React.podspec'
+    end
+
     # The name of the app as specified in package.json
     # @return [String] the app name
     def app_name
       @app_name ||= package_json['name']
     end
 
-    def app_target
-      project.app_target
+    def app_target(platform = :ios)
+      project.app_target platform
     end
 
-    def test_target
-      project.test_target
+    def test_target(platform = :ios)
+      project.test_target platform
     end
 
     def podfile_path
@@ -312,7 +316,7 @@ module ReactNativeUtil
     # Generate a Podfile from a template.
     def generate_podfile!
       log "Generating #{podfile_path}"
-      podfile_contents = ERB.new(File.read(PODFILE_TEMPLATE_PATH)).result binding
+      podfile_contents = ERB.new(File.read(PODFILE_TEMPLATE_PATH), nil, '<>').result binding
       File.open podfile_path, 'w' do |file|
         file.write podfile_contents
       end

data/lib/react_native_util/core_ext/xcodeproj.rb

@@ -4,6 +4,14 @@ module Xcodeproj
   class Project
     module Object
       class AbstractTarget
+        PODFILE_TARGET_TEMPLATE_PATH = File.expand_path '../../assets/templates/Podfile-target.erb', __dir__
+
+        def podfile_excerpt(commented_out: false)
+          text = ERB.new(File.read(PODFILE_TARGET_TEMPLATE_PATH), nil, '-').result binding
+          text = text.split("\n").map { |line| "# #{line}" }.join("\n") if commented_out
+          "#{text}\n"
+        end
+
         def subspecs_from_libraries
           libs = frameworks_build_phase.files.select do |file|
             path = file.file_ref.pretty_print
@@ -12,11 +20,15 @@ module Xcodeproj
 
             # project is a ReactNativeUtil::Project
             # #static_libs is from the Libraries group
-            project.static_libs.include?(path)
+            project.static_libs(platform_name).include?(path)
           end
 
-          libs.map do |lib|
+          react_project_subspecs = %w[Core CxxBridge DevSupport]
+          react_project_subspecs << 'tvOS' if platform_name == :tvos
+
+          react_project_subspecs + libs.map do |lib|
             root = lib.file_ref.pretty_print.sub(/^lib(.*)\.a$/, '\1')
+            root.sub!(/-tvOS/, '')
 
             case root
             when 'RCTLinking'

data/lib/react_native_util/metadata.rb

@@ -1,11 +1,13 @@
 # Conversion tools for React Native projects
 module ReactNativeUtil
   NAME = 'react_native_util'
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
   SUMMARY = 'Community utility CLI for React Native projects'
   DESCRIPTION = 'Converts a project created with react-native init to use CocoaPods with the ' \
                 'React pod from node_modules. This preserves compatibility with ' \
                 'react-native link. A converted project will still start the Metro packager ' \
                 'automatically via a Run Script build phase in the Xcode project. This is an ' \
                 'alternative to performing manual surgery on a project in Xcode.'
+  GITHUB_ORG  = 'jdee'
+  GITHUB_REPO = "https://github.com/#{GITHUB_ORG}/#{NAME}"
 end

data/lib/react_native_util/project.rb

@@ -29,12 +29,12 @@ module ReactNativeUtil
 
     attr_accessor :app_name
 
-    def app_target
-      targets.find { |t| t.platform_name == :ios && t.product_type == 'com.apple.product-type.application' }
+    def app_target(platform = :ios)
+      targets.find { |t| t.platform_name == platform && t.product_type == 'com.apple.product-type.application' }
     end
 
-    def test_target
-      targets.select(&:test_target_type?).select { |t| t.platform_name == :ios }.first
+    def test_target(platform = :ios)
+      targets.select(&:test_target_type?).select { |t| t.platform_name == platform }.first
     end
 
     # Validate an assumption about the project. TODO: Provide override option.
@@ -49,19 +49,58 @@ module ReactNativeUtil
       self['Libraries']
     end
 
+    def targets_linking_with(root)
+      targets_matching do |r|
+        if root.respond_to?(:include?)
+          root.include? r
+        else
+          log "r = #{r}, root = #{root}"
+          r == root
+        end
+      end
+    end
+
+    def targets_matching(&block)
+      targets.reject do |target|
+        file_refs = target.frameworks_build_phase.files.map(&:file_ref).reject(&:nil?).map(&:pretty_print)
+
+        libs_from_libraries_group = file_refs.select do |lib|
+          lib = lib.sub(/-tvOS/, '')
+          matches = /^lib(.+)\.a$/.match lib
+          next false unless matches
+
+          yield matches[1]
+        end
+
+        libs_from_libraries_group.empty?
+      end
+    end
+
     # Remove the Libraries group from the xcodeproj in memory.
     def remove_libraries_group
-      # Remove links against these static libraries
-      targets.select { |t| t.platform_name == :ios }.each do |t|
+      # Remove links against these static libraries from all targets
+      targets.each do |t|
         remove_libraries_from_target t
       end
 
-      unless (library_roots - DEFAULT_DEPENDENCIES).empty?
+      # Remove any unused projects from the Libraries group
+      library_roots.each do |root|
+        next unless targets_linking_with(root).empty?
+
+        # Remove this lib from the Libraries group. Nothing is linking against it
+        # anymore.
+        child = libraries_group.children.find { |c| c.path =~ /#{root}\.xcodeproj/ }
+        log "Removing #{root}.xcodeproj from Libraries group."
+        child.remove_from_project
+      end
+
+      # Remove the Libraries group if it's empty. Or report that it's not.
+      unless library_roots.empty?
         log 'Libraries group not empty. Not removing.'
         return
       end
 
-      log 'Removing Libraries group'
+      log 'Removing Libraries group.'
       libraries_group.remove_from_project
     end
 
@@ -70,6 +109,7 @@ module ReactNativeUtil
         path = file.file_ref.pretty_print
         next false unless /^lib(.+)\.a$/.match?(path)
 
+        path = path.sub(/-tvOS\.a$/, '.a')
         static_libs.include?(path)
       end
 
@@ -152,8 +192,15 @@ module ReactNativeUtil
 
     # All static libraries from the Libraries group
     # @return [Array<String>] an array of filenames
-    def static_libs
-      library_roots.map { |root| "lib#{root}.a" }
+    def static_libs(platform = :ios)
+      library_roots.map do |root|
+        case platform
+        when :tvos
+          "lib#{root}-tvOS.a"
+        else
+          "lib#{root}.a"
+        end
+      end
     end
 
     # Returns the original Start Packager build phase (from the React.xcodeproj

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_native_util
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -237,7 +237,7 @@ files:
 - README.md
 - bin/react_native_util
 - bin/rn
-- lib/assets/patches/version.yml
+- lib/assets/templates/Podfile-target.erb
 - lib/assets/templates/Podfile.erb
 - lib/react_native_util.rb
 - lib/react_native_util/cli.rb

data/lib/assets/patches/version.yml

@@ -1,3 +0,0 @@
-regexp: "(VERSION = ['\"])[^'\"]+"
-text: '\1<%= version %>'
-mode: replace