ruby_native 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a113d3d2c433bccc6c9ada4e8a5a02c0775774e442112476c109f7dcbe4ca3
-  data.tar.gz: bf0e665c8c987163110db90a32bf94c75b5bd3ab280525825b3560c3eadcff80
+  metadata.gz: a20e456fe2c38a3885bd29bc796da70a6ef238bf30de87297ca14f9f407d783d
+  data.tar.gz: b266e12b4c911bb57ba5c21eb6748f270a13a7449e27296fb5bf5fefb4b20d96
 SHA512:
-  metadata.gz: 518187e2f0671bbfba76d1b9012ffb74244f53eef1c96ed2e30e1971128438196ff449b6bfb3d1681fcace412430625764ecc67dd9af49ce059fb7e117e2c345
-  data.tar.gz: 385d005b83652aedaa1dac4c0b629479f3f589cd43303089162bb7b18c8fcc4a5fb12622cc12d8e5d5ceff036581566fd5c528e3bc1fb5a63aff9bcb9f993b41
+  metadata.gz: 7a59080e79c82b040910d146ad1b3f214ef247a1f251783ba951400bf099bc1f161b41195b2230bb0da977988ae7850be1be6aff1e4f89c16a539b7b7dcef8f3
+  data.tar.gz: 289783ff033617cc3b77f697334e861985f98786562d978b923118c56638c0411931df89929bf9c771cbe77a88d71f38d6f177fbb1762c66badfdb039fa7379c

data/lib/ruby_native/cli/preview.rb

@@ -2,6 +2,7 @@ require "open3"
 require "net/http"
 require "uri"
 require "resolv"
+require "ruby_native/cli/credentials"
 
 module RubyNative
   class CLI
@@ -14,6 +15,8 @@ module RubyNative
       DEFAULT_PORT = 3000
       PORT_RANGE = (1..65_535)
       OUTPUT_TAIL_LINES = 5
+      DEPLOY_URL = "https://rubynative.com/deploy"
+      QR_QUIET_ZONE = 4
 
       def initialize(argv)
         @url = parse_option(argv, "--url")
@@ -269,6 +272,17 @@ module RubyNative
         require "rqrcode"
 
         qr = RQRCode::QRCode.new(url, level: :l)
+        width = (qr.modules.size + QR_QUIET_ZONE * 2) * 2
+        columns = terminal_columns
+
+        # A row that wraps prints as two, and the code never scans. Longer tunnel
+        # hostnames make bigger codes, so a pane that fit yesterday can fail today.
+        if columns && columns < width
+          puts ""
+          puts "Your terminal is #{columns} columns wide and the QR code needs #{width}. Widen the window, or paste the URL into the Ruby Native app."
+          print_preview_details(url)
+          return
+        end
 
         # Painted as background colors, not block glyphs: a glyph takes the terminal's
         # foreground color, which prints the code inverted on a dark theme, and Android
@@ -281,23 +295,52 @@ module RubyNative
         print qr.as_ansi(
           light: "\e[48;2;255;255;255m",
           dark: "\e[48;2;0;0;0m",
-          quiet_zone_size: 4
+          quiet_zone_size: QR_QUIET_ZONE
         )
+        print_preview_details(url)
+      end
+
+      def print_preview_details(url)
         puts ""
         puts url
         puts ""
-        puts "Scan the QR code or paste the URL into the Ruby Native app."
-        puts "Don't have it yet? Download it at https://rubynative.com/try/download"
+        puts "Download the Ruby Native app and scan the QR code: https://rubynative.com/try/download"
+        puts ""
         if @url
-          puts "Keep this running and your Rails server reachable at #{@url}."
+          puts "Keep this running and your Rails server reachable at #{@url}. Press Ctrl+C to stop."
         else
-          puts "Keep this running and your Rails server on port #{port_description} in another terminal."
+          puts "Keep this running and your Rails server on port #{port_description} in another terminal. Press Ctrl+C to stop."
         end
-        puts "Press Ctrl+C to stop."
+      end
+
+      # Only a terminal can wrap the code; captured or piped output never does.
+      def terminal_columns
+        return unless $stdout.tty?
+
+        require "io/console"
+        IO.console&.winsize&.last
+      rescue StandardError
+        nil
+      end
+
+      # Nobody has deployed from a machine that has never logged in, so the
+      # hint reaches first-time users and spares customers previewing day to day.
+      def never_logged_in?
+        Credentials.token.nil?
+      end
+
+      def print_farewell
+        return unless never_logged_in?
+
+        puts ""
+        puts "Like what you see? `ruby_native deploy` puts a real app on your phone for good."
+        puts ""
+        puts "Free until you ship: #{DEPLOY_URL}"
       end
 
       def trap_interrupt
         Signal.trap("INT") do
+          print_farewell
           kill_tunnel
           exit 0
         end

data/lib/ruby_native/version.rb

@@ -1,3 +1,3 @@
 module RubyNative
-  VERSION = "0.17.1"
+  VERSION = "0.17.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_native
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Joe Masilotti