automateit 0.71101.1 → 0.71101.2

data/CHANGES.txt

@@ -1,3 +1,12 @@
+0.71101.2:
+    Date: Thu, 01 Nov 2007 22:37:44 -0700
+    Desc:
+    - (%) Fixed bug in TagParser, it couldn't parse hostnames with non-letter characters. Added tests. Thanks for the report, David Brewer.
+    - (%) Fixed bug in TagManager, adding a run-time tag caused it to not parse tags.yml. Added tests.
+    - (+) Improved TagManager, it now makes run-time tags available to the interpreter when parsing tags.yml, which provides greater flexibility in defining tags. Added tests. Thanks for the suggestion, David Brewer.
+
+Thanks for the report, David Brewer.
+
 0.71101.1:
     Date: Thu, 01 Nov 2007 18:52:01 -0700
     Desc:

data/examples/basic/config/tags.yml

@@ -2,12 +2,6 @@ rails_servers:
   - localhost
   - kagami
   - tsukasa
-  - michiru
-  - rheya
-  - satori
 myapp_servers:
   - localhost
   - kagami
-  - michiru
-  - rheya
-  - satori

data/lib/automateit/interpreter.rb

@@ -176,6 +176,7 @@ module AutomateIt
       # Instantiate core plugins so they're available to the project
       _instantiate_plugins
 
+      # Add optional run-time tags
       tags.merge(opts[:tags]) if opts[:tags]
 
       if project_path = opts[:project] || ENV["AUTOMATEIT_PROJECT"] || ENV["AIP"]
@@ -190,7 +191,7 @@ module AutomateIt
             log.debug(PNOTE+"Loading project library: #{lib}")
             invoke(lib)
           end
-
+          
           tag_file = File.join(@project, "config", "tags.yml")
           if File.exists?(tag_file)
             log.debug(PNOTE+"Loading project tags: #{tag_file}")

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.71101.1")
+  VERSION=Gem::Version.new("0.71101.2")
 
   # Instantiates a new Interpreter. See documentation for
   # Interpreter#setup.

data/lib/automateit/tag_manager/struct.rb

@@ -13,33 +13,49 @@ class AutomateIt::TagManager::Struct < AutomateIt::TagManager::BaseDriver
   # * :struct -- Hash to use for queries.
   def setup(opts={})
     super(opts)
-
     @struct ||= {}
     @tags   ||= Set.new
+    @struct_updated = false
+    @our_hostname_tags ||= Set.new
+    @our_platform_tags ||= Set.new
 
     if opts[:struct]
+      @struct_updated = true
       @struct.merge!(AutomateIt::TagManager::TagParser.expand(opts[:struct]))
     end
   end
 
   # Return tags, populate them if necessary.
   def tags
-    if @tags.empty?
+    if @our_hostname_tags.empty?
+      @struct_updated = true
+
       begin
-        hostnames = interpreter.address_manager.hostnames # SLOW 0.4s
-        @tags.merge(hostnames)
-        @tags.merge(tags_for(hostnames))
-        @tags.merge(interpreter.address_manager.addresses)
+        @our_hostname_tags.merge(interpreter.address_manager.hostnames) # SLOW 0.4s
+        @our_hostname_tags.merge(interpreter.address_manager.addresses)
       rescue NotImplementedError => e
         log.debug("Can't find AddressManager for this platform: #{e}")
       end
 
+      @tags.merge(@our_hostname_tags)
+    end
+
+    if @our_platform_tags.empty?
+      @struct_updated = true
+
       begin
-        @tags.merge(interpreter.platform_manager.tags)
+        @our_platform_tags = interpreter.platform_manager.tags
+        @tags.merge(@our_platform_tags)
       rescue NotImplementedError => e
         log.debug("Can't find PlatformManager for this platform: #{e}")
       end
     end
+
+    if @struct_updated
+      @tags.merge(tags_for(@our_hostname_tags))
+      @struct_updated = false
+    end
+
     @tags
   end
 

data/lib/automateit/tag_manager/tag_parser.rb

@@ -3,7 +3,7 @@
 # Helper class for parsing tags. Not useful for users -- for internal use only.
 class AutomateIt::TagManager::TagParser
   attr_accessor :struct
-  attr_accessor :is_trace
+  attr_accessor :is_trace # FIXME replace is_trace with nitpick
 
   # Create a parser for the +struct+, a hash of tag keys to values with arrays of items.
   def initialize(struct, is_trace=false)
@@ -38,6 +38,11 @@ class AutomateIt::TagManager::TagParser
     puts msg if is_trace
   end
 
+  HOSTS_FOR_VALUE = /(.+?)/
+  HOSTS_FOR_INCLUDE_TAG_RE = /^INCLUDE_TAG #{HOSTS_FOR_VALUE}$/
+  HOSTS_FOR_EXCLUDE_TAG_RE = /^EXCLUDE_TAG #{HOSTS_FOR_VALUE}$/
+  HOSTS_FOR_EXCLUDE_HOST_RE = /^EXCLUDE_HOST #{HOSTS_FOR_VALUE}$/
+
   # Return array of hosts for the +tag+.
   def hosts_for(tag)
     raise IndexError.new("Unknown tag - #{tag}") unless struct[tag]
@@ -45,13 +50,13 @@ class AutomateIt::TagManager::TagParser
     hosts = Set.new
     for item in struct[tag]
       case item
-      when /^INCLUDE_TAG (\w+)$/
+      when HOSTS_FOR_INCLUDE_TAG_RE
         trace "+g %s" % $1
         hosts.merge(hosts_for($1))
-      when /^EXCLUDE_TAG (\w+)$/
+      when HOSTS_FOR_EXCLUDE_TAG_RE
         trace "-g %s" % $1
         hosts.subtract(hosts_for($1))
-      when /^EXCLUDE_HOST (\w+)$/
+      when HOSTS_FOR_EXCLUDE_HOST_RE
         trace "-h %s" % $1
         hosts.delete($1)
       else

data/spec/integration/cli_spec.rb

@@ -141,6 +141,18 @@ describe AutomateIt::CLI, " with a project" do# {{{
   end
 
   it "should add run-time tags to a project" do
+    with_project do
+      recipe = "recipes/recipe.rb"
+
+      write_to(recipe, <<-HERE)
+        tagged?("added")
+      HERE
+
+      AutomateIt::CLI.run(:recipe => recipe, :tags => %w(added)).should be_true
+    end
+  end
+
+  it "should add run-time tags to a project without masking existing tags" do
     with_project do
       recipe = "recipes/recipe.rb"
       tags_yml = "config/tags.yml"
@@ -151,10 +163,10 @@ describe AutomateIt::CLI, " with a project" do# {{{
       HERE
 
       write_to(recipe, <<-HERE)
-        tagged?("tsukai")
+        tagged?("added && all_servers")
       HERE
 
-      AutomateIt::CLI.run(:recipe => recipe, :tags => %w(tsukai)).should be_true
+      AutomateIt::CLI.run(:recipe => recipe, :tags => %w(added)).should be_true
     end
   end
 

data/spec/unit/tag_manager_spec.rb

@@ -138,6 +138,14 @@ describe "AutomateIt::TagManager", :shared => true do
   it "should exclude groups from groups" do
     @a.hosts_tagged_with("all_servers_except_proxy_servers").sort.should == ["kurou", "shirou"].sort
   end
+
+  it "should match tags with dashes" do
+    @a.tagged?("apache-servers-using-dashes").should be_true
+  end
+
+  it "should include groups with dashes" do
+    @a.tagged?("apache-servers-using-dashes-include").should be_true
+  end
 end
 
 describe "AutomateIt::TagManager::Struct" do
@@ -166,6 +174,12 @@ describe "AutomateIt::TagManager::Struct" do
           "@all_servers",
           "!@proxy_servers",
         ],
+        "apache-servers-using-dashes" => [
+          "@apache_servers",
+        ],
+        "apache-servers-using-dashes-include" => [
+          "@apache-servers-using-dashes",
+        ]
       }
     )
   end
@@ -190,6 +204,10 @@ describe "AutomateIt::TagManager::YAML" do
       all_servers_except_proxy_servers:
         - @all_servers
         - !@proxy_servers
+      apache-servers-using-dashes:
+        - @apache_servers
+      apache-servers-using-dashes-include:
+        - @apache-servers-using-dashes
     EOB
     @m.setup(
       :default => :yaml,

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: 0.71101.1
+  version: 0.71101.2
 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: 
@@ -168,7 +168,6 @@ files:
 - spec/unit/interpreter_spec.rb
 - spec/unit/platform_manager_spec.rb
 - spec/unit/edit_manager_spec.rb
-- spec/unit/tag_manager_spec.rb.orig
 - spec/integration/service_manager_sysv_spec.rb
 - spec/integration/template_manager_erb_spec.rb
 - spec/integration/package_manager_spec.rb
@@ -200,7 +199,6 @@ test_files:
 - spec/unit/interpreter_spec.rb
 - spec/unit/platform_manager_spec.rb
 - spec/unit/edit_manager_spec.rb
-- spec/unit/tag_manager_spec.rb.orig
 - spec/integration/service_manager_sysv_spec.rb
 - spec/integration/template_manager_erb_spec.rb
 - spec/integration/package_manager_spec.rb

data/spec/unit/tag_manager_spec.rb.orig

@@ -1,215 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "/../spec_helper.rb")
-
-describe "AutomateIt::TagManager", :shared => true do
-  before(:all) do
-    @a = AutomateIt.new
-    @a.platform_manager.setup(
-      :default => :struct,
-      :struct => {
-        :os => "mizrahi",
-        :arch => "realian",
-        :distro => "momo",
-        :version => "s100",
-      }
-    )
-    @a.address_manager.should_receive(:hostnames).any_number_of_times.and_return(["kurou", "kurou.foo"])
-
-    @m = @a.tag_manager
-  end
-
-  it "should have tags" do
-    @a.tags.should be_a_kind_of(Enumerable)
-  end
-
-  it "should have tags that include tag for hostname" do
-    @a.tags.should include("kurou")
-  end
-
-  it "should have tag for short hostname" do
-    @a.tagged?("kurou").should be_true
-  end
-
-  it "should have tag for long hostname" do
-    @a.tagged?("kurou.foo").should be_true
-  end
-
-  it "should have tag for OS" do
-    @a.tagged?("mizrahi").should be_true
-  end
-
-  it "should have tag for OS/arch" do
-    @a.tagged?("mizrahi_realian").should be_true
-  end
-
-  it "should have tag for distro/release" do
-    @a.tagged?("momo_s100").should be_true
-  end
-
-  it "should have tag for a role" do
-    @a.tagged?("apache_servers").should be_true
-  end
-
-  it "should match a symbol query" do
-    @a.tagged?(:apache_servers).should be_true
-  end
-
-  it "should match a string query" do
-    @a.tagged?("apache_servers").should be_true
-  end
-
-  it "should not match unknown symbol keys" do
-    @a.tagged?(:foo).should be_false
-  end
-
-  it "should not match unknown string keys" do
-    @a.tagged?("foo").should be_false
-  end
-
-  it "should match an AND query" do
-    @a.tagged?("kurou && apache_servers").should be_true
-  end
-
-  it "should match an OR query" do
-    @a.tagged?("kurou || apache_servers").should be_true
-  end
-
-  it "should match a grouped AND and OR query" do
-    @a.tagged?("(kurou || apache_servers) && momo_s100").should be_true
-  end
-
-  it "should not match AND with unknown keys" do
-    @a.tagged?("kurou && foo").should be_false
-  end
-
-  it "should not match OR with unknown keys" do
-    @a.tagged?("foo && bar").should be_false
-  end
-
-  it "should query tags for a specific host" do
-    @a.tagged?("proxy_servers", "kurou").should be_false
-    @a.tagged?("proxy_servers", "akane.foo").should be_true
-    @a.tagged?("proxy_servers", "akane").should be_true
-  end
-
-  it "should append tags" do
-    @a.tagged?("magic").should be_false
-    @a.tags << "magic"
-    @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" do
-    @a.tags_for("akane.foo.bar").should include("proxy_servers")
-  end
-
-  it "should find tags for an array of hosts" do
-    @a.tags_for(["kurou"]).should include("apache_servers")
-  end
-
-  it "should find hosts with a tag" do
-    hosts = @a.hosts_tagged_with("apache_servers")
-    hosts.should include("kurou")
-    hosts.should include("shirou")
-    hosts.should_not include("akane")
-  end
-
-  it "should find matching negative queries" do
-    @a.tagged?("akane").should be_false
-    @a.tagged?("!akane").should be_true
-    @a.tagged?("!akane && !proxy_servers").should be_true
-  end
-
-  it "should include group aliases" do
-    @a.hosts_tagged_with("all_servers").sort.should == ["kurou", "shirou", "akane.foo"].sort
-  end
-
-  it "should exclude hosts from groups" do
-    @a.hosts_tagged_with("apache_servers_except_kurou").should == ["shirou"]
-  end
-
-  it "should exclude groups from groups" do
-    @a.hosts_tagged_with("all_servers_except_proxy_servers").sort.should == ["kurou", "shirou"].sort
-  end
-end
-
-describe "AutomateIt::TagManager::Struct" do
-  it_should_behave_like "AutomateIt::TagManager"
-
-  before(:all) do
-    @m.setup(
-      :default => :struct,
-      :struct => {
-        "apache_servers" => [
-          "kurou",
-          "shirou",
-        ],
-        "proxy_servers" => [
-          "akane.foo",
-        ],
-        "all_servers" => [
-          "@apache_servers",
-          "@proxy_servers",
-        ],
-        "apache_servers_except_kurou" => [
-          "@apache_servers",
-          "!kurou",
-        ],
-        "all_servers_except_proxy_servers" => [
-          "@all_servers",
-          "!@proxy_servers",
-        ],
-      }
-    )
-  end
-end
-
-describe "AutomateIt::TagManager::YAML" do
-  it_should_behave_like "AutomateIt::TagManager"
-
-  def setup_yaml_tags
-    @m[:yaml].should_receive(:_read).any_number_of_times.with("demo.yml").and_return(<<-EOB)
-      <%="apache_servers"%>:
-        - kurou
-        - shirou
-      proxy_servers:
-        - akane.foo
-      all_servers:
-        - @apache_servers
-        - @proxy_servers
-      apache_servers_except_kurou:
-        - @apache_servers
-        - !kurou
-      all_servers_except_proxy_servers:
-        - @all_servers
-        - !@proxy_servers
-    EOB
-    @m.setup(
-      :default => :yaml,
-      :file => "demo.yml"
-    )
-  end
-
-  before(:all) do
-    setup_yaml_tags
-  end
-
-  it "should not clear tags if re-loaded" do
-    setup_yaml_tags
-    tag = "ivemell"
-
-    @a.tags << tag
-    @a.should be_tagged(tag)
-
-    setup_yaml_tags
-    @a.should be_tagged(tag)
-  end
-end