puppetfactory 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f21eff79fdd9ffaded59f986834a49490379cf2
-  data.tar.gz: d38bc62908bcbace5d0155f9a1c77adf8dac0965
+  metadata.gz: 3defebfd3eeeeb27423a7f864e73ffc131eb44ad
+  data.tar.gz: c33e1dcf1f4df1641b615b35bbba212cad039bbf
 SHA512:
-  metadata.gz: 0a4543c5d601cc2478e21088024b991e2afcdd13fe3fc2db1c3b915f8794f54a03416e952554d70851ff86e23b31681bc48c00967f632accd256ece149be86d9
-  data.tar.gz: e68ef55d635a24b24b97283cf8fe53b0a543a2d65d4ee2fb720eab471dbdaffef0b99a301d2f91294c6d12232bab9e2cd56cd6ac0aed9548d743301ee59406e9
+  metadata.gz: 7048bcca8e6508c619e97733b70b1f150799d1f47cb74ae8416bc7cc0a03202d7b0ea35f2c9a81050216ec8bfb6944d2a59798344e91f539204d80ec152da27a
+  data.tar.gz: 10a5e94ece8c2eae39d357d60e6ab0ac345b60b373458f9a4f0c57bd4845bf29f8eb4aa20e72de56f5fdc91db8f02023821e3fdb600d2de8a0c5fd00ebb99710

data/lib/puppetfactory/plugins/classification.rb

@@ -23,10 +23,10 @@ class Puppetfactory::Plugins::Classification < Puppetfactory::Plugins
 
   def create(username, password)
     environment = Puppetfactory::Helpers.environment_name(username)
-    certname    = "#{username}.#{@suffix}"
+    certname = "#{username}.#{@suffix}"
 
     group_hash = {
-      'name'               => certname,
+      'name'               => "#{username}'s environment group",
       'environment'        => environment,
       'environment_trumps' => true,
       'parent'             => '00000000-0000-4000-8000-000000000000',
@@ -37,26 +37,25 @@ class Puppetfactory::Plugins::Classification < Puppetfactory::Plugins
     begin
       @puppetclassify.groups.create_group(group_hash)
     rescue => e
-      $logger.error "Could not create node group #{certname}: #{e.message}"
+      $logger.error "Could not create node group for #{username}: #{e.message}"
       return false
     end
 
-    $logger.info "Created node group #{certname} assigned to environment #{environment}"
+    $logger.info "Created node group for #{certname} assigned to environment #{environment}"
     true
   end
 
   def delete(username)
-    certname = "#{username}.#{@suffix}"
 
     begin
-      group_id = @puppetclassify.groups.get_group_id(certname)
+      group_id = @puppetclassify.groups.get_group_id("#{username}'s environment group")
       @puppetclassify.groups.delete_group(group_id)
     rescue => e
-      $logger.warn "Error removing node group #{certname}: #{e.message}"
+      $logger.warn "Error removing node group for #{username}: #{e.message}"
       return false
     end
 
-    $logger.info "Node group #{certname} removed"
+    $logger.info "Node group #{username} removed"
     true
   end
 
@@ -65,9 +64,9 @@ class Puppetfactory::Plugins::Classification < Puppetfactory::Plugins
     certname = "#{username}.#{@suffix}"
     
     begin
-      ngid = @puppetclassify.groups.get_group_id(certname)
+      ngid = @puppetclassify.groups.get_group_id("#{username}'s environment group")
     rescue => e
-      $logger.warn "Error retrieving node group #{certname}: #{e.message}"
+      $logger.warn "Error retrieving node group for #{certname}: #{e.message}"
       return nil
     end
 

data/lib/puppetfactory/plugins/tree.rb

@@ -0,0 +1,45 @@
+require 'puppetfactory'
+
+# inherit from Puppetfactory::Plugins
+class Puppetfactory::Plugins::Tree < Puppetfactory::Plugins
+  attr_reader :weight
+
+  def initialize(options)
+    super(options) # call the superclass to initialize it
+
+    @weight  = 1
+    @environments = options[:environments]
+  end
+
+  def userinfo(username, extended = false)
+    # we can bail if we don't want to add to the basic user object.
+    # for example, if these are heavy operations.
+    return unless extended
+    environment = Puppetfactory::Helpers.environment_name(username)
+
+    # return a hash with the :username key
+    {
+      :username => username,
+      :tree     => pathwalker("#{@environments}/#{environment}", '#' ).to_json,
+    }
+  end
+
+  def pathwalker(path, parent)
+    accumulator = []
+    Dir.glob("#{path}/*").each do |file|
+      filename = File.basename file
+
+      # this way .fixtures.yml, etc will show up
+      next if ['.', '..'].include? filename
+
+      if File.directory?(file)
+        accumulator << { "id" => file, "parent" => parent, "text" => filename }
+        accumulator << pathwalker(file, file)
+      else
+        accumulator << { "id" => file, "parent" => parent, "icon" => "jstree-file", "text" => filename }
+      end
+    end
+    accumulator.flatten
+  end
+
+end

data/lib/puppetfactory/plugins/user_environment.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'restclient'
 require 'puppetfactory'
 
 class Puppetfactory::Plugins::UserEnvironment < Puppetfactory::Plugins
@@ -6,6 +7,8 @@ class Puppetfactory::Plugins::UserEnvironment < Puppetfactory::Plugins
   def initialize(options)
     super(options)
 
+    @master       = options[:master]
+    @confdir      = options[:confdir]
     @codedir      = options[:codedir]
     @stagedir     = options[:stagedir]
     @puppetcode   = options[:puppetcode]
@@ -52,11 +55,8 @@ class Puppetfactory::Plugins::UserEnvironment < Puppetfactory::Plugins
   end
 
   def delete(username)
-    environment = "#{@environments}/#{Puppetfactory::Helpers.environment_name(username)}"
-    FileUtils.rm_rf environment
-
-    # also delete any prefixed environments. Is this even a good idea?
-    FileUtils.rm_rf "#{@environments}/#{username}_*" if @repomodel == :peruser
+    FileUtils.rm_rf "#{@codestage}/#{Puppetfactory::Helpers.environment_name(username)}"
+    FileUtils.rm_rf "#{@environments}/#{Puppetfactory::Helpers.environment_name(username)}"
   end
 
   def deploy(username)
@@ -64,7 +64,22 @@ class Puppetfactory::Plugins::UserEnvironment < Puppetfactory::Plugins
     return if @codestage == @environments
     environment = Puppetfactory::Helpers.environment_name(username)
 
-    FileUtils.cp_r("#{@codestage}/#{environment}/.", "#{@environments}/#{environment}")
+    begin
+      FileUtils.cp_r("#{@codestage}/#{environment}/*", "#{@environments}/#{environment}/")
+      FileUtils.chown_R('pe-puppet', 'pe-puppet', "#{@environments}/#{environment}")
+
+      RestClient::Resource.new(
+        "https://#{@master}:8140/puppet-admin-api/v1/environment-cache?environment=#{environment}",
+        :ssl_client_cert  =>  OpenSSL::X509::Certificate.new(File.read("#{@confdir}/ssl/certs/#{@master}.pem")),
+        :ssl_client_key   =>  OpenSSL::PKey::RSA.new(File.read("#{@confdir}/ssl/private_keys/#{@master}.pem")),
+        :ssl_ca_file      =>  "#{@confdir}/ssl/ca/ca_crt.pem",
+        :verify_ssl       =>  OpenSSL::SSL::VERIFY_PEER
+      ).delete
+    rescue => e
+      $logger.error "Deploying environment #{environment} failed: #{e.message}"
+      $logger.debug e.backtrace
+      raise "Error deploying environment #{environment}."
+    end
   end
 
   def redeploy(username)

data/public/css/style.css

@@ -76,6 +76,7 @@ table#currentuser th.header {
   white-space: nowrap;
   text-align: right;
   padding-right: 1em;
+  vertical-align: top;
 }
 table#currentuser tr.actions {
   text-align: right;