foreman_users 1.0.0 → 1.0.1

data/app/controllers/foreman_users/syusers_controller.rb

@@ -81,9 +81,9 @@ class ForemanUsers::SyusersController < ApplicationController
   def destroy
     @syuser = ForemanUsers::Syuser.find(params[:id])
     @syuser.destroy
-    #@syuser.destory_dir
+    @syuser.destory_dir
     respond_to do |format|
-      format.html { redirect_to syusers_url }
+      format.html { redirect_to foreman_users_syusers_url }
       format.json { head :no_content }
     end
 

data/app/models/foreman_users/syuser.rb

@@ -22,22 +22,31 @@ class ForemanUsers::Syuser < ActiveRecord::Base
 	  				Dir::mkdir(root_dir_name + "/files")
 	  			end
 
-					if !File.exist?(root_dir_name + "/manifests")
+				if !File.exist?(root_dir_name + "/manifests")
 	  				Dir::mkdir(root_dir_name + "/manifests")
 	  			end
-
+	  		end
+  			 if File.exist?(root_dir_name + "/files")
+	  			if File.exist?(root_dir_name + "/files/welcome.conf")
 					#生成files下welcome.conf文件
 					files_welcome_File = File.new(root_dir_name + "/files/welcome.conf", "w+")
 		  			files_welcome_File.close
-					#生成manifests下init.pp文件
-					main_init_File = File.new(root_dir_name +"/manifests/init.pp", "w+")
-						if main_init_File
-						   main_init_File.syswrite(self.create_content)
-						else
-						   puts "Unable to open file!"
-						end
-					main_init_File.close
-	  		end
+	  			end
+  			end
+
+			if File.exist?(root_dir_name + "/manifests")
+				if File.exist?(root_dir_name + "/manifests/init.pp")
+					FileUtils.rm_r (root_dir_name + "/manifests/init.pp")
+	  			end
+  				#生成manifests下init.pp文件
+				main_init_File = File.new(root_dir_name +"/manifests/init.pp", "w+")
+					if main_init_File
+					   main_init_File.syswrite(self.create_content)
+					else
+					   puts "Unable to open file!"
+					end
+				main_init_File.close
+  			end
 	  end
 
 
@@ -49,7 +58,9 @@ class ForemanUsers::Syuser < ActiveRecord::Base
 			dir_exist_status = File.exist?(root_dir_name )
 	  		if dir_exist_status
 	  			#使用fileUtils.rm_r 删除该文件夹及其以下所有内容
-	  			FileUtils.rm_r root_dir_name
+	  			if ForemanUsers::Syuser.all.size  == 0 
+	  				FileUtils.rm_r root_dir_name
+	  			end
 	  		end
 	  end
 

data/lib/foreman_users/version.rb

@@ -1,3 +1,3 @@
 module ForemanUsers
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_users
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -50,48 +50,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/models/foreman_users/sygroup.rb
-- app/models/foreman_users/syuser.rb
-- app/overrides/dashboard/index/sample_override.html.erb.deface
-- app/helpers/foreman_users/syusers_helper.rb
 - app/views/dashboard/_foreman_users_widget.html.erb
 - app/views/foreman_users/layouts/layouts/new_layout.html.erb
 - app/views/foreman_users/layouts/new_layout.html.erb
+- app/views/foreman_users/syusers/edit.html.erb
 - app/views/foreman_users/syusers/new.html.erb
 - app/views/foreman_users/syusers/show.html.erb
-- app/views/foreman_users/syusers/_sub.html.erb
 - app/views/foreman_users/syusers/index.html.erb
-- app/views/foreman_users/syusers/_form.html.erb
-- app/views/foreman_users/syusers/edit.html.erb
 - app/views/foreman_users/syusers/_list.html.erb
-- app/views/foreman_users/hosts/new_action.html.erb
+- app/views/foreman_users/syusers/_form.html.erb
+- app/views/foreman_users/syusers/_sub.html.erb
 - app/views/foreman_users/hosts/hosts/new_action.html.erb
+- app/views/foreman_users/hosts/new_action.html.erb
+- app/overrides/dashboard/index/sample_override.html.erb.deface
 - app/controllers/foreman_users/syusers_controller.rb
+- app/helpers/foreman_users/syusers_helper.rb
+- app/models/foreman_users/syuser.rb
+- app/models/foreman_users/sygroup.rb
 - config/routes.rb
-- db/migrate/20150918050239_create_sygroups.rb
 - db/migrate/20150918055455_add_syuser_id_to_sygroup.rb
-- db/migrate/20150918022411_create_syusers.rb
+- db/migrate/20150918050239_create_sygroups.rb
+- db/migrate/syusers/edit.html.erb
 - db/migrate/syusers/new.html.erb
 - db/migrate/syusers/show.html.erb
-- db/migrate/syusers/_sub.html.erb
 - db/migrate/syusers/index.html.erb
-- db/migrate/syusers/_form.html.erb
-- db/migrate/syusers/edit.html.erb
 - db/migrate/syusers/_list.html.erb
+- db/migrate/syusers/_form.html.erb
+- db/migrate/syusers/_sub.html.erb
+- db/migrate/20150918022411_create_syusers.rb
+- lib/tasks/foreman_users_tasks.rake
 - lib/foreman_users.rb
-- lib/foreman_users/engine.rb
 - lib/foreman_users/version.rb
-- lib/tasks/foreman_users_tasks.rake
+- lib/foreman_users/engine.rb
 - locale/gemspec.rb
 - locale/en/foreman_users.po
-- locale/foreman_users.pot
 - locale/Makefile
+- locale/foreman_users.pot
 - LICENSE
 - Rakefile
 - README.md
-- test/factories/foreman_users_factories.rb
-- test/unit/foreman_users_test.rb
 - test/test_plugin_helper.rb
+- test/unit/foreman_users_test.rb
+- test/factories/foreman_users_factories.rb
 homepage: https://github.com/stdtnt/foreman-users
 licenses: []
 post_install_message: 
@@ -112,11 +112,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: 创建用户，/etc/puppet/environments/production/modules/users
 test_files:
-- test/factories/foreman_users_factories.rb
-- test/unit/foreman_users_test.rb
 - test/test_plugin_helper.rb
+- test/unit/foreman_users_test.rb
+- test/factories/foreman_users_factories.rb