puppetfactory 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e25865eb9b2e350ec9adc0acc9a8623e830865
-  data.tar.gz: 97f5ef8070782bda36b4c8540263387c53bf7554
+  metadata.gz: 38a7e8adf9316dfd8228109df2fdf418988cb1cf
+  data.tar.gz: d860112658d89746e951733c69edac617bf6d862
 SHA512:
-  metadata.gz: 5eb208518aeb528ec09f89f7174ed1a990b005abd5e7f1fa309368816f4f6b14e3208b85adc267fb3e505cfda3bccef04c76efff4d32e4a8365bd2b9fb76519c
-  data.tar.gz: 4c16e801e9240a4332df4a2fe9b49e80b610bc8a3bd9fff045fb804c5ccc561a50c50bd6b8b18db99ce42c0075ff2b5bbbb93260b38cc81f6bf6e9096b8343d2
+  metadata.gz: ba9b43f391a6d3e9e9bb5dc469ff63fe368c592a77ffa986dd542a5707afb4843d54c82989dfaf2742b905710ff1fd4be9c022f27d59bafc6f93d9b1c7c21ed2
+  data.tar.gz: e44cd56760233534a617db20435a84f13f57f9a3ba347cb35058255c722fdbb567b6759140bb9e8109e2eaf7c6b5f8b16287884fd59e143fec27ac671e656539

data/CHANGELOG.md

@@ -0,0 +1,88 @@
+# v0.6.4
+* Corrected some UI artifacts.
+* Display username in alternate login section.
+* Add upstream parameter for Gitea configuration.
+* Restored *deploy* button spinner.
+* Restored missing Gitviz tab.
+
+# v0.6.3
+* Set server timeout property correctly
+* UI/UX fixes
+* Fixed user login/logout issues
+* Upgrade JQuery to Latest stable
+
+# v0.6.2
+* Correct user login crasher
+
+# v0.6.1
+* Fix user selection bug
+* Ensure that the gitea admin's .ssh directory exists
+
+# v0.6.0
+* Major UI overhaul--single page interface for users
+* More robust user management
+* Remove race conditions with Gitea integration
+* Made it much less likely for users to get raw html error dialogs when provisioning
+* Removed some minor shell injection vulnerabilities
+* Stopped mapping the yum repo directory, so no more extraneous permission changes from pe_repo
+
+# v0.5.9
+* Add link to Gitea when enabled
+* Correct caching issue with IE preventing users from deploying code
+* Corrected bug causing user sessions to be lost
+* Minor style changes
+
+# v0.5.8
+* Map additional directories into container for local yum cache
+
+# v0.5.7
+* Split puppet module from gem and rearrange repo
+* Vendor jruby for offline
+* Improved styling
+
+# v0.5.6
+* Parameterized the gitea plugin for all virtual courses
+* Remove some non-student users from the user list
+
+# v0.5.5
+* Treeview plugin view
+* Set UsePAM to 'yes' for ssh server
+* Friendlier names for student environment groups
+
+# v0.5.4
+* gitea support
+* Improved dashboard code
+* Minor bugfixes
+
+# v0.5.2
+* Use full fqdn instead of just the hostname.
+* Rescue puppetclassify errors.
+
+# v0.5.1
+* Sanitize user environment for CLI tools we use
+* Don't create sources when running in a single control repo
+
+# v0.5.0
+Moved to using the code-staging directory for everything. Rather than editing
+code live, this expects users to edit the code-staging directory and then
+deploy via the button.
+
+* Live puppet code-editing disabled.
+* Use code-staging to edit code, and then push-button deploy!
+* Improved 404 and 50x error pages
+
+
+# v0.4.0
+
+This is a major refactoring. It's marked as a Y release due to the internal
+architecture changing so much, indicating a higher likelihood of errors. It
+should not actually be a breaking change.
+
+This adds the plugin system allowing us to reconfigure Puppetfactory for the
+different ways we use it. It also adds a few new features, like a *Logs* tab
+and the ability to manage code deployments directly from the UI.
+
+This should simplify class setup drastically, as there's no more need for
+creating user branches or webhook configuration.
+
+This also marks the first **public release** of the tool, so yay!

data/lib/puppetfactory/plugins/gitea.rb

@@ -14,6 +14,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
     @controlrepo    = options[:controlrepo]
     @reponame       = File.basename(@controlrepo, '.git')
     @repopath       = "#{@cache_dir}/#{@reponame}"
+    @gitea_upstream = options[:gitea_upstream]       || "https://github.com/puppetlabs-education/#{@controlrepo}"
     @gitea_cmd      = options[:gitea_cmd]            || '/home/git/go/bin/gitea'
     @admin_username = options[:gitea_admin_username] || 'root'
     @admin_password = options[:gitea_admin_password] || 'puppetlabs'
@@ -72,7 +73,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
       $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}",
+                          'clone_addr' => @gitea_upstream,
                           'uid'        => 1,
                           'repo_name'  => @reponame,
                        })

data/public/css/style.css

@@ -47,6 +47,8 @@ code {
 header {
   height: 4em;
   top: 0;
+  overflow-x: scroll;
+  white-space: nowrap;
 }
 
 header ul,
@@ -157,7 +159,7 @@ input.fail {
 }
 
 .tab.active {
-  background: #ECEFF1;  
+  background: #ECEFF1;
 }
 
 .tab-content {

data/views/currentuser.erb

@@ -53,6 +53,7 @@
   <% end -%>
   <% if action_enabled? :deploy -%>
     <input type="button" id="deploy" data-user="<%= @current[:username] %>" value="Deploy Environment">
+    <i class="fa"></i>
   <% end -%>
 <% end %>
 
@@ -62,4 +63,4 @@
       $('#tree').jstree({ 'core': { 'data': <%= @current[:tree] %> } });
   });
 </script>
-<% end %>
+<% end %>

data/views/index.erb

@@ -19,9 +19,9 @@
         <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 %>
+        <% @tabs.each do |url, title| %>
+          <li><a href="/<%= url %>"><%= title %></a></li>
         <% end %>
       </ul>
       <a href="http://<%= request.host %>:9090" target="_presentation">Presentation</a>

data/views/shell.erb

@@ -12,7 +12,7 @@
 
   <% else %>
     <h2>Welcome to the Puppet Classroom.</h2>
-    <p>Please log in or create a user account.</p>    
+    <p>Please log in or create a user account.</p>
   <% end -%>
   <div id="instruction">
     <p>
@@ -28,13 +28,13 @@
         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>
+          <li>Run <code>ssh <% if @current %><%= @current[:username] %>@<% end %><%= request.host %></code></li>
         </ol>
       </li>
       <li>
         Windows:
         <ul>
-          <li><a href="https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH">OpenSSH</a></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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetfactory
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Ben Ford
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -137,6 +137,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
 - bin/pfsh