From ca0234b02da65ca868880454e35cf62bf69f2419 Mon Sep 17 00:00:00 2001
From: Andrew Cantino <cantino@gmail.com>
Date: Mon, 22 Sep 2014 22:19:49 -0700
Subject: [PATCH] refactor bin/setup_heroku so button users get admin accounts

---
 app/views/devise/registrations/new.html.erb |  6 +--
 bin/setup_heroku                            | 48 +++++++++++++--------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 54fa459ea8..fe8d1ff05f 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -15,7 +15,7 @@
             <ul>
               <li>Read <a href="https://github.com/cantino/huginn/wiki/Run-Huginn-for-free-on-Heroku" target="_target">this document</a> carefully if you are going to try out Huginn for free on <a href="https://id.heroku.com/" target="_target">Heroku</a>.</li>
 
-              <li>Install the <a href="https://toolbelt.heroku.com/" target="_target">Heroku Toolbelt</a> and run <kbd>heroku login</kbd> if you haven't already.</li>
+              <li>Install the <a href="https://toolbelt.heroku.com/" target="_target">Heroku Toolbelt</a> and run <kbd>heroku login</kbd>, if you haven't already.</li>
 
               <li>Run the following commands:<br />
                 <%= content_tag :pre do -%>
@@ -25,7 +25,7 @@ bundle
 bin/setup_heroku
 <%- end %>
 
-              <li>Get back to this page and sign up with the invitation code shown by the last command.</li>
+              <li>This command will create an admin account for you.</li>
             </ul>
           </div>
           <% end %>
@@ -78,4 +78,4 @@ bin/setup_heroku
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/bin/setup_heroku b/bin/setup_heroku
index ae11b75502..e1e6a9f19a 100755
--- a/bin/setup_heroku
+++ b/bin/setup_heroku
@@ -138,19 +138,6 @@ unless $config['SMTP_DOMAIN'] && $config['SMTP_USER_NAME'] && $config['SMTP_PASS
   end
 end
 
-if first_time
-  puts "Restarting..."
-  puts capture("heroku restart")
-
-  puts "Done!"
-  puts
-  puts "Visit https://#{app_name}.herokuapp.com/users/sign_up and use the invitation code shown below:"
-  puts
-  puts "\t#{$config['INVITATION_CODE']}"
-
-  exit
-end
-
 branch = capture("git rev-parse --abbrev-ref HEAD")
 if yes?("Should I push your current branch (#{branch}) to heroku?")
   puts "This may take a moment..."
@@ -158,21 +145,44 @@ if yes?("Should I push your current branch (#{branch}) to heroku?")
 
   puts "Running database migrations..."
   puts capture("heroku run rake db:migrate")
+end
 
+if first_time
+  puts "Restarting..."
+  puts capture("heroku restart")
+  puts "Done!"
   puts
   puts
   puts "I can make an admin user on your new Huginn instance and setup some example Agents."
   if yes?("Should I create a new admin user and some example Agents?")
-    seed_email = nag "Okay, what is your email address?"
-    seed_username = nag "And what username would you like to login as?"
-    seed_password = nag "Finally, what password would you like to use?", noecho: true
-    puts "\nJust a moment..."
-
-    capture("heroku run rake db:seed SEED_EMAIL=#{seed_email} SEED_USERNAME=#{seed_username} SEED_PASSWORD=#{seed_password}")
+    done = false
+    while !done
+      seed_email = nag "Okay, what is your email address?"
+      seed_username = nag "And what username would you like to login as?"
+      seed_password = nag "Finally, what password would you like to use?", noecho: true
+      puts "\nJust a moment..."
+
+      result = capture("heroku run rake db:seed SEED_EMAIL=#{seed_email} SEED_USERNAME=#{seed_username} SEED_PASSWORD=#{seed_password}")
+      if result =~ /Validation failed/
+        puts "ERROR:"
+        puts
+        puts result
+        puts
+      else
+        done = true
+      end
+    end
     puts
     puts
     puts "Okay, you should be all set!  Visit https://#{app_name}.herokuapp.com and login as '#{seed_username}' with your password."
+    puts
+    puts "If you'd like to make more users, you can visit https://#{app_name}.herokuapp.com/users/sign_up and use the invitation code:"
+  else
+    puts
+    puts "Visit https://#{app_name}.herokuapp.com/users/sign_up and use the invitation code shown below:"
   end
+  puts
+  puts "\t#{$config['INVITATION_CODE']}"
 end
 
 puts