automateit 0.71031.2 → 0.71101

data/CHANGES.txt

@@ -1,3 +1,9 @@
+0.71101:
+    Date: Thu, 01 Nov 2007 17:07:51 -0700
+    Desc:
+    - (%) Fixed bug in TagManager#tagged? when checking tag names containing dashes ("-"), refactored to improve tag tokenizing rules, added test. Thank you, David Brewer.
+    - Fixed bug in TemplateManager#render when rendering templates to strings, added tests. Thank you for the report, David Brewer.
+
 0.71031.2:
     Date: Wed, 31 Oct 2007 23:48:41 -0700
     Desc:

data/Rakefile

@@ -15,7 +15,6 @@ def automateit
 end
 
 # Run a hoe +task+.
-#
 def hoe(task)
   # XXX Hoe provides many tasks I don't need, don't like the implementation of,
   # or don't like their names. I'd use Rake's 'import' and 'invoke' but the Hoe
@@ -180,6 +179,7 @@ end
 task :publish do
   automateit
   hoe("release VERSION=#{AutomateIt::VERSION}")
+  Rake::Task[:after].invoke
 end
 
 #---[ Install and uninstall ]-------------------------------------------

data/TODO.txt

@@ -5,6 +5,7 @@ KEY: Important? Urgent? Easy? 1=yes, 0=no
 BUGS
 - does service_manager.start_and_enable work as expected?
 
+111 PackageManager -- Improve PEAR spec by having it check files with and without channel URL
 111 aissh or aion -- Write command for running stuff against servers with ssh, e.g., "aissh rails_servers ls", which is basically a wrapper over "for t in aitag -w rails_servers; do echo $t; ssh $t "ls"; done"
 111 Shell -- Write #su(user, *command) as a wrapper around #sh
 101 Shell -- Expand glob patterns, e.g. chown_R(500, 500, "*")

data/lib/automateit/root.rb

@@ -1,7 +1,7 @@
 # See AutomateIt::Interpreter for usage information.
 module AutomateIt # :nodoc:
   # AutomateIt version
-  VERSION=Gem::Version.new("0.71031.2")
+  VERSION=Gem::Version.new("0.71101")
 
   # Instantiates a new Interpreter. See documentation for
   # Interpreter#setup.

data/lib/automateit/tag_manager/struct.rb

@@ -50,15 +50,19 @@ class AutomateIt::TagManager::Struct < AutomateIt::TagManager::BaseDriver
     return hosts.select{|hostname| tagged?(query, hostname)}
   end
 
+  TAG_NEGATION = %r{!?}
+  TAG_WORD = %r{[\w\.\-]+}
+  TAG_TOKENIZER = %r{\!|\(|\)|\&{1,2}|\|{1,2}|#{TAG_NEGATION}#{TAG_WORD}}
+
   # See TagManager#tagged?
   def tagged?(query, hostname=nil)
     query = query.to_s
     selected_tags = hostname ? tags_for(hostname) : tags
-    # XXX This tokenization process discards unknown characters, which may hide errors in the query
-    tokens = query.scan(%r{\!|\(|\)|\&+|\|+|!?[\.\w]+})
+    # XXX Tokenizer discards unknown characters, which may hide errors in the query
+    tokens = query.scan(TAG_TOKENIZER)
     if tokens.size > 1
       booleans = tokens.map do |token|
-        if matches = token.match(/^(!?)([\.\w]+)$/)
+        if matches = token.match(/^(#{TAG_NEGATION})(#{TAG_WORD})$/)
           selected_tags.include?(matches[2]) && matches[1].empty?
         else
           token

data/lib/automateit/template_manager/base.rb

@@ -18,7 +18,7 @@ class AutomateIt::TemplateManager::BaseDriver < AutomateIt::Plugin::Driver
 
   #.......................................................................
 
-  protected
+protected
 
   # Return Array of +dependencies+ newer than +filename+. Will be empty if
   # +filename+ is newer than all of the +dependencies+.
@@ -92,12 +92,11 @@ class AutomateIt::TemplateManager::BaseDriver < AutomateIt::Plugin::Driver
 
     raise ArgumentError.new("No source specified with :file or :text") if not source_filename and not source_text
     raise Errno::ENOENT.new(source_filename) if writing? and source_filename and not _exists?(source_filename)
-    raise ArgumentError.new("No target specified with :to") if not target_filename
 
     begin
       # source_filename, target_filename, opts={}
       opts[:check] ||= @default_check
-      target_exists = _exists?(target_filename)
+      target_exists = target_filename && _exists?(target_filename)
       updates = []
 
       unless opts[:force]
@@ -167,8 +166,8 @@ class AutomateIt::TemplateManager::BaseDriver < AutomateIt::Plugin::Driver
       end
 
       _backup(target_filename) if target_exists and opts[:backup]
-      result = _write(target_filename, output)
-      return result
+
+      return(target_filename ? _write(target_filename, output) : output)
     ensure
       if opts[:mode] or opts[:user] or opts[:group]
         interpreter.chperm(target_filename, :mode => opts[:mode], :user => opts[:user], :group => opts[:group])

data/spec/unit/tag_manager_spec.rb

@@ -96,6 +96,16 @@ describe "AutomateIt::TagManager", :shared => true do
     @a.tagged?("magic").should be_true
   end
 
+  it "should find tags with dashes in the name" do
+    tag_with_dash = "pawafuru-mirakuru"
+    tag_without_dash = "wandafuru"
+
+    @a.tags << tag_with_dash << tag_without_dash
+
+    @a.tagged?(tag_with_dash).should be_true
+    @a.tagged?(tag_without_dash).should be_true
+  end
+
   it "should find tags for a host using an array" do
     @a.tags_for(["kurou"]).should include("apache_servers")
   end

data/spec/unit/template_manager_erb_spec.rb

@@ -6,6 +6,7 @@ describe "AutomateIt::TemplateManager::ERB" do
     @m = @a.template_manager
     @d = @m[:erb]
 
+    @content = "my template content"
     @source = "source_for_template"
     @target = "target_for_template"
   end
@@ -17,14 +18,25 @@ describe "AutomateIt::TemplateManager::ERB" do
     end
   end
 
-  it "should render a string template" do
+  it "should render a string template to a string" do
+    @a.render(:text => @content).should == @content
+  end
+
+  it "should render a file template to a string" do
+    @d.should_receive(:_exists?).once.with(@source).and_return(true)
+    @d.should_receive(:_read).once.with(@source).and_return(@content)
+
+    @a.render(:file => @source).should == @content
+  end
+
+  it "should render a string template to a file" do
     @d.should_receive(:_exists?).once.with(@target).and_return(false)
     @d.should_receive(:_write).once.with(@target, "my template content").and_return(true)
 
     @a.render(:text => "my template content", :to => @target).should be_true
   end
 
-  it "should render a file template" do
+  it "should render a file template to a file" do
     @d.should_receive(:_exists?).once.with(@source).and_return(true)
     @d.should_receive(:_exists?).once.with(@target).and_return(false)
     @d.should_receive(:_read).once.with(@source).and_return("my template content")

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: 0.71031.2
+  version: "0.71101"
 date: 2007-11-01 00:00:00 -07:00
 summary: AutomateIt is an open source tool for automating the setup and maintenance of servers, applications and their dependencies.
 require_paths: 

metadata.gz.sig

@@ -1,3 +1,2 @@
-W+�<f������V?/��j�6���:e��S>Š�@�v�|�d���q�@h����u>?�{�[n��ڭ��9G~r�|�4e�
-]$�mS0����f8�H0�!�p�T�/�c��ۢ���m2����{A�����n;
�	��nd�?�
r�l4���L~Wk�|+��$I޺�
-��L%�b����ŋ�z��C���fw�RՎ��q�=ó����l��R-l��1Л9mR5vX�ې��_���"�{.
+���q��Nk���������W%{��`������$����$���,F�(~i��:�\i�r��˯�6Vo�g]4�Q&�
+��|1�"	�.y�Р�U��l��Y��v�e@QFMr����?�eG!���n������_�����s�Ô�*Ƶ�zf`>V�.H���������{Ɲ�:ULї.�GԔq�A��~/�t��
%���vb������w#Sd�N�)��!5��ZG�R:�d