rutty 2.3.1 → 2.3.2

data/VERSION

@@ -1 +1 @@
-2.3.1
+2.3.2

data/bin/rutty

@@ -69,13 +69,6 @@ command :list_nodes do |c|
   # TODO: Make tag searching AND or OR, not just OR
   c.syntax = "rutty list_nodes [options]"
   c.summary = "List nodes according to [options]."
-  c.description = "#{c.summary} Options are the same as add_node"
-  
-  c.example "List all nodes", "rutty list_nodes"
-  c.example "List all nodes that are tagged with 'web' OR 'db'", "rutty list_nodes --tags web,db"
-  c.example "List all nodes configued to SSH into port 2222", "rutty list_nodes --port 2222"
-  
-  add_filter_options.call(c)
   
   c.when_called do |args, options|
     $r.list_nodes args, options

data/lib/rutty/nodes.rb

@@ -94,10 +94,10 @@ module Rutty
 
       filter = nil
 
-      if query_str =~ /^\w$/
+      if query_str =~ /^[A-Za-z_-]+$/
         # Single tag query, no need to fire up the parser
-        filter = Procs::SingleTagQuery.new { |n| n.has_tag? "#{$1}" }
-      elsif query_str =~ /^(?:\w,?)+$/
+        filter = Procs::SingleTagQuery.new { |n| !n.has_tag? query_str }
+      elsif query_str =~ /^(?:[A-Za-z_-]+,?)+$/
         # Old-style comma-separated tag query. Still no
         # need to fire up the parser, just additively compare.
         tags = query_str.split(',')

data/lib/rutty/version.rb

@@ -9,7 +9,7 @@ module Rutty
   module Version
     MAJOR = 2
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/rutty.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutty}
-  s.version = "2.3.1"
+  s.version = "2.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Lindsey"]

data/test/helper.rb

@@ -44,3 +44,12 @@ class Test::Unit::TestCase
     end
   end
 end
+
+class Class
+  def publicize_methods
+    saved_private_instance_methods = self.private_instance_methods
+    self.class_eval { public *saved_private_instance_methods }
+    yield
+    self.class_eval { private *saved_private_instance_methods }
+  end
+end

data/test/test_nodes.rb

@@ -45,6 +45,7 @@ class TestNodes < Test::Unit::TestCase
                                :user => 'example',
                                :keypath => '/home/example/.ssh/id_rsa.pem',
                                :tags => %w(broken test example)
+      
       @nodes = Rutty::Nodes.new [@node1, @node2, @node3]
     end
     
@@ -54,6 +55,35 @@ class TestNodes < Test::Unit::TestCase
       assert_contains @nodes, @node1, @node2
     end
     
+    should "return the correct Proc type for each query string type" do
+      Rutty::Nodes.publicize_methods do
+        assert_instance_of Rutty::Procs::SingleTagQuery, @nodes.get_tag_query_filter('foo')
+        assert_instance_of Rutty::Procs::MultipleTagQuery, @nodes.get_tag_query_filter('foo,bar')
+        assert_instance_of Rutty::Procs::SqlLikeTagQuery, @nodes.get_tag_query_filter("'foo' AND 'bar' OR 'baz'")
+      end
+    end
+    
+    should "generate the correct Proc string to eval" do
+      Rutty::Nodes.publicize_methods do
+         # New sql-like tag query. Need the parser for this.
+          require 'treetop'
+          require 'rutty/treetop/syntax_nodes'
+          require 'rutty/treetop/tag_query'
+
+          parser = TagQueryGrammarParser.new
+
+          proc_str = @nodes.recursive_build_query_proc_string parser.parse("'foo' AND 'bar' OR 'baz'").elements
+          proc_str = proc_str.rstrip << ') }'
+          
+          assert_equal "Procs::SqlLikeTagQuery.new { |n| !(n.has_tag?('foo') && n.has_tag?('bar') || n.has_tag?('baz')) }", proc_str
+          
+          proc_str = @nodes.recursive_build_query_proc_string parser.parse("'test' OR ('example' AND 'foo')").elements
+          proc_str = proc_str.rstrip << ') }'
+          
+          assert_equal "Procs::SqlLikeTagQuery.new { |n| !(n.has_tag?('test') || (n.has_tag?('example') && n.has_tag?('foo'))) }", proc_str
+      end
+    end
+    
     should "filter out nodes matching provided criteria" do
       assert_equal [@node1, @node2], @nodes.filter(OpenStruct.new :port => 22)
       assert_equal [@node2], @nodes.filter(OpenStruct.new :user => 'google')
@@ -68,6 +98,10 @@ class TestNodes < Test::Unit::TestCase
       filtered = @nodes.filter(OpenStruct.new :tags => 'fake')
       assert_equal 2, filtered.length
       assert_equal [@node1, @node2], filtered
+      
+      filtered = @nodes.filter(OpenStruct.new :tags => 'google')
+      assert_equal 1, filtered.length
+      assert_equal [@node2], filtered
     end
     
     should "correctly filter on a comma-separated list of tags and return the correct node(s)" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutty
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Josh Lindsey