danarchy_deploy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc77046b77757e8d847424bced87d9b0a78131a9
-  data.tar.gz: f07bf23008b48a3dd3f84b35d1bd87cb9e0a379a
+  metadata.gz: d27ed8ebe6a52e48face1634ec324df797fc5911
+  data.tar.gz: 984a5dd15941c77724f0adab1158f7f06257141c
 SHA512:
-  metadata.gz: d017636ab2096321579edeb48973913374dd23680328fafada853012394af638c80e9e107b21cfaad81b10a6bc51e93f937e5c81b2368bcfe0a0b3430a399d9a
-  data.tar.gz: 91523adf0a963049251406efe47516c91689f89f0a1b423870c71ddb56a65f3fddeefc6541e2da26a62afd0f5b190e1e5a53190bcee332ee2d2b6439473c55e7
+  metadata.gz: ec05b6367357474d110db4bf3c74f2af2ec03b1dd75922c6b8d37087c7dc6bd0fdf55302e727afa11748d3caefab6551f903fa46f2d828fa79289875faf179e6
+  data.tar.gz: 3fe0235b25830068af8a1de8ef7d2e0b592248c0302ceb1c65a22008bb1f93237b4fabe8988431366b7e7515750a666eb3ef86b2932f2edd09f9eff2b5e48d17

data/lib/danarchy_deploy/installer.rb

@@ -6,11 +6,10 @@ module DanarchyDeploy
       abort('Operating System not defined! Exiting!') if !deployment[:os]
       puts "\n" + self.name
 
-      os = deployment[:os]
-      packages = deployment[:packages]
-      installer, updater, cleaner, packages = prep_operating_system(os, packages, options)
+      installer, updater, cleaner, packages = prep_operating_system(deployment, options)
       install_result = nil
       if packages
+        packages = deployment[:packages].join(' ')
         install_result = DanarchyDeploy::Helpers.run_command("#{installer} #{packages}", options)
       else
         puts 'No packages to install.'
@@ -30,21 +29,17 @@ module DanarchyDeploy
     end
 
     private
-    def self.prep_operating_system(os, packages, options)
+    def self.prep_operating_system(deployment, options)
       (installer, updater, cleaner) = nil
+      os = deployment[:os]
+
       if os.downcase == 'gentoo'
         puts "#{os.capitalize} detected! Using emerge."
+        installer  =  'emerge --usepkg --quiet --noreplace '
+        installer += '--pretend ' if options[:pretend]
 
-        if packages
-          installer  =  'emerge --usepkg --quiet --noreplace '
-          installer += '--pretend ' if options[:pretend]
-
-          packages.each do |pkg|
-            IO.popen("qlist -I #{pkg}") do |o|
-              packages.delete(pkg) if !o.read.empty?
-            end
-          end
-        end
+        # Build packages if template instance
+        installer.gsub('usepkg', 'buildpkg') if deployment[:hostname] =~ /^(image|template)/
 
         cleaner  = 'emerge --depclean --quiet '
         cleaner += '--pretend ' if options[:pretend]
@@ -66,21 +61,19 @@ module DanarchyDeploy
       elsif %w[centos redhat].include?(os.downcase)
         # needs more testing
         puts "#{os.capitalize} detected! Using yum."
-        if packages
-          installer = 'yum install -y '
+        installer = 'yum install -y '
 
-          packages.each do |pkg|
-            IO.popen("rpm -q #{pkg}") do |o|
-              packages.delete(pkg) if !o.read.include?('not installed')
-            end
-          end
-        end
+          # packages.each do |pkg|
+          #   IO.popen("rpm -q #{pkg}") do |o|
+          #     packages.delete(pkg) if !o.read.include?('not installed')
+          #   end
+          # end
 
         updater = nil
         cleaner = nil
       end
 
-      [installer, updater, cleaner, packages.join(' ')]
+      [installer, updater, cleaner]
     end
   end
 end

data/lib/danarchy_deploy/services.rb

@@ -7,16 +7,16 @@ module DanarchyDeploy
       deployment[:services].each do |service, params|
         puts "Configuring service: #{service}"
 
-        if params[:templates] && !params[:templates].empty?
-          puts " > COnfiguring templates for #{service}"
-          DanarchyDeploy::Templater.new(params[:templates], options)
-        end
-
         if params[:archives] && !params[:archives].empty?
           puts "\n" + self.name
           puts " > Deploying archives for #{service}"
           DanarchyDeploy::Archiver.new(params[:archives], options)
         end
+
+        if params[:templates] && !params[:templates].empty?
+          puts " > COnfiguring templates for #{service}"
+          DanarchyDeploy::Templater.new(params[:templates], options)
+        end
       end
 
       deployment

data/lib/danarchy_deploy/users.rb

@@ -123,7 +123,7 @@ module DanarchyDeploy
 
     def self.sudoer(user)
       sudoer_file = '/etc/sudoers.d/danarchy_deploy-' + user[:username]
-      File.open(sudoer_file, 'r+') do |f|
+      File.open(sudoer_file, 'a+') do |f|
         if !f.read.include?(user[:sudoer])
           puts "   |+ Added: '#{user[:sudoer]}'"
           f.puts user[:sudoer]

data/lib/danarchy_deploy/version.rb

@@ -1,3 +1,3 @@
 module DanarchyDeploy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/danarchy_deploy.rb

@@ -27,7 +27,8 @@ module DanarchyDeploy
 
       deployment[:last_deploy] = DateTime.now.strftime("%Y/%m/%d %H:%M:%S")
       puts "\nFinished Local Deployment at #{deployment[:last_deploy]}!"
-      File.write(options[:deploy_file], deployment.to_json) if options[:deploy_file].end_with?('.json')
+      File.write(options[:deploy_file],
+                 JSON.pretty_generate(deployment) if options[:deploy_file].end_with?('.json')
       File.write(options[:deploy_file], deployment.to_yaml) if options[:deploy_file].end_with?('.yaml')
       deployment
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danarchy_couchdb