moose-inventory 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97767bc15af5cacaf663c0d481bdf3bb3ce44945
-  data.tar.gz: b78aee8bd6198832650adf9f6d396f0f8e104ec2
+  metadata.gz: aa64e991a9487d623df71257a5c1aaf59edda5b1
+  data.tar.gz: 94b5ae699178d9fdba732e31878899bb988fa15b
 SHA512:
-  metadata.gz: f72e5c69616c5453b9a03282754ba78292e4c92e3f6e9293b9ab3bb62f99a6cc616bad2ed3701e568565e881eef47321d7dac15bfded5085210b677152f78366
-  data.tar.gz: f8c1100975131c6646659b642efad9e579eef5984cf5c6bd4b886d609e08b6f78c0d21dba0340e81f8b0f41229bfcb3bb3554cdf077da194baa4943f22838c51
+  metadata.gz: 7d59d86537df3366dba60baff13c0656915bd42d6d17fd2bfe42080363c8aeef6dfba1e36deca4cdbf92fc59160b9f5d4a8afbb9d63f4ac17cd9ada2b2dc6bc3
+  data.tar.gz: 22d2c8eb12465e4c51f7aad80669b2173f6e86501739be2310339b4c0633e9d3b4ad90145faa37525b96c02303ecfe3f011af54afc135562b63208818b9ba85d

data/.gitignore

@@ -17,3 +17,4 @@ mkmf.log
 /coverage/
 *.gem
 /gems/
+moose-inventory.spec

data/config/dotfiles/gitignore

@@ -17,3 +17,4 @@ mkmf.log
 /coverage/
 *.gem
 /gems/
+moose-inventory.spec

data/lib/moose_inventory/db/db.rb

@@ -73,30 +73,31 @@ module Moose
             yield
           end
 
-          rescue Sequel::DatabaseError => e
-          # We want to rescue Sqlite3::BusyException.  But, sequel catches that
-          # and re-raises it as Sequel::DatabaseError, with a message referencing
-          # the original exception class  
-           
-          # We look into e, to see whether it is a BusyException.  If not, 
-          # we re-raise immediately.  
-          raise unless e.message.include?("BusyException")  
-
-          # Looks like a BusyException, so we retrying, with a random stand-off.           
-          tries += 1
-          case tries
-          when 1..10
-            if Moose::Inventory::Config._confopts[:trace] == true
-              STDERR.puts e.message
-            end
-            warn('The database appears to be locked by another process. '\
-                 " This was try #{tries} of 10. "\
-                 ' Retrying after a pause of random duration.')
-            sleep rand()
-            retry
-          else
-            raise 
+        rescue Sequel::DatabaseError => e
+        # We want to rescue Sqlite3::BusyException.  But, sequel catches that
+        # and re-raises it as Sequel::DatabaseError, with a message referencing
+        # the original exception class  
+         
+        # We look into e, to see whether it is a BusyException.  If not, 
+        # we re-raise immediately.  
+        raise unless e.message.include?("BusyException")  
+
+        # Looks like a BusyException, so we retry, after a random delay.           
+        tries += 1
+        case tries
+        when 1..10
+          if Moose::Inventory::Config._confopts[:trace] == true
+            STDERR.puts e.message
           end
+          sleep rand()
+          retry
+        else
+          warn('The database appears to be locked by another process, and '\
+               " did not become free after #{tries} tries. Giving up. ")
+
+          # TODO: Some useful advice to the user, as to what to do about this error. 
+          raise  
+        end
             
         rescue @exceptions[:moose] => e
           warn 'An error occurred during a transaction, any changes have been rolled back.'

data/lib/moose_inventory/version.rb

@@ -2,6 +2,6 @@ module Moose
   ##
   # The Moose-Tools dynamic inventory management library
   module Inventory
-    VERSION = '1.0.5'
+    VERSION = '1.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moose-inventory
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Russell Davies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indentation