puppetfactory 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c914e44caa0a8d8068dc1dde6458e1587a4e9a21
-  data.tar.gz: 0277babbde8fd654b881e33ec3db1dd2a8b5d7b5
+  metadata.gz: ceb3c177e16f42c3355f8b55007907ab79f5e3f1
+  data.tar.gz: 2b5e48325f1708c176684b63c03092534708198e
 SHA512:
-  metadata.gz: d0aca7da02276544f5225eb03982ba6ca36dfa1dc6e9b7b260f38db7ee5174fdd9e745ce5abfa171ae22fe476b25c2d53ede98cbf31aa9a0270f67b0d918b288
-  data.tar.gz: 5a917e68a33b5eb846483ab4cb419bc4ae4fab9cd708c89640308c614979837aebf5c10d5c9dd175260a92c6a018d1526b54933b8485c37f2c5352f0b25eb81d
+  metadata.gz: 03da88692da76df631a8e1a3bb3118dbf87ecc96e555886aae85f584b0c98166c9198c185c879eed12d920f531c1605d986e24dc738fe98fea29a144574312c2
+  data.tar.gz: 6fcc7a8a4516ceef4fc01758c263ca2136a54bdf14549a721fbea913242c1ba12bcbdb3172d79e0d9b2511c6922951cd8e5cc162678106e14b8d40b45753686d

data/lib/puppetfactory/plugins/code_manager.rb

@@ -38,37 +38,40 @@ class Puppetfactory::Plugins::CodeManager < Puppetfactory::Plugins
     begin
       environment = "#{@environments}/#{Puppetfactory::Helpers.environment_name(username)}"
       FileUtils.mkdir_p environment
-      FileUtils.chown('pe-puppet', 'pe-puppet', environment)
+      FileUtils.chown(username, 'pe-puppet', environment)
       FileUtils.chmod(0750, environment)
 
-      File.open(@sources) do |file|
-        # make sure we don't have any concurrency issues
-        file.flock(File::LOCK_EX)
-
-        # We need to duplicate the sources list in the MEEP config for recovery options
-        # I'd like to add it to code-manager.conf too and avoid the delay of running
-        # puppet, but that's a race condition that we cannot accept.
-        File.open(@meep) do |anotherfile|
-          anotherfile.flock(File::LOCK_EX)
-
-          source = {
-            'remote'  => sprintf(@pattern, username),
-            'prefix'  => (@repomodel == :peruser),
-          }
-
-          sources = YAML.load_file(@sources)
-          meep    = Hocon::Parser::ConfigDocumentFactory.parse_file(@meep)
-
-          sources['puppet_enterprise::master::code_manager::sources'][username] = source
-          meep = meep.set_config_value(
-                      "\"puppet_enterprise::master::code_manager::sources\".#{username}",
-                      Hocon::ConfigValueFactory.from_any_ref(source)
-                    )
-
-          # Ruby 1.8.7, why don't you just go away now
-          File.open(@sources, 'w') { |f| f.write(sources.to_yaml) }
-          File.open(@meep, 'w')    { |f| f.write(meep.render)     }
-          $logger.info "Created Code Manager source for #{username}"
+      # We don't need to add sources unless we're using a repo per student.
+      if @repomodel == :peruser
+        File.open(@sources) do |file|
+          # make sure we don't have any concurrency issues
+          file.flock(File::LOCK_EX)
+
+          # We need to duplicate the sources list in the MEEP config for recovery options
+          # I'd like to add it to code-manager.conf too and avoid the delay of running
+          # puppet, but that's a race condition that we cannot accept.
+          File.open(@meep) do |anotherfile|
+            anotherfile.flock(File::LOCK_EX)
+
+            source = {
+              'remote'  => sprintf(@pattern, username),
+              'prefix'  => (@repomodel == :peruser),
+            }
+
+            sources = YAML.load_file(@sources)
+            meep    = Hocon::Parser::ConfigDocumentFactory.parse_file(@meep)
+
+            sources['puppet_enterprise::master::code_manager::sources'][username] = source
+            meep = meep.set_config_value(
+                        "\"puppet_enterprise::master::code_manager::sources\".#{username}",
+                        Hocon::ConfigValueFactory.from_any_ref(source)
+                      )
+
+            # Ruby 1.8.7, why don't you just go away now
+            File.open(@sources, 'w') { |f| f.write(sources.to_yaml) }
+            File.open(@meep, 'w')    { |f| f.write(meep.render)     }
+            $logger.info "Created Code Manager source for #{username}"
+          end
         end
       end
     rescue => e

data/lib/puppetfactory/plugins/r10k.rb

@@ -22,28 +22,29 @@ class Puppetfactory::Plugins::R10k < Puppetfactory::Plugins
   end
 
   def create(username, password)
-    return unless @repomodel == :peruser
-
     begin
       environment = "#{@environments}/#{Puppetfactory::Helpers.environment_name(username)}"
       FileUtils.mkdir_p environment
       FileUtils.chown_R(username, 'pe-puppet', environment)
       FileUtils.chmod(0750, environment)
 
-      File.open(@r10k_config) do |file|
-        # make sure we don't have any concurrency issues
-        file.flock(File::LOCK_EX)
-
-        r10k = YAML.load_file(@r10k_config)
-        r10k['sources'][username] = {
-          'remote'  => sprintf(@pattern, username),
-          'basedir' => @environments,
-          'prefix'  => true,
-        }
-
-        # Ruby 1.8.7, why don't you just go away now
-        File.open(@r10k_config, 'w') { |f| f.write(r10k.to_yaml) }
-        $logger.info "Created r10k source for #{username}"
+      # We don't need to add sources unless we're using a repo per student.
+      if @repomodel == :peruser
+        File.open(@r10k_config) do |file|
+          # make sure we don't have any concurrency issues
+          file.flock(File::LOCK_EX)
+
+          r10k = YAML.load_file(@r10k_config)
+          r10k['sources'][username] = {
+            'remote'  => sprintf(@pattern, username),
+            'basedir' => @environments,
+            'prefix'  => true,
+          }
+
+          # Ruby 1.8.7, why don't you just go away now
+          File.open(@r10k_config, 'w') { |f| f.write(r10k.to_yaml) }
+          $logger.info "Created r10k source for #{username}"
+        end
       end
     rescue => e
       $logger.error "Cannot create r10k source for #{username}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetfactory
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ben Ford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-26 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
@@ -164,6 +162,14 @@ files:
 - lib/puppetfactory/plugins/r10k.rb
 - lib/puppetfactory/plugins/shell_user.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
@@ -233,12 +239,6 @@ files:
 - 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
@@ -259,7 +259,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.