gluez 0.1 → 0.1.1

data/lib/gluez/impl/linux.rb

@@ -8,34 +8,50 @@ module Gluez
         
         case task
           when :gem
-            steps << "$(su -l #{opts[:user]} -c \"gem list | awk '{print \\$1}' | grep ^#{name}$ | wc -l\") -eq 1"
-            steps << "su -l #{opts[:user]} -c \"gem install #{name} --version #{opts[:version]} --user-install --no-rdoc --no-ri\""
+            steps << {
+              :check  => "$(su -l #{opts[:user]} -c \"gem list | awk '{print \\$1}' | grep ^#{name}$ | wc -l\") -eq 1",
+              :code   => "su -l #{opts[:user]} -c \"gem install #{name} --version #{opts[:version]} --user-install --no-rdoc --no-ri\""
+            }
 
             name = "#{name}@#{opts[:user]}"
 
           when :file
-            steps << "-f #{name}"
-            steps << "touch #{name}"
-
-            steps << "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "644"]}\""
-            steps << "chmod #{opts[:chmod, "644"]} #{name}"
-
-            steps << "\"$(stat -L --format=%G:%U #{name})\" = \"#{opts[:chown, "root:root"]}\""
-            steps << "chown --no-dereference #{opts[:chown, "root:root"]} #{name}"
+            steps << {
+              :check  => "-f #{name}",
+              :code   => "touch #{name}"
+            }
+
+            steps << {
+              :check  => "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "644"]}\"",
+              :code   => "chmod #{opts[:chmod, "644"]} #{name}"
+            }
+            
+            steps << {
+              :check  => "\"$(stat -L --format=%G:%U #{name})\" = \"#{opts[:chown, "root:root"]}\"",
+              :code   => "chown --no-dereference #{opts[:chown, "root:root"]} #{name}"
+            }
 
           when :dir
-            steps << "-d #{name}"
-            steps << "mkdir #{name}"
+            steps << {
+              :check  => "-d #{name}",
+              :code   => "mkdir #{name}"
+            }
 
-            steps << "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "755"]}\""
-            steps << "chmod #{opts[:chmod, "755"]} #{name}"
+            steps << {
+              :check  => "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "755"]}\"",
+              :code   => "chmod #{opts[:chmod, "755"]} #{name}"
+            }
 
-            steps << "\"$(stat -L --format=%G:%U #{name})\" = \"#{opts[:chown, "root:root"]}\""
-            steps << "chown --no-dereference #{opts[:chown, "root:root"]} #{name}"
+            steps << {
+              :check  => "\"$(stat -L --format=%G:%U #{name})\" = \"#{opts[:chown, "root:root"]}\"",
+              :code   => "chown --no-dereference #{opts[:chown, "root:root"]} #{name}"
+            }
 
           when :package
-            steps << "$(apt-cache policy #{name} | grep Installed | wc -l) -eq 1 && $(apt-cache policy #{name} | grep Installed | grep '(none)' | wc -l) -eq 0"
-            steps << "apt-get install #{name} --yes"
+            steps << {
+              :check  => "$(apt-cache policy #{name} | grep Installed | wc -l) -eq 1 && $(apt-cache policy #{name} | grep Installed | grep '(none)' | wc -l) -eq 0",
+              :code   => "apt-get install #{name} --yes"
+            }
 
           when :transfer
             raw = File.read(cfg[:file_dir] + "/files/" + opts[:source])
@@ -49,90 +65,124 @@ DATA
 )
 CMD
 
-            steps << "-f #{name}"
-            steps << "touch #{name}"
+            steps << {
+              :check  => "-f #{name}",
+              :code   => "touch #{name}"
+            }
 
-            steps << "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "644"]}\""
-            steps << "chmod #{opts[:chmod, "644"]} #{name}"
+            steps << {
+              :check  => "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "644"]}\"",
+              :code   => "chmod #{opts[:chmod, "644"]} #{name}"
+            }
 
-            steps << "\"$(stat -L --format=%G:%U #{name})\" = \"#{opts[:chown, "root:root"]}\""
-            steps << "chown --no-dereference #{opts[:chown, "root:root"]} #{name}"
+            steps << {
+              :check  => "\"$(stat -L --format=%G:%U #{name})\" = \"#{opts[:chown, "root:root"]}\"",
+              :code   => "chown --no-dereference #{opts[:chown, "root:root"]} #{name}"
+            }
 
-            steps << "\"$(echo -n $data | base64 -i -d | md5sum - | awk '{print $1}')\" = \"$(md5sum #{name} | awk '{print $1}')\""
-            steps << "echo -n ${data} | base64 -i -d > #{name}"
+            steps << {
+              :check  => "\"$(echo -n $data | base64 -i -d | md5sum - | awk '{print $1}')\" = \"$(md5sum #{name} | awk '{print $1}')\"",
+              :code   => "echo -n ${data} | base64 -i -d > #{name}"
+            }
 
           when :group
-            steps << "$(cat /etc/group | grep ^#{name}: | wc -l) -eq 1"
-            steps << "groupadd --gid #{opts[:gid]} #{name}"
+            steps << {
+              :check  => "$(cat /etc/group | grep ^#{name}: | wc -l) -eq 1",
+              :code   => "groupadd --gid #{opts[:gid]} #{name}"
+            }
 
           when :user
-            steps << "$(cat /etc/passwd | grep ^#{name}: | wc -l) -eq 1"
-            steps << "useradd --create-home --uid #{opts[:uid]} --gid #{opts[:gid]} --shell #{opts[:shell, "/bin/bash"]} #{name}"
+            steps << {
+              :check  => "$(cat /etc/passwd | grep ^#{name}: | wc -l) -eq 1",
+              :code   => "useradd --create-home --uid #{opts[:uid]} --gid #{opts[:gid]} --shell #{opts[:shell, "/bin/bash"]} #{name}"
+            }
 
           when :start
             setup = "service --status-all 1>/tmp/gluez.tmp 2>&1"
-            steps << "\"$(grep #{name} /tmp/gluez.tmp | wc -l)\" = \"1\" && \"$(service #{name} status | grep -E 'is running|start/running' | wc -l)\" = \"1\""
-            steps << "service #{name} start"
+            
+            steps << {
+              :check  => "\"$(grep #{name} /tmp/gluez.tmp | wc -l)\" = \"1\" && \"$(service #{name} status | grep -E 'is running|start/running' | wc -l)\" = \"1\"",
+              :code   => "service #{name} start"
+            }
 
           when :stop
             setup = "service --status-all 1>/tmp/gluez.tmp 2>&1"
-            steps << "\"$(grep #{name} /tmp/gluez.tmp | wc -l)\" = \"1\" && \"$(service #{name} status | grep -E 'is running|start/running' | wc -l)\" = \"0\""
-            steps << "service #{name} stop"
+            steps << {
+              :check  => "\"$(grep #{name} /tmp/gluez.tmp | wc -l)\" = \"1\" && \"$(service #{name} status | grep -E 'is running|start/running' | wc -l)\" = \"0\"",
+              :code   => "service #{name} stop"
+            }
 
           when :restart
             setup = "service --status-all 1>/tmp/gluez.tmp 2>&1"
-            steps << "1 -eq 0"
-            steps << <<-CODE
-              if [[ "$(grep #{name} /tmp/gluez.tmp | wc -l)" = "1" && "$(service #{name} status | grep -E 'is running|start/running' | wc -l)" = "1" ]]; then
-                service #{name} restart
-              else
-                service #{name} start
-              fi
-            CODE
+
+            steps << {
+              :check  => :false,
+              :code   => <<-CODE
+                if [[ "$(grep #{name} /tmp/gluez.tmp | wc -l)" = "1" && "$(service #{name} status | grep -E 'is running|start/running' | wc -l)" = "1" ]]; then
+                  service #{name} restart
+                else
+                  service #{name} start
+                fi
+              CODE
+            }
 
           when :bash
-            steps << opts[:not_if]
-            steps << "su -l #{opts[:user, 'root']} -c '#{opts[:code]}'"
+            steps << {
+              :check  => opts[:not_if],
+              :code   => "su -l #{opts[:user, 'root']} -c '#{opts[:code]}'"
+            }
 
           when :link
-            steps << "-L #{name} && $(file #{name} | grep \"#{name}: symbolic link to \\`#{opts[:target]}'\" | wc -l) -eq 1"
-            steps << "ln -f -s #{opts[:target]} #{name}"
+            steps << {
+              :check  => "-L #{name} && $(file #{name} | grep \"#{name}: symbolic link to \\`#{opts[:target]}'\" | wc -l) -eq 1",
+              :code   => "ln -f -s #{opts[:target]} #{name}"
+            }
             
-            steps << "\"$(stat --format=%G:%U #{name})\" = \"#{opts[:chown]}\""
-            steps << "chown --no-dereference #{opts[:chown]} #{name}"
+            steps << {
+              :check  => "\"$(stat --format=%G:%U #{name})\" = \"#{opts[:chown]}\"",
+              :code   => "chown --no-dereference #{opts[:chown]} #{name}"
+            }
 
           when :enable
-            steps << "$(update-rc.d -n -f #{name} remove | grep '/etc/rc' | wc -l) -gt 0"
-            steps << "/usr/sbin/update-rc.d #{name} defaults"
+            steps << {
+              :check  => "$(update-rc.d -n -f #{name} remove | grep '/etc/rc' | wc -l) -gt 0",
+              :code   => "/usr/sbin/update-rc.d #{name} defaults"
+            }
 
           when :disable
-            steps << "$(update-rc.d -n -f #{name} remove | grep '/etc/rc' | wc -l) -eq 0"
-            steps << "/usr/sbin/update-rc.d -f #{name} remove"
+            steps << {
+              :check  => "$(update-rc.d -n -f #{name} remove | grep '/etc/rc' | wc -l) -eq 0",
+              :code   => "/usr/sbin/update-rc.d -f #{name} remove"
+            }
 
           when :source
             user = opts[:user, "root"]
             home_dir = (user != "root") ? "/home/#{opts[:user]}" : "/root"
             
-            steps << "-d #{home_dir}/tmp"
-            steps << "mkdir #{home_dir}/tmp && chown #{user}:#{user} #{home_dir}/tmp"
+            steps << {
+              :check  => "-d #{home_dir}/tmp",
+              :code   => "mkdir #{home_dir}/tmp && chown #{user}:#{user} #{home_dir}/tmp"
+            }
 
-            steps << "-f #{opts[:binary]}"
-            steps << <<-CODE
-              [ -f #{home_dir}/tmp/#{opts[:filename]} ] && rm #{home_dir}/tmp/#{opts[:filename]}
-              [ -d #{home_dir}/tmp/#{opts[:folder]} ] && rm -rf #{home_dir}/tmp/#{opts[:folder]}
+            steps << {
+              :check  => "-f #{opts[:binary]}",
+              :code   => <<-CODE
+                [ -f #{home_dir}/tmp/#{opts[:filename]} ] && rm #{home_dir}/tmp/#{opts[:filename]}
+                [ -d #{home_dir}/tmp/#{opts[:folder]} ] && rm -rf #{home_dir}/tmp/#{opts[:folder]}
 
-              wget --no-check-certificate -O #{home_dir}/tmp/#{opts[:filename]} #{name}
+                wget --no-check-certificate -O #{home_dir}/tmp/#{opts[:filename]} #{name}
 
-              chown #{user}:#{user} #{home_dir}/tmp/#{opts[:filename]}
+                chown #{user}:#{user} #{home_dir}/tmp/#{opts[:filename]}
 
-              tar -C #{home_dir}/tmp/ -x#{opts[:filename] =~ /\.tar\.bz2/ ? "j" : "z"}f #{home_dir}/tmp/#{opts[:filename]}
+                tar -C #{home_dir}/tmp/ -x#{opts[:filename] =~ /\.tar\.bz2/ ? "j" : "z"}f #{home_dir}/tmp/#{opts[:filename]}
 
-              chown -R #{user}:#{user} #{home_dir}/tmp/#{opts[:folder]}
+                chown -R #{user}:#{user} #{home_dir}/tmp/#{opts[:folder]}
 
-              su -l #{user} -c 'cd #{home_dir}/tmp/#{opts[:folder]} && #{opts[:steps].join(' && ')}'
+                su -l #{user} -c 'cd #{home_dir}/tmp/#{opts[:folder]} && #{opts[:steps].join(' && ')}'
 
-              chown -R #{user}:#{user} #{home_dir}/tmp/#{opts[:folder].split('/').first}
-            CODE
+                chown -R #{user}:#{user} #{home_dir}/tmp/#{opts[:folder].split('/').first}
+              CODE
+            }
             
           else
             raise "unsupported task: #{task}, name: #{name}, opts: #{opts.inspect}"

data/lib/gluez/impl/mac.rb

@@ -1,34 +1,34 @@
-module Gluez
-  module Impl
-    class Mac
-      def self.steps(cfg, task, name, opts)
-        
-        setup = nil
-        steps = []
-        
-        case task
-
-          when :group
-            steps << "$(/usr/bin/dscl . -list Groups | grep ^#{name}$ | wc -l) -eq 1"
-            steps << "$(/usr/bin/dscl . -create /Groups/#{name} PrimaryGroupID #{opts[:gid]})"
-
-          when :user
-            steps << "$(/usr/bin/dscl . -list Users | grep ^#{name}$ | wc -l) -eq 1"
-            steps << "$(/usr/bin/dscl . -create /Users/#{name} UniqueID #{opts[:uid]} PrimaryGroupID #{opts[:gid]} UserShell #{opts[:shell, "/bin/bash"]} NFSHomeDir /Users/#{name})"
-
-            steps << "-d /Users/#{name}"
-            steps << "mkdir /Users/#{name}"
-            
-            steps << "\"$(stat -L -f %Sg:%Su /Users/#{name})\" = \"#{name}:#{name}\""
-            steps << "chown #{name}:#{name} /Users/#{name}"
-
-          else
-            raise "unsupported task: #{task}, name: #{name}, opts: #{opts.inspect}"
-        end
-        
-        
-        [name, setup, steps]
-      end
-    end
-  end
-end
+# module Gluez
+#   module Impl
+#     class Mac
+#       def self.steps(cfg, task, name, opts)
+#         
+#         setup = nil
+#         steps = []
+#         
+#         case task
+# 
+#           when :group
+#             steps << "$(/usr/bin/dscl . -list Groups | grep ^#{name}$ | wc -l) -eq 1"
+#             steps << "$(/usr/bin/dscl . -create /Groups/#{name} PrimaryGroupID #{opts[:gid]})"
+# 
+#           when :user
+#             steps << "$(/usr/bin/dscl . -list Users | grep ^#{name}$ | wc -l) -eq 1"
+#             steps << "$(/usr/bin/dscl . -create /Users/#{name} UniqueID #{opts[:uid]} PrimaryGroupID #{opts[:gid]} UserShell #{opts[:shell, "/bin/bash"]} NFSHomeDir /Users/#{name})"
+# 
+#             steps << "-d /Users/#{name}"
+#             steps << "mkdir /Users/#{name}"
+#             
+#             steps << "\"$(stat -L -f %Sg:%Su /Users/#{name})\" = \"#{name}:#{name}\""
+#             steps << "chown #{name}:#{name} /Users/#{name}"
+# 
+#           else
+#             raise "unsupported task: #{task}, name: #{name}, opts: #{opts.inspect}"
+#         end
+#         
+#         
+#         [name, setup, steps]
+#       end
+#     end
+#   end
+# end

data/lib/gluez.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 require 'gluez/ext/string'
 
 require 'gluez/option_wrapper'
@@ -7,19 +5,18 @@ require 'gluez/formatter'
 require 'gluez/erb/engine'
 
 require 'gluez/impl/linux'
-# require 'gluez/impl/mac'
 
 module Gluez
 
   def self.run(entries, cfg={})
     
     cfg = {
-      :file_dir => "."
+      :file_dir => ".",
+      :simulate => false
     }.merge(cfg)
     
     lines = []
     lines << "#!/bin/bash"
-    # lines << "set -x"
     lines << "set -e"
     
     entries.each do |entry|
@@ -48,8 +45,12 @@ module Gluez
           entries << [notify_task, notify_name, {:embedded => true}]
         end
       end
-            
-      add_steps(true, lines, [], [fun, steps], notifies)
+      
+      if cfg[:simulate]
+        generate_simulate(lines, fun, steps, notifies)
+      else
+        generate_execute(lines, fun, steps, notifies)
+      end
       
       lines << "}"
       
@@ -61,7 +62,6 @@ module Gluez
       
       lines << function_name(task, name) unless opts[:embedded]
     end
-
     
     Formatter.format(lines.join("\n"))
   end
@@ -72,58 +72,55 @@ module Gluez
     "#{task}_#{name}".gsub('/', '_').gsub(':', '_').gsub("@", "_").gsub("~", "_").gsub(".", "_")
   end
   
-  def self.add_steps(first, lines, completed, steps_wrapper, notifies)
+  def self.generate_simulate(lines, fun, steps, notifies)
+
+    lines << "if [[ #{steps.collect{|s| s[:check] == :false ? '1 -eq 0' : s[:check]}.join(' && ')} ]]; then"
+    lines << "  echo \"[ up2date     ] #{fun}\""
+    lines << "else"
+    lines << "  echo \"[ not up2date ] #{fun}\""
     
-    fun, steps = steps_wrapper
+    notifies.each do |notify|
+      lines << notify
+    end
     
-    if first
-      if steps.length == 2
-        add_steps(false, lines, [], [fun, steps], notifies)
-      else
-        checks = []
-        steps.each_with_index do |step, idx|
-          checks << step if idx % 2 == 0
-        end
+    lines << "fi"
+  end
+  
+  def self.generate_execute(lines, fun, steps, notifies)
+    
+    lines << "if [[ #{steps.collect{|s| s[:check] == :false ? '1 -eq 0' : s[:check]}.join(' && ')} ]]; then"
+    lines << "  echo \"[ up2date     ] #{fun}\""
+    lines << "else"
 
-        lines << "if [[ #{checks.join(' && ')} ]]; then"
-        lines << "  echo \"[ #{fun} ] up2date\""
+    if steps.length > 1
+      (0..steps.length-1).to_a.each do |limit|
+        lines << "if [[ #{steps[0..limit].collect{|s| s[:check] == :false ? '1 -eq 0' : s[:check]}.join(' && ')} ]]; then"
+        lines << "  echo \"[ up2date     ] #{fun}\""
         lines << "else"
-        lines << "  echo \"[ #{fun} ] NOT up2date\""
-        add_steps(false, lines, [], [fun, steps], notifies)
+        lines << "  #{steps[limit][:code]}"
+        lines << "  if [[ #{steps[0..limit].collect{|s| s[:check] == :false ? '1 -eq 0' : s[:check]}.join(' && ')} ]]; then"
+        lines << "    echo \"[ applied     ] #{fun}\""
+        lines << "  else"
+        lines << "    echo \"[ not applied ] #{fun}\""
+        lines << "    exit 1"
+        lines << "  fi"
         lines << "fi"
       end
-      
     else
-      check, code = steps.slice!(0,2)
-      
-      if check == "1 -eq 0"
-        completed << "1 -eq 1"
-      else
-        completed << check
-      end
-      
-      lines << "if [[ #{check} ]]; then"
-      lines << "  echo \"[ #{fun} ] up2date\""
-      lines << "else"
-      lines << "  #{code}"
-      lines << "  if [[ #{completed.join(' && ')} ]]; then"
-      lines << "    echo \"[ #{fun} ] applied\""
+      lines << "  #{steps[0][:code]}"
+      lines << "  if [[ #{steps[0][:check] == :false ? '1 -eq 1' : steps[0][:check]} ]]; then"
+      lines << "    echo \"[ applied     ] #{fun}\""
       lines << "  else"
+      lines << "    echo \"[ not applied ] #{fun}\""
       lines << "    exit 1"
       lines << "  fi"
-      
-      lines << "fi"
-
-      if steps.empty?
-        notifies.each do |notify|
-          lines << notify
-        end
-      else
-        add_steps(false, lines, completed, [fun, steps], notifies) 
-      end
     end
     
+    notifies.each do |notify|
+      lines << notify
+    end
     
+    lines << "fi"
   end
     
 end

metadata

@@ -2,7 +2,7 @@
 name: gluez
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -31,7 +31,6 @@ files:
 - lib/gluez/impl/mac.rb
 - lib/gluez/option_wrapper.rb
 - lib/gluez.rb
-- bin/gluez
 has_rdoc: true
 homepage: 
 licenses: []

data/bin/gluez

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-# /usr/bin/env ruby "require gluez; Gluez::run"