gluez 0.1.5 → 0.2

data/lib/gluez/formatter.rb

@@ -2,22 +2,30 @@ module Gluez
   class Formatter
     def self.format(lines)
       indent = 0
+      num_line = 0
 
       prev_line = nil
       lines.split("\n").collect do |line|
-        line = line.strip
+        num_line += 1
+        begin
+          line = line.strip
         
-        indent -= 2 if ['}', 'fi', 'else'].include?(line)
+          indent -= 2 if ['}', 'fi', 'else'].include?(line)
         
-        l = (' ' * indent) + line
-        indent += 2 if [/^function /, /^if /, /^else/].any?{|e| line =~ e}
+          l = (' ' * indent) + line
+          indent += 2 if [/^function /, /^if /, /^else/].any?{|e| line =~ e}
 
-        indent -= 2 if line =~ /^data=/
-        indent += 2 if line == ')' && prev_line == 'DATA'
+          # indent -= 2 if line =~ /^data=/
+          indent -= 2 if line.index('cat >~/.gluez_transfer <<\DATA')
+          indent += 2 if line == '"' && prev_line == 'DATA'
         
-        prev_line = line
+          prev_line = line
         
-        l
+          l
+        rescue Exception => e
+          puts "error on line: #{num_line}"
+          raise e
+        end
       end.join("\n")
     end
   end

data/lib/gluez/impl/linux.rb

@@ -9,12 +9,10 @@ module Gluez
         case task
           when :gem
             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\""
+              :check  => "\\$(gem list | awk '{print \\$1}' | grep ^#{name}$ | wc -l) -eq 1",
+              :code   => "gem install #{name} --version #{opts[:version]} --user-install --no-rdoc --no-ri"
             }
 
-            name = "#{name}@#{opts[:user]}"
-
           when :file
             steps << {
               :check  => "-f #{name}",
@@ -22,15 +20,10 @@ module Gluez
             }
 
             steps << {
-              :check  => "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "644"]}\"",
+              :check  => %Q("\\$(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 << {
               :check  => "-d #{name}",
@@ -38,18 +31,16 @@ module Gluez
             }
 
             steps << {
-              :check  => "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "755"]}\"",
+              :check  => %Q("\\$(stat -L --format=%a #{name})" = "#{opts[:chmod, "755"]}"),
               :code   => "chmod #{opts[:chmod, "755"]} #{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 << {
-              :check  => "$(apt-cache policy #{name} | grep Installed | wc -l) -eq 1 && $(apt-cache policy #{name} | grep Installed | grep '(none)' | wc -l) -eq 0",
+              :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"
             }
 
@@ -68,7 +59,7 @@ DATA
 CMD
 
             steps << {
-              :check  => "\"$(echo -n $data | base64 -i -d | md5sum - | awk '{print $1}')\" = \"$(crontab -u #{name} -l | md5sum - | awk '{print $1}')\"",
+              :check  => %Q("\\$(echo -n $data | base64 -i -d | md5sum - | awk '{print $1}')" = "\\$(crontab -u #{name} -l | md5sum - | awk '{print $1}')"),
               :code   => "echo -n $data | base64 -i -d | crontab -u #{name} -"
             }
             
@@ -80,10 +71,10 @@ CMD
             content = Gluez::Erb::Engine.parse(raw, opts[:vars, {}])
 
             setup = <<-CMD
-data=$(cat <<\\DATA
+su -l #{opts[:user, 'root']} -c "cat >~/.gluez_transfer <<\\DATA
 #{content.strip}
 DATA
-)
+"
 CMD
 
             steps << {
@@ -92,18 +83,13 @@ CMD
             }
 
             steps << {
-              :check  => "\"$(stat -L --format=%a #{name})\" = \"#{opts[:chmod, "644"]}\"",
+              :check  => %Q("\\$(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}"
-            }
-
-            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}"
+              :check  => %Q("\\$(cat ~/.gluez_transfer | base64 -i -d - | md5sum - | awk '{print \\$1}')" = "\\$(md5sum #{name} | awk '{print \\$1}')"),
+              :code   => "chmod +w #{name} && cat ~/.gluez_transfer | base64 -i -d - > #{name} && chmod #{opts[:chmod, "644"]} #{name}"
             }
 
           when :group
@@ -122,14 +108,21 @@ CMD
             setup = "service --status-all 1>/tmp/gluez.tmp 2>&1"
             
             steps << {
-              :check  => "\"$(grep #{name} /tmp/gluez.tmp | wc -l)\" = \"1\" && \"$(service #{name} status | grep -E 'is running|start/running' | wc -l)\" = \"1\"",
+              :check  => [
+                %Q("\\$(grep #{name} /tmp/gluez.tmp | wc -l)" = "1"),
+                %Q("\\$(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 << {
-              :check  => "\"$(grep #{name} /tmp/gluez.tmp | wc -l)\" = \"1\" && \"$(service #{name} status | grep -E 'is running|start/running' | wc -l)\" = \"0\"",
+              :check  => [
+                %Q("\\$(grep #{name} /tmp/gluez.tmp | wc -l)" = "1"),
+                %Q("\\$(service #{name} status | grep -E 'is running|start/running' | wc -l)" = "0"),
+              ],
               :code   => "service #{name} stop"
             }
 
@@ -137,38 +130,32 @@ CMD
             setup = "service --status-all 1>/tmp/gluez.tmp 2>&1"
 
             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
+              :check  => '1 -eq 0',
+              :code   => "service #{name} restart"
             }
 
           when :bash
             steps << {
               :check  => opts[:not_if],
-              :code   => "su -l #{opts[:user, 'root']} -c '#{opts[:code]}'"
+              :code   => opts[:code]
             }
             
           when :bash_once
             home_dir = (opts[:user, 'root'] == 'root') ? "/root" : "/home/#{opts[:user, 'root']}"
             steps << {
               :check  => "-f #{home_dir}/.gluez/#{name}",
-              :code   => "su -l #{opts[:user, 'root']} -c '#{opts[:code]}\ntouch #{home_dir}/.gluez/#{name}'"
+              :code   => opts[:code] + "\n" + "touch #{home_dir}/.gluez/#{name}"
             }
 
           when :bundler
             steps << {
-              :check    => "\"$(su -l #{opts[:user]} -c 'cd #{name} && bundle check > /dev/null' && echo 'up2date')\" = \"up2date\"",
-              :code     => "su -l #{opts[:user]} -c \"cd #{name} && bundle install\""
+              :check    => "\"\\$(cd #{name} && bundle check > /dev/null && echo 'up2date')\" = \"up2date\"",
+              :code     => "cd #{name} && bundle install"
             }
           
           when :umount
             steps << {
-              :check  => "$(mount | grep \"on #{name} type\" | wc -l) -eq 0",
+              :check  => "\\$(mount | grep \"on #{name} type\" | wc -l) -eq 0",
               :code   => "umount #{name}"
             }
             
@@ -179,30 +166,28 @@ CMD
             cmd = "#{cmd} #{opts[:device]} #{name}"
             
             steps << {
-              :check  => "$(mount | grep \"on #{name} type\" | wc -l) -eq 1",
+              :check  => "\\$(mount | grep \"on #{name} type\" | wc -l) -eq 1",
               :code   => cmd
             }
 
           when :link
             steps << {
-              :check  => "-L #{name} && $(file #{name} | grep \"#{name}: symbolic link to \\`#{opts[:target]}'\" | wc -l) -eq 1",
+              :check  => [
+                "-L #{name}",
+                "\\$(file #{name} | grep \"#{name.gsub('~', '\$HOME')}: symbolic link to \\\\\\`#{opts[:target].gsub('~', '\$HOME')}'\" | wc -l) -eq 1"
+              ],
               :code   => "ln -f -s #{opts[:target]} #{name}"
             }
             
-            steps << {
-              :check  => "\"$(stat --format=%G:%U #{name})\" = \"#{opts[:chown]}\"",
-              :code   => "chown --no-dereference #{opts[:chown]} #{name}"
-            }
-
           when :enable
             steps << {
-              :check  => "$(update-rc.d -n -f #{name} remove | grep '/etc/rc' | wc -l) -gt 0",
+              :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 << {
-              :check  => "$(update-rc.d -n -f #{name} remove | grep '/etc/rc' | wc -l) -eq 0",
+              :check  => "\\$(update-rc.d -n -f #{name} remove | grep '/etc/rc' | wc -l) -eq 0",
               :code   => "/usr/sbin/update-rc.d -f #{name} remove"
             }
 
@@ -211,34 +196,27 @@ CMD
             home_dir = (user != "root") ? "/home/#{opts[:user]}" : "/root"
             
             steps << {
-              :check  => "-d #{home_dir}/tmp",
-              :code   => "mkdir #{home_dir}/tmp && chown #{user}:#{user} #{home_dir}/tmp"
+              :check  => "-d ~/tmp",
+              :code   => "mkdir ~/tmp"
             }
 
             steps << {
               :check  => opts[:test],
               :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}
+                [ -f ~/tmp/#{opts[:filename]} ] && rm ~/tmp/#{opts[:filename]}
+                [ -d ~/tmp/#{opts[:folder]} ] && rm -rf ~/tmp/#{opts[:folder]}
 
-                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]}
-
-                chown -R #{user}:#{user} #{home_dir}/tmp/#{opts[:folder]}
-
-                su -l #{user} -c 'cd #{home_dir}/tmp/#{opts[:folder]} && #{opts[:steps].join(' && ')}'
-
-                chown -R #{user}:#{user} #{home_dir}/tmp/#{opts[:folder].split('/').first}
+                wget --no-check-certificate -O ~/tmp/#{opts[:filename]} #{name}
+                tar -C ~/tmp/ -x#{opts[:filename] =~ /\.tar\.bz2/ ? "j" : "z"}f ~/tmp/#{opts[:filename]}
+                cd ~/tmp/#{opts[:folder]} && #{opts[:steps].join(' && ')}
               CODE
             }
             
           else
             raise "unsupported task: #{task}, name: #{name}, opts: #{opts.inspect}"
         end
-        
+
+        name = "#{name}@#{opts[:user]}" if opts.key?(:user)
         
         [name, setup, steps]
       end

data/lib/gluez.rb

@@ -17,7 +17,7 @@ module Gluez
     
     lines = []
     lines << "#!/bin/bash"
-    lines << "set -e"
+    # lines << "set -e"
     
     entries.each do |entry|
 
@@ -27,6 +27,18 @@ module Gluez
       opts = OptionWrapper.new(opts)
 
       name, setup, steps = Gluez::Impl::Linux.steps(cfg, task, name, opts)
+      
+      steps.each do |step|
+        if step[:check].is_a?(Array)
+          step[:check].each_with_index do |check, idx|
+            step[:check][idx] = step[:check][idx].gsub("\"", "\\\"")
+          end
+        else
+          step[:check] = step[:check].gsub("\"", "\\\"")
+        end
+        step[:code] = step[:code].gsub("\"", "\\\"")
+      end
+      
       entry[1] = name
 
       fun = function_name(task, name)
@@ -47,9 +59,9 @@ module Gluez
       end
       
       if cfg[:simulate]
-        generate_simulate(lines, fun, steps, notifies)
+        generate_simulate(lines, opts[:user, 'root'], fun, steps, notifies)
       else
-        generate_execute(lines, fun, steps, notifies)
+        generate_execute(lines, opts[:user, 'root'], fun, steps, notifies)
       end
       
       lines << "}"
@@ -72,9 +84,11 @@ module Gluez
     "#{task}_#{name}".gsub('/', '_').gsub(':', '_').gsub("@", "_").gsub("~", "_").gsub(".", "_")
   end
   
-  def self.generate_simulate(lines, fun, steps, notifies)
+  def self.generate_simulate(lines, user, fun, steps, notifies)
 
-    lines << "if [[ #{steps.collect{|s| s[:check] == :false ? '1 -eq 0' : s[:check]}.join(' && ')} ]]; then"
+    lines << code_check(steps, user, true)
+
+    lines << "if [[ $? -eq 0 ]]; then"
     lines << "  echo \"[ up2date     ] #{fun}\""
     lines << "else"
     lines << "  echo \"[ not up2date ] #{fun}\""
@@ -85,20 +99,45 @@ module Gluez
     
     lines << "fi"
   end
-  
-  def self.generate_execute(lines, fun, steps, notifies)
+
+  def self.code_check(steps, user, applied)
+    steps.collect do |step|
+      
+      if step[:check].is_a?(Array)
+        
+        step[:check].collect do |check|
+          "su -l #{user} -c \"test " + check + "\""
+        end.join(" && ")
+        
+      else
+        "su -l #{user} -c \"test " + step[:check] + "\"" unless (applied && step[:check] == '1 -eq 0')
+      end
+      
+    end.join(" && ")
+  end
+
+  def self.generate_execute(lines, user, fun, steps, notifies)
+    
+    lines << code_check(steps, user, false)
     
-    lines << "if [[ #{steps.collect{|s| s[:check] == :false ? '1 -eq 0' : s[:check]}.join(' && ')} ]]; then"
+    lines << "if [[ $? -eq 0 ]]; then"
     lines << "  echo \"[ up2date     ] #{fun}\""
     lines << "else"
 
     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 << code_check(steps[0..limit], user, false)
+
+        lines << "if [[ $? -eq 0 ]]; then"
         lines << "  echo \"[ up2date     ] #{fun}\""
         lines << "else"
-        lines << "  #{steps[limit][:code]}"
-        lines << "  if [[ #{steps[0..limit].collect{|s| s[:check] == :false ? '1 -eq 0' : s[:check]}.join(' && ')} ]]; then"
+        
+        lines << "  su -l #{user} -c \"#{steps[limit][:code]}\""
+
+        lines << code_check(steps[0..limit], user, true)
+        
+        lines << "  if [[ $? -eq 0 ]]; then"
         lines << "    echo \"[ applied     ] #{fun}\""
         lines << "  else"
         lines << "    echo \"[ not applied ] #{fun}\""
@@ -107,8 +146,11 @@ module Gluez
         lines << "fi"
       end
     else
-      lines << "  #{steps[0][:code]}"
-      lines << "  if [[ #{steps[0][:check] == :false ? '1 -eq 1' : steps[0][:check]} ]]; then"
+      lines << "  su -l #{user} -c \"#{steps[0][:code]}\""
+
+      lines << code_check([steps[0]], user, true)
+      
+      lines << "  if [[ $? -eq 0 ]]; then"
       lines << "    echo \"[ applied     ] #{fun}\""
       lines << "  else"
       lines << "    echo \"[ not applied ] #{fun}\""
@@ -122,5 +164,5 @@ module Gluez
     
     lines << "fi"
   end
-    
+      
 end

metadata

@@ -2,7 +2,7 @@
 name: gluez
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: "0.2"
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 +02:00
+date: 2011-06-05 00:00:00 +02:00
 default_executable: 
 dependencies: []