hotdog 1.20190725.0 → 1.20191028.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0699880ef57158626ee7638e7cc6266a878006b482254017d13788ce08cf310e'
-  data.tar.gz: a4ac76092f199b6f375c5331ebee107b61f76659a03d101d40c8647989599223
+  metadata.gz: cc7f01237e5e718c19c91da270e2797c93f9a856a7523b606f191308db2e5dd6
+  data.tar.gz: f090618091d02d4a9b5b584b7abf7f0fbc2d3f2b6db022904cf4abd4af95c4c1
 SHA512:
-  metadata.gz: 71d16dc1aabe0256baa77e107392b97a8e54a10f95859ef50067c7feb3c6004b24bc21cc4b33b87f54718123422d6fcf4c8d413f3b203e794adf566736a64491
-  data.tar.gz: 47d88afa02e2558b7de9b16446a18c0d64d80870fe1bb3f8daa20c5914d485c0dcc13352b2e0512e002d1e58fe0c62bfe783e776f0408c1c663b4e05df49ecd9
+  metadata.gz: 8defb7bfc76397da0ec2f1fb508f8f55d2fec772a0ca58d66aff8b7abf15fdedde2851c0ac545a7a910ebb98eab36aec273ce187b366090b772103c671590865
+  data.tar.gz: b65b3a4e73f35768605ff26f9af42b17a095f8343a351261c0fce7df017a76bbad862c4ed7e829c43985d02fd762e3551219275161a5ae0cfce50df6a477e7a8

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 script:
   - rspec spec
 sudo: false

data/lib/hotdog/application.rb

@@ -49,7 +49,7 @@ module Hotdog
         confdir: find_confdir(File.expand_path(".")),
         debug: false,
         expiry: 3600,
-        fixed_string: false,
+        use_fallback: false,
         force: false,
         format: "text",
         headers: false,
@@ -80,16 +80,21 @@ module Hotdog
     attr_reader :source_provider
 
     def main(argv=[])
-      config = File.join(options[:confdir], "config.yml")
-      if File.file?(config)
-        begin
-          loaded = YAML.load(ERB.new(File.read(config)).result)
-        rescue => error
-          STDERR.puts("hotdog: failed to load configuration file at #{config.inspect}: #{error}")
-          exit(1)
-        end
-        if Hash === loaded
-          @options = @options.merge(Hash[loaded.map { |key, value| [Symbol === key ? key : key.to_s.to_sym, value] }])
+      [
+        File.join(options[:confdir], "config.yaml"),
+        File.join(options[:confdir], "config.yml"),
+      ].each do |config|
+        if File.file?(config)
+          begin
+            loaded = YAML.load(ERB.new(File.read(config)).result)
+          rescue => error
+            STDERR.puts("hotdog: failed to load configuration file at #{config.inspect}: #{error}")
+            exit(1)
+          end
+          if Hash === loaded
+            @options = @options.merge(Hash[loaded.map { |key, value| [Symbol === key ? key : key.to_s.to_sym, value] }])
+          end
+          break
         end
       end
       args = @optparse.order(argv)
@@ -217,8 +222,11 @@ module Hotdog
       @optparse.on("-d", "--[no-]debug", "Enable debug mode") do |v|
         options[:debug] = v
       end
-      @optparse.on("--fixed-string", "Interpret pattern as fixed string") do |v|
-        options[:fixed_string] = v
+      @optparse.on("--[no-]fixed-string", "Never fallback to alternative expression in case of result is empty. Inversed meaning as '--use-fallback'") do |v|
+        options[:use_fallback] = !v
+      end
+      @optparse.on("--[no-]use-fallback", "Fallback to alternative expressions in case of result is empty. Inversed meaning as '--fixed-string'") do |v|
+        options[:use_fallback] = v
       end
       @optparse.on("-f", "--[no-]force", "Enable force mode") do |v|
         options[:force] = v

data/lib/hotdog/commands.rb

@@ -28,8 +28,13 @@ module Hotdog
         execute_db(@db, q, args)
       end
 
+      def fallback?()
+        @options[:use_fallback]
+      end
+
       def fixed_string?()
-        @options[:fixed_string]
+        # deprecated - superseded by `fallback?`
+        not @options[:use_fallback]
       end
 
       def reload(options={})

data/lib/hotdog/expression/semantics.rb

@@ -694,7 +694,7 @@ module Hotdog
             if options[:did_fallback]
               []
             else
-              if not environment.fixed_string? and @options[:fallback]
+              if environment.use_fallback? and @options[:fallback]
                 # avoid optimizing @options[:fallback] to prevent infinite recursion
                 @options[:fallback].evaluate(environment, options.merge(did_fallback: true))
               else

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "1.20190725.0"
+  VERSION = "1.20191028.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 1.20190725.0
+  version: 1.20191028.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler