hotdog 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 798b005f303cead90997e9fbff30a5206d2eb56e
-  data.tar.gz: d4985510ac09a270b1a18a24a1f54e1b61778c7c
+  metadata.gz: 6f6979e71063978d355744d1ee83f2f4abd31e87
+  data.tar.gz: dca259705e279dcc30dd7732df21efec91d89ed5
 SHA512:
-  metadata.gz: 47e9228e056ef41c95b4dd332a1c4dc0856470005b076e9b5abd0e89afdf6d68cea5ddb5e723de84131e506f5110fc074c9760bdd208dd967c0521544328269b
-  data.tar.gz: 1f174e4a5f7ab4b427dc38c618a69866a6915414c6cf6bce0b51548459a5ef2265b695ca1695b74193cbfaa1b36dd049af9811839ae50c1cc72bcb7aec5cf59d
+  metadata.gz: ae9cd27a6872df2ccb09f885ccd57b3a98ab510b276d6f0a014021cee303ef83037893c5bc120288d96017cdeed55e6e9216807464a058673ba5775b196762a6
+  data.tar.gz: fc33569232c83c80ac0c4d48defeaa126adb30961539a2a0ff45ae0cd9fb7d4c9d1dd3954ebbef16eed165c05ac1a0aec951c53d409b2685560c0f59f4347b2d

data/lib/hotdog/commands.rb

@@ -204,24 +204,38 @@ module Hotdog
         if @db
           @db
         else
-          FileUtils.mkdir_p(File.dirname(persistent_db_path))
-          if not options[:force] or options[:offline] or (File.exist?(persistent_db_path) and Time.new < (File.mtime(persistent_db_path) + options[:expiry]))
-            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;")
-              @db = persistent_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"))
+          if options[:force]
+            @db = nil
+          else
+            if options[:offline]
+              @db = __open_db(options)
+            else
+              FileUtils.mkdir_p(File.dirname(persistent_db_path))
+              if File.exist?(persistent_db_path) and Time.new <= (File.mtime(persistent_db_path) + options[:expiry])
+                @db = __open_db(options)
               else
-                persistent_db.close()
+                @db = nil
               end
             end
           end
-          @db
+        end
+      end
+
+      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
+        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
         end
       end
 

data/lib/hotdog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler