react_native_util 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58961157dd9ea8d01ec449637c1176395346c7642fe46d0fc28b47a957fde4ea
-  data.tar.gz: 6a20fb2a70fa264e561f2b69314e8b4a2d88c48144583919010cf5b321234b75
+  metadata.gz: 44ea8dd51fe614a4e2783d13f25c4d9b3a07fe363817b0beae8e625419c5bfa2
+  data.tar.gz: 9cda19321bfb85e2ef98a45ec0c0837d72f54da09e4e9a85d094a1d6a6d19a4e
 SHA512:
-  metadata.gz: 3f6c62f22d58fe55fccb9b763b5bc0dbfa369ab52af53fcb65d3688c7e4a4b858481aeb1b7fcca25ea16e72d49fdeacdc520fba005fb8229dd800b88017c6e31
-  data.tar.gz: 92b345621ac4e5d59eef6cb454cb4b3343965942ed353a1b3a1da6e04754e2b9c4fc5ab8a1399b8c6268eecc0dc38b71d1bc415a88001fc2abb812b77aa6f4f4
+  metadata.gz: 37d07a4d245c1eba1d5a359b254aee5f7c62c69b3c19884d3481d4c8546e1c34f293e89c68248ae91b087ce2c2ac74c0e136ebedbdb25cf4e43ed7a1843310bb
+  data.tar.gz: 165f4085612334cb8d1d89c1be685ededdac5f64ba176933d420b38a4ffe9a8475aaec18e690e2b3fdd2c2c201ea681de0dd640aac621a276c16276fa62cfe64

data/README.md

@@ -14,7 +14,7 @@ Community utility CLI for React Native projects.
 _macOS required_
 
 ```bash
-brew install yarn
+brew install yarn # Not necessary if installing from Homebrew tap
 npm install -g react-native-cli
 ```
 
@@ -27,8 +27,7 @@ npm install -g react-native-cli
 ## Install from Homebrew tap
 
 ```bash
-brew tap jdee/tap
-brew install react_native_util
+brew install jdee/tap/react_native_util
 ```
 
 ## Gemfile

data/lib/assets/templates/Podfile.erb

@@ -7,17 +7,7 @@ target '<%= app_name %>' do
       Core
       CxxBridge
       DevSupport
-      RCTActionSheet
-      RCTAnimation
-      RCTBlob
-      RCTGeolocation
-      RCTImage
-      RCTLinkingIOS
-      RCTNetwork
-      RCTSettings
-      RCTText
-      RCTVibration
-      RCTWebSocket
+      <%= @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'

data/lib/react_native_util/converter.rb

@@ -9,17 +9,21 @@ module ReactNativeUtil
   class Converter
     include Util
 
-    # [Array<String>] Default contents of Libraries group
+    # [Array<String>] Xcode projects from react-native that may be in the Libraries group
     DEFAULT_DEPENDENCIES = %w[
-      RCTAnimation
+      ART
       React
       RCTActionSheet
+      RCTAnimation
       RCTBlob
+      RCTCameraRoll
       RCTGeolocation
       RCTImage
       RCTLinking
       RCTNetwork
+      RCTPushNotification
       RCTSettings
+      RCTTest
       RCTText
       RCTVibration
       RCTWebSocket
@@ -38,6 +42,7 @@ module ReactNativeUtil
     attr_reader :xcodeproj
 
     attr_reader :options
+    attr_reader :react_podspec
 
     def initialize(repo_update: nil)
       @options = {}
@@ -60,11 +65,8 @@ module ReactNativeUtil
       log 'package.json:'
       log " app name: #{app_name.inspect}"
 
-      log 'Installing NPM dependencies with yarn'
-      execute 'yarn'
-
       # 1. Detect project. TODO: Add an option to override.
-      @xcodeproj_path = File.expand_path "ios/#{package_json['name']}.xcodeproj"
+      @xcodeproj_path = File.expand_path "ios/#{app_name}.xcodeproj"
       load_xcodeproj!
       log "Found Xcode project at #{xcodeproj_path}"
 
@@ -73,6 +75,13 @@ module ReactNativeUtil
         exit 0
       end
 
+      # Don't run yarn until we're sure we're proceeding,
+      log 'Installing NPM dependencies with yarn'
+      execute 'yarn'
+
+      # Unused, but should be there and parseable
+      load_react_podspec!
+
       # 2. Detect native dependencies in Libraries group.
       log 'Dependencies:'
       dependencies.each { |d| log " #{d}" }
@@ -88,17 +97,19 @@ module ReactNativeUtil
       # reload after react-native unlink
       load_xcodeproj!
 
-      # 4a. TODO: Add Start Packager script
+      # 4a. Add Start Packager script
       validate_app_target!
       add_packager_script
 
+      # Make a note of pod subspecs to replace Libraries group
+      load_subspecs_from_libraries
+
       # 4b. Remove Libraries group from Xcode project.
       remove_libraries_group_from_project!
 
       xcodeproj.save
 
       # 5. Generate boilerplate Podfile.
-      # TODO: Determine appropriate subspecs from contents of Libraries group
       generate_podfile!
 
       # 6. Run react-native link for each dependency.
@@ -138,6 +149,17 @@ module ReactNativeUtil
       raise ConversionError, "Failed to load #{xcodeproj_path}: #{e.message}"
     end
 
+    def load_react_podspec!
+      podspec_dir = 'node_modules/react-native'
+      podspec_contents = File.read "#{podspec_dir}/React.podspec"
+      podspec_contents.gsub!(/__dir__/, podspec_dir.inspect)
+
+      require 'cocoapods-core'
+      # rubocop: disable Security/Eval
+      @react_podspec = eval(podspec_contents)
+      # rubocop: enable Security/Eval
+    end
+
     # A representation of the Libraries group (if any) from the Xcode project.
     # @return the Libraries group
     def libraries_group
@@ -189,12 +211,27 @@ module ReactNativeUtil
       paths.map { |p| File.expand_path p, File.join(Dir.pwd, 'ios') }
     end
 
+    def library_roots
+      libraries_group.children.map do |library|
+        File.basename(library.path).sub(/\.xcodeproj$/, '')
+      end
+    end
+
     # All static libraries from the Libraries group
     # @return [Array<String>] an array of filenames
     def static_libs
-      libraries_group.children.map do |library|
-        root = File.basename(library.path).sub(/\.xcodeproj$/, '')
-        "lib#{root}.a"
+      library_roots.map { |root| "lib#{root}.a" }
+    end
+
+    def load_subspecs_from_libraries
+      roots = library_roots - %w[React]
+      @subspecs_from_libraries = roots.select { |r| DEFAULT_DEPENDENCIES.include?(r) }.map do |root|
+        case root
+        when 'RCTLinking'
+          'RCTLinkingIOS'
+        else
+          root
+        end
       end
     end
 
@@ -242,17 +279,38 @@ module ReactNativeUtil
       raise ConversionError, 'Uncommitted changes in repo. Please commit or stash before continuing.'
     end
 
+    # Adds the Start Packager script from the React.xcodeproj under node_modules
+    # to the main application target before deleting React.xcodeproj from the
+    # Libraries group. Adjusts paths in the script to account for the different
+    # project location. If React.xcodeproj cannot be opened, or if the relevant
+    # build phase is not found, a warning is logged, and this step is skipped.
+    #
+    # TODO: The build phase is added after all other build phases. Ideally it
+    # can be moved to the beginning. The packager is independent of the Xcode
+    # build process. It may be started at any time. Starting it early is an
+    # optimization that allows it to load while the build is in progress.
+    # Currently it's possible to simply drag the build phase in Xcode to a
+    # higher position after running the react_pod command.
     def add_packager_script
-      script = packager_script
-      return unless script
+      old_packager_phase = packager_phase_from_react_project
+      unless old_packager_phase
+        log 'Could not find packager build phase in React.xcodeproj. Skipping.'.yellow
+        return
+      end
 
+      # location of project is different relative to packager script
+      script = old_packager_phase.shell_script.gsub(%r{../scripts}, '../node_modules/react-native/scripts')
+
+      # target can't be nil. Already validated earlier by #validate_app_target!
       target = xcodeproj.targets.find { |t| t.name == app_name }
-      phase = target.new_shell_script_build_phase 'Start Packager'
+      phase = target.new_shell_script_build_phase old_packager_phase.name
       phase.shell_script = script
-
-      # TODO: Move this build phase to the top of the list before the pod install.
     end
 
+    # Returns a Project object with the contents of the React.xcodeproj project
+    # from node_modules.
+    # @return [Xcodeproj::Project] a Project object with the contents of React.xcodeproj from node_modules
+    # @raise Xcodeproj::PlainInformative in case of most failures
     def react_project!
       return @react_project if @react_project
 
@@ -260,8 +318,12 @@ module ReactNativeUtil
       @react_project = Xcodeproj::Project.open path
     end
 
-    def packager_script
-      react_project!.targets.first.build_phases.find { |p| p.name =~ /packager/i }.shell_script.gsub(%r{../scripts}, '../node_modules/react-native/scripts')
+    # Returns the original Start Packager build phase from the React.xcodeproj
+    # under node_modules. This contains the original script.
+    # @return the packager build phase if found
+    # @return nil if not found or React.xcodeproj cannot be opened
+    def packager_phase_from_react_project
+      react_project!.targets.first.build_phases.find { |p| p.name =~ /packager/i }
     rescue Errno::ENOENT
       log 'Could not open React.xcodeproj. File not found.'
       nil

data/lib/react_native_util/metadata.rb

@@ -1,7 +1,7 @@
 # Conversion tools for React Native projects
 module ReactNativeUtil
   NAME = 'react_native_util'
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   SUMMARY = 'Community utility CLI for React Native projects'
   DESCRIPTION = 'Automatically modifies a project created with react-native ' \
     'init to use the React pod from node_modules.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_native_util
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods