puppetfactory 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3defebfd3eeeeb27423a7f864e73ffc131eb44ad
-  data.tar.gz: c33e1dcf1f4df1641b615b35bbba212cad039bbf
+  metadata.gz: ca16771b7e1b183af22c6d3b8b2b9d51a2163938
+  data.tar.gz: 24c67912766f3a87a9a1f84858290e048e476b33
 SHA512:
-  metadata.gz: 7048bcca8e6508c619e97733b70b1f150799d1f47cb74ae8416bc7cc0a03202d7b0ea35f2c9a81050216ec8bfb6944d2a59798344e91f539204d80ec152da27a
-  data.tar.gz: 10a5e94ece8c2eae39d357d60e6ab0ac345b60b373458f9a4f0c57bd4845bf29f8eb4aa20e72de56f5fdc91db8f02023821e3fdb600d2de8a0c5fd00ebb99710
+  metadata.gz: f99df65aaeff3f965cbf8725a70f8b1c0544913c3154e21af8880a3b7343a6a26adaaf0683085f248104f84cd88915cd421115868543321befd13348111982b4
+  data.tar.gz: 09f632dc3061b1b5fe46b826dc903150307f00622a742d4d36ffbf30db66d18db4b239cd3c70f2b01bdbb5e596b2d8092555e2bf024351e72327ec1ef4e66527

data/lib/puppetfactory/plugins/gitea.rb

@@ -8,22 +8,28 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
     super(options)
 
     @suffix         = options[:usersuffix]
+    @controlrepo    = options[:controlrepo]
+    @reponame       = File.basename(@controlrepo, '.git')
     @gitea_path     = options[:gitea_path] || '/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'
 
-    begin
-      `curl -su "#{@admin_username}:#{@admin_password}" --data 'clone_addr=https://github.com/puppetlabs-education/classroom-control-vf.git&uid=1&repo_name=classroom-control-vf' http://localhost:#{@gitea_port}/api/v1/repos/migrate`
-      FileUtils::mkdir_p '/var/cache/puppetfactory/gitea'
-      Dir.chdir('/var/cache/puppetfactory/gitea') do
-        `git clone --depth 1 http://#{@admin_username}:#{@admin_password}@localhost:#{@gitea_port}/#{@admin_username}/classroom-control-vf.git`
+    @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
-    rescue => e
-      $logger.error "Error migrating repository: #{e.message}"
-      return false
     end
-
   end
 
   def add_collaborator(owner, repo, username, permission)
@@ -31,7 +37,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
   end
 
   def make_branch(username)
-    Dir.chdir('/var/cache/puppetfactory/gitea/classroom-control-vf') do
+    Dir.chdir("#{@cache_dir}/#{@reponame}") do
       `git checkout -b #{username} && git push origin #{username}`
     end
   end
@@ -41,8 +47,8 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
       if password.length < 8
         raise "Password must be at least 8 characters"
       end
-      `su git -c "cd && #{@gitea_path} admin create-user --name #{username} --password #{password} --email #{username}.#{@suffix}"`
-      add_collaborator(@admin_username, 'classroom-control-vf', username, 'write')
+      `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}."
     rescue => e
@@ -56,9 +62,9 @@ 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}`
-      $logger.info "Removed GitLab user #{username}."
+      $logger.info "Removed Gitea user #{username}."
     rescue => e
-      $logger.error "Error removing GitLab user #{username}: #{e.message}"
+      $logger.error "Error removing Gitea user #{username}: #{e.message}"
       return false
     end
 

data/lib/puppetfactory/plugins/shell_user.rb

@@ -54,7 +54,7 @@ class Puppetfactory::Plugins::ShellUser < Puppetfactory::Plugins
 
   def users
     usernames = Dir.glob('/home/*').map { |path| File.basename path }
-    usernames.reject { |username| ['centos', 'training', 'showoff'].include? username }
+    usernames.reject { |username| ['centos', 'git', 'showoff', 'training', 'vagrant'].include? username }
   end
 
   def userinfo(username, extended = false)

data/templates/init_scripts.erb

@@ -8,3 +8,4 @@ Restart=on-failure
 
 [Install]
 WantedBy=default.target
+After=docker.service

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetfactory
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Ben Ford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -136,18 +136,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
+- LICENSE
 - bin/pfsh
 - bin/puppetfactory
-- lib/puppetfactory.rb
 - lib/puppetfactory/cli.rb
 - lib/puppetfactory/dashboard/rake_tasks.rb
 - lib/puppetfactory/dashboard/serverspec_helper.rb
 - lib/puppetfactory/dashboard/spec_helper.rb
 - lib/puppetfactory/helpers.rb
 - lib/puppetfactory/monkeypatches.rb
-- lib/puppetfactory/plugins.rb
 - lib/puppetfactory/plugins/certificates.rb
 - lib/puppetfactory/plugins/classification.rb
 - lib/puppetfactory/plugins/code_manager.rb
@@ -166,6 +164,14 @@ files:
 - lib/puppetfactory/plugins/shell_user.rb
 - lib/puppetfactory/plugins/tree.rb
 - lib/puppetfactory/plugins/user_environment.rb
+- lib/puppetfactory/plugins.rb
+- lib/puppetfactory.rb
+- views/dashboard.erb
+- views/home.erb
+- views/index.erb
+- views/logs.erb
+- views/shell.erb
+- views/users.erb
 - public/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 - public/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
 - public/css/images/ui-bg_flat_10_000000_40x100.png
@@ -234,25 +240,19 @@ files:
 - public/js/usermanagement.js
 - public/jstree-3.3.3/jstree.js
 - public/jstree-3.3.3/jstree.min.js
-- public/jstree-3.3.3/themes/default-dark/32px.png
-- public/jstree-3.3.3/themes/default-dark/40px.png
-- public/jstree-3.3.3/themes/default-dark/style.css
-- public/jstree-3.3.3/themes/default-dark/style.min.css
-- public/jstree-3.3.3/themes/default-dark/throbber.gif
 - public/jstree-3.3.3/themes/default/32px.png
 - public/jstree-3.3.3/themes/default/40px.png
 - public/jstree-3.3.3/themes/default/style.css
 - public/jstree-3.3.3/themes/default/style.min.css
 - public/jstree-3.3.3/themes/default/throbber.gif
+- public/jstree-3.3.3/themes/default-dark/32px.png
+- public/jstree-3.3.3/themes/default-dark/40px.png
+- public/jstree-3.3.3/themes/default-dark/style.css
+- public/jstree-3.3.3/themes/default-dark/style.min.css
+- public/jstree-3.3.3/themes/default-dark/throbber.gif
 - templates/init_scripts.erb
 - templates/puppet.conf.erb
 - templates/site.pp.erb
-- views/dashboard.erb
-- views/home.erb
-- views/index.erb
-- views/logs.erb
-- views/shell.erb
-- views/users.erb
 homepage: https://github.com/puppetlabs/puppetfactory
 licenses:
 - Apache-2.0
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Stands up a graphical classroom manager with containerized puppet agents.