hotdog 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767a3a461352d6a061a8a7541c63485b8aa93a82
-  data.tar.gz: d10b581aefae9b078c25560de2eac8f7102cdb36
+  metadata.gz: cd9ee4784a5a2ae1305938dad9acffbda27344f5
+  data.tar.gz: ab2ae3bdce389ba30f9bb20f11b9ab5952edc19a
 SHA512:
-  metadata.gz: d448f39a939e75d2063e435b6b883d5fc9b77b13070a7d7478505201cfad1e8f36fcce91b5088323fff2a7ba6bcfb1bcc44ae164804b1e6149983bd3c8f983e0
-  data.tar.gz: 130e2134cb73948d096006ac9b2443be9a0f3ceafae62c4fd6c004337e5ee697bd2327cd45ba53d4eceaacd8938e21067cb2bd5166b8117ac5d96dc867a55f29
+  metadata.gz: 21a810b1448b94c8678e02bccf635a3716b796b2846d317cd493b092f707bc2111a1787dee5c7f6db4df8ad9d56cde2a9d95926cf177f771fec37e61bb4b2c91
+  data.tar.gz: b1bfbba8629422bb3ede7dee2c5b2f65c0ea1029723ab92d60b4a997656af6bc13a7bf6436600a7c72436d25d4b1ebc2eb59d0ba33052645cc1a770ca5f02781

data/lib/hotdog/commands/search.rb

@@ -48,15 +48,10 @@ module Hotdog
         result0 = evaluate(node, self)
         if 0 < result0.length
           result, fields = get_hosts_with_search_tags(result0, node)
-          if options[:limit]
-            STDOUT.print(format(result.take(options[:limit]), fields: fields))
-            logger.info("found %d host(s), limited to %d in result." % [result.length, options[:limit]])
-          else
-            STDOUT.print(format(result, fields: fields))
-            logger.info("found %d host(s)." % result.length)
-          end
+          STDOUT.print(format(result, fields: fields))
+          logger.info("found %d host(s)." % result.length)
         else
-          STDERR.puts("no match found: #{expression}")
+          logger.error("no match found: #{expression}")
           exit(1)
         end
       end
@@ -121,10 +116,13 @@ module Hotdog
 
       private
       def rewrite_expression(expression)
-        if expression.empty?
+        if expression.strip.empty?
           # return everything if given expression is empty
           expression = "*"
         end
+        if options[:limit]
+          expression = "LIMIT((#{expression}), #{options[:limit]})"
+        end
         expression
       end
     end

data/lib/hotdog/commands/ssh.rb

@@ -108,7 +108,7 @@ module Hotdog
 
       def validate_hosts!(tuples, fields)
         if tuples.length < 1
-          STDERR.puts("no match found")
+          logger.error("no match found")
           exit(1)
         end
       end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.28.0"
+  VERSION = "0.29.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler