superbot-cloud 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5bd835b5b98790f2f3781fa2ff283288e549a3bff592d56bc088fd70261297b
-  data.tar.gz: d7d43561f6b36cd25e4ff4b166c4f6cfd3e7f920ac14965a138a1998c483b463
+  metadata.gz: 95f7b0130f9adf8531a841cda20fa97ad78431b6d7b11109b8fe06fc79a1acc3
+  data.tar.gz: 197fd5861fd0cac3ce1350099ca69dca9821f82dcda6ed884897e2e21e1e9365
 SHA512:
-  metadata.gz: 4d7a961ce5eb71bd5d87bc953f5745bca6be8b4eff9f5d5065a25f47340cd69769189f4e6a676ee95de3438522c98ee438fd1b5182b71afc1f8ac7f394d54f3f
-  data.tar.gz: aade2c3fd1d8eda888b39bc4f25b2a5caf29cdbcd187d381b0ed7b0c65a5f89059d9d5746d224a6d56939e4719043c6f551e6674aba1db7beee01ca40d478565
+  metadata.gz: 53c8e647210dd13dbb28bfc3c4fa13afd22846c81640fd30c26ae71d9ce3795d17f3cc573e3ae6a21a240f1a3a6147144e4b9592ebd42517392d5dd094c50965
+  data.tar.gz: 92123bbb7f3178bf75dc33d60c221b77dfd872ae2f231414bcfc063040c050b8e2104d436a3a5b5c50d4b719354f9d64b608586a4f0fe591dd54130178dd2a33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot-cloud (0.1.9)
+    superbot-cloud (0.1.11)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
 
@@ -60,13 +60,13 @@ GEM
       rack-protection (= 2.0.3)
       tilt (~> 2.0)
     sinatra-silent (0.0.1)
-    superbot (0.1.13)
+    superbot (0.1.14)
       clamp (= 1.2.1)
       kommando (~> 0.1)
       launchy (= 2.4.3)
       sinatra (= 2.0.3)
       sinatra-silent (= 0.0.1)
-      superbot-cloud (~> 0.1.4)
+      superbot-cloud (~> 0.1.9)
       zaru (= 0.2.0)
     tilt (2.0.8)
     unicode-display_width (1.4.0)

data/lib/superbot/cloud/cli/cloud/login_command.rb

@@ -15,7 +15,8 @@ module Superbot
 
           begin
             Superbot::Cloud::Api.request(:token)
-            puts "Logged in as #{Superbot::Cloud.credentials[:email]}"
+            user_creds = Superbot::Cloud.credentials
+            puts "Logged in as #{user_creds[:username]} (#{user_creds[:email]})"
           rescue SystemExit => e
             abort unless e.message == 'Invalid credentials'
             proceed_to_login
@@ -34,20 +35,37 @@ module Superbot
         end
 
         def web_login
-          Superbot::Cloud::WebLogin.run!
-          Launchy.open(cloud_login_uri)
-
-          puts "Your browser has been opened to visit:"
-          puts cloud_login_uri
-          puts ""
-          puts "Press enter to exit"
-          $stdin.gets
+          web = Superbot::Cloud::WebLogin.new
+          web.run_async_after_running!
+          open_cloud_login_uri
+          handle_keyboard_interrupt
+          wait_for_login(web)
         end
 
-        def cloud_login_uri
-          URI.parse(Superbot::Cloud::LOGIN_URI).tap do |uri|
+        def open_cloud_login_uri
+          cloud_login_uri = URI.parse(Superbot::Cloud::LOGIN_URI).tap do |uri|
             uri.query = URI.encode_www_form(redirect_uri: 'http://localhost:4567/login')
           end.to_s
+
+          Launchy.open(cloud_login_uri)
+          puts "Your browser has been opened to visit:", cloud_login_uri
+          puts
+        end
+
+        def handle_keyboard_interrupt
+          trap "SIGINT" do
+            puts
+            puts "Command killed by keyboard interrupt"
+            exit 130
+          end
+        end
+
+        def wait_for_login(web)
+          loop do
+            break unless web.running?
+
+            sleep 0.1
+          end
         end
       end
     end

data/lib/superbot/cloud/version.rb

@@ -2,6 +2,6 @@
 
 module Superbot
   module Cloud
-    VERSION = "0.1.9"
+    VERSION = "0.1.11"
   end
 end

data/lib/superbot/cloud/web_login.rb

@@ -14,10 +14,12 @@ module Superbot
           set :silent_webrick, true
           set :silent_access_log, false
           server_settings[:Silent] = true
+          instance = self
 
           get "/login" do
             credentials = request.params.slice('username', 'email', 'token')
             Superbot::Cloud.save_credentials(credentials)
+            instance.quit!
             redirect "#{Superbot::Cloud::LOGIN_URI}/success?username=#{Superbot::Cloud.credentials[:username]}"
           end
         end
@@ -28,9 +30,23 @@ module Superbot
       end
 
       def run!
+        @sinatra.run_async!
+      end
+
+      def running?
+        @sinatra.running?
+      end
+
+      def run_async_after_running!
         Thread.new do
           @sinatra.run!
         end
+
+        loop do
+          break if running?
+
+          sleep 0.001
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superbot-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Superbots