automateit 0.71101 → 0.71101.1

data/CHANGES.txt

@@ -1,3 +1,8 @@
+0.71101.1:
+    Date: Thu, 01 Nov 2007 18:52:01 -0700
+    Desc:
+    - (%) Fixed bug in Interpreter, which only set optional run-time tags specified on the command-line AFTER it loaded the fields/tags files. Thanks for the report, David Brewer.
+
 0.71101:
     Date: Thu, 01 Nov 2007 17:07:51 -0700
     Desc:

data/lib/automateit/interpreter.rb

@@ -176,6 +176,8 @@ module AutomateIt
       # Instantiate core plugins so they're available to the project
       _instantiate_plugins
 
+      tags.merge(opts[:tags]) if opts[:tags]
+
       if project_path = opts[:project] || ENV["AUTOMATEIT_PROJECT"] || ENV["AIP"]
         # Only load a project if we find its env file
         env_file = File.join(project_path, "config", "automateit_env.rb")
@@ -212,8 +214,6 @@ module AutomateIt
           raise ArgumentError.new("Couldn't find project at: #{project_path}")
         end
       end
-
-      tags.merge(opts[:tags]) if opts[:tags]
     end
 
     # Hash of plugin tokens to plugin instances for this Interpreter.

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

data/lib/automateit/tag_manager/struct.rb

@@ -14,12 +14,11 @@ class AutomateIt::TagManager::Struct < AutomateIt::TagManager::BaseDriver
   def setup(opts={})
     super(opts)
 
+    @struct ||= {}
+    @tags   ||= Set.new
+
     if opts[:struct]
-      @struct = AutomateIt::TagManager::TagParser.expand(opts[:struct])
-      @tags   = Set.new
-    else
-      @struct ||= {}
-      @tags   ||= Set.new
+      @struct.merge!(AutomateIt::TagManager::TagParser.expand(opts[:struct]))
     end
   end
 

data/spec/integration/cli_spec.rb

@@ -140,6 +140,24 @@ describe AutomateIt::CLI, " with a project" do# {{{
     end
   end
 
+  it "should add run-time tags to a project" do
+    with_project do
+      recipe = "recipes/recipe.rb"
+      tags_yml = "config/tags.yml"
+
+      write_to(tags_yml, <<-HERE)
+        all_servers:
+          - localhost
+      HERE
+
+      write_to(recipe, <<-HERE)
+        tagged?("tsukai")
+      HERE
+
+      AutomateIt::CLI.run(:recipe => recipe, :tags => %w(tsukai)).should be_true
+    end
+  end
+
   it "should load fields in a project" do
     with_project do
       recipe = "recipes/recipe.rb"

data/spec/unit/tag_manager_spec.rb

@@ -174,8 +174,8 @@ end
 describe "AutomateIt::TagManager::YAML" do
   it_should_behave_like "AutomateIt::TagManager"
 
-  before(:all) do
-    @m[:yaml].should_receive(:_read).with("demo.yml").and_return(<<-EOB)
+  def setup_yaml_tags
+    @m[:yaml].should_receive(:_read).any_number_of_times.with("demo.yml").and_return(<<-EOB)
       <%="apache_servers"%>:
         - kurou
         - shirou
@@ -196,4 +196,19 @@ describe "AutomateIt::TagManager::YAML" do
       :file => "demo.yml"
     )
   end
+
+  before(:all) do
+    setup_yaml_tags
+  end
+
+  it "should not clear tags if re-loaded" do
+    setup_yaml_tags
+    tag = "al-azif"
+
+    @a.tags << tag
+    @a.should be_tagged(tag)
+
+    setup_yaml_tags
+    @a.should be_tagged(tag)
+  end
 end

data/spec/unit/tag_manager_spec.rb.orig

@@ -0,0 +1,215 @@
+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

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.71101"
+  version: 0.71101.1
 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,6 +168,7 @@ 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
@@ -199,6 +200,7 @@ 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