react_native_util 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec7faa11d4e1299c289b1fb7f155068749610da6c8c82c38a832bf71931a1c06
-  data.tar.gz: 4e84dd8004655ba30919db3fcf9af3fdb06b7e15bacd0bf77b9169abdc6afcd6
+  metadata.gz: dfaa6619187a580a0872773ae36342ea43700ab1b3e9dd8da45f580dab7fb580
+  data.tar.gz: 74a0a023c968f18bacea1789b5601f90bc976bce155abb7571104a74399e7ede
 SHA512:
-  metadata.gz: b7da0570c0270088031c9666b1ef8b2b34e41bb08df9b3f8b7442612ddea5e450832d04380d2a739e77263b450782a263561b20fb90b50459b075be8a902bf8c
-  data.tar.gz: 8ee1632015a0c50e1e1722772c0bb67239d030f8cd0300decd14ec56162c5571adfe67fa3f0a26d753e4efb27a97ce11cf312445edbf0070498418463f39c29c
+  metadata.gz: 9ad3d26ed58e0d1d070d1cc48acf76f25ffd5aede1275f2554f6e246d294caf1fd6156b2875d2feea66bafe839bcce42c0774b725fe63724286f37ff0c07fd2a
+  data.tar.gz: 93890c3de8daedf7f2380a86f4463a55a45518dba1c77f7700646a50b02e45e8da72d5c5a5ba62461961d70d69d86ae2bf5c74421e20e0e93f6e69a7551ba0c7

data/README.md

@@ -64,6 +64,13 @@ brew install jdee/tap/react_native_util --with-react-native-cli
 gem 'react_native_util'
 ```
 
+## Fastlane
+
+See https://github.com/jdee/fastlane-plugin-react_native_util
+```bash
+fastlane add_plugin react_native_util
+```
+
 ## Usage
 
 ```bash
@@ -128,34 +135,39 @@ git status
 
 _Typical command output:_
 ```
-2019-05-14T12:30:50-07:00 react_native_util react_pod v0.5.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
+2019-05-14T19:21:36-07:00 react_native_util react_pod v0.5.1
+2019-05-14T19:21:37-07:00  Darwin 18.5.0 x86_64
+2019-05-14T19:21:37-07:00  Ruby 2.6.3: ~/.rvm/rubies/ruby-2.6.3/bin/ruby
+2019-05-14T19:21:37-07:00  RubyGems 3.0.3: ~/.rvm/rubies/ruby-2.6.3/bin/gem
+2019-05-14T19:21:37-07:00  Bundler 2.0.1: ~/.rvm/gems/ruby-2.6.3/bin/bundle
+2019-05-14T19:21:37-07:00  react-native-cli: ~/.nvm/versions/node/v10.15.0/bin/react-native
+2019-05-14T19:21:37-07:00   react-native-cli: 2.0.1
+2019-05-14T19:21:37-07:00   react-native: 0.59.8
+2019-05-14T19:21:38-07:00  yarn 1.16.0: /usr/local/bin/yarn
+2019-05-14T19:21:38-07:00  cocoapods 1.6.1: ~/.rvm/gems/ruby-2.6.3/bin/pod
+2019-05-14T19:21:38-07:00  cocoapods-core: 1.6.1
+2019-05-14T19:21:38-07:00 package.json:
+2019-05-14T19:21:38-07:00  app name: "TestApp"
+2019-05-14T19:21:38-07:00 Found Xcode project at ~/github/$USER/react_native_util/examples/TestApp/ios/TestApp.xcodeproj
+2019-05-14T19:21:38-07:00 Dependencies:
+2019-05-14T19:21:38-07:00  react-native-webview
+2019-05-14T19:21:38-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
+2019-05-14T19:21:39-07:00 Generating ios/Podfile
+2019-05-14T19:21:39-07:00 Removing Libraries from TestApp
+2019-05-14T19:21:39-07:00 Removing Libraries from TestAppTests
+2019-05-14T19:21:39-07:00 Removing Libraries group
+2019-05-14T19:21:39-07:00 Linking dependencies
+[✔] react-native link react-native-webview success in 0.5 s
+2019-05-14T19:21:40-07:00 Generating Pods project and ios/TestApp.xcworkspace
+2019-05-14T19:21:40-07:00 Once pod install is complete, your project will be part of this workspace.
+2019-05-14T19:21:40-07:00 From now on, you should build the workspace with Xcode instead of the project.
+2019-05-14T19:21:40-07:00 Always add the workspace and Podfile.lock to SCM.
+2019-05-14T19:21:40-07:00 It is common practice also to add the Pods directory.
+2019-05-14T19:21:40-07:00 The workspace will be automatically opened when pod install completes.
+[✔] pod install success in 8.6 s
+2019-05-14T19:21:48-07:00 Conversion complete ✅
+2019-05-14T19:21:48-07:00 $ open ios/TestApp.xcworkspace
 ```
 
 ## Convert your own app with Rake
@@ -216,7 +228,7 @@ Dir.chdir '/path/to/rn/project' do
     # Update a converted project
     converter.update_project!
   rescue ReactNativeUtil::BaseException => e
-    puts "Error from #convert_to_react_pod!: #{e.message}"
+    puts "Error from ReactNativeUtil::Converter: #{e.message}"
   end
 end
 ```

data/lib/react_native_util.rb

@@ -1,2 +1 @@
 require_relative 'react_native_util/converter'
-require_relative 'react_native_util/metadata'

data/lib/react_native_util/cli.rb

@@ -1,6 +1,5 @@
 require 'commander'
 require_relative 'converter'
-require_relative 'metadata'
 
 module ReactNativeUtil
   class CLI

data/lib/react_native_util/converter.rb

@@ -2,6 +2,7 @@ require 'cocoapods-core'
 require 'erb'
 require 'json'
 require 'rubygems'
+require_relative 'metadata'
 require_relative 'project'
 
 module ReactNativeUtil
@@ -106,7 +107,24 @@ module ReactNativeUtil
       end
 
       # 7. pod install
-      log "Generating Pods project and ios/#{app_name}.xcworkspace"
+      # TODO: Can this be customized? Is this the only thing I have to look for
+      # in case CocoaPods needs an initial setup? We pull it in as a dependency.
+      # It could be they've never set it up before. Assume if this directory
+      # exists, pod install is possible (possibly with --repo-update).
+      master_podspec_repo_path = File.join ENV['HOME'], '.cocoapods', 'repos', 'master'
+      unless Dir.exist?(master_podspec_repo_path)
+        # The worst thing that can happen is this is equivalent to pod repo update.
+        # But then pod install --repo-update will take very little time.
+        log 'Setting up CocoaPods'
+        run_command_with_spinner! 'pod', 'setup', log: File.join(Dir.tmpdir, 'pod-setup.log')
+      end
+
+      log "Generating Pods project and ios/#{app_name}.xcworkspace".bold.cyan
+      log 'Once pod install is complete, your project will be part of this workspace.'.bold.cyan
+      log 'From now on, you should build the workspace with Xcode instead of the project.'.bold.cyan
+      log 'Always add the workspace and Podfile.lock to SCM.'.bold.cyan
+      log 'It is common practice also to add the Pods directory.'.bold.cyan
+      log 'The workspace will be automatically opened when pod install completes.'.bold.cyan
       command = %w[pod install]
       command << '--repo-update' if options[:repo_update]
       run_command_with_spinner!(*command, chdir: 'ios', log: File.join(Dir.tmpdir, 'pod-install.log'))
@@ -117,6 +135,7 @@ module ReactNativeUtil
       execute 'open', File.join('ios', "#{app_name}.xcworkspace")
 
       # 9. TODO: SCM/git (add, commit - optional)
+      # See https://github.com/jdee/react_native_util/issues/18
     end
 
     def update_project!

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.5.0'
+  VERSION = '0.5.1'
   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

@@ -28,18 +28,17 @@ module ReactNativeUtil
     attr_accessor :app_name
 
     def app_target
-      targets.find { |t| t.name == app_name }
+      targets.find { |t| t.platform_name == :ios && t.product_type == 'com.apple.product-type.application' }
     end
 
     def test_target
-      targets.select(&:test_target_type?).reject { |t| t.name =~ /tvOS/ }.first
+      targets.select(&:test_target_type?).select { |t| t.platform_name == :ios }.first
     end
 
     # Validate an assumption about the project. TODO: Provide override option.
     # @raise ConversionError if an application target is not found with the same name as the project.
     def validate_app_target!
-      raise ConversionError, "Unable to find target #{app_name} in #{path}." if app_target.nil?
-      raise ConversionError, "Target #{app_name} is not an application target." unless app_target.product_type == 'com.apple.product-type.application'
+      raise ConversionError, "Unable to find application target in #{path}." if app_target.nil?
     end
 
     # A representation of the Libraries group (if any) from the Xcode project.

metadata

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