cocoapods-embed-flutter 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2967996d60f14ff19b440e5a75e87b0a6cea80cd5c0c0c656ca64fe724c170c
-  data.tar.gz: 7c370b83a302656f8f7747a51788a202558c2cc11c14067e1866dd30841173c3
+  metadata.gz: 2a64be69df26a945c384cd9c91456396a1dae3542120763103cea1ea95906c62
+  data.tar.gz: 379fd07871bf85cddaf9f3287d08d92e5ef82a31502a81929f14804de9744db6
 SHA512:
-  metadata.gz: b92b9b9aa47ee784402cad9ad294c316b148acf4bb0574246f9ed7c4bbf73fb671868559cc0acb1c3d9a3105a6127717e795be1cfe2e93d22b7d9f4277c6f785
-  data.tar.gz: 2ba932ff07f3291cb0797345720c2676b53ddb51ab37086a2b8d13a417fae2112bff668a6f7749f0a1bbb751d747c565edf723b06893b440ee1beafce4367ba2
+  metadata.gz: 81f87e0aa277b5eedbd585a6db5c026f08a06913f24e11a3037ffe5226a2bdccdac5c96339fa5cfde605896a276708ee8ce0d89ffe47769aa584ed211e0b25d6
+  data.tar.gz: 29648b77e626389b0a41e8f4548797935d9ce98638ac267dc41594652518ad69e2b22a4a4f353e2a35781b3e25133a16d9b43682d87c355fe1b82b7e140c48b6

data/.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "castwide.solargraph",
+    "rebornix.ruby"
+  ]
+}

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.6.0](https://github.com/DartBuild/cocoapods-embed-flutter/compare/v0.5.3...v0.6.0) (2022-03-27)
+
+
+### 📚 Documentation
+
+* **README:** add pub.dev limitation ([8f955f3](https://github.com/DartBuild/cocoapods-embed-flutter/commit/8f955f36519b1e5eeac89ffebd660a5f84f9983b))
+
+
+### 🛠 Dependency
+
+* bump cocoapods from 1.11.2 to 1.11.3 ([#4](https://github.com/DartBuild/cocoapods-embed-flutter/issues/4)) ([152737d](https://github.com/DartBuild/cocoapods-embed-flutter/commit/152737dd77852ef6937b5f458019e6535a426755))
+
+
+### 💄 Styles
+
+* add vscode extensions recommendation ([4f021fb](https://github.com/DartBuild/cocoapods-embed-flutter/commit/4f021fbfa75dd58d1257c43ea3d19cb68b8a19e6))
+
+
+### 🚀 Features
+
+* allow specifying different path for remote sources ([bc9c850](https://github.com/DartBuild/cocoapods-embed-flutter/commit/bc9c8509f90ef88248b56361794b6f8f1182a082))
+
 ### [0.5.3](https://github.com/DartBuild/cocoapods-embed-flutter/compare/v0.5.2...v0.5.3) (2022-03-18)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-embed-flutter (0.5.3)
+    cocoapods-embed-flutter (0.6.0)
       cocoapods
       fileutils
       yaml
@@ -28,10 +28,10 @@ GEM
     bacon (1.2.0)
     benchmark (0.2.0)
     claide (1.1.0)
-    cocoapods (1.11.2)
+    cocoapods (1.11.3)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.2)
+      cocoapods-core (= 1.11.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -46,7 +46,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 1.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.2)
+    cocoapods-core (1.11.3)
       activesupport (>= 5.0, < 7)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)

data/README.md

@@ -30,6 +30,7 @@ plugin 'cocoapods-embed-flutter'
 pub 'flutter_module', :path => '../'
 ```
 
+<a name="path_desc"></a>
 *`:path` can be path pointing to `pubspec.yaml` or to the directory containing `pubspec.yaml` or to the directory containg flutter module.*
 
 ### Embedding module from a repository.
@@ -40,8 +41,15 @@ pub 'flutter_module', :git => 'https://github.com/gowalla/flutter_module.git', :
 pub 'flutter_module', :git => 'https://github.com/gowalla/flutter_module.git', :commit => '082f8319af'
 ```
 
+*flutter module project should be at the root of repository, if that's not the case add additional `:path` attribute for relative path to flutter project in repository. `:path` follows [these](#path_desc) restictions.*
+
+```rb
+pub 'flutter_module', :git => 'https://github.com/gowalla/flutter_module.git', :tag => '0.7.0', :path => 'relative path/to/project'
+```
+
 ## Limitations
 
+- Modules hosted in [pub.dev](https://pub.dev/) are not supported, only local modules and modules in remote sources like git are supported.
 - You won't be able to add more than one flutter module to a single target. Currently flutter only supports one module per target.
 - No caching is done for external sources, every time you run `pod install` flutter module will be downloaded each time.
 

data/Rakefile

@@ -4,6 +4,16 @@ def specs(dir)
   FileList["spec/#{dir}/*_spec.rb"].shuffle.join(' ')
 end
 
+def setup_project(pod_install = false)
+  system('bundle install', exception: true)
+  Bundler.with_unbundled_env do
+    Dir.chdir('example/ios_app') do |path|
+      system('bundle install', exception: true)
+      system('bundle exec pod install', exception: true) if pod_install
+    end
+  end
+end
+
 desc 'Runs all the specs'
 task :specs do
   sh "bundle exec bacon #{specs('**')}"
@@ -11,23 +21,12 @@ end
 
 desc 'Setup example project'
 task :demo do
-  system('bundle install', exception: true)
-  Bundler.with_unbundled_env do
-    Dir.chdir('example/ios_app') do |path|
-      system('bundle install', exception: true)
-      system('bundle exec pod install', exception: true)
-    end
-  end
+  setup_project(true)
 end
 
 desc 'Update lock files'
 task :update do
-  system('bundle install', exception: true)
-  Bundler.with_unbundled_env do
-    Dir.chdir('example/ios_app') do |path|
-      system('bundle install', exception: true)
-    end
-  end
+  setup_project
 end
 
 desc 'Publish to cocoapods plugins if not present'

data/lib/cocoapods-embed-flutter/flutter/external_sources.rb

@@ -38,12 +38,12 @@ module Flutter
         options = options.last if options.is_a?(Array)
         raise StandardError, "No options specified for flutter module: '#{name}'." unless options.is_a?(Hash)
 
-        if options.key?(:path)
-          path = options[:path]
-        elsif SOURCE_KEYS.keys.any? { |key| options.key?(key) }
+        if SOURCE_KEYS.keys.any? { |key| options.key?(key) }
           source = DownloaderSource.new(name, options, Pod::Config.instance.podfile_path)
           source.fetch(Pod::Config.instance.sandbox)
           path = source.normalized_pupspec_path
+        elsif options.key?(:path)
+          path = options[:path]
         else
           raise StandardError, "Invalid flutter module: '#{name}'."
         end
@@ -116,8 +116,8 @@ module Flutter
         # @return [String] a string representation of the source suitable for UI.
         #
         def description
-          strategy = Pod::Downloader.strategy_from_options(params)
-          options = params.dup
+          strategy = Pod::Downloader.strategy_from_options(download_params)
+          options = download_params.dup
           url = options.delete(strategy)
           result = "from `#{url}`"
           options.each do |key, value|
@@ -148,7 +148,8 @@ module Flutter
         #         and expanding it if necessary.
         #
         def normalized_pupspec_path
-          Spec.find_file(name, target)
+          search_path = params[:path].nil? ? target : File.expand_path(params[:path], target)
+          Spec.find_file(name, search_path)
         end
 
         private
@@ -203,10 +204,16 @@ module Flutter
         def download_request
           Pod::Downloader::Request.new(
             :name => name,
-            :params => params,
+            :params => download_params,
           )
         end
 
+        # @return [Hash] the options for remote source download.
+        #
+        def download_params
+          params.select { |key, value| !key.equal?(:path) }
+        end
+
         # @return [String] the path where this flutter project
         #         will be downloaded relative paths.
         #

data/lib/cocoapods-embed-flutter/gem_version.rb

@@ -4,5 +4,5 @@
 module CocoapodsEmbedFlutter
   # The version of the cocoapods-embed-flutter.
   #
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/cocoapods-embed-flutter/src/pub.rb

@@ -99,7 +99,10 @@ module Pod
       #     pub 'flutter_module', :git => 'https://github.com/octokit/flutter_module.git', :commit => '082f8319af'
       #
       # The flutter module or its `pubspec` file is expected to be in the
-      # root of the repository.
+      # root of the repository, if that's not the case specify relative path
+      # to flutter project in repository.
+      #
+      #     pub 'flutter_module', :git => 'https://github.com/octokit/flutter_module.git', :tag => '0.7.0', :path => 'custom/flutter_module'
       #
       #
       # @note       This method allow a nil name and the raises to be more

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-embed-flutter
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Soumya Ranjan Mahunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -90,6 +90,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".vscode/extensions.json"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile