react_native_util 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ea13b794e259fd108a7ee0bde1fea6fdd26f1d2a2b8caf407eb4f3f84bad10
-  data.tar.gz: 8d1b5bab6d808249ae166ccda1db6022f7733b9e62843099a070be54b13d008a
+  metadata.gz: bac5388f9ceda5e72b4a54c717f742c5a56c07f0a7b7489a9cac567469cfe728
+  data.tar.gz: aea447d8cf31bb2d9feb5b4eb42ec8d869071ced5036f722049fabd38f17b00b
 SHA512:
-  metadata.gz: '0369e513d78c6a581fd53c5e95e7ce9f066f7d161371917442b548bb474c0ae7996622dec6ca92bc93b436ee075d01c7302fa8504e7deed8149f9ca1c5fc576a'
-  data.tar.gz: 5775dbf8bf502d8d611f62106fb8289fbb5701ea266e365a924e5a4675d19dc5beed0a2d8ebf1bee889657a1dcf6a5b3d94b8dc74f16ab809f114cac4c6c69d8
+  metadata.gz: e3f3375ad84f084472f36eeac3ae9a6ce2a0fda11a88bb32055a45940c7c39919daea4c5056b75650c130e509f964751e3ae70aeac0b445ef886eefad8f6fc1f
+  data.tar.gz: 89fcadbf7b2e9db331dd7bab9e3d066a1e06b4c2bd9117560ba79b58c5b871a1a658bf6bbe7bcd5ff6f3d60330d23202e71a79d94b78caa76a8491334aef9179

data/README.md

@@ -46,53 +46,72 @@ rn react_pod -h
 
 ## Try it out
 
-First set up a test app:
-```bash
-react-native init TestApp
-cd TestApp
-yarn add react-native-webview
-react-native link react-native-webview
-git init .
-git add .
-git commit -m'Before conversion'
-```
+Convert examples/TestApp using Rake.
 
-Now do the conversion:
 ```bash
-rn react_pod
+bundle check || bundle install
+bundle exec rake react_pod
 git status
 ```
 
 _Typical command output:_
 ```
-2019-05-11T12:25:14-07:00 react_native_util react_pod v0.2.0
-2019-05-11T12:25:14-07:00  Installed from Homebrew
-2019-05-11T12:25:14-07:00  Darwin 18.5.0 x86_64
-2019-05-11T12:25:14-07:00  Ruby 2.3.7: /System/Library/Frameworks/Ruby.framework/Versions/2.3/usr/bin/ruby
-2019-05-11T12:25:14-07:00  RubyGems 2.6.14: /usr/bin/gem
-2019-05-11T12:25:14-07:00  react-native-cli: /usr/local/bin/react-native
-2019-05-11T12:25:14-07:00   react-native-cli: 2.0.1
-2019-05-11T12:25:14-07:00   react-native: 0.59.8
-2019-05-11T12:25:14-07:00  yarn 1.16.0: /usr/local/bin/yarn
-2019-05-11T12:25:15-07:00  cocoapods 1.6.1: /usr/local/bin/pod
-2019-05-11T12:25:15-07:00  cocoapods-core: 1.6.1
-2019-05-11T12:25:15-07:00 package.json:
-2019-05-11T12:25:15-07:00  app name: "TestApp"
-2019-05-11T12:25:15-07:00 Found Xcode project at ~/sandbox/TestApp/ios/TestApp.xcodeproj
-2019-05-11T12:25:15-07:00 Installing NPM dependencies with yarn
-[✔] yarn success in 0.8 s
-2019-05-11T12:25:16-07:00 Dependencies:
-2019-05-11T12:25:16-07:00  react-native-webview
-2019-05-11T12:25:16-07:00 Unlinking dependencies
-[✔] react-native unlink react-native-webview success in 0.6 s
-2019-05-11T12:25:17-07:00 Removing Libraries from TestApp
-2019-05-11T12:25:17-07:00 Removing Libraries from TestAppTests
-2019-05-11T12:25:17-07:00 Removing Libraries group
-2019-05-11T12:25:17-07:00 Generating ios/Podfile
-2019-05-11T12:25:17-07:00 Linking dependencies
-[✔] react-native link react-native-webview success in 0.6 s
-2019-05-11T12:25:17-07:00 Generating Pods project and ios/TestApp.xcworkspace
-[✔] pod install success in 10.5 s
-2019-05-11T12:25:28-07:00 Conversion complete ✅
-2019-05-11T12:25:28-07:00 $ open ios/TestApp.xcworkspace
+2019-05-12T11:42:03-07:00 react_native_util react_pod v0.2.2
+[✔] yarn install success in 10.9 s
+2019-05-12T11:42:14-07:00  Darwin 18.5.0 x86_64
+2019-05-12T11:42:14-07:00  Ruby 2.6.3: ~/.rvm/rubies/ruby-2.6.3/bin/ruby
+2019-05-12T11:42:14-07:00  RubyGems 3.0.3: ~/.rvm/rubies/ruby-2.6.3/bin/gem
+2019-05-12T11:42:14-07:00  Bundler 1.17.2: ~/.rvm/gems/ruby-2.6.3/bin/bundle
+2019-05-12T11:42:14-07:00  react-native-cli: /usr/local/bin/react-native
+2019-05-12T11:42:14-07:00   react-native-cli: 2.0.1
+2019-05-12T11:42:14-07:00   react-native: 0.59.8
+2019-05-12T11:42:15-07:00  yarn 1.16.0: /usr/local/bin/yarn
+2019-05-12T11:42:15-07:00  cocoapods 1.6.1: ~/.rvm/gems/ruby-2.6.3/bin/pod
+2019-05-12T11:42:15-07:00  cocoapods-core: 1.6.1
+2019-05-12T11:42:15-07:00 package.json:
+2019-05-12T11:42:15-07:00  app name: "TestApp"
+2019-05-12T11:42:15-07:00 Found Xcode project at ~/github/jdee/react_native_util/examples/TestApp/ios/TestApp.xcodeproj
+2019-05-12T11:42:15-07:00 Dependencies:
+2019-05-12T11:42:15-07:00  react-native-webview
+2019-05-12T11:42:15-07:00 Unlinking dependencies
+[✔] react-native unlink react-native-webview success in 0.7 s
+2019-05-12T11:42:16-07:00 Removing Libraries from TestApp
+2019-05-12T11:42:16-07:00 Removing Libraries from TestAppTests
+2019-05-12T11:42:16-07:00 Removing Libraries group
+2019-05-12T11:42:16-07:00 Generating ios/Podfile
+2019-05-12T11:42:16-07:00 Linking dependencies
+[✔] react-native link react-native-webview success in 0.5 s
+2019-05-12T11:42:17-07:00 Generating Pods project and ios/TestApp.xcworkspace
+[✔] pod install success in 8.2 s
+2019-05-12T11:42:25-07:00 Conversion complete ✅
+2019-05-12T11:42:25-07:00 $ open ios/TestApp.xcworkspace
+```
+
+## Rake task
+
+Add to Rakefile:
+```Ruby
+require 'react_native_util/rake/react_pod_task'
+ReactNativeUtil::Rake::ReactPodTask.new
+```
+
+Customize:
+```Ruby
+require 'react_native_util/rake/react_pod_task'
+ReactNativeUtil::Rake::ReactPodTask.new(
+  :react_pod,                         # task name
+  'Convert project to use React pod', # description
+  chdir: '/path/to/rn/project',       # path to project package.json
+  repo_update: true                   # optionally disable pod repo update
+)
+```
+
+## Ruby script
+
+```Ruby
+require 'react_native_util/converter'
+
+Dir.chdir '/path/to/rn/project' do
+  ReactNativeUtil::Converter.new(repo_update: true).convert_to_react_pod!
+end
 ```

data/lib/react_native_util/cli.rb

@@ -1,6 +1,4 @@
-require 'cocoapods-core'
 require 'commander'
-require 'rubygems'
 require_relative 'converter'
 require_relative 'metadata'
 
@@ -24,7 +22,6 @@ module ReactNativeUtil
 
         c.action do |_args, opts|
           begin
-            report_configuration
             converter = Converter.new repo_update: opts.repo_update
             converter.convert_to_react_pod!
             exit 0
@@ -41,47 +38,5 @@ module ReactNativeUtil
 
       run!
     end
-
-    def report_configuration
-      log "#{NAME} react_pod v#{VERSION}".bold
-
-      log ' Installed from Homebrew' if ENV['REACT_NATIVE_UTIL_INSTALLED_FROM_HOMEBREW']
-
-      log " #{`uname -msr`}"
-
-      log " Ruby #{RUBY_VERSION}: #{RbConfig.ruby}"
-      log " RubyGems #{Gem::VERSION}: #{`which gem`}"
-      log " Bundler #{Bundler::VERSION}: #{`which bundle`}" if defined?(Bundler)
-
-      log_command_path 'react-native', 'react-native-cli', include_version: false
-      unless `which react-native`.empty?
-        react_native_info = `react-native --version`
-        react_native_info.split("\n").each { |l| log "  #{l}" }
-      end
-
-      log_command_path 'yarn'
-      log_command_path 'pod', 'cocoapods'
-
-      log " cocoapods-core: #{Pod::CORE_VERSION}"
-    rescue Errno::ENOENT
-      # On Windows, e.g., which and uname may not work.
-      log 'Conversion failed: macOS required.'.red.bold
-      exit(-1)
-    end
-
-    def log_command_path(command, package = command, include_version: true)
-      path = `which #{command}`
-      if path.empty?
-        log " #{package}: #{'not found'.red.bold}"
-        return
-      end
-
-      if include_version
-        version = `#{command} --version`.chomp
-        log " #{package} #{version}: #{path}"
-      else
-        log " #{package}: #{path}"
-      end
-    end
   end
 end

data/lib/react_native_util/converter.rb

@@ -1,5 +1,7 @@
+require 'cocoapods-core'
 require 'erb'
 require 'json'
+require 'rubygems'
 require 'tmpdir'
 require 'tty/platform'
 require 'xcodeproj'
@@ -57,11 +59,13 @@ module ReactNativeUtil
     # Convert project to use React pod
     # @raise ConversionError on failure
     def convert_to_react_pod!
-      raise ConversionError, "macOS required." unless mac?
-
       # Make sure no uncommitted changes
       check_repo_status!
 
+      report_configuration!
+
+      raise ConversionError, "macOS required." unless mac?
+
       load_package_json!
       log 'package.json:'
       log " app name: #{app_name.inspect}"
@@ -83,10 +87,6 @@ module ReactNativeUtil
         exit 1
       end
 
-      # Don't run yarn until we're sure we're proceeding.
-      log 'Installing NPM dependencies with yarn'
-      run_command_with_spinner! 'yarn', log: File.join(Dir.tmpdir, 'yarn.log')
-
       load_react_podspec!
 
       # 2. Detect native dependencies in Libraries group.
@@ -150,6 +150,60 @@ module ReactNativeUtil
       raise ConversionError, "Failed to parse package.json: #{e.message}"
     end
 
+    def install_npm_deps_if_needed!
+      raise ConversionError, 'package.json not found. Please run from the project root.' unless File.readable?('package.json')
+
+      execute 'yarn', 'check', '--integrity', log: nil, output: :close
+      execute 'yarn', 'check', '--verify-tree', log: nil, output: :close
+    rescue ExecutionError
+      # install deps if either check fails
+      run_command_with_spinner! 'yarn', 'install', log: File.join(Dir.tmpdir, 'yarn.log')
+    end
+
+    def report_configuration!
+      log "#{NAME} react_pod v#{VERSION}".bold
+
+      install_npm_deps_if_needed!
+
+      log ' Installed from Homebrew' if ENV['REACT_NATIVE_UTIL_INSTALLED_FROM_HOMEBREW']
+
+      log " #{`uname -msr`}"
+
+      log " Ruby #{RUBY_VERSION}: #{RbConfig.ruby}"
+      log " RubyGems #{Gem::VERSION}: #{`which gem`}"
+      log " Bundler #{Bundler::VERSION}: #{`which bundle`}" if defined?(Bundler)
+
+      log_command_path 'react-native', 'react-native-cli', include_version: false
+      unless `which react-native`.empty?
+        react_native_info = `react-native --version`
+        react_native_info.split("\n").each { |l| log "  #{l}" }
+      end
+
+      log_command_path 'yarn'
+      log_command_path 'pod', 'cocoapods'
+
+      log " cocoapods-core: #{Pod::CORE_VERSION}"
+    rescue Errno::ENOENT
+      # On Windows, e.g., which and uname may not work.
+      log 'Conversion failed: macOS required.'.red.bold
+      exit(-1)
+    end
+
+    def log_command_path(command, package = command, include_version: true)
+      path = `which #{command}`
+      if path.empty?
+        log " #{package}: #{'not found'.red.bold}"
+        return
+      end
+
+      if include_version
+        version = `#{command} --version`.chomp
+        log " #{package} #{version}: #{path}"
+      else
+        log " #{package}: #{path}"
+      end
+    end
+
     # Load the project at @xcodeproj_path into @xcodeproj
     # @raise ConversionError on failure
     def load_xcodeproj!

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.2.1'
+  VERSION = '0.2.2'
   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.'

data/lib/react_native_util/rake/react_pod_task.rb

@@ -0,0 +1,27 @@
+require 'rake'
+require 'rake/tasklib'
+require_relative '../converter'
+
+module ReactNativeUtil
+  module Rake
+    # Rakefile:
+    #   require 'react_native_util/rake/react_pod_task'
+    #   ReactNativeUtil::Rake::ReactPodTask.new chdir: '/path/to/rn/app'
+    class ReactPodTask < ::Rake::TaskLib
+      include Util
+      def initialize(
+        name = :react_pod,
+        description = 'Convert project to use React pod',
+        chdir: '.',
+        repo_update: boolean_env_var?(:REACT_NATIVE_UTIL_REPO_UPDATE)
+      )
+        desc description
+        task name do
+          Dir.chdir chdir do
+            Converter.new(repo_update: repo_update).convert_to_react_pod!
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_native_util
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jimmy Dee
@@ -229,6 +229,7 @@ files:
 - lib/react_native_util/core_ext/string.rb
 - lib/react_native_util/exceptions.rb
 - lib/react_native_util/metadata.rb
+- lib/react_native_util/rake/react_pod_task.rb
 - lib/react_native_util/util.rb
 homepage: https://github.com/jdee/react_native_util
 licenses: