etch 3.20.1 → 4.0.0

data/Rakefile

@@ -3,7 +3,7 @@ spec = Gem::Specification.new do |s|
   s.name	= 'etch'
   s.summary	= 'Etch system configuration management client'
   s.add_dependency('facter')
-  s.version = '3.20.1'
+  s.version = '4.0.0'
   s.author = 'Jason Heiss'
   s.email = 'etch-users@lists.sourceforge.net'
   s.homepage = 'http://etch.sourceforge.net'

data/lib/etch/client.rb

@@ -42,7 +42,7 @@ end
 require 'etch'
 
 class Etch::Client
-  VERSION = '3.20.1'
+  VERSION = '4.0.0'
   
   CONFIRM_PROCEED = 1
   CONFIRM_SKIP = 2
@@ -204,7 +204,7 @@ class Etch::Client
     @already_processed = {}
     @exec_already_processed = {}
     @exec_once_per_run = {}
-    @results = []
+    @results = {}
     # See start/stop_output_capture for these
     @output_pipes = []
     
@@ -521,11 +521,11 @@ class Etch::Client
       rails_results << "status=#{CGI.escape(status.to_s)}"
       rails_results << "message=#{CGI.escape(message)}"
       if @detailed_results.include?('SERVER')
-        @results.each do |result|
+        @results.each do |file, result|
           # Strangely enough this works.  Even though the key is not unique to
           # each result the Rails parameter parsing code keeps track of keys it
           # has seen, and if it sees a duplicate it starts a new hash.
-          rails_results << "results[][file]=#{CGI.escape(result['file'])}"
+          rails_results << "results[][file]=#{CGI.escape(file)}"
           rails_results << "results[][success]=#{CGI.escape(result['success'].to_s)}"
           rails_results << "results[][message]=#{CGI.escape(result['message'])}"
         end
@@ -563,8 +563,8 @@ class Etch::Client
               file.puts "Message:\n#{message}\n"
             end
             # Then the detailed results
-            @results.each do |result|
-              file.puts "File #{result['file']}, result #{result['success']}:\n"
+            @results.each do |resultfile, result|
+              file.puts "File #{resultfile}, result #{result['success']}:\n"
               file.puts result['message']
             end
           end
@@ -621,7 +621,6 @@ class Etch::Client
     
     # Prep the results capturing for this file
     result = {}
-    result['file'] = file
     result['success'] = true
     result['message'] = ''
     
@@ -654,13 +653,19 @@ class Etch::Client
         # Process any other files that this file depends on
         config.elements.each('/config/depend') do |depend|
           puts "Processing dependency #{depend.text}" if (@debug)
-          process_file(depend.text, responsedata)
+          continue_processing = process_file(depend.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # Process any commands that this file depends on
         config.elements.each('/config/dependcommand') do |dependcommand|
           puts "Processing command dependency #{dependcommand.text}" if (@debug)
-          process_commands(dependcommand.text, responsedata)
+          continue_processing = process_commands(dependcommand.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # See what type of action the user has requested
@@ -834,7 +839,6 @@ class Etch::Client
                 save_results = false
                 throw :process_done
               when CONFIRM_QUIT
-                unlock_all_files
                 continue_processing = false
                 save_results = false
                 throw :process_done
@@ -1099,7 +1103,6 @@ class Etch::Client
                 save_results = false
                 throw :process_done
               when CONFIRM_QUIT
-                unlock_all_files
                 continue_processing = false
                 save_results = false
                 throw :process_done
@@ -1279,7 +1282,6 @@ class Etch::Client
                 save_results = false
                 throw :process_done
               when CONFIRM_QUIT
-                unlock_all_files
                 continue_processing = false
                 save_results = false
                 throw :process_done
@@ -1404,7 +1406,6 @@ class Etch::Client
                 save_results = false
                 throw :process_done
               when CONFIRM_QUIT
-                unlock_all_files
                 continue_processing = false
                 save_results = false
                 throw :process_done
@@ -1504,7 +1505,7 @@ class Etch::Client
     end
     result['message'] << output
     if save_results
-      @results << result
+      @results[file] = result
     end
     
     if exception
@@ -1542,7 +1543,6 @@ class Etch::Client
     
     # Prep the results capturing for this command
     result = {}
-    result['file'] = commandname
     result['success'] = true
     result['message'] = ''
     
@@ -1575,13 +1575,19 @@ class Etch::Client
         # Process any other commands that this command depends on
         command.elements.each('/commands/depend') do |depend|
           puts "Processing command dependency #{depend.text}" if (@debug)
-          process_commands(depend.text, responsedata)
+          continue_processing = process_commands(depend.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # Process any files that this command depends on
         command.elements.each('/commands/dependfile') do |dependfile|
           puts "Processing file dependency #{dependfile.text}" if (@debug)
-          process_file(dependfile.text, responsedata)
+          continue_processing = process_file(dependfile.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # Perform each step
@@ -1593,6 +1599,9 @@ class Etch::Client
           guard_result = process_guard(guard, commandname)
           
           if !guard_result
+            # Tell the user what we're going to do
+            puts "Will run command '#{command}'"
+            
             # If the user requested interactive mode ask them for
             # confirmation to proceed.
             if @interactive
@@ -1603,7 +1612,6 @@ class Etch::Client
                 save_results = false
                 throw :process_done
               when CONFIRM_QUIT
-                unlock_all_files
                 continue_processing = false
                 save_results = false
                 throw :process_done
@@ -1637,7 +1645,7 @@ class Etch::Client
     end
     result['message'] << output
     if save_results
-      @results << result
+      @results[commandname] = result
     end
     
     if exception
@@ -2314,14 +2322,17 @@ class Etch::Client
         else print "[p|s|q] "
       end
       response = $stdin.gets.chomp
-      if response =~ /p/i || @last_response =~ /p/i
-        @last_response = response if !response.strip.empty?
+      if response.empty?
+        response = @last_response
+      end
+      if response =~ /p/i
+        @last_response = response
         return CONFIRM_PROCEED
-      elsif response =~ /s/i || @last_response =~ /s/i
-        @last_response = response if !response.strip.empty?
+      elsif response =~ /s/i
+        @last_response = response
         return CONFIRM_SKIP
-      elsif response =~ /q/i || @last_response =~ /q/i
-        @last_response = response if !response.strip.empty?
+      elsif response =~ /q/i
+        @last_response = response
         return CONFIRM_QUIT
       end
     end
@@ -2384,9 +2395,9 @@ class Etch::Client
     # Make 30 attempts (1s sleep after each attempt)
     30.times do |i|
       begin
-        fd = IO::sysopen(lockpath, Fcntl::O_WRONLY|Fcntl::O_CREAT|Fcntl::O_EXCL)
+        fd = File.sysopen(lockpath, Fcntl::O_WRONLY|Fcntl::O_CREAT|Fcntl::O_EXCL)
         puts "Lock acquired for #{file}" if (@debug)
-        f = IO.open(fd) { |lockfile| lockfile.puts $$ }
+        File.open(fd) { |lockfile| lockfile.puts $$ }
         @locked_files[file] = true
         return
       rescue Errno::EEXIST
@@ -2459,8 +2470,14 @@ class Etch::Client
     # to the pipe.  The child gathers up anything sent over the pipe and
     # when we close the pipe later it sends the captured output back to us
     # over a second pipe.
-    pread, pwrite = IO.pipe
-    oread, owrite = IO.pipe
+    pread = pwrite = oread = owrite = nil
+    if RUBY_VERSION.split('.')[0..1].join('.').to_f >= 1.9
+      pread, pwrite = IO.pipe(Encoding.default_external, 'UTF-8', :invalid => :replace, :undef => :replace)
+      oread, owrite = IO.pipe(Encoding.default_external, 'UTF-8', :invalid => :replace, :undef => :replace)
+    else
+      pread, pwrite = IO.pipe
+      oread, owrite = IO.pipe
+    end
     if fork
       # Parent
       pread.close

data/lib/etch.rb

@@ -51,16 +51,16 @@ end
 class Etch
   # FIXME: I'm not really proud of this, it seems like there ought to be a way
   # to just use one logger.  The problem is that on the server we'd like to
-  # use RAILS_DEFAULT_LOGGER for general logging (which is logging to
+  # use Rails.logger for general logging (which is logging to
   # log/production.log), but be able to turn on debug-level logging for
   # individual connections (via the debug parameter sent in the HTTP
-  # requests).  If we twiddle the log level of RAILS_DEFAULT_LOGGER then all
+  # requests).  If we twiddle the log level of Rails.logger then all
   # connections coming in at the same time as the debug connection will also
   # get logged as debug, making the logs confusing.  And if the debug
   # connection aborts for some reason we also risk leaving
-  # RAILS_DEFAULT_LOGGER set to debug, flooding the logs.  So it seems like we
+  # Rails.logger set to debug, flooding the logs.  So it seems like we
   # need a seperate logger for debugging.  But that just seems wrong somehow. 
-  # We don't want to just dup RAILS_DEFAULT_LOGGER for each connection, even
+  # We don't want to just dup Rails.logger for each connection, even
   # if Logger didn't immediately blow up we'd probably end up with scrambled
   # logs as simultaneous connections tried to write at the same time.  Or
   # maybe that would work, depending on how Ruby and the OS buffer writes to
@@ -285,7 +285,11 @@ class Etch
     end
     
     # Load the config.xml file
-    config_xml = Etch.xmlload(config_xml_file)
+    begin
+      config_xml = Etch.xmlload(config_xml_file)
+    rescue Exception => e
+      raise Etch.wrap_exception(e, "Error loading config.xml for #{file}:\n" + e.message)
+    end
     
     # Filter the config.xml file by looking for attributes
     begin
@@ -822,6 +826,10 @@ class Etch
       end
     end
     
+    # Earlier we chdir'd into the file's directory in the repository.  It
+    # seems best not to leave this process with that as the cwd.
+    Dir.chdir('/')
+    
     # In addition to successful configs return configs for files that need
     # orig data (generation_status==false) because any setup commands might be
     # needed to create the original file.
@@ -961,6 +969,10 @@ class Etch
       generation_status = :success
     end
     
+    # Earlier we chdir'd into the command's directory in the repository.  It
+    # seems best not to leave this process with that as the cwd.
+    Dir.chdir('/')
+    
     # If filtering didn't remove all the content then add this to the list of
     # commands to be returned to the client.
     if generation_status && generation_status != :unknown &&

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etch
 version: !ruby/object:Gem::Version
-  version: 3.20.1
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70164344222100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164344222100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: etch-users@lists.sourceforge.net
 executables:
@@ -59,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: etchsyscm
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Etch system configuration management client