hotdog 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f6979e71063978d355744d1ee83f2f4abd31e87
-  data.tar.gz: dca259705e279dcc30dd7732df21efec91d89ed5
+  metadata.gz: 3b865a57629931368bc2cc6aff14de44286c76f0
+  data.tar.gz: b78e6691723f194e974976f62d592b10e01b9b19
 SHA512:
-  metadata.gz: ae9cd27a6872df2ccb09f885ccd57b3a98ab510b276d6f0a014021cee303ef83037893c5bc120288d96017cdeed55e6e9216807464a058673ba5775b196762a6
-  data.tar.gz: fc33569232c83c80ac0c4d48defeaa126adb30961539a2a0ff45ae0cd9fb7d4c9d1dd3954ebbef16eed165c05ac1a0aec951c53d409b2685560c0f59f4347b2d
+  metadata.gz: 46feecc3f4b76165991280530fbaefb49265d06b8cbaf1ef3950bfc262f2c704fe058032e7ea8305dbd94835c1a07dec4c79431ca9257ef78cdd917f87172ce2
+  data.tar.gz: 6a3b4b5cc69f23aae701709a20ef63141ab90a46273dc22b3c721016f19e7dc049a1d2b9559536af4f18ec4cd1da02c12088369882f42c3324162ff1151ed730

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.1.10
   - 2.2.6
   - 2.3.3
+  - 2.4.0
 script:
   - rspec spec
 sudo: false

data/hotdog.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop"
 
   spec.add_dependency "dogapi"
   spec.add_dependency "multi_json"

data/lib/hotdog/commands.rb

@@ -12,7 +12,6 @@ require "uri"
 module Hotdog
   module Commands
     class BaseCommand
-      PERSISTENT_DB = "persistent.db"
       MASK_DATABASE = 0xffff0000
       MASK_QUERY = 0x0000ffff
 
@@ -22,10 +21,12 @@ module Hotdog
         @options = application.options
         @dog = nil # lazy initialization
         @prepared_statements = {}
+        @persistent_db_path = File.join(@options.fetch(:confdir, "."), "persistent.db")
       end
       attr_reader :application
       attr_reader :logger
       attr_reader :options
+      attr_reader :persistent_db_path
 
       def run(args=[], options={})
         raise(NotImplementedError)
@@ -223,19 +224,15 @@ module Hotdog
 
       def __open_db(options={})
         begin
-          persistent_db = SQLite3::Database.new(persistent_db_path)
-          persistent_db.execute("SELECT hosts_tags.host_id FROM hosts_tags INNER JOIN hosts ON hosts_tags.host_id = hosts.id INNER JOIN tags ON hosts_tags.tag_id = tags.id LIMIT 1;")
-          persistent_db
+          db = SQLite3::Database.new(persistent_db_path)
+          db.execute("SELECT hosts_tags.host_id FROM hosts_tags INNER JOIN hosts ON hosts_tags.host_id = hosts.id INNER JOIN tags ON hosts_tags.tag_id = tags.id LIMIT 1;")
+          db
         rescue SQLite3::BusyException
           sleep(rand) # FIXME: configurable retry interval
           retry
         rescue SQLite3::SQLException
-          if options[:offline]
-            raise(RuntimeError.new("no database available on offline mode"))
-          else
-            persistent_db.close()
-            nil
-          end
+          db.close()
+          nil
         end
       end
 
@@ -244,13 +241,17 @@ module Hotdog
         if open_db(options)
           @db
         else
-          memory_db = create_db(SQLite3::Database.new(":memory:"), options)
-          # backup in-memory db to file
-          FileUtils.mkdir_p(File.dirname(persistent_db_path))
-          persistent_db = SQLite3::Database.new(persistent_db_path)
-          copy_db(memory_db, persistent_db)
-          close_db(memory_db)
-          @db = persistent_db
+          if options[:offline]
+            abort("could not update database on offline mode")
+          else
+            memory_db = create_db(SQLite3::Database.new(":memory:"), options)
+            # backup in-memory db to file
+            FileUtils.mkdir_p(File.dirname(persistent_db_path))
+            db = SQLite3::Database.new(persistent_db_path)
+            copy_db(memory_db, db)
+            close_db(memory_db)
+            @db = db
+          end
         end
       end
 
@@ -420,10 +421,6 @@ module Hotdog
         end
         raise("retry count exceeded")
       end
-
-      def persistent_db_path()
-        File.join(options[:confdir], PERSISTENT_DB)
-      end
     end
   end
 end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.20.1"
+  VERSION = "0.21.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dogapi
   requirement: !ruby/object:Gem::Requirement
@@ -159,8 +145,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -237,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Yet another command-line tool for Datadog

data/.rubocop.yml

@@ -1 +0,0 @@
-inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,400 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-01-07 02:10:16 +0000 using RuboCop version 0.35.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 17
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/hosts.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/tags.rb'
-
-# Offense count: 70
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/help.rb'
-    - 'lib/hotdog/commands/hosts.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-    - 'lib/hotdog/commands/tags.rb'
-    - 'lib/hotdog/commands/version.rb'
-    - 'lib/hotdog/formatters.rb'
-    - 'lib/hotdog/formatters/plain.rb'
-
-# Offense count: 28
-Metrics/AbcSize:
-  Max: 151
-
-# Offense count: 8
-Metrics/BlockNesting:
-  Max: 7
-
-# Offense count: 8
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 291
-
-# Offense count: 15
-Metrics/CyclomaticComplexity:
-  Max: 15
-
-# Offense count: 276
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 215
-
-# Offense count: 38
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 87
-
-# Offense count: 18
-Metrics/PerceivedComplexity:
-  Max: 18
-
-# Offense count: 1
-Style/AccessorMethodName:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-
-# Offense count: 52
-# Cop supports --auto-correct.
-Style/AlignArray:
-  Exclude:
-    - 'spec/core/commands_spec.rb'
-    - 'spec/parser/glob_expression_spec.rb'
-    - 'spec/parser/regexp_expression_spec.rb'
-    - 'spec/parser/string_expression_spec.rb'
-
-# Offense count: 43
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-    - 'lib/hotdog/commands/tags.rb'
-    - 'lib/hotdog/commands/up.rb'
-    - 'lib/hotdog/formatters.rb'
-    - 'lib/hotdog/formatters/csv.rb'
-    - 'lib/hotdog/formatters/json.rb'
-    - 'lib/hotdog/formatters/plain.rb'
-    - 'lib/hotdog/formatters/tsv.rb'
-    - 'lib/hotdog/formatters/yaml.rb'
-
-# Offense count: 123
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-Style/BlockDelimiters:
-  Enabled: false
-
-# Offense count: 77
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'spec/parser/glob_expression_spec.rb'
-    - 'spec/parser/parser_spec.rb'
-    - 'spec/parser/regexp_expression_spec.rb'
-    - 'spec/parser/string_expression_spec.rb'
-
-# Offense count: 18
-Style/CaseEquality:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 15
-# Cop supports --auto-correct.
-Style/DefWithParentheses:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/help.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/formatters.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/DeprecatedHashMethods:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-
-# Offense count: 49
-# Configuration parameters: Exclude.
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 13
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyElse:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundAccessModifier:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/help.rb'
-    - 'lib/hotdog/commands/pssh.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-    - 'lib/hotdog/formatters.rb'
-
-# Offense count: 23
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FirstParameterIndentation:
-  Exclude:
-    - 'spec/optparse/down_spec.rb'
-    - 'spec/optparse/hosts_spec.rb'
-    - 'spec/optparse/pssh_spec.rb'
-    - 'spec/optparse/search_spec.rb'
-    - 'spec/optparse/ssh_spec.rb'
-    - 'spec/optparse/tags_spec.rb'
-    - 'spec/optparse/up_spec.rb'
-
-# Offense count: 20
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FormatString:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/down.rb'
-    - 'lib/hotdog/commands/hosts.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-    - 'lib/hotdog/commands/tags.rb'
-    - 'lib/hotdog/commands/up.rb'
-
-# Offense count: 3
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Exclude:
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 2
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/hotdog/commands/ssh.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
-Style/HashSyntax:
-  Enabled: false
-
-# Offense count: 13
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands/down.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-    - 'lib/hotdog/commands/up.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/Lambda:
-  Exclude:
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/LambdaCall:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Exclude:
-    - 'bin/hotdog'
-
-# Offense count: 12
-# Cop supports --auto-correct.
-Style/MethodCallParentheses:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/up.rb'
-
-# Offense count: 7
-Style/MultilineBlockChain:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/NegatedIf:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-Style/Next:
-  Exclude:
-    - 'lib/hotdog/commands/ssh.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/Not:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/NumericLiterals:
-  MinDigits: 6
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'hotdog.gemspec'
-
-# Offense count: 13
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantBegin:
-  Exclude:
-    - 'lib/hotdog/commands.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-Style/RegexpLiteral:
-  Exclude:
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 17
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/down.rb'
-    - 'lib/hotdog/commands/search.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-    - 'lib/hotdog/commands/up.rb'
-    - 'lib/hotdog/formatters.rb'
-
-# Offense count: 158
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
-Style/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: MultiSpaceAllowedForOperators.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'lib/hotdog/commands/down.rb'
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpaceInsideBrackets:
-  Exclude:
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 374
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: false
-
-# Offense count: 25
-# Cop supports --auto-correct.
-Style/SpaceInsideParens:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'lib/hotdog/commands/help.rb'
-    - 'lib/hotdog/commands/ssh.rb'
-    - 'lib/hotdog/commands/version.rb'
-
-# Offense count: 1554
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
-# Offense count: 15
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiteralsInInterpolation:
-  Enabled: false
-
-# Offense count: 16
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-Style/SymbolProc:
-  Exclude:
-    - 'lib/hotdog/application.rb'
-    - 'lib/hotdog/commands.rb'
-    - 'lib/hotdog/commands/search.rb'
-
-# Offense count: 71
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/TrailingWhitespace:
-  Exclude:
-    - 'spec/formatter/plain_spec.rb'
-    - 'spec/formatter/text_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Exclude:
-    - 'hotdog.gemspec'
-
-# Offense count: 66
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-Style/WordArray:
-  MinSize: 4