Added web-renderer flag and updated run command

Author: Thomas Roovers

CHANGELOG.md

@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## v1.8.2
+
+### New features
+- Add web-renderer flag: auto, canvaskit or html
+
+
+### Breaking changes 
+The `run` command has been updated. Previously:
+
+```shell
+flttr run --platform ios --flavor accept
+flttr run --platform android --flavor accept
+flttr run --platform web --flavor accept
+```
+
+Currently:
+
+```shell
+flttr run ios --flavor accept
+flttr run android --flavor accept
+flttr run web --flavor accept
+```
+
 ## v1.8.1
 
 ### New features
@@ -24,7 +47,6 @@
 ## v1.7.0
 
 ### Breaking changes
-
 Updated build commands, see README.md for new format and argument descriptions. 
 
 **Previously:**
@@ -35,6 +57,6 @@ flttr build --platform android [--flavor=] [--artifact=] [--release] [--[no-]obf
 
 **New:**
 ```
-flttr build ios [--flavor=] [--release] [--archive] [--export-method=] [--[no-]obfuscation] [--[no-]codesign] [--prepare]
-flttr build android [--flavor=] [--release] [--artifact=] [--[no-]obfuscation] [--prepare]
+flttr build ios [--flavor=] [--release] [--archive] [--export-method=] [--[no-]obfuscation] [--[no-]codesign] [--dry-run]
+flttr build android [--flavor=] [--release] [--artifact=] [--[no-]obfuscation] [--dry-run]
 ```

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flttr (1.7.1)
+    flttr (1.8.1)
       dotenv (~> 2.8.1)
       gli (~> 2.21.0)
       jwt (~> 2.7.0)

bin/flttr

@@ -86,30 +86,78 @@ class App
 
   desc 'Run on a device or simulator'
   command :run do |c|
-    c.flag [:p,:platform], 
-      :desc => 'Specify platform, android or ios', 
-      :must_match => ["android", "ios", "web"]
+    c.command :android do |sc|
+      sc.flag [:f,:flavor], 
+        :desc => 'Specify flavor' 
+        
+      sc.switch [:r,:release], 
+        :desc => 'Run in release mode, debug by default'
+      
+      sc.switch [:profile], 
+        :desc => 'Run in profile mode, debug by default'
+      
+      sc.switch ['dry-run'], 
+        :desc => 'Prepare only for running the app (writing config files)'
+      
+      sc.flag [:d, :device], 
+        :desc => 'Specify a device ID to target'
 
-    c.flag [:f,:flavor], 
-      :desc => 'Specify flavor' 
+      sc.action do |global_options,options,args|
+        mergedOptions = global_options.merge(**options, **options[GLI::Command::PARENT], **{'platform': 'android'})
+        mergedOptions.delete(GLI::Command::PARENT)
+        Commands::Run.new(mergedOptions).execute
+      end
+    end
+
+    c.command :ios do |sc|
+      sc.flag [:f,:flavor], 
+        :desc => 'Specify flavor' 
+        
+      sc.switch [:r,:release], 
+        :desc => 'Run in release mode, debug by default'
 
-    c.switch [:r,:release], 
-      :desc => 'Run in release mode, debug by default'
-    
-    c.switch [:profile], 
-      :desc => 'Run in profile mode, debug by default'
-    
-    c.switch [:prepare], 
-      :desc => 'Prepare only for running the app (writing config files)'
-    
-    c.flag [:d, :device], 
-      :desc => 'Specify a device ID to target'
+      sc.switch [:profile], 
+        :desc => 'Run in profile mode, debug by default'
+      
+      sc.switch ['dry-run'], 
+        :desc => 'Prepare only for running the app (writing config files)'
 
-    c.flag [:port], 
-      :desc => 'Specify the port to use: https://localhost:<port>'
+      sc.flag [:d, :device], 
+        :desc => 'Specify a device ID to target'
 
-    c.action do |global_options,options,args|
-      Commands::Run.new(global_options.merge(options)).execute
+      sc.action do |global_options,options,args|
+        mergedOptions = global_options.merge(**options, **options[GLI::Command::PARENT], **{'platform': 'ios'})
+        mergedOptions.delete(GLI::Command::PARENT)
+        Commands::Run.new(mergedOptions).execute
+      end
+    end
+
+    c.command :web do |sc|
+      sc.flag [:f,:flavor], 
+        :desc => 'Specify flavor'
+        
+      sc.switch [:r,:release], 
+        :desc => 'Run in release mode, debug by default'
+      
+      sc.switch ['dry-run'], 
+        :desc => 'Prepare only for running the app (writing config files)'
+      
+      sc.flag [:d, :device], 
+        :desc => 'Specify a device ID to target'
+        
+      sc.flag [:port], 
+        :desc => 'Specify the port to use: https://localhost:<port>'
+
+      sc.flag ['web-renderer'],
+        :desc => 'Specify the renderer',
+        :must_match => ['canvaskit', 'html', 'auto'],
+        :default_value => 'auto'
+
+      sc.action do |global_options,options,args|
+        mergedOptions = global_options.merge(**options, **options[GLI::Command::PARENT], **{'platform': 'web'})
+        mergedOptions.delete(GLI::Command::PARENT)
+        Commands::Run.new(mergedOptions).execute
+      end
     end
   end
 
@@ -122,7 +170,7 @@ class App
       sc.flag [:f,:flavor], 
         :desc => 'Specify flavor'
 
-      sc.switch [:prepare], 
+      sc.switch ['dry-run'], 
         :desc => 'Prepare only for running the app (writing config files)',
         :negatable => false
 
@@ -148,7 +196,7 @@ class App
       sc.flag [:f,:flavor], 
         :desc => 'Specify flavor'
 
-      sc.switch [:prepare], 
+      sc.switch ['dry-run'], 
         :desc => 'Prepare only for running the app (writing config files)',
         :negatable => false
 
@@ -179,10 +227,15 @@ class App
       sc.flag [:f,:flavor], 
         :desc => 'Specify flavor'
 
-      sc.switch [:prepare], 
+      sc.switch ['dry-run'], 
         :desc => 'Prepare only for running the app (writing config files)',
         :negatable => false
 
+      sc.flag ['web-renderer'],
+        :desc => 'Specify the renderer',
+        :must_match => ['canvaskit', 'html', 'auto'],
+        :default_value => 'auto'
+
       sc.action do |global_options,options,args|
         mergedOptions = global_options.merge(**options, **options[GLI::Command::PARENT], **{'platform': 'web'})
         mergedOptions.delete(GLI::Command::PARENT)

latest_release.json

@@ -1,5 +1,5 @@
 {
-    "name": "1.8.1",
-    "download_url": "https://github.com/UnlockAgency/flutter-cli/releases/download/v1.8.1/flttr-1.8.1.gem",
-    "url": "https://github.com/UnlockAgency/flutter-cli/releases/tag/v1.8.1"
+    "name": "1.8.2",
+    "download_url": "https://github.com/UnlockAgency/flutter-cli/releases/download/v1.8.2/flttr-1.8.2.gem",
+    "url": "https://github.com/UnlockAgency/flutter-cli/releases/tag/v1.8.2"
 }

lib/commands/build.rb

@@ -13,7 +13,10 @@ def initialize(args)
             @@exportMethod = args['export-method']
 
             @@obfuscation = args['obfuscation'] == true
-            @@prepare = args['prepare'] == true
+            @@prepare = args['dry-run'] == true
+
+            # Web
+            @@renderer = args['web-renderer']
         end
 
         def execute
@@ -28,7 +31,7 @@ def execute
             end
 
             if @@prepare
-                puts colored :blue, "\n#{CHAR_FLAG} Skipping actual build in prepare mode"
+                puts colored :blue, "\n#{CHAR_FLAG} Skipping actual build in dry-run mode"
                 puts colored :default, "#{command}\n\n"
                 return
             end
@@ -68,7 +71,13 @@ def build_ios
         end
 
         def build_web
-            return "flutter build web --target=lib/main.dart --dart-define-from-file=config/.build.json"
+            command = "flutter build web --target=lib/main.dart --dart-define-from-file=config/.build.json"
+
+            unless @@renderer.nil?
+                command += " --web-renderer #{@@renderer}"
+            end
+
+            return command
         end
 
         def generate_ios_export_options

lib/commands/run.rb

@@ -7,8 +7,11 @@ def initialize(args)
             @profile = args[:profile]
             @device = args[:device]
 
+            @@prepare = args['dry-run'] == true
+
             # Web
             @@port = args[:port]
+            @@renderer = args['web-renderer']
         end
 
         def execute
@@ -35,6 +38,16 @@ def execute
                 command += " --web-port #{@@port}"
             end
 
+            unless @@renderer.nil?
+                command += " --web-renderer #{@@renderer}"
+            end
+
+            if @@prepare
+                puts colored :blue, "\n#{CHAR_FLAG} Skipping actual run in dry-run mode"
+                puts colored :default, "#{command}\n\n"
+                return
+            end
+
             puts colored :blue, "\n#{CHAR_FLAG} Running app in flavor: #{@flavor}"
             puts colored :default, "#{command}\n\n"
 

lib/flttr/version.rb

@@ -1,3 +1,3 @@
 module Flttr
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end