react_native_util 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4495b59cc2e3fe5dc64a4c39d2c1392ba78eac7dd0416951d2adfb91b261ad0b
-  data.tar.gz: 861b5462fc20ef9d5a270ed84b1f152261e8ca62d2c1c80a1000194f44bcdba3
+  metadata.gz: 6db3f0bd398429fdfe2b21315c6fbf4c0e269d1c2194d3b4c0db07339ae03921
+  data.tar.gz: '08a734aa93a6bb080eb7fd63f932165a5fd3a4652f847cf2b5d74c03ee557df5'
 SHA512:
-  metadata.gz: 58cda62803a11796d7d231126189ee4c4f81a9fa9b44e93ea3af82349244c17d620d8a9ee79ef7a92706f43caf0ab538c5a972ffd3a10c36c302c6dd9d36b094
-  data.tar.gz: 38b5639df1425eca480333a181b168b22362ecb51c1e9036f5788c448601fdb82eef9a1157b3f09ad2626d4ef090f4e7be6dc7a493ea4ef302ba9e362f89a595
+  metadata.gz: c20af6ddf47bf1f33d6a2239b1495744aa51b494b7c0e17ac0d02f0bf5972a45f527f81d20e230b539206cb4e1cf913fcd66f4eecdc3d3271eabc0f21ec3a2b2
+  data.tar.gz: 8052d6b6998484502602087f15dc62d1b8eda7ad6f74e6f8868ea7490be2cd4e4dcfa6e793bc81be62d47fd3784a9e06c472096337652f5330b102ccc81959e6

data/README.md

@@ -17,7 +17,7 @@ alternative to performing manual surgery on a project in Xcode.
 
 ## Prerequisites
 
-_macOS required_
+_macOS & Xcode required_
 
 The react_pod command requires `yarn` from Homebrew and the `react-native-cli`.
 If installing react_native_util from the Homebrew tap, `yarn` will be
@@ -53,6 +53,11 @@ brew install react-native-cli
 brew install jdee/tap/react_native_util
 ```
 
+Include react-native-cli from Homebrew:
+```bash
+brew install jdee/tap/react_native_util --with-react-native-cli
+```
+
 ## Gemfile
 
 ```Ruby
@@ -94,35 +99,42 @@ git status
 
 _Typical command output:_
 ```
-2019-05-12T15:37:50-07:00 react_native_util react_pod v0.3.0
-[✔] yarn install success in 7.2 s
-2019-05-12T15:37:57-07:00  Darwin 18.5.0 x86_64
-2019-05-12T15:37:57-07:00  Ruby 2.6.3: ~/.rvm/rubies/ruby-2.6.3/bin/ruby
-2019-05-12T15:37:57-07:00  RubyGems 3.0.3: ~/.rvm/rubies/ruby-2.6.3/bin/gem
-2019-05-12T15:37:57-07:00  Bundler 1.17.2: ~/.rvm/gems/ruby-2.6.3/bin/bundle
-2019-05-12T15:37:57-07:00  react-native-cli: /usr/local/bin/react-native
-2019-05-12T15:37:57-07:00   react-native-cli: 2.0.1
-2019-05-12T15:37:57-07:00   react-native: 0.59.8
-2019-05-12T15:37:58-07:00  yarn 1.16.0: /usr/local/bin/yarn
-2019-05-12T15:37:58-07:00  cocoapods 1.6.1: ~/.rvm/gems/ruby-2.6.3/bin/pod
-2019-05-12T15:37:58-07:00  cocoapods-core: 1.6.1
-2019-05-12T15:37:58-07:00 package.json:
-2019-05-12T15:37:58-07:00  app name: "TestApp"
-2019-05-12T15:37:58-07:00 Found Xcode project at ~/github/jdee/react_native_util/examples/TestApp/ios/TestApp.xcodeproj
-2019-05-12T15:37:58-07:00 Dependencies:
-2019-05-12T15:37:58-07:00  react-native-webview
-2019-05-12T15:37:58-07:00 Unlinking dependencies
-[✔] react-native unlink react-native-webview success in 0.6 s
-2019-05-12T15:37:59-07:00 Removing Libraries from TestApp
-2019-05-12T15:37:59-07:00 Removing Libraries from TestAppTests
-2019-05-12T15:37:59-07:00 Removing Libraries group
-2019-05-12T15:37:59-07:00 Generating ios/Podfile
-2019-05-12T15:37:59-07:00 Linking dependencies
-[✔] react-native link react-native-webview success in 0.5 s
-2019-05-12T15:37:59-07:00 Generating Pods project and ios/TestApp.xcworkspace
-[✔] pod install success in 12.2 s
-2019-05-12T15:38:12-07:00 Conversion complete ✅
-2019-05-12T15:38:12-07:00 $ open ios/TestApp.xcworkspace
+2019-05-14T12:30:50-07:00 react_native_util react_pod v0.4.0
+2019-05-14T12:30:52-07:00  Darwin 18.5.0 x86_64
+2019-05-14T12:30:52-07:00  Ruby 2.3.7: ~/.rvm/rubies/ruby-2.3.7/bin/ruby
+2019-05-14T12:30:52-07:00  RubyGems 3.0.3: ~/.rvm/rubies/ruby-2.3.7/bin/gem
+2019-05-14T12:30:52-07:00  Bundler 1.17.3: ~/.rvm/gems/ruby-2.3.7/bin/bundle
+2019-05-14T12:30:52-07:00  react-native-cli: ~/.nvm/versions/node/v10.15.0/bin/react-native
+2019-05-14T12:30:52-07:00   react-native-cli: 2.0.1
+2019-05-14T12:30:52-07:00   react-native: 0.59.8
+2019-05-14T12:30:52-07:00  yarn 1.16.0: /usr/local/bin/yarn
+2019-05-14T12:30:53-07:00  cocoapods 1.6.1: ~/.rvm/gems/ruby-2.3.7/bin/pod
+2019-05-14T12:30:53-07:00  cocoapods-core: 1.6.1
+2019-05-14T12:30:53-07:00 package.json:
+2019-05-14T12:30:53-07:00  app name: "TestApp"
+2019-05-14T12:30:53-07:00 Found Xcode project at ~/github/jdee/react_native_util/examples/TestApp/ios/TestApp.xcodeproj
+2019-05-14T12:30:53-07:00 Dependencies:
+2019-05-14T12:30:53-07:00  react-native-webview
+2019-05-14T12:30:53-07:00 Unlinking dependencies
+[✔] react-native unlink react-native-webview success in 0.5 s
+2019-05-14T12:30:53-07:00 Generating ios/Podfile
+2019-05-14T12:30:53-07:00 Removing Libraries from TestApp
+2019-05-14T12:30:53-07:00 Removing Libraries from TestAppTests
+2019-05-14T12:30:53-07:00 Removing Libraries group
+2019-05-14T12:30:53-07:00 Linking dependencies
+[✔] react-native link react-native-webview success in 0.6 s
+2019-05-14T12:30:54-07:00 Generating Pods project and ios/TestApp.xcworkspace
+[✔] pod install success in 10.2 s
+2019-05-14T12:31:04-07:00 Conversion complete ✅
+2019-05-14T12:31:04-07:00 $ open ios/TestApp.xcworkspace
+```
+
+## Convert your own app with Rake
+
+From this repo:
+
+```bash
+bundle exec rake react_pod[/path/to/your/app]
 ```
 
 ## Rake task
@@ -144,6 +156,11 @@ ReactNativeUtil::Rake::ReactPodTask.new(
 )
 ```
 
+Override `chdir` at the command line:
+```bash
+rake react_pod[/path/to/another/rn/project]
+```
+
 ## Ruby script
 
 ```Ruby

data/lib/assets/patches/version.yml

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

data/lib/assets/templates/Podfile.erb

@@ -7,7 +7,7 @@ target '<%= app_name %>' do
       Core
       CxxBridge
       DevSupport
-      <%= @subspecs_from_libraries.join("\n      ") %>
+      <%= 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'
@@ -18,7 +18,7 @@ end
 
 <% if test_target %>
 target '<%= test_target.name %>' do
-  pod 'React', path: '../node_modules/react-native', subspecs: %w[Core CxxBridge]
+  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'
 end

data/lib/react_native_util/converter.rb

@@ -87,7 +87,8 @@ module ReactNativeUtil
 
       project.validate_app_target!
 
-      load_react_podspec!
+      # Not used at the moment
+      # load_react_podspec!
 
       # 2. Detect native dependencies in Libraries group.
       log 'Dependencies:'
@@ -106,27 +107,23 @@ module ReactNativeUtil
       load_xcodeproj!
       load_react_project!
 
-      # 4a. Add Start Packager script
+      # 4. Add Start Packager script
       project.add_packager_script_from react_project
 
-      # Make a note of pod subspecs to replace Libraries group
-      load_subspecs_from_libraries
+      # 5. Generate boilerplate Podfile.
+      generate_podfile!
 
-      # 4b. Remove Libraries group from Xcode project.
+      # 6. Remove Libraries group from Xcode project.
       project.remove_libraries_group
-
       project.save
 
-      # 5. Generate boilerplate Podfile.
-      generate_podfile!
-
-      # 6. Run react-native link for each dependency.
+      # 7. Run react-native link for each dependency (adds to Podfile).
       log 'Linking dependencies'
       deps_to_add.each do |dep|
         run_command_with_spinner! 'react-native', 'link', dep, log: File.join(Dir.tmpdir, "react-native-link-#{dep}.log")
       end
 
-      # 7. pod install
+      # 8. pod install
       log "Generating Pods project and ios/#{app_name}.xcworkspace"
       command = %w[pod install]
       command << '--repo-update' if options[:repo_update]
@@ -134,10 +131,10 @@ module ReactNativeUtil
 
       log 'Conversion complete ✅'
 
-      # 8. SCM/git (add, commit - optional)
-
       # 9. Open workspace/build
       execute 'open', File.join('ios', "#{app_name}.xcworkspace")
+
+      # 10. TODO: SCM/git (add, commit - optional)
     end
 
     # Read the contents of ./package.json into @package_json
@@ -227,18 +224,6 @@ module ReactNativeUtil
       # rubocop: enable Security/Eval
     end
 
-    def load_subspecs_from_libraries
-      roots = project.library_roots - %w[React]
-      @subspecs_from_libraries = roots.select { |r| Project::DEFAULT_DEPENDENCIES.include?(r) }.map do |root|
-        case root
-        when 'RCTLinking'
-          'RCTLinkingIOS'
-        else
-          root
-        end
-      end
-    end
-
     # The name of the app as specified in package.json
     # @return [String] the app name
     def app_name
@@ -268,15 +253,11 @@ module ReactNativeUtil
 
     def check_repo_status!
       # If the git command is not installed, there's not much we can do.
-      # Don't want to use verify_git here, which will insist on installing
-      # the command. The logic of that method could change.
       return if `which git`.empty?
 
-      unless Dir.exist? ".git"
-        `git rev-parse --git-dir > /dev/null 2>&1`
-        # Not a git repo
-        return unless $?.success?
-      end
+      `git rev-parse --git-dir > /dev/null 2>&1`
+      # Not a git repo
+      return unless $?.success?
 
       `git diff-index --quiet HEAD --`
       return if $?.success?
@@ -287,8 +268,7 @@ module ReactNativeUtil
     # Load the contents of the React.xcodeproj project from node_modules.
     # @raise Xcodeproj::PlainInformative in case of most failures
     def load_react_project!
-      path = project.libraries_group.children.find { |c| c.path =~ /React.xcodeproj/ }.real_path
-      @react_project = Project.open path
+      @react_project = Project.open 'node_modules/react-native/React/React.xcodeproj'
     end
   end
 end

data/lib/react_native_util/core_ext/xcodeproj.rb

@@ -0,0 +1,32 @@
+require 'xcodeproj'
+
+module Xcodeproj
+  class Project
+    module Object
+      class AbstractTarget
+        def subspecs_from_libraries
+          libs = frameworks_build_phase.files.select do |file|
+            path = file.file_ref.pretty_print
+            next false unless /^lib(.+)\.a$/.match?(path)
+            next false if path == 'libReact.a'
+
+            # project is a ReactNativeUtil::Project
+            # #static_libs is from the Libraries group
+            project.static_libs.include?(path)
+          end
+
+          libs.map do |lib|
+            root = lib.file_ref.pretty_print.sub(/^lib(.*)\.a$/, '\1')
+
+            case root
+            when 'RCTLinking'
+              'RCTLinkingIOS'
+            else
+              root
+            end
+          end
+        end
+      end
+    end
+  end
+end

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.3.2'
+  VERSION = '0.4.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 ' \

data/lib/react_native_util/project.rb

@@ -1,4 +1,4 @@
-require 'xcodeproj'
+require_relative 'core_ext/xcodeproj'
 require_relative 'util'
 
 module ReactNativeUtil

data/lib/react_native_util/rake/react_pod_task.rb

@@ -7,6 +7,10 @@ module ReactNativeUtil
     # Rakefile:
     #   require 'react_native_util/rake'
     #   ReactNativeUtil::Rake::ReactPodTask.new chdir: '/path/to/rn/app'
+    #
+    # The task accepts a path argument that overrides chdir. If neither
+    # chdir or a path argument is provided, the command executes in the
+    # current directory.
     class ReactPodTask < ::Rake::TaskLib
       include Util
       def initialize(
@@ -16,8 +20,9 @@ module ReactNativeUtil
         repo_update: boolean_env_var?(:REACT_NATIVE_UTIL_REPO_UPDATE)
       )
         desc description
-        task name do
-          Dir.chdir chdir do
+        task name, %i[path] do |_task, opts|
+          project_dir = opts[:path] || chdir
+          Dir.chdir project_dir do
             Converter.new(repo_update: repo_update).convert_to_react_pod!
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_native_util
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ files:
 - README.md
 - bin/react_native_util
 - bin/rn
+- lib/assets/patches/version.yml
 - lib/assets/templates/Podfile.erb
 - lib/react_native_util.rb
 - lib/react_native_util/cli.rb
@@ -244,6 +245,7 @@ files:
 - lib/react_native_util/core_ext/io.rb
 - lib/react_native_util/core_ext/regexp.rb
 - lib/react_native_util/core_ext/string.rb
+- lib/react_native_util/core_ext/xcodeproj.rb
 - lib/react_native_util/exceptions.rb
 - lib/react_native_util/metadata.rb
 - lib/react_native_util/project.rb