fastlane-plugin-yarn 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1fd2ecb7fd0bed4e5139ca7f5173b2218a03c4e1
-  data.tar.gz: a1d890deb1ef658a607d5610bd1b1b8e7f7d1e27
+SHA256:
+  metadata.gz: f12b9cacbde76c69ad57c4618c2c5939b966ccbab6b696bbff3476ff06d67a76
+  data.tar.gz: 87110064759967fc957c1d689d8c6a16d4654ab90693a0f0e8a6ab020e14748b
 SHA512:
-  metadata.gz: 4b155d2c9979761b6020ae0661fb2d5020a7f272e81ac50087237f7712124c5c2526f697609ddde5eba4970a4fdaa64ab4bcf76b499aabb450b5fe06062496b3
-  data.tar.gz: 81b70f16b307210b8b4afd1353ef0eda6a46a26515e0f862076cee2949413e59f2500ed7a2b8539e4616a943e65bf9031735dce6e20e8207f18fdbb978c4ec68
+  metadata.gz: f6341970a340238ae18c831abef8198f8da7697957031ffe8bc36d4694610e82b4403146e98e740a756d7d7325f77e0b850219fd3973d7535bf2d2da3c5a95a5
+  data.tar.gz: 841e1d372d8e0d59c5884d10402ad20aab2721ead9e79e2d006506a286412923d980f1369774cfbfc9e5df1ec61815ee7ed9479b575527d93487edcc98dd8e3d

data/README.md

@@ -1,6 +1,7 @@
 # yarn plugin
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-yarn)
+[![Gem](https://img.shields.io/gem/v/fastlane-plugin-yarn.svg)](https://rubygems.org/gems/fastlane-plugin-yarn/versions/1.1)
 
 ## Getting Started
 
@@ -18,10 +19,34 @@ When using the yarn action in your fastfile, it will install any dependencies th
 It will by default look for your package.json file in the root directory, or you can choose a different location.
 ```ruby
 yarn(
-  task: "test",
+  command: "test",
   package_path: "../package.json"
 )
 ```
+
+Yarn Options
+
+```
++---------------------------+---------------------------+---------------------------+---------+
+|                                        yarn Options                                         |
++---------------------------+---------------------------+---------------------------+---------+
+| Key                       | Description               | Env Var                   | Default |
++---------------------------+---------------------------+---------------------------+---------+
+| flags                     | Flags you want Yarn to    | YARN_FLAGS                |         |
+|                           | perform as listed in      |                           |         |
+|                           | package.json file         |                           |         |
+| command                   | Command you want Yarn to  | YARN_COMMAND              |         |
+|                           | perform, e.g. 'add' or    |                           |         |
+|                           | 'upgrade'                 |                           |         |
+| package_path              | Path to package.json file | PACKAGE_PATH              |         |
+| project_root              | package.json folder       | PROJECT_ROOT              |         |
+| options                   | Options to pass to Yarn   | YARN_OPTIONS              |         |
+| auto_install_dependencies | Runs yarn install before  | AUTO_INSTALL_DEPENDENCIES | false   |
+|                           | executing any yarn        |                           |         |
+|                           | command                   |                           |         |
++---------------------------+---------------------------+---------------------------+---------+
+```
+
 ## Example
 
 Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`.

data/lib/fastlane/plugin/yarn/actions/yarn_action.rb

@@ -6,15 +6,16 @@ module Fastlane
         command = params[:command]
         options = params[:options]
         package_path = params[:package_path]
+        project_root = params[:project_root]
 
         # create a new object from yarn helper
-        yarn = Helper::YarnHelper.new(package_path: package_path)
+        yarn = Helper::YarnHelper.new(package_path: package_path, project_root: project_root)
 
         # Check if yarn is installed
         yarn.check_install
 
         if params[:auto_install_dependencies]
-          UI.message("Installign dependecies")
+          UI.message("Installing dependecies")
           yarn.install_dependencies
         end
 
@@ -55,22 +56,34 @@ module Fastlane
                                        env_name: "PACKAGE_PATH",
                                        description: "Path to package.json file",
                                        optional: true,
-                                       type: String),
+                                       type: String,
+                                       conflicting_options: [:project_root]),
+          FastlaneCore::ConfigItem.new(key: :project_root,
+                                       env_name: "PROJECT_ROOT",
+                                       description: "Folder hosting the package.json",
+                                       optional: true,
+                                       type: String,
+                                       conflicting_options: [:package_path]),
           FastlaneCore::ConfigItem.new(key: :options,
                                        env_name: "YARN_OPTIONS",
                                        description: "Options to pass to Yarn",
                                        optional: true,
-                                       type: String),
+                                       is_string: false,
+                                       verify_block: ->(value) {
+                                        case value when String; when Array;
+                                          else  UI.user_error! "Invalid option: #{value.inspect}, must be an Array or String"
+                                        end
+                                          }),
           FastlaneCore::ConfigItem.new(key: :auto_install_dependencies,
                                        env_name: "AUTO_INSTALL_DEPENDENCIES",
                                        description: "Runs yarn install before executing any yarn command",
                                        optional: true,
                                        default_value: false,
                                        is_string: false)
-
         ]
       end
 
+
       def self.is_supported?(platform)
         # Adjust this if your plugin only works for a particular platform (iOS vs. Android, for example)
         # See: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Platforms.md

data/lib/fastlane/plugin/yarn/helper/yarn_helper.rb

@@ -8,13 +8,17 @@ module Fastlane
       attr_accessor :commands
       attr_accessor :options
       attr_accessor :package_path
+      attr_accessor :project_root
       attr_accessor :yarn
 
-      def initialize(package_path: nil)
+      def initialize(package_path: nil, project_root: nil)
         self.package_path = package_path
+        self.project_root = project_root
 
         if self.package_path
           self.yarn = "cd #{File.dirname(self.package_path)} && yarn"
+        elsif self.project_root
+          self.yarn = "cd #{self.project_root} && yarn"
         else
           self.yarn = "yarn"
         end
@@ -22,7 +26,10 @@ module Fastlane
 
       # Run a certain action
       def trigger(command: nil, flags: nil, options: nil, print_command: true, print_command_output: true)
-        command = [self.yarn, command, flags, options].compact.join(" ")
+        unless options == "" || options == [] || options == nil then
+          option_string = options.respond_to?(:join) ? "-- #{options.join(" ")}" : "-- #{options}"
+        end
+        command = [self.yarn, flags, command, option_string].compact.join(" ")
         Action.sh(command, print_command: print_command, print_command_output: print_command_output)
       end
 
@@ -43,15 +50,16 @@ module Fastlane
       end
 
       def check_package
-        if self.package_path.nil?
-          package_path = 'package.json'
-        else
+        if self.package_path
           package_path = self.package_path
+        elsif self.project_root
+          package_path = File.join(self.project_root, 'package.json')
+        else
+          package_path = 'package.json'
         end
 
         unless File.exist?(package_path)
-          UI.error("Could not find package.json")
-          raise Errno::ENOENT
+          UI.crash!("Could not find package.json: (#{package_path})")
         end
       end
     end

data/lib/fastlane/plugin/yarn/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Yarn
-    VERSION = "1.0"
+    VERSION = "1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-yarn
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Josh Lesch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Execute Yarn commands from your Fastfile