puppetfactory 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c925f67c54a20814cd88a9c1b0db49d12e44a9
-  data.tar.gz: 6ffa50fac51bdca43e47891a886c780d0ed0b1d3
+  metadata.gz: f68142c666caae7ed6041926b898235c8ec86adb
+  data.tar.gz: 3e44a08a9800fe697b19d0e310f04324e26bb636
 SHA512:
-  metadata.gz: f68d09e430b101a71c1103da68a5c3d022085cca5e668ca221037342fac00ad775d38984c8044da7bd41560d6ac4bdfc70b5bc2762f3600e5243991b796efb54
-  data.tar.gz: d65e3d31ec098f7f00d10506ddc98065762f5d63397daf7fd18352c5edc885ffaaf2ab615d4230d0e6a13492557f6d501d38a4000a9a6a29ce6e9d63d76ecce5
+  metadata.gz: 8a13501a324ee2f1657437b6c3af2da79a9daa79f95556e29597fe80157bf43a21e2429cf36865dc5458cc52f0e7a716bf965288517a627f2b14ce1c2c11bec9
+  data.tar.gz: 676a0e83e781edea7579224602899865edf35019b9998340ec15504afbe827f1f4fb572ee0689555c902def65f0a84f19dbdc4d364467794f22ee542af53c476

data/bin/puppetfactory

@@ -85,7 +85,7 @@ options[:gituser]      ||= 'puppetlabs'
 options[:controlrepo]  ||= 'control-repo.git'
 options[:repomodel]    ||= :single
 
-options[:plugins]      ||= [:ShellUser, :Logs]
+options[:plugins]      ||= [:ShellUser, :Logs, :LoginShell]
 
 def validate(options, option, values)
   unless values.include? options[option]
@@ -106,7 +106,10 @@ $logger.formatter = proc { |severity,datetime,progname,msg| "[#{datetime}] #{sev
 
 # if no arguments, start up the server
 if ARGV.size == 0
- Puppetfactory.run! options
+  # TODO: remove this insane timeout once we have a progressive user creation dialog
+  Puppetfactory.run!(options) do |server|
+    server.timeout = 180
+  end
 
 #   opts = {
 #           :Port               => 8000,

data/lib/puppetfactory.rb

@@ -26,7 +26,7 @@ class Puppetfactory < Sinatra::Base
 
   configure :production, :development do
     enable :logging
-    use Rack::Session::Cookie, 
+    use Rack::Session::Cookie,
       :key          => 'puppetfactory.session',
       :path         => '/',
       :expire_after => 2592000, # In seconds
@@ -37,7 +37,7 @@ class Puppetfactory < Sinatra::Base
     # IE is cache happy. Let's make that go away.
     cache_control :no_cache, :max_age => 0
   end
-  
+
   def initialize(app=nil)
     super(app)
 
@@ -66,14 +66,11 @@ class Puppetfactory < Sinatra::Base
   # UI tab endpoints
   get '/' do
     @tabs = merge(plugins(:tabs, privileged?))
+    @current = merge(plugins(:userinfo, session[:username], true)) if session.include? :username
 
     erb :index
   end
 
-  get '/home' do
-    erb :home
-  end
-
   get '/users' do
     @users   = load_users()
     @current = merge(plugins(:userinfo, session[:username], true)) if session.include? :username
@@ -88,16 +85,38 @@ class Puppetfactory < Sinatra::Base
 
   # set the currently active user. This should probably be a PUT action.
   get '/users/active/:username' do |username|
+    username ||= myParams[user]
+
+    users ||= load_users()
+
+    unless users.include?(username)
+      return {
+        "status"  => "failure",
+        "message" => "invalid user"
+      }.to_json
+    end
+
     session[:username] = username
     {"status" => "ok"}.to_json
+    redirect '/'
+  end
+
+  get '/users/deactive' do
+    session.delete :username
+    redirect '/'
   end
 
   # admin login
-  get '/login' do
+  get '/admin-login' do
     protected!
     redirect '/'
   end
 
+  get '/admin-logout' do
+    remove_privileges!
+    redirect '/'
+  end
+
   # create a new username with the default password.
   get '/new/:username' do |username|
     protected!
@@ -300,10 +319,14 @@ class Puppetfactory < Sinatra::Base
         session[:privileges] = 'admin'
         true
       else
-        session.delete :privileges
+        remove_privileges!
         false
       end
     end
 
+    def remove_privileges!
+      session.delete :privileges
+    end
+
   end
 end

data/lib/puppetfactory/plugins/docker.rb

@@ -33,7 +33,7 @@ class Puppetfactory::Plugins::Docker < Puppetfactory::Plugins
         "/var/yum:/var/yum",
         "/var/cache:/var/cache",
         "/etc/pki/rpm-gpg:/etc/pki/rpm-gpg",
-        "/etc/yum.repos.d:/etc/yum.repos.d",
+#        "/etc/yum.repos.d:/etc/yum.repos.d", # we can't share this because of pe_repo.repo
         "/opt/puppetlabs/server:/opt/puppetlabs/server",
         "/home/#{username}/puppet:#{@confdir}",
         "/sys/fs/cgroup:/sys/fs/cgroup:ro"

data/lib/puppetfactory/plugins/gitea.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'fileutils'
+require 'restclient'
 require 'puppetfactory'
 
 class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
@@ -7,49 +8,40 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
   def initialize(options)
     super(options)
 
+    @cache_dir      = '/var/cache/puppetfactory/gitea'
+    @lockfile       = '/var/cache/puppetfactory/gitea.lock'
     @suffix         = options[:usersuffix]
     @controlrepo    = options[:controlrepo]
     @reponame       = File.basename(@controlrepo, '.git')
-    @gitea_path     = options[:gitea_path] || '/home/git/go/bin/gitea'
+    @repopath       = "#{@cache_dir}/#{@reponame}"
+    @gitea_cmd      = options[:gitea_cmd]            || '/home/git/go/bin/gitea'
     @admin_username = options[:gitea_admin_username] || 'root'
     @admin_password = options[:gitea_admin_password] || 'puppetlabs'
-    @gitea_port     = options[:gitea_port] || '3000'
+    @gitea_port     = options[:gitea_port]           || '3000'
+    @gitea_user     = options[:gitea_user]           || 'git'
+    @gitea_homedir  = Dir.home(@gitea_user)
 
-    @cache_dir = '/var/cache/puppetfactory/gitea'
-
-    if (!File.directory?("#{@cache_dir}/#{@reponame}"))
-      $logger.info "Migrating repository #{@reponame}"
-      begin
-        `curl -su "#{@admin_username}:#{@admin_password}" --data "clone_addr=https://github.com/puppetlabs-education/#{@controlrepo}&uid=1&repo_name=#{@reponame}" http://localhost:#{@gitea_port}/api/v1/repos/migrate`
-        FileUtils::mkdir_p @cache_dir
-        Dir.chdir(@cache_dir) do
-          `git clone --depth 1 http://#{@admin_username}:#{@admin_password}@localhost:#{@gitea_port}/#{@admin_username}/#{@controlrepo}`
-        end
-      rescue => e
-        $logger.error "Error migrating repository: #{e.message}"
-        return false
-      end
-    end
-  end
-
-  def add_collaborator(owner, repo, username, permission)
-    `curl -su "#{@admin_username}:#{@admin_password}" -X PUT -H "Content-Type: application/json" -d '{"permissions":"#{permission}"}' http://localhost:#{@gitea_port}/api/v1/repos/#{owner}/#{repo}/collaborators/#{username}`
-  end
-
-  def make_branch(username)
-    Dir.chdir("#{@cache_dir}/#{@reponame}") do
-      `git checkout -b #{username} && git push origin #{username}`
-    end
+    migrate_repo! unless File.directory?(@cache_dir)
   end
 
   def create(username, password)
     begin
-      `su git -c "cd && #{@gitea_path} admin create-user --name #{username} --password #{password} --email #{username}@#{@suffix}"`
-      add_collaborator(@admin_username, @reponame, username, 'write')
-      make_branch(username)
-      $logger.info "Created Gitea user #{username}."
+      # since we're changing directories, none of this can be done concurrently; lock it all.
+      #
+      # TODO: consider forking worker processes so that CWD doesn't leak between threads.
+      File.open(@lockfile, 'w') do |file|
+        file.flock(File::LOCK_EX)
+
+        make_user(username, password)
+        $logger.debug "Created Gitea user #{username}."
+        make_branch(username)
+        $logger.debug "Created Gitea branch #{username}."
+        add_collaborator(@admin_username, @reponame, username, 'write')
+        $logger.info "Created Gitea collaborator #{username}."
+      end
     rescue => e
-      $logger.error "Error creating Gitea user #{username}: #{e.message}"
+      $logger.error "Error configuring Gitea for #{username}: #{e.message}"
+      $logger.error e.backtrace.join("\n")
       return false
     end
 
@@ -58,7 +50,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
 
   def delete(username)
     begin
-      `curl -su "#{@admin_username}:#{@admin_password}" -X "DELETE" http://localhost:#{@gitea_port}/api/v1/admin/users/#{username}`
+      remove_user(username)
       $logger.info "Removed Gitea user #{username}."
     rescue => e
       $logger.error "Error removing Gitea user #{username}: #{e.message}"
@@ -68,4 +60,73 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
     true
   end
 
+  private
+    def migrate_repo!
+      FileUtils::mkdir_p @cache_dir
+      $logger.info "Migrating repository #{@reponame}"
+      begin
+        RestClient.post("http://#{@admin_username}:#{@admin_password}@localhost:#{@gitea_port}/api/v1/repos/migrate", {
+                          'clone_addr' => "https://github.com/puppetlabs-education/#{@controlrepo}",
+                          'uid'        => 1,
+                          'repo_name'  => @reponame,
+                       })
+
+        # make sure the server has time to finish cloning from GitHub before cloning
+        sleep 5
+
+        Dir.chdir(@cache_dir) do
+          repo_uri = "http://#{@admin_username}:#{@admin_password}@localhost:#{@gitea_port}/#{@admin_username}/#{@controlrepo}"
+          output, status = Open3.capture2e('git', 'clone', '--depth', '1', repo_uri)
+          raise output unless status.success?
+        end
+
+      rescue => e
+        $logger.error "Error migrating repository: #{e.message}"
+        $logger.error e.backtrace.join("\n")
+        return false
+      end
+    end
+
+    def make_user(username, password)
+      Dir.chdir(@gitea_homedir) do
+        uid = Etc.getpwnam(@gitea_user).uid
+        pid = Process.fork do
+          ENV['USER']  = @gitea_user
+          Process.uid  = uid
+          Process.euid = uid
+
+          output, status = Open3.capture2e(@gitea_cmd, 'admin', 'create-user',
+                                            '--name',     username,
+                                            '--password', password,
+                                            '--email',    "#{username}@#{@suffix}")
+
+          $logger.error output unless status.success?
+          exit status.exitstatus
+        end
+
+        pid, status = Process.wait2(pid)
+        raise "Error creating Gitea user #{username}" unless status.success?
+      end
+    end
+
+    def add_collaborator(owner, repo, username, permission)
+      repo_uri = "http://#{@admin_username}:#{@admin_password}@localhost:#{@gitea_port}/api/v1/repos/#{owner}/#{repo}/collaborators/#{username}"
+      RestClient.put(repo_uri, {'permissions' => permission}.to_json)
+    end
+
+    def make_branch(username)
+      Dir.chdir(@repopath) do
+        # use --force in case the branch already exists
+        output, status = Open3.capture2e('git', 'branch', '--force', username)
+        raise output unless status.success?
+
+        output, status = Open3.capture2e('git', 'push', 'origin', username)
+        raise output unless status.success?
+      end
+    end
+
+    def remove_user(username)
+      RestClient.delete("http://#{@admin_username}:#{@admin_password}@localhost:#{@gitea_port}/api/v1/admin/users/#{username}")
+    end
+
 end

data/public/css/style.css

@@ -14,6 +14,16 @@ footer {
   width: 100%;
 }
 
+hr {
+  border: none;
+  border-top: 2px solid #222222;
+  margin: 2em 0 1em;
+}
+
+article {
+  margin: 6em 4em 2em 4em;
+}
+
 a {
   text-decoration: none;
   color: #3880ff;
@@ -28,24 +38,31 @@ button:focus {
   outline: none;
 }
 
+code {
+  background-color: #ddd;
+  border-bottom: 2px dotted #aaa;
+  padding: 0.25em;
+}
+
 header {
   height: 4em;
   top: 0;
 }
 
+header ul,
+header li,
+header a {
+  display: inline-block;
+}
+
 header ul {
   margin: 0;
   padding: 0;
   list-style: none;
 }
 
-header li {
-  float: left;
-  padding: 1.2em 2em;
-}
-
-header li a {
-  display: block;
+header a {
+  margin: 1.2em 1em;
   color: #ffffff;
 }
 
@@ -55,13 +72,14 @@ a:hover {
 
 header a:hover,
 .ui-tabs-active a,
-#login:hover {
+#admin-login:hover {
   color: #ffae1a;
   border-color: #ffae1a;
 }
 
 input[type="button"],
-.ui-dialog button {
+.ui-dialog button,
+.button {
   padding: .5em 1em;
   border: none;
   background-color: #ffae1a;
@@ -73,10 +91,6 @@ input[type="button"]:hover {
   opacity: .7;
 }
 
-article {
-  margin: 6em 4em 2em 4em;
-}
-
 li {
   margin-bottom: .5em;
 }
@@ -95,10 +109,29 @@ tr:nth-child(2n+2) {
   background: #dedede;
 }
 
-.right {
-  float: right;
+input[type="text"],
+input[type="password"] {
+  font-size: .8em;
+  width: 100%;
+  max-width: 100%;
+  padding: 8px 12px;
+  border: 2px solid #dedede;
+  outline: none;
+}
+
+input.fail {
+  background-color: #f88484;
+  border-color: #d63700;
 }
 
+.flexrow { display: flex; }
+
+.flex-7 { flex: 7; }
+.flex-3 { flex: 3; }
+
+.flex-right { margin-left:  1em; }
+.flex-left  { margin-right: 1em; }
+
 .ui-dialog {
   background-color: #ffffff;
   padding: 1em 2em;
@@ -111,85 +144,42 @@ tr:nth-child(2n+2) {
 
 #nav-logo {
   float: left;
-  padding: 1em 2em;
+  padding: 1em 1em 1em 2em;
   height: 2em;
 }
 
-#login {
-  color: transparent;
-  background-color: transparent;
-}
-
-#userslist,
-#shellwrapper {
-  display: none;
-}
-
-#usercontent {
-  position: relative;
-}
-
-#newuserwrapper {
-  margin-top: 2em;
+#admin-login,
+#admin-logout {
+  float: right;
+  margin: 1.2em 2em;
+  color: #ffffff;
 }
 
-#newuser {
+#userslist {
   display: none;
-  margin-top: 0.5em;
-  padding: 1em;
 }
 
-#newuser div {
+#user-wrapper div {
   margin: .5em 0;
 }
 
-#newuser.processing,
 #newuser.processing input {
   background: #dedede;
-  color: #ffffff;
-  border: none;
-}
-
-#newuser.processing {
-  border-color: #565656;
-}
-
-#newuser label {
-  display: inline-block;
-  width: 6em;
+  border: #4e4e4e;
 }
 
-#newuser input[type="text"],
-#newuser input[type="password"] {
-  font-family: 'Calibre-Regular', sans-serif;
-  font-size: 1em;
-  display: inline-block;
-  box-sizing: border-box;
-  width: 25%;
-  max-width: 100%;
-  padding: 8px 12px;
-  line-height: 1em;
-  border: 2px solid #dedede;
-  outline: none;
-}
-
-#newuser input.fail {
-  background: #f88484;
+#user-wrapper h3 {
+  margin-top: 0;
 }
 
 #currentuser {
-  margin-bottom: 4em;
+  margin-bottom: 1em;
 }
 
 #currentuser th.header {
-  width: 10%;
-  white-space: nowrap;
   text-align: right;
   padding-right: 1em;
 }
-#currentuser tr.actions {
-  text-align: right;
-}
 
 #users {
   margin-top: 1em;
@@ -203,42 +193,20 @@ tr:nth-child(2n+2) {
   text-align: center;
 }
 
-#users td.select {
-  font-size: 0.8em;
-}
-
 #console {
   width: 100%;
-  height: 24em;
-  resize: vertical;
-}
-
-#shell code {
-  background-color: #ddd;
-  border-bottom: 2px dotted #aaa;
-  padding: 0.25em;
+  height: 36em;
 }
 
-#alternate,
 #explanation {
   display: none;
 }
 
-#show-alternate {
-  float: right;
-  margin-left: 0.5em;
-}
-
-#dashboard {
-
-}
-
-#dashboard #notifications {
-  font-size: 0.5em;
+#notifications {
   color: #666;
 }
 
-#dashboard #notifications.fail {
+#notifications.fail {
   font-weight: bold;
   background-color: red;
   border: 1px solid black;
@@ -246,18 +214,13 @@ tr:nth-child(2n+2) {
   padding: 0.25em 0.5em;
 }
 
-#dashboard #tools {
+#tools {
   float: right;
   top: 1em;
-  font-size: 0.8em;
   margin-bottom: 0.5em;
 }
 
-#dashboard #tools * {
-  font-size: 0.8em;
-}
-
-#dashboard #tools * .ui-button-text {
+#tools * .ui-button-text {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
 }
@@ -274,7 +237,6 @@ tr:nth-child(2n+2) {
   background-color: #ffdddd;
   border-radius: 0.25em;
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25) inset;
-  font-size: 0.8em;
 }
 
 #dashboard .gutter .label {
@@ -292,7 +254,6 @@ tr:nth-child(2n+2) {
 }
 
 #dashboard .completed a {
-  font-size: 0.5em;
   text-decoration: none;
 }
 
@@ -300,7 +261,20 @@ tr:nth-child(2n+2) {
   border-bottom: 2px solid black;
 }
 
+#logs .data {
+  font-family: monospace;
+  font-size: 1.2em;
+  white-space: pre-wrap;
+}
+
 #gitviz {
   width: 100%;
   min-height: 600px;
 }
+
+@media ( max-width: 1024px ) {
+  .flexrow { flex-direction: column; }
+
+  .flex-right { margin-left:  0; }
+  .flex-left  { margin-right: 0; }
+}

data/public/explain-git-with-d3/css/explaingit.css

@@ -9,6 +9,7 @@ p {
 
 .container {
   padding: 0;
+  min-width: 1150px;
 }
 
 #menuwrapper {

data/public/js/scripts.js

@@ -16,12 +16,6 @@ $(document).ready(function(){
       return keepLoading;
     },
   });
-
-  $('#login').button({
-    icons: {
-      primary: "ui-icon-locked"
-    }
-  });
 });
 
 function updatePage(name) {
@@ -32,5 +26,11 @@ function updatePage(name) {
     var idx = $("#tabs").tabs("option","active");
   }
 
-  $("#tabs").tabs('load', idx);
+  // force a hard reload if we're already on the desired page
+  if ($("#tabs").tabs("option","active") == idx) {
+    location.reload(true);
+  }
+  else {
+    $("#tabs").tabs('load', idx);
+  }
 }

data/public/js/usermanagement.js

@@ -9,19 +9,6 @@ $(document).ready(function(){
     return true;
   };
 
-  function open() {
-    $('#showuser').hide();
-    $('#newuserwrapper').addClass("open");
-    $('#newuser').slideDown("fast");
-    $('#user').focus();
-  }
-
-  function close() {
-    $('#showuser').show();
-    $('#newuserwrapper').removeClass("open");
-    $('#newuser').hide();
-  }
-
   function start_processing() {
     $('#newuser input[type=button]').attr("disabled", true);
     $('#newuser').addClass("processing");
@@ -48,15 +35,22 @@ $(document).ready(function(){
     close();
   });
 
-  $('#users .select a').click(function(event){
+  $('#users .select a, #user-logout').click(function(event){
     event.preventDefault();
     var action = $(this).attr('href');
-
     $.get(action, function(data) {
       updatePage();
     });
   });
 
+  $('#login-submit').click(function (event) {
+    event.preventDefault();
+    var action = $(this).attr('href');
+    var user = $('#login-user').val();
+
+    $.get(action, {user: user});
+  });
+
   // save the new user
   $('#save').click(function(){
     var username  = $('#user').val();

data/views/currentuser.erb

@@ -0,0 +1,51 @@
+<div id="currentuser-wrapper">
+<% if @current %>
+  <h3>Selected User</h3>
+  <table id="currentuser">
+    <tr><th class="header">Username:</th>    <td><%= @current[:username] %></td></tr>
+    <tr><th class="header">Certname:</th>    <td><%= @current[:certname] %></td></tr>
+<% if @current[:port] -%>
+    <tr><th class="header">Webserver URL:</th> <td><a href="/port/<%= @current[:port] %>/"><%= @current[:url] %></a></td></tr>
+<% end -%>
+<% if @current[:container_status] -%>
+    <tr><th class="header">Container:</th>   <td><%= @current[:container_status]['Description'] %></td></tr>
+<% end -%>
+<% if @current[:node_group_url] -%>
+    <tr><th class="header">Node Group:</th>  <td><a href="https://<%= request.host %>/<%= @current[:node_group_url] %>" target="_console">Console login</a></td></tr>
+<% end -%>
+<% if @current[:controlrepo] -%>
+    <tr><th class="header">Control Repo:</th>  <td><a href="<%= @current[:controlrepo] %>" target="_repository"><%= @current[:controlrepo] %></a></td></tr>
+<% end -%>
+<% if @current[:latestcommit] -%>
+    <tr><th class="header">Latest Commit:</th>
+      <td>
+        <a href="<%= @current[:latestcommit][:url] %>" target="_repository"><%= @current[:latestcommit][:message] %></a>
+        <small>(<%= @current[:latestcommit][:time] %>)</small>
+    </td></tr>
+<% end -%>
+<% if settings.plugins.include? :Dashboard -%>
+    <tr><th class="header">Spec Tests:</th>  <td><a href="/dashboard/details/<%= @current[:username] %>" target="_results">results</a> <small>(may not always be available)</small></td></tr>
+<% end -%>
+<% if @current[:tree] -%>
+  <tr>
+    <th class="header">Environment Structure:</th>
+    <td><div id="tree"></div></td>
+  </tr>
+<% end -%>
+  </table>
+  <% if action_enabled? :deploy -%>
+    <i class="fa"></i><input type="button" id="deploy" data-user="<%= @current[:username] %>" value="Deploy Environment">
+  <% end -%>
+  <div>
+    <a class="user-logout" href="/users/deactive">Logout</a>
+  </div>
+<% end %>
+
+<% if @current and @current[:tree] %>
+<script type="text/javascript">
+  $(document).ready(function() {
+      $('#tree').jstree({ 'core': { 'data': <%= @current[:tree] %> } });
+  });
+</script>
+<% end %>
+</div>

data/views/index.erb

@@ -1,37 +1,59 @@
 <html>
 <head>
-    <title>Puppet Training Classroom Manager</title>
-    <link rel="stylesheet" type="text/css" href="font-awesome/css/font-awesome.min.css">
-    <link rel="stylesheet" type="text/css" href="jstree-3.3.3/themes/default/style.min.css" />
-    <link rel="stylesheet" type="text/css" href="css/style.css" />
-    <script type="text/javascript" src="js/jquery.js"></script>
-    <script type="text/javascript" src="js/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="js/scripts.js"></script>
-    <script type="text/javascript" src="js/jquery.activity-indicator-1.0.0.min.js"></script>
-    <script type="text/javascript" src="jstree-3.3.3/jstree.min.js"></script>
+  <title>PuppetFactory</title>
+  <link rel="stylesheet" type="text/css" href="font-awesome/css/font-awesome.min.css">
+  <link rel="stylesheet" type="text/css" href="jstree-3.3.3/themes/default/style.min.css" />
+  <link rel="stylesheet" type="text/css" href="css/style.css" />
+  <script type="text/javascript" src="js/jquery.js"></script>
+  <script type="text/javascript" src="js/jquery-ui.min.js"></script>
+  <script type="text/javascript" src="js/scripts.js"></script>
+  <script type="text/javascript" src="js/jquery.activity-indicator-1.0.0.min.js"></script>
+  <script type="text/javascript" src="jstree-3.3.3/jstree.min.js"></script>
+  <script type="text/javascript" src="js/usermanagement.js"></script>
 </head>
 <body>
   <div id="tabs">
     <header>
+      <img src="/images/Puppet-Logo-Mark-Amber-sm.png" alt="logo" id="nav-logo">
       <ul>
-        <img src="/images/Puppet-Logo-Amber-White-sm.png" alt="logo" id="nav-logo">
-        <li><a href="#home">Home</a></li>
-        <li><a href="/users">Users</a></li>
-        <li><a class="cache" href="/shell">SSH Login</a></li>
-        <% @tabs.each do |url, title| %>
-          <li><a href="/<%= url %>"><%= title %></a></li>
+        <li><a href="#home" class="cache">Home</a></li>
+        <% if privileged? %>
+          <li><a href="/users">Users</a></li>
+          <% @tabs.each do |url, title| %>
+            <li><a href="/<%= url %>"><%= title %></a></li>
+          <% end %>
         <% end %>
-        <li class="right">
-          <% unless privileged? %><a href="/login" id="login">Admin Login</a><% end %>
-        </li>
       </ul>
+      <a href="http://<%= request.host %>:9090" target="_presentation">Presentation</a>
+      <a href="https://<%= request.host %>" target="_console">PE Console</a>
+      <% if settings.plugins.include? :Gitea -%> 
+        <a href="http://<%= request.host %>:3000" target="_gitea">Code Repository</a>
+      <% end %>
+      <% if privileged? %>
+        <a href="/admin-logout" id="admin-logout">Logout</a>
+      <% else %>
+        <a href="/admin-login" id="admin-login">Admin Login</a>
+      <% end %>
     </header>
-    <article>
-      <h1>Puppet Training Classroom Manager</h1>
+    <article>    
+      <h2>Puppet Classroom</h2>
       <div id="home">
-        <%= erb :home %>
+        <div class="flexrow">
+          <div class="flex-7 flex-left">
+            <%= erb :shell %>
+          </div>
+          <div id="user-wrapper" class="flex-3 flex-right">
+          <% if @current %>
+            <%= erb :currentuser %>
+          <% else %>
+            <%= erb :newuser %>
+            <hr>
+            <%= erb :userlogin %>
+          <% end -%>
+          </div>
+        </div>
       </div>
-    </article>
+    </article>    
   </div>
 </body>
 </html>

data/views/logs.erb

@@ -14,7 +14,7 @@
 
       // use timeout instead of an interval so that in case of network error
       // we don't end up with a queue of requests stacked up.
-      setTimeout(loadLogs, 5000);
+      setTimeout(function(){loadLogs}, 5000);
     });
   }
 
@@ -22,12 +22,3 @@
     loadLogs(true);
   });
 </script>
-
-<style>
-  #logs .data {
-    font-family: monospace;
-    white-space: pre-wrap;
-    height: 500px;
-    overflow-y: scroll;
-  }
-</style>

data/views/newuser.erb

@@ -0,0 +1,19 @@
+<div id="newuser">
+  <h3>Create a new user</h3>
+  <div>
+    <label for="user">Username:</label><input type="text" id="user" value="" />
+  </div>
+  <div>
+    <label for="password">Password:</label><input type="password" id="password" value="" />
+  </div>
+  <div>
+    <label for="password2">Repeat:</label><input type="password" id="password2" value="" />
+  </div>
+  <div>
+    <label for="session">Session ID:</label><input type="text" id="session" value="" />
+    <p></p>
+  </div>
+  <div>
+    <input type="button" id="save" value="Submit" />
+  </div>
+</div>

data/views/shell.erb

@@ -1,35 +1,35 @@
 <div id="shell">
-  <p>
-    <input type="button" id="show-alternate" value="Other ways to log in" />
-    Shell accounts have been created for each student for editing code and
-    running Puppet interactively. Log in using the user account and credentials
-    you created.
-  </p>
-  <p>
-    <iframe id="console" src="/shell/login/"></iframe>
-  </p>
-  <div id="alternate" title="Alternate Login Methods">
-    <p>
-      If you prefer, you may also use any standard SSH client using the username
-      and password you specified. Some common SSH clients include:
-    <p>
+<% if @current %>
+  <iframe id="console" src="/shell/login/"></iframe>
+<% else %>
+<p>
+  Welcome to the Puppet Classroom. Please log in or create a user account.
+</p>
+<p>
+  We will provision a Puppet agent node for you and you'll use it to complete labs and
+  exercises. This node can be accessed through a web terminal once you've logged in.
+</p>
+<p>
+  If you prefer, you may also use any standard SSH client using the username
+  and password you specified. Some common SSH clients include:
+<p>
+<ul>
+  <li>
+    Built-in to Mac OSX and Linux:
+    <ol>
+      <li>Start Terminal.app or any terminal emulator to get to the command line</li>
+      <li>Run <code>ssh <%= request.host %></code></li>
+    </ol>
+  </li>
+  <li>
+    Windows:
     <ul>
-      <li>
-        Built-in to Mac OSX and Linux:
-        <ol>
-          <li>Start Terminal.app or any terminal emulator to get to the command line</li>
-          <li>Run <code>ssh <%= request.host %></code></li>
-        </ol>
-      </li>
-      <li>
-        Windows:
-        <ul>
-          <li><a href="http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe">PuTTY</a></li>
-          <li><a href="http://winscp.net/eng/download.php#download2" target="_new">WinSCP</a></li>
-          <li><a href="http://www.vandyke.com/download/securecrt/download.html" target="_new">SecureCRT</a></li>
-        </ul>
-      </li>
+      <li><a href="https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH">OpenSSH</a></li>    
+      <li><a href="http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe">PuTTY</a></li>
+      <li><a href="http://winscp.net/eng/download.php#download2" target="_new">WinSCP</a></li>
+      <li><a href="http://www.vandyke.com/download/securecrt/download.html" target="_new">SecureCRT</a></li>
     </ul>
-  </div>
+  </li>
+</ul>
+<% end -%>  
 </div>
-<script type="text/javascript" src="js/loginscripts.js"></script>

data/views/userlogin.erb

@@ -0,0 +1,9 @@
+<div id="login">
+  <h3>Login</h3>
+  <div>
+    <label for="login-user">Username:</label><input type="text" id="login-user" value="" />
+  </div>
+  <div>
+    <a href="#" id="login-submit" class="button">Login</a>
+  </div>
+</div>

data/views/users.erb

@@ -1,43 +1,4 @@
 <div id="usercontent">
-
-<% if @current %>
-  <h3>Selected User</h3>
-  <table id="currentuser">
-    <tr><th class="header">Username:</th>    <td><%= @current[:username] %></td></tr>
-    <tr><th class="header">Certname:</th>    <td><%= @current[:certname] %></td></tr>
-<% if @current[:port] -%>
-    <tr><th class="header">Webserver URL:</th> <td><a href="/port/<%= @current[:port] %>/"><%= @current[:url] %></a></td></tr>
-<% end -%>
-<% if @current[:container_status] -%>
-    <tr><th class="header">Container:</th>   <td><%= @current[:container_status]['Description'] %></td></tr>
-<% end -%>
-<% if @current[:node_group_url] -%>
-    <tr><th class="header">Node Group:</th>  <td><a href="https://<%= request.host %>/<%= @current[:node_group_url] %>" target="_console">Console login</a></td></tr>
-<% end -%>
-<% if @current[:controlrepo] -%>
-    <tr><th class="header">Control Repo:</th>  <td><a href="<%= @current[:controlrepo] %>" target="_repository"><%= @current[:controlrepo] %></a></td></tr>
-<% end -%>
-<% if @current[:latestcommit] -%>
-    <tr><th class="header">Latest Commit:</th>
-      <td>
-        <a href="<%= @current[:latestcommit][:url] %>" target="_repository"><%= @current[:latestcommit][:message] %></a>
-        <small>(<%= @current[:latestcommit][:time] %>)</small>
-    </td></tr>
-<% end -%>
-<% if settings.plugins.include? :Dashboard -%>
-    <tr><th class="header">Spec Tests:</th>  <td><a href="/dashboard/details/<%= @current[:username] %>" target="_results">results</a> <small>(may not always be available)</small></td></tr>
-<% end -%>
-<% if action_enabled? :deploy -%>
-    <tr class="actions"><td colspan=2><i class="fa"></i><input type="button" id="deploy" data-user="<%= @current[:username] %>" value="Deploy Environment"></td></tr>
-<% end -%>
-<% if @current[:tree] -%>
-  <tr>
-    <th class="header">Environment Structure:</th>
-    <td><div id="tree"></div></td>
-  </tr>
-<% end -%>
-  </table>
-<% end %>
   <h3>All Users</h3>
   <table id="users">
     <tr class="header">
@@ -60,32 +21,3 @@
     <% end %>
   </table>
 </div>
-
-<div id="newuserwrapper">
-  <input type="button" id="showuser" value="+ New User" />
-  <div id="newuser">
-    <div>
-      <label for="user">Username:</label><input type="text" id="user" value="" />
-    </div>
-    <div>
-      <label for="password">Password:</label><input type="password" id="password" value="" />
-    </div>
-    <div>
-      <label for="password2">Repeat:</label><input type="password" id="password2" value="" />
-    </div>
-    <div>
-      <label for="session">Session ID:</label><input type="text" id="session" value="" />
-    </div>
-    <input type="button" id="hideuser" value="Cancel" />
-    <input type="button" id="save" value="Save" />
-  </div>
-</div>
-
-<script type="text/javascript" src="js/usermanagement.js"></script>
-<% if @current and @current[:tree] %>
-<script type="text/javascript">
-  $(document).ready(function() {
-      $('#tree').jstree({ 'core': { 'data': <%= @current[:tree] %> } });
-  });
-</script>
-<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetfactory
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Ben Ford
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -225,12 +225,11 @@ files:
 - public/font-awesome/fonts/fontawesome-webfont.ttf
 - public/font-awesome/fonts/fontawesome-webfont.woff
 - public/font-awesome/fonts/fontawesome-webfont.woff2
-- public/images/Puppet-Logo-Amber-White-sm.png
+- public/images/Puppet-Logo-Mark-Amber-sm.png
 - public/js/dashboard.js
 - public/js/jquery-ui.min.js
 - public/js/jquery.activity-indicator-1.0.0.min.js
 - public/js/jquery.js
-- public/js/loginscripts.js
 - public/js/scripts.js
 - public/js/usermanagement.js
 - public/jstree-3.3.3/jstree.js
@@ -248,11 +247,13 @@ files:
 - templates/init_scripts.erb
 - templates/puppet.conf.erb
 - templates/site.pp.erb
+- views/currentuser.erb
 - views/dashboard.erb
-- views/home.erb
 - views/index.erb
 - views/logs.erb
+- views/newuser.erb
 - views/shell.erb
+- views/userlogin.erb
 - views/users.erb
 homepage: https://github.com/puppetlabs/puppetfactory
 licenses:

data/public/js/loginscripts.js

@@ -1,18 +0,0 @@
-$(document).ready(function(){
-  $('#show-alternate').click( function(e) {
-    e.preventDefault();
-
-    $( "#alternate" ).dialog({
-      title: $(this).attr("title"),
-      buttons: {
-        Ok: function() {
-          $( this ).dialog( "close" );
-        }
-      },
-      open: function () {
-        $(this).parent().find('button:nth-child(1)').focus();
-      },
-      width: '500px',
-    });
-  });
-});

data/views/home.erb

@@ -1,44 +0,0 @@
-<p>
-  A simulated Puppet Enterprise infrastructure has been constructed on the
-  classroom server. Each student has an environment providing a sandboxed
-  container for Puppet code and configuration. The classroom server is also
-  running the unmodified Puppet Enterprise Console with an account for each
-  student.
-</p>
-
-<p>
-  Students have full <code>root</code> access on their container, meaning that all
-  Puppet commands and resources work as expected. Each container also exposes
-  port 80 as a high port proxied from the Master, meaning that students are able
-  to run a web server inside their sandbox environment. A link to this proxied
-  port is listed for each user on the <em>Users</em> tab.
-</p>
-
-<h3>Resources:</h3>
-<ul>
-  <li><a href="http://<%= request.host %>:9090" target="_showoff">Course Material Presentation</a>
-    <ul>
-      <li>Follow along with the instructor's slides, or navigate it independently.</li>
-    </ul>
-  </li>
-  <li><a href="https://<%= request.host %>" target="_console">Puppet Enterprise Console</a>
-    <ul>
-      <li>Log into the PE Console using the credentials of the user account you created.</li>
-    </ul>
-  </li>
-<% if settings.plugins.include? :Gitea -%>
-  <li><a href="http://<%= request.host %>:3000" target="_gitea">Git Repository Server</a>
-    <ul>
-      <li>Log into the Gitea server using the credentials of the user account you created.</li>
-    </ul>
-  </li>
-<% end -%>
-</ul>
-
-<h3>Accessing your environment:</h3>
-
-<ol>
-  <li>First create your account on the <em>Users</em> tab.</li>
-  <li>Log in to your sandbox following the directions on the <em>SSH Login</em> tab.</li>
-  <li>Log in to the <a href="https://<%= request.host %>" target="_console">Puppet Enterprise Console</a></li>
-<ol>