fstab 0.1 → 0.1.1

data/README.md

@@ -20,10 +20,10 @@ Adding a new entry to fstab:
     # Asuming /dev/sda1 has a valid FS
     # The library will use the FS UUID automatically by default even if the block device path
     # was used as an argument. This is usually safer.
-    fstab.add_device '/dev/sda1', '/mnt', 'ext4', 'discard,errors=remount-ro', 0, 1
+    fstab.add_fs '/dev/sda1', '/mnt', 'ext4', 'discard,errors=remount-ro', 0, 1
 
     # You can use filesystem UUID also
-    fstab.add_device '15baeabd-b419-4a69-a306-bc550dc8355f', '/mnt', 'ext4', 'discard,errors=remount-ro', 0, 1
+    fstab.add_fs '15baeabd-b419-4a69-a306-bc550dc8355f', '/mnt', 'ext4', 'discard,errors=remount-ro', 0, 1
 
     # List fstab entries
     fstab.entries.each do |key, val|

data/lib/fstab.rb

@@ -1,6 +1,6 @@
 class Fstab
 
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 
   # if safe_mode true, non existing devices won't be added to fstab.
   # Adding a non existing device to fstab will raise an exception.
@@ -77,6 +77,7 @@ class Fstab
       f.puts @contents
       f.puts format_entry(dev, opts)
     end
+    reload
   end
 
   def add_fs(dev, mpoint, type, opts, dump = 0, pass = 0)
@@ -94,8 +95,11 @@ class Fstab
     @lcount
   end
 
-  def parse(reload = true)
-    @contents = File.read @file if reload
+  def reload
+    @contents = File.read @file
+  end
+
+  def parse
     raise Exception.new("/sbin/blkid not found") unless File.exist?('/sbin/blkid')
     fslist = {}
     ucount = 0
@@ -122,7 +126,7 @@ class Fstab
         # by UUID
         uuid = fs.split("=").last.strip.chomp
         pdev = "/dev/" + File.readlink("/dev/disk/by-uuid/#{uuid}").split("/").last rescue "unknown_#{ucount}"
-        label = Fstab.get_label pdev
+        label = Fstab.get_label pdev rescue nil
       elsif l =~ /^\s*\/dev/
         # by dev path
         pdev = fs
@@ -185,6 +189,7 @@ class Fstab
         f.puts format_entry(k, v)
       end
     end
+    reload
     true
   end
 
@@ -222,7 +227,7 @@ class Fstab
   # All the attributes except dev may be nil at any given time since
   # device may not have a valid filesystem or label.
   def self.get_blkdev_fs_attrs(dev)
-    raise ArgumentError.new("Invalid device path") unless File.blockdev?(dev)
+    raise ArgumentError.new("Invalid device path #{dev}") unless File.blockdev?(dev)
     blkid = `/sbin/blkid #{dev}`
     attrs = {}
     attrs[:uuid] = blkid.match(/UUID="(.*?)"/)[1] rescue nil

data/spec/fstab_helper_spec.rb

@@ -105,6 +105,7 @@ describe Fstab do
         devs.first.last[:invalid].should == true
         f.puts 'weird_entry foo bar'
         f.flush
+        fstab.reload
         devs = fstab.parse
         devs.count.should == 2
         devs.each do |k,v|
@@ -112,6 +113,15 @@ describe Fstab do
         end
       end
     end
+    
+    it "should parse valid UUID entries" do
+      pdev, uuid, label, type = get_first_blkid
+      File.open @fake_fstab, 'w+' do |f|
+        f.puts  "UUID=74bc785f-1024-4779-80a1-7a1e0619ad26 /srv/node/74bc785f-1024-4779-80a1-7a1e0619ad26 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0"
+      end
+      fstab = Fstab.new @fake_fstab
+      fstab.parse.count.should == 1
+    end
   end
 
   describe "#add_fs" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fstab
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 866801040596206319
+      hash: -1231055836827073287
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: