fastlane-plugin-rome 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7852106ef9083b6636cf3810c6499b115c8c9b9e
-  data.tar.gz: e4c255d1fd9658b5332dce9dac81d1df68cb3830
+  metadata.gz: 56ccbfc46d06cf73456af17e454a6c9056139ece
+  data.tar.gz: f556b1a335f6273efaa84d766824dd3afc56fcf3
 SHA512:
-  metadata.gz: 84acb9efb1aee0a7e10ae06e47000068d6314855ef547dc315644be16967712c456e457095c436ccf3c688d332052e5c29cee4526f5b657b5cdb8f5d3827f2a0
-  data.tar.gz: e8ff5882b2741f06f4d1ca449925ff789e5ee0a987786695864deb82ec0ced99325056085096331375481208cf849da1f514c787df8815e95f65f99d6f098165
+  metadata.gz: c184d703bfadd805ea22a7099282ed23d8d673ae883af10ed22cda883ab7230f918d4d3c1a69b1332c2490308b20656560fd462290874ed35325a80f44b6cecb
+  data.tar.gz: 5e7e77bf3646b509b28dccc718b9d9c811e0d72091087b9a1928778b9ec0affb3dac9df6129eeaaa9f08c288514f2930fea5bb941b85f121e7063dc33a20eac3

data/lib/fastlane/plugin/rome/actions/rome_action.rb

@@ -2,10 +2,9 @@ module Fastlane
   module Actions
     class RomeAction < Action
       def self.run(params)
-        check_tools!
         validate(params)
 
-        cmd = ["rome"]
+        cmd = [params[:binary_path]]
         command_name = params[:command]
 
         if command_name == "version"
@@ -31,8 +30,8 @@ module Fastlane
         Actions.sh(cmd.join(' '))
       end
 
-      def self.meet_minimum_version(minimum_version)
-        version = Actions.sh('rome --version') #i.e. 0.12.0.31 - Romam uno die non fuisse conditam.
+      def self.meet_minimum_version(binary_path, minimum_version)
+        version = Actions.sh("#{binary_path} --version") # i.e. 0.12.0.31 - Romam uno die non fuisse conditam.
         version_number = version.split(' - ')[0]
 
         minimum_version_parts = minimum_version.split('.')
@@ -48,9 +47,19 @@ module Fastlane
       end
 
       def self.validate(params)
-        unless params
-          Actions.sh("rome --help")
-          exit
+        binary_path = params[:binary_path]
+        unless params[:binary_path].include?('rome')
+          UI.important("Install Rome for the plugin to work")
+          UI.important("")
+          UI.error("Or install it using CocoaPods:")
+          UI.error("Add `pod 'Rome'` to your Podfile, and set `binary_path` option to `Pods/Rome/rome`")
+          UI.error("")
+          UI.error("Install it using Homebrew:")
+          UI.command("brew install blender/homebrew-tap/rome")
+          UI.error("")
+          UI.error("If you don't have homebrew, visit http://brew.sh")
+
+          UI.user_error!("Install Rome and start your lane again!")
         end
 
         command_name = params[:command]
@@ -61,20 +70,17 @@ module Fastlane
           UI.user_error!("Missing/Present option is available only for 'list' command.")
         end
         if command_name == "list" && !(params[:printformat] == nil || params[:printformat] == "JSON" || params[:printformat] == "Text")
-            UI.user_error!("Unsupported print format. Supported print formats are 'JSON' and 'Text'.")
+          UI.user_error!("Unsupported print format. Supported print formats are 'JSON' and 'Text'.")
+          UI.user_error!("'printformat' option requires Rome version '0.13.0.33' or later") if !meet_minimum_version(binary_path, "0.13.0.33")
         end
-      end
-
-      def self.check_tools!
-        unless `which rome`.include?('rome')
-          UI.important("Install Rome for the plugin to work")
-          UI.important("")
-          UI.error("Install it using (Homebrew):")
-          UI.command("brew install blender/homebrew-tap/rome")
-          UI.error("")
-          UI.error("If you don't have homebrew, visit http://brew.sh")
 
-          UI.user_error!("Install Rome and start your lane again!")
+        noignore = params[:noignore]
+        if noignore != nil
+          UI.user_error!("'noignore' option requires Rome version '0.13.1.35' or later") if !meet_minimum_version(binary_path, "0.13.1.35")
+        end
+        cacheprefix = params[:cacheprefix]
+        if cacheprefix != nil
+          UI.user_error!("'cacheprefix' option requires Rome version '0.12.0.31' or later") if !meet_minimum_version(binary_path, "0.12.0.31")
         end
       end
 
@@ -104,6 +110,12 @@ module Fastlane
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(key: :binary_path,
+                                       env_name: "FL_ROME_BINARY_PATH",
+                                       description: "Rome binary path, set to `Pods/Rome/rome` if you install Rome via CocoaPods",
+                                       optional: true,
+                                       default_value: `which rome`),
+
           FastlaneCore::ConfigItem.new(key: :command,
                                        env_name: "FL_ROME_COMMAND",
                                        description: "Rome command (one of: #{available_commands.join(', ')})",
@@ -128,7 +140,6 @@ module Fastlane
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass a valid value for noignore. Use one of the following: true, false") unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
-                                         UI.user_error!("Requires Rome version '0.13.1.35' or later") if !meet_minimum_version("0.13.1.35")
                                        end),
 
           FastlaneCore::ConfigItem.new(key: :platform,
@@ -169,20 +180,13 @@ module Fastlane
                                        env_name: "FL_ROME_CACHE_PREFIX",
                                        description: "Allow a prefix for top level directories to be specified for all commands. Useful to store frameworks built with different Swift versions",
                                        optional: true,
-                                       is_string: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("Requires Rome version '0.12.0.31' or later") if !meet_minimum_version("0.12.0.31")
-                                       end),
+                                       is_string: true),
 
           FastlaneCore::ConfigItem.new(key: :printformat,
                                        env_name: "FL_ROME_PRINT_FORMAT",
                                        description: "Specify what format to use in the output of the list command. One of 'JSON' or 'Text'. Defaults to 'Text' if omitted",
                                        optional: true,
-                                       is_string: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("Please pass a valid print format. Use one of the following: JSON, Text") unless value == nil || value == "JSON" || value == "Text"
-                                         UI.user_error!("Requires Rome version '0.13.0.33' or later") if !meet_minimum_version("0.13.0.33")
-                                       end)
+                                       is_string: true)
 
         ]
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Rome
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-rome
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - François Benaiteau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-05-28 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.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An S3 cache tool for Carthage