puppetfactory 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a14b1df3c7c1c6fdc4a8ab870ccf579e379374
-  data.tar.gz: 330ee7f16af7a0d4c9cc28f49572ba5fcc721fbb
+  metadata.gz: 6f21eff79fdd9ffaded59f986834a49490379cf2
+  data.tar.gz: d38bc62908bcbace5d0155f9a1c77adf8dac0965
 SHA512:
-  metadata.gz: 0facd2f02cb71826e570aedcededc5b9a7350d7de4ea373c2080a7cdf49c9d4fd8150b83d6c8dc8b6c24d5f15179e300c7d2c3bc2d2bcfff1ca8d8946d337449
-  data.tar.gz: 8a4f20a8f41b1557cbed4f824146376789f870341d3d338a271d8b72f55dd1e3a71229fa1890710a7aded41fba6a26150b97b10e9ada934129ffa106a2c637e3
+  metadata.gz: 0a4543c5d601cc2478e21088024b991e2afcdd13fe3fc2db1c3b915f8794f54a03416e952554d70851ff86e23b31681bc48c00967f632accd256ece149be86d9
+  data.tar.gz: e68ef55d635a24b24b97283cf8fe53b0a543a2d65d4ee2fb720eab471dbdaffef0b99a301d2f91294c6d12232bab9e2cd56cd6ac0aed9548d743301ee59406e9

data/lib/puppetfactory/dashboard/rake_tasks.rb

@@ -36,9 +36,11 @@ namespace :spec do
   targets = []
   Dir.glob('/etc/puppetlabs/code/environments/*').each do |dir|
     next unless File.directory?(dir)
-    next unless dir.end_with? '_production'
-    target = File.basename(dir.sub('_production', ''))
-    targets << target
+
+    dir = File.basename(dir)
+    next if dir == 'production'
+
+    targets << dir.sub('_production', '')
   end
   task :all_agents => targets
 
@@ -47,10 +49,12 @@ namespace :spec do
     html    = "output/html/#{test}"
     json    = "output/json/#{test}"
     pattern = "spec/#{test}_spec.rb"
+    puts "Running the #{test} test suite..."
   else
     html    = "output/html"
     json    = "output/json"
     pattern = "spec/*_spec.rb"
+    puts "Running all test suites..."
   end
 
   FileUtils.mkdir_p html
@@ -59,6 +63,7 @@ namespace :spec do
   targets.each do |target|
     desc "Run Puppetfactory tests for #{target}"
     RSpec::Core::RakeTask.new(target.to_sym) do |t|
+      puts " * #{target}"
       ENV['TARGET_HOST'] = target
       t.verbose = false
       t.fail_on_error = false

data/lib/puppetfactory/dashboard/spec_helper.rb

@@ -6,10 +6,14 @@ environmentpath = "/etc/puppetlabs/code/environments"
 
 if File.directory? "#{environmentpath}/#{username}_production"
   environment = "#{username}_production"
-else
+elsif File.directory? "#{environmentpath}/#{username}"
   environment = username
+else
+  raise "No environment exists for #{username}"
 end
 
+puts "   - Testing environment #{environment}"
+
 RSpec.configure do |c|
   c.environmentpath = environmentpath
   c.module_path     = "#{environmentpath}/#{environment}/site"

data/lib/puppetfactory/plugins/dashboard.rb

@@ -43,10 +43,15 @@ class Puppetfactory::Plugins::Dashboard < Puppetfactory::Plugins
     @server.get '/dashboard/update' do
       $logger.info "Triggering dashboard update."
 
-      if plugin(:Dashboard, :update_results)
+      case plugin(:Dashboard, :update_results)
+      when :running
+        {'status' => 'fail', 'message' => 'Already running'}.to_json
+      when :success
         {'status' => 'success'}.to_json
+      when :fail
+        {'status' => 'fail', 'message' => "Tests failed to execute. Please see logs"}.to_json
       else
-        {'status' => 'fail', 'message' => 'Already running'}.to_json
+        {'status' => 'fail', 'message' => "Unknown status"}.to_json
       end
     end
 
@@ -67,20 +72,29 @@ class Puppetfactory::Plugins::Dashboard < Puppetfactory::Plugins
   end
 
   def update_results()
-    return false if @test_running
+    return :running if @test_running
     @test_running = true
 
+    output = nil
+    status = nil
+
     Dir.chdir(@path) do
       case @current_test
       when 'all', 'summary'
-        system('rake', 'generate')
+        output, status = Open3.capture2e('rake', 'generate')
       else
-        system('rake', 'generate', "current_test=#{@current_test}")
+        output, status = Open3.capture2e('rake', 'generate', "current_test=#{@current_test}")
       end
     end
 
+    if status.success?
+      $logger.info output
+    else
+      $logger.error output
+    end
+
     @test_running = false
-    true
+    return status.success? ? :success : :fail
   end
 
   def available_tests()

data/lib/puppetfactory/plugins/gitea.rb

@@ -0,0 +1,68 @@
+require 'json'
+require 'fileutils'
+require 'puppetfactory'
+
+class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
+
+  def initialize(options)
+    super(options)
+
+    @suffix         = options[:usersuffix]
+    @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`
+      end
+    rescue => e
+      $logger.error "Error migrating repository: #{e.message}"
+      return false
+    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('/var/cache/puppetfactory/gitea/classroom-control-vf') do
+      `git checkout -b #{username} && git push origin #{username}`
+    end
+  end
+
+  def create(username, password)
+    begin
+      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')
+      make_branch(username)
+      $logger.info "Created Gitea user #{username}."
+    rescue => e
+      $logger.error "Error creating Gitea user #{username}: #{e.message}"
+      return false
+    end
+
+    true
+  end
+
+  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}."
+    rescue => e
+      $logger.error "Error removing GitLab user #{username}: #{e.message}"
+      return false
+    end
+
+    true
+  end
+
+end

data/lib/puppetfactory/plugins/user_environment.rb

@@ -38,7 +38,7 @@ class Puppetfactory::Plugins::UserEnvironment < Puppetfactory::Plugins
 
       # make sure the user and pe-puppet can access all the needful
       FileUtils.chown_R(username, 'pe-puppet', environment)
-      FileUtils.chmod(0750, environment)
+      FileUtils.chmod_R(0750, environment)
 
       deploy(username)
 
@@ -60,6 +60,8 @@ class Puppetfactory::Plugins::UserEnvironment < Puppetfactory::Plugins
   end
 
   def deploy(username)
+    # TODO: temporary hack to keep this from disrupting current deliveries.
+    return if @codestage == @environments
     environment = Puppetfactory::Helpers.environment_name(username)
 
     FileUtils.cp_r("#{@codestage}/#{environment}/.", "#{@environments}/#{environment}")

data/views/logs.erb

@@ -4,8 +4,13 @@
 </div>
 
 <script type="text/javascript">
-  function loadLogs() {
+  function loadLogs(force) {
     $("#logs .data").load("logs/data", function() {
+      var elem = $(this)[0]
+      // track the bottom of the logs, unless we've scrolled away
+      if(force || (elem.scrollHeight - elem.scrollTop - elem.clientHeight < 100)) {
+        $(this).animate({scrollTop: elem.scrollHeight}, 500);
+      }
 
       // 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.
@@ -14,7 +19,7 @@
   }
 
   $(document).ready(function() {
-    loadLogs();
+    loadLogs(true);
   });
 </script>
 
@@ -22,5 +27,7 @@
   #logs .data {
     font-family: monospace;
     white-space: pre-wrap;
+    height: 500px;
+    overflow-y: scroll;
   }
 </style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetfactory
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ben Ford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -155,6 +155,7 @@ files:
 - lib/puppetfactory/plugins/dashboard.rb
 - lib/puppetfactory/plugins/docker.rb
 - lib/puppetfactory/plugins/example.rb
+- lib/puppetfactory/plugins/gitea.rb
 - lib/puppetfactory/plugins/github.rb
 - lib/puppetfactory/plugins/gitlab.rb
 - lib/puppetfactory/plugins/gitviz.rb
@@ -259,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Stands up a graphical classroom manager with containerized puppet agents.