puppetfactory 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68142c666caae7ed6041926b898235c8ec86adb
-  data.tar.gz: 3e44a08a9800fe697b19d0e310f04324e26bb636
+  metadata.gz: cec32bdf45caae0009512d87b8bea2a44cbe39b9
+  data.tar.gz: 27301c30a9c58642bce89a379e87a6ecbc2a8799
 SHA512:
-  metadata.gz: 8a13501a324ee2f1657437b6c3af2da79a9daa79f95556e29597fe80157bf43a21e2429cf36865dc5458cc52f0e7a716bf965288517a627f2b14ce1c2c11bec9
-  data.tar.gz: 676a0e83e781edea7579224602899865edf35019b9998340ec15504afbe827f1f4fb572ee0689555c902def65f0a84f19dbdc4d364467794f22ee542af53c476
+  metadata.gz: 95af4028098cec7c6ae2ba5d7a3195881fc9eb2ef3810c95832414c61b518baf14594538df61ccd84260b4fc10f730f5b431afa9cb4882288a3f1fcf26e921a2
+  data.tar.gz: 9359226c973d85989484ec7163123d44f2241756cd0c45a11002a82c30911db649e076a3ce7af6dfe509f011c81ebf58e831b2131b3362364b0e242bfefbfe3b

data/lib/puppetfactory.rb

@@ -97,13 +97,18 @@ class Puppetfactory < Sinatra::Base
     end
 
     session[:username] = username
-    {"status" => "ok"}.to_json
-    redirect '/'
+    {
+      "status" => "ok",
+      "event"  => "login"
+    }.to_json
   end
 
   get '/users/deactive' do
     session.delete :username
-    redirect '/'
+    {
+      "status" => "ok",
+      "event"  => "logout"
+    }.to_json  
   end
 
   # admin login

data/lib/puppetfactory/plugins/gitea.rb

@@ -20,6 +20,9 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
     @gitea_port     = options[:gitea_port]           || '3000'
     @gitea_user     = options[:gitea_user]           || 'git'
     @gitea_homedir  = Dir.home(@gitea_user)
+    
+    # gitea will scream if the admin's .ssh directory doesn't exist
+    FileUtils.mkdir_p(File.expand_path("~#{@admin_username}/.ssh"))
 
     migrate_repo! unless File.directory?(@cache_dir)
   end

data/public/js/usermanagement.js

@@ -35,11 +35,16 @@ $(document).ready(function(){
     close();
   });
 
-  $('#users .select a, #user-logout').click(function(event){
+  $('article').on('click', '#users .select a, #user-logout', function(event){
     event.preventDefault();
     var action = $(this).attr('href');
     $.get(action, function(data) {
-      updatePage();
+      var results = $.parseJSON(data);
+      if (results.status == 'ok') {
+        location.replace('/');
+      } else {
+        alert('User selection failed');
+      }
     });
   });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetfactory
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ben Ford
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra