cocoapods-fix-react-native 2018.04.28.09 → 2018.05.03.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d83aa260cbf102b14794cb685bb41812f6364df156f85e916fa20d72fdbfdf
-  data.tar.gz: b6f0a43c648d29ea2cfc5e849dd854bda7864f0260c6b41a0da4c5571ac6635e
+  metadata.gz: 9e61ae67e2d6bd5f2e0327bb13bde287c03507fcc1bea282563cb68fee5f62c5
+  data.tar.gz: e6b3aef3de1f2a673b2246a344b67154e444059f43b4f9149babafd80866e0a9
 SHA512:
-  metadata.gz: 6f08e612a32ad64150d1ffeb3e6beedbf8faa021d8c2430ae200711752485f6b848e094f49320fb2b15c61e1333bca0d98004daf54a79ac5ffddf4a6ff7dc88c
-  data.tar.gz: 97148bcb5405710afcade77b9ae440f7a87e159bb0704f65c39dbab06fe1df67719e0e3f893155c06abae75e218aed4916e9b0a491a50faee58c7eac0107e74b
+  metadata.gz: ed78330f5a4a09f5088e57525c16236f58ef9d0cb82d0e93aa9eef7f064357a14429343b381c0e9ea348e596508b107dba055254ca993d11010780f719ae3502
+  data.tar.gz: 71a807a28d9c5c953d82a7a8635709b12d8ddcbd8ce93eb607f08d37f03a4e64b2549245e28dd5717383274adabaf051d550a04781ff0b28dd4763ba80ceddc7

data/README.md

@@ -1,22 +1,27 @@
-Hi there! This a CocoaPods plugin that **we, the community**, can use to plug the holes in React Native's CocoaPods
-support.
+Hi there! This a CocoaPods plugin that **we, the community**, can use to plug
+the holes in React Native's CocoaPods support.
 
-CocoaPods allows you to add code to run at the end of the Podfile via a `post_install` hook. You probably already have
-some custom code in there. This plugin allows all that code to be centralized and reasoned about in a single place per
-React Native version.
+CocoaPods allows you to add code to run before and at the end of the Podfile via
+installation hooks. You probably already have some custom code in there. This
+plugin allows all that code to be centralized and reasoned about in a single
+place per React Native version.
 
 ## Why Does This Need To Exist?
 
-React Native is a pragmatic project, it's great Facebook open sources it, but if you want to work with a flow they don't
-use - the onus is on you to make sure it continues to work. Facebook have a big mono-repo, and so they don't need to use
-CocoaPods, and they also use static compilation because they don't use Swift. Meaning if you want to use CocoaPods and
-Swift, you're pretty far from their workflow.
+React Native is a pragmatic project, it's great Facebook open sources it, but if
+you want to work with a flow they don't use - the onus is on you to make sure it
+continues to work. Facebook have a big mono-repo, and so they don't need to use
+CocoaPods, and they also use static compilation because they don't use Swift.
+Meaning if you want to use CocoaPods and Swift, you're pretty far from their
+workflow.
 
-In order to get it working for just your app you scour, like, a million issues on React Native (or go look at
-[artsy/eigen][eigen]) to get it compiling on your setup. Again, not optimal.
+In order to get it working for just your app you scour, like, a million issues
+on React Native (or go look at [artsy/eigen][eigen]) to get it compiling on your
+setup. Again, not optimal.
 
-This plugin _tries_ to fix this by centralizing the code needed to modify React Native. This means makes it easy to
-update your versions of React Native, because you can update the gem at the same time.
+This plugin _tries_ to fix this by centralizing the code needed to modify React
+Native. This means makes it easy to update your versions of React Native,
+because you can update the gem at the same time.
 
 ## Installation
 
@@ -24,57 +29,71 @@ Lazy way (bad, but ok if 1 engineer):
 
     $ gem install cocoapods-fix-react-native
 
-Correct way, edit [`your Gemfile`](http://www.mokacoding.com/blog/ruby-for-ios-developers-bundler/) to be:
+Correct way, edit
+[`your Gemfile`](http://www.mokacoding.com/blog/ruby-for-ios-developers-bundler/)
+to be:
 
     gem "cocoapods"
     gem "cocoapods-fix-react-native"
 
-Then remove any React Native related `post_install` code, and add this to the top level of your `Podfile`:
+Then remove any React Native related `pre_install` and `post_install` code, and
+add this to the top level of your `Podfile`:
 
     plugin 'cocoapods-fix-react-native'
 
-For the first time you do this, I'd recommend running `rm -rf Pods; bundle exec pod install`. After that you can
-`bundle exec pod install` like normal.
+For the first time you do this, I'd recommend running `rm -rf Pods; bundle exec
+pod install`. After that you can `bundle exec pod install` like normal.
 
 ## How do I Update This?
 
-`bundle update cocoapods-fix-react-native`.
+    bundle update cocoapods-fix-react-native
 
-This project is auto-deployed after every merged PR, so it's should always be up-to-date.
+This project is auto-deployed after every merged PR, so it's should always be
+up-to-date.
 
 ## How Does This Work?
 
-A CocoaPods plugin can register a `post_install` hook just like you can in your `Podfile`. This hook will first look at
-what version of React Native is installed, and will then run a corresponding script to make changes to the environment.
+A CocoaPods plugin can register hooks before and after installation, just like
+you can in your `Podfile`. This hook will first look at what version of React
+Native is installed, and will then run a corresponding scripts to make changes
+to the environment.
 
 ## Contributing Back
 
-You'll note that this repo has issues disabled, I'm not going to make the time to support questions and requests for
-fixes to this. I have a lot of projects, and only so much time. However, I'm happy to handle the mainainance and upkeep
-from code people submit. If you want a change, you'll need to do so yourself, so let's cover how you do that:
+You'll note that this repo has issues disabled, I'm not going to make the time
+to support questions and requests for fixes to this. I have a lot of projects,
+and only so much time. However, I'm happy to handle the mainainance and upkeep
+from code people submit. If you want a change, you'll need to do so yourself, so
+let's cover how you do that:
 
-This project is very specific about what versions of React Native it supports, you can see them in the folder
+This project is very specific about what versions of React Native it supports,
+you can see them in the folder
 [`lib/cocoapods-fix-react-native/versions/`][versions]:
 
 ```
 ~/dev/projects/react-native/cocoapods-fix-react-native master*
 ❯ tree lib/cocoapods-fix-react-native/versions/
 lib/cocoapods-fix-react-native/versions/
-└── 0_54_4.rb
+└── 0_54_4-post.rb
 ```
 
-There's likely more than just one by the time you read this, but if you want to use a version that isn't supported yet,
-then you're going to want to copy the most recent into a new file. The files are named by converting dots to
-underscores. E.g. `0.54.4` -> `0_54_4.rb`.
+There's likely more than just one by the time you read this, but if you want to
+use a version that isn't supported yet, then you're going to want to copy the
+most recent into a new file. The files are named by converting dots to
+underscores. E.g. `0.54.4` -> `0_54_4-pre.rb`/`0_54_4-post.rb`.
 
-The scripts itself should be entirely self contained, so that it's easy to understand wthout learning the project.
+The scripts itself should be entirely self contained, so that it's easy to
+understand without learning the project.
 
-The biggest change you'd need to make from the sort of code you can find inside the issues is that it needs to support
-many different potential roots. So instead of just `Pods/React/*` - this plugin will also handle
-`node_modules/react-native/*` and `../node_modules/react-native/*`. Basically, your dev repo, and your prod app.
+The biggest change you'd need to make from the sort of code you can find inside
+the issues is that it needs to support many different potential roots. So
+instead of just `Pods/React/*` - this plugin will also handle
+`node_modules/react-native/*` and `../node_modules/react-native/*`. Basically,
+your dev repo, and your prod app.
 
 This can be done by removing `'Pods/React'` from the path and wrapping it with a
-`File.join(root, 'Path/InReactLib.js')`. You'll see this in the current scripts.
+`File.join($root, 'Path/InReactLib.js')`. You'll see this in the current
+scripts.
 
 ### Getting Setup To Improve
 
@@ -86,18 +105,19 @@ cd cocoapods-fix-react-native
 bundle install
 ```
 
-You want to use a `:path` based gem in your project's Gemfile to point to the cloned repo. Make you to your App's
-`Gemfile` something like this:
+You want to use a `:path` based gem in your project's Gemfile to point to the
+cloned repo. Make you to your App's `Gemfile` something like this:
 
 ```ruby
 gem 'cocoapods', '~> 1.4.0'
 gem 'cocoapods-fix-react-native', path: "../../../../react-native/cocoapods-fix-react-native"
 ```
 
-Then when you run `bundle exec pod install` in that project, it will use the the code from your cloned copy.
+Then when you run `bundle exec pod install` in that project, it will use the the
+code from your cloned copy.
 
-As `use_frameworks!` is more strict than static libraries, I'd recommend working on this project using a repo that has
-frameworks.
+As `use_frameworks!` is more strict than static libraries, I'd recommend working
+on this project using a repo that has frameworks.
 
 [eigen]: https://github.com/artsy/eigen/
 [versions]: https://github.com/orta/cocoapods-fix-react-native/tree/master/lib/cocoapods-fix-react-native/versions

data/lib/cocoapods-fix-react-native/fix_with_context.rb

@@ -0,0 +1,91 @@
+require 'molinillo/dependency_graph'
+
+class CocoaPodsFixReactNative
+  def post_fix_with_context(context)
+    # Get the current version of React Native in your app
+    react_spec = nil
+    context.umbrella_targets.each do |target|
+      react = target.specs.find { |s| s.name == 'React' || s.name.start_with?('React/') }
+      next if react.nil?
+      react_spec = react
+    end
+
+    if react_spec.nil?
+      Pod::UI.warn "No React dependency found"
+      return
+    end
+
+    version = react_spec.version.to_s
+
+    unless patch_exist?(version)
+      Pod::UI.warn "CP-Fix-React-Native does not support #{version} yet, please send " +
+                   'PRs to https://github.com/orta/cocoapods-fix-react-native'
+      return
+    end
+
+    path_to_fix = version_file(version)
+
+    if File.exist? path_to_fix
+      Pod::UI.section "Patching React Native #{version}" do
+        require(path_to_fix)
+      end
+    end
+  end
+
+  def pre_fix_with_context(context)
+    # Get the current version of React Native in your app
+    locked_dependencies = Molinillo::DependencyGraph.new
+    context.lockfile.dependencies.each do |dependency|
+      locked_dependencies.add_vertex(dependency.name, dependency, true)
+    end
+
+    sources = context.podfile.sources.map do |source|
+      Pod::Config.instance.sources_manager.source_with_name_or_url(source)
+    end
+
+    resolver = Pod::Resolver.new(context.sandbox, context.podfile, locked_dependencies, sources, true)
+    target_definitions = resolver.resolve
+
+    react_spec = nil
+
+    target_definitions.each do |(definition, dependencies)|
+      next if definition.name == 'Pods'
+
+      react = dependencies.find { |d| d.spec.name == 'React' || d.spec.name.start_with?('React/') }
+      next if react.nil?
+      react_spec = react.spec
+    end
+
+    return if react_spec.nil?
+
+    version = react_spec.version.to_s
+
+    # There will probably always be a neeed for the post, but a pre can be ignored
+    return unless patch_exist?(version)
+
+    path_to_fix = version_file(version, 'pre')
+
+    if File.exist? path_to_fix
+      Pod::UI.section "Patching React Native #{version}" do
+        require(path_to_fix)
+      end
+    end
+  end
+
+  private
+
+    def patch_exist?(version)
+      version_file_name = version.tr('.', '_')
+      patches = Dir.glob(File.join(versions_path, "#{version_file_name}-*"))
+      patches.present?
+    end
+
+    def version_file(version, suffix = 'post')
+      file_to_parse = version.tr('.', '_') + "-#{suffix}.rb"
+      File.join(versions_path, file_to_parse)
+    end
+
+    def versions_path
+      File.expand_path('../versions', __FILE__)
+    end
+end

data/lib/cocoapods-fix-react-native/issues/react_dependency_version.rb

@@ -0,0 +1,14 @@
+class ReactDependencyVersion
+  def fix_with_context(context)
+    all_pods_targets = context.pods_project.targets
+    all_pods_targets.each do |t|
+      deployment_target = t.build_configurations.first.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
+      has_react_dep =  t.dependencies.find { |dep| dep.name == 'React' }
+
+      if has_react_dep && deployment_target == '4.3'
+        raise 'You have a Pod which has a deployment target of 4.3, and a dependency on React.' \
+              "\nIn order for React Native to compile you need to give the Podspec for #{t.name} a version like `s.platform = :ios, '9.0'`.\n"
+      end
+    end
+  end
+end

data/lib/cocoapods_plugin.rb

@@ -1,20 +1,20 @@
-require 'cocoapods-fix-react-native/version_resolver'
+require 'cocoapods-fix-react-native/fix_with_context'
+require 'cocoapods-fix-react-native/issues/react_dependency_version'
+
+Pod::HooksManager.register('cocoapods-fix-react-native', :pre_install) do |context|
+  # The pre-fix resolver, usually for modifying Podspecs
+  fixer = CocoaPodsFixReactNative.new
+  fixer.pre_fix_with_context(context)
+end
+
 
 Pod::HooksManager.register('cocoapods-fix-react-native', :post_install) do |context|
-  
   # Check that the min version of iOS has been set right for CocoaPods
   # This happens when a pod has a lower than iOS 6 deployment target.
-  all_pods_targets = context.pods_project.targets
-  all_pods_targets.each do |t|
-    deployment_target = t.build_configurations.first.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
-    has_react_dep =  t.dependencies.find { |dep| dep.name == "React" }
-
-    if has_react_dep && deployment_target == '4.3'
-      raise 'You have a Pod which has a deployment target of 4.3, and a dependency on React.' + 
-            "\nIn order for React Native to compile you need to give the Podspec for #{t.name} a version like `s.platform = :ios, '9.0'`.\n"
-    end
-  end
+  dep_version = ReactDependencyVersion.new
+  dep_version.fix_with_context(context)
 
+  # The post-fix resolver, for editing the RN source code after it's been installed
   fixer = CocoaPodsFixReactNative.new
-  fixer.fix_with_context(context)
+  fixer.post_fix_with_context(context)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-react-native
 version: !ruby/object:Gem::Version
-  version: 2018.04.28.09
+  version: 2018.05.03.10
 platform: ruby
 authors:
 - Orta Therox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-28 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,10 +53,11 @@ files:
 - Rakefile
 - cocoapods-fix-react-native.gemspec
 - lib/cocoapods-fix-react-native.rb
-- lib/cocoapods-fix-react-native/version_resolver.rb
+- lib/cocoapods-fix-react-native/fix_with_context.rb
+- lib/cocoapods-fix-react-native/issues/react_dependency_version.rb
 - lib/cocoapods-fix-react-native/versions/0_53_3.rb
-- lib/cocoapods-fix-react-native/versions/0_54_2.rb
-- lib/cocoapods-fix-react-native/versions/0_54_4.rb
+- lib/cocoapods-fix-react-native/versions/0_54_2-post.rb
+- lib/cocoapods-fix-react-native/versions/0_54_4-post.rb
 - lib/cocoapods_plugin.rb
 - spec/command/native_spec.rb
 - spec/spec_helper.rb

data/lib/cocoapods-fix-react-native/version_resolver.rb

@@ -1,27 +0,0 @@
-class CocoaPodsFixReactNative
-  def fix_with_context(context)
-    # Get the current version of React Native in your app
-    react = nil
-    context.umbrella_targets.each do |target|
-      react_spec = target.specs.find { |s| s.name == 'React' || s.name.start_with?('React/') }
-      react = react_spec if react_spec
-    end
-
-    # 0.44.1 -> 0_44_1
-    version = react.version.to_s
-    file_to_parse = version.tr('.', '_')
-    path_to_fix = File.join(File.dirname(__FILE__), 'versions', file_to_parse + '.rb')
-
-    # require 'pry'
-    # binding.pry
-
-    if File.exist? path_to_fix
-      Pod::UI.section "Patching React Native #{version}" do
-        require(path_to_fix)
-      end
-    else
-      Pod::UI.warn "CP-Fix-React-Native does not support #{version} yet, please send " +
-                   'PRs to https://github.com/orta/cocoapods-fix-react-native'
-    end
-  end
-end