hotdog 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a33c6f318f239ae040083b0b5fa2c2650dba0ea
-  data.tar.gz: a8812e2ddd826bbb5e40b980e5c3a38620b95402
+  metadata.gz: 9389d9529203f20a278c0446d57c1ae72e57cb99
+  data.tar.gz: 807eab226a18b286a38a7968bfb98ed27525b657
 SHA512:
-  metadata.gz: bd017bf022fe2b3f8e6d6a129e361f02aa33c1cfaf3ff20a9fb2c0b322ccd3230f5834142b530eff6f6b7c9637e63165e13959a1e7c5365eb26152ace6e7944d
-  data.tar.gz: af6f72f01971977d1c727e741ce5bb67926e1732029bea3193976831014e8cddbce4db829568a44d419dc63a58221e9a2e7e4e6e609453a1df515e932ea96fe6
+  metadata.gz: ef097ee620a3e70d38195b5f4f6ea32f4d7f439962f68495e7d6997e2e667f963d3ef6bff1395ab524cf5ac0f3a60b812a783a542f5bd74082e207971b96a821
+  data.tar.gz: e97de69542e3559ea62b19d1a35fb3d3c2ec30102719596050e15b66ab6e7cff06f05a202670a3a9ce054eac576938f8ebbc698fde046009c4d4036327e652d0

data/lib/hotdog/commands/down.rb

@@ -6,9 +6,9 @@ module Hotdog
   module Commands
     class Down < BaseCommand
       def define_options(optparse, options={})
-        options[:downtime] = 86400
-        options[:start] = Time.new
-        options[:retry] = 5
+        default_option(options, :downtime, 86400)
+        default_option(options, :start, Time.new)
+        default_option(options, :retry, 5)
         optparse.on("--downtime DURATION") do |v|
           options[:downtime] = v.to_i
         end

data/lib/hotdog/commands/pssh.rb

@@ -10,8 +10,8 @@ module Hotdog
   module Commands
     class Pssh < SshAlike
       def define_options(optparse, options={})
+        default_option(options, :show_identifier, true)
         super
-        options[:show_identifier] = true
         optparse.on("--[no-]identifier", "Each output line will be prepended with identifier.") do |identifier|
           options[:show_identifier] = identifier
         end

data/lib/hotdog/commands/search.rb

@@ -3,6 +3,19 @@
 require "json"
 require "parslet"
 
+# Monkey patch to prevent `NoMethodError` after some parse error in parselet
+module Parslet
+  class Cause
+    def cause
+      self
+    end
+
+    def backtrace
+      []
+    end
+  end
+end
+
 module Hotdog
   module Commands
     class Search < BaseCommand
@@ -114,7 +127,8 @@ module Hotdog
           )
         }
         rule(:expression1) {
-          ( unary_op.as(:unary_op) >> spacing.maybe >> expression.as(:expression) \
+          ( unary_op.as(:unary_op) >> spacing >> expression.as(:expression) \
+          | unary_op.as(:unary_op) >> spacing.maybe >> str('(') >> spacing.maybe >> expression.as(:expression) >> spacing.maybe >> str(')') \
           | expression2 \
           )
         }
@@ -182,10 +196,14 @@ module Hotdog
         }
         rule(:identifier_glob) {
           ( binary_op.absent? >> unary_op.absent? >> identifier.repeat(0) >> (glob >> identifier.maybe).repeat(1) \
+          | binary_op >> identifier.repeat(1) >> (glob >> identifier.maybe).repeat(1) \
+          | unary_op >> identifier.repeat(1) >> (glob >> identifier.maybe).repeat(1) \
           )
         }
         rule(:identifier) {
           ( binary_op.absent? >> unary_op.absent? >> match('[A-Za-z]') >> match('[-./0-9A-Z_a-z]').repeat(0) \
+          | binary_op >> match('[-./0-9A-Z_a-z]').repeat(1) \
+          | unary_op >> match('[-./0-9A-Z_a-z]').repeat(1) \
           )
         }
         rule(:separator) {
@@ -199,10 +217,14 @@ module Hotdog
         }
         rule(:attribute_glob) {
           ( binary_op.absent? >> unary_op.absent? >> attribute.repeat(0) >> (glob >> attribute.maybe).repeat(1) \
+          | binary_op >> attribute.repeat(1) >> (glob >> attribute.maybe).repeat(1) \
+          | unary_op >> attribute.repeat(1) >> (glob >> attribute.maybe).repeat(1) \
           )
         }
         rule(:attribute) {
           ( binary_op.absent? >> unary_op.absent? >> match('[-./0-9:A-Z_a-z]').repeat(1) \
+          | binary_op >> match('[-./0-9:A-Z_a-z]').repeat(1) \
+          | unary_op >> match('[-./0-9:A-Z_a-z]').repeat(1) \
           )
         }
         rule(:glob) {

data/lib/hotdog/commands/ssh.rb

@@ -9,14 +9,13 @@ module Hotdog
   module Commands
     class SshAlike < Search
       def define_options(optparse, options={})
-        options[:options] = []
-        options[:user] = nil
-        options[:port] = nil
-        options[:identity_file] = nil
-        options[:forward_agent] = false
-        options[:color] = :auto
-        options[:max_parallelism] = nil
-
+        default_option(options, :options, [])
+        default_option(options, :user, nil)
+        default_option(options, :port, nil)
+        default_option(options, :identity_file, nil)
+        default_option(options, :forward_agent, false)
+        default_option(options, :color, :auto)
+        default_option(options, :max_parallelism, Parallel.processor_count)
         optparse.on("-o SSH_OPTION", "Passes this string to ssh command through shell. This option may be given multiple times") do |option|
           options[:options] += [option]
         end

data/lib/hotdog/commands/up.rb

@@ -6,7 +6,7 @@ module Hotdog
   module Commands
     class Up < BaseCommand
       def define_options(optparse, options={})
-        options[:retry] = 5
+        default_option(options, :retry, 5)
         optparse.on("--retry NUM") do |v|
           options[:retry] = v.to_i
         end

data/lib/hotdog/commands.rb

@@ -59,6 +59,14 @@ module Hotdog
       end
 
       private
+      def default_option(options, key, default_value)
+        if options.key?(key)
+          options[key]
+        else
+          options[key] = default_value
+        end
+      end
+
       def prepare(db, query)
         k = (db.hash & MASK_DATABASE) | (query.hash & MASK_QUERY)
         @prepared_statements[k] ||= db.prepare(query)
@@ -132,7 +140,7 @@ module Hotdog
               }
             ]
           end
-          q1 = "SELECT tags.name, GROUP_CONCAT(tags.value, ',') FROM hosts_tags " \
+          q1 = "SELECT LOWER(tags.name), GROUP_CONCAT(tags.value, ',') FROM hosts_tags " \
                  "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
                    "WHERE hosts_tags.host_id = ? AND tags.name IN (%s) " \
                      "GROUP BY tags.name;"
@@ -146,7 +154,7 @@ module Hotdog
               if tag_name == "host"
                 host_names.fetch(host_id, nil)
               else
-                tag_value = tag_values.fetch(tag_name, nil)
+                tag_value = tag_values.fetch(tag_name.downcase, nil)
                 if tag_value
                   if tag_value.empty?
                     tag_name # use `tag_name` as `tag_value` for the tags without any values

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/spec/core/commands_spec.rb

@@ -81,7 +81,7 @@ describe "commands" do
 
   it "get host fields without host" do
     q1 = [
-      "SELECT tags.name, GROUP_CONCAT(tags.value, ',') FROM hosts_tags",
+      "SELECT LOWER(tags.name), GROUP_CONCAT(tags.value, ',') FROM hosts_tags",
         "INNER JOIN tags ON hosts_tags.tag_id = tags.id",
           "WHERE hosts_tags.host_id = ? AND tags.name IN (?, ?, ?)",
             "GROUP BY tags.name;",
@@ -103,7 +103,7 @@ describe "commands" do
       [[1, "host1"], [2, "host2"], [3, "host3"]]
     }
     q1 = [
-      "SELECT tags.name, GROUP_CONCAT(tags.value, ',') FROM hosts_tags",
+      "SELECT LOWER(tags.name), GROUP_CONCAT(tags.value, ',') FROM hosts_tags",
         "INNER JOIN tags ON hosts_tags.tag_id = tags.id",
           "WHERE hosts_tags.host_id = ? AND tags.name IN (?, ?)",
             "GROUP BY tags.name;",

data/spec/parser/parser_spec.rb

@@ -94,6 +94,42 @@ describe "parser" do
     expect(cmd.parse("( ( foo ) )")).to eq({identifier: "foo"})
   end
 
+  it "parses 'identifier with prefix and'" do
+    expect(cmd.parse("android")).to eq({identifier: "android"})
+  end
+
+  it "parses 'identifier with infix and'" do
+    expect(cmd.parse("islander")).to eq({identifier: "islander"})
+  end
+
+  it "parses 'identifier with suffix and'" do
+    expect(cmd.parse("mainland")).to eq({identifier: "mainland"})
+  end
+
+  it "parses 'identifier with prefix or'" do
+    expect(cmd.parse("oreo")).to eq({identifier: "oreo"})
+  end
+
+  it "parses 'identifier with infix or'" do
+    expect(cmd.parse("category")).to eq({identifier: "category"})
+  end
+
+  it "parses 'identifier with suffix or'" do
+    expect(cmd.parse("imperator")).to eq({identifier: "imperator"})
+  end
+
+  it "parses 'identifier with prefix not'" do
+    expect(cmd.parse("nothing")).to eq({identifier: "nothing"})
+  end
+
+  it "parses 'identifier with infix not'" do
+    expect(cmd.parse("annotation")).to eq({identifier: "annotation"})
+  end
+
+  it "parses 'identifier with suffix not'" do
+    expect(cmd.parse("forgetmenot")).to eq({identifier: "forgetmenot"})
+  end
+
   it "parses 'foo bar'" do
     expect(cmd.parse("foo bar")).to eq({left: {identifier: "foo"}, binary_op: nil, right: {identifier: "bar"}})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler