linux_admin 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a7e59d030d792e7f4855c26079a6603b4283e6327438316e2b8acf77659cf36a
-  data.tar.gz: 333842257625f0836cc5dd8f34f2512d4714f239d61e88aebee6642543a9e1fb
+SHA1:
+  metadata.gz: 7a836fda94b3dbbc618dcab138690adde8e2803a
+  data.tar.gz: b3e87b291a6dba82b58a0b924c44fb41dbebadb1
 SHA512:
-  metadata.gz: 4e131edeb3e983f65beebf33818e98956da47aaad6346cb3a6f8c72b936ddc6e82e97e20edf712f407b08f5053b45ff0c61fe959e316e9afdd99fe6823288c3b
-  data.tar.gz: 986bd3e4510e9a9b3cba5fb013a79af6d37e71c895fee414e1568e78c39767c946133a70dfc59bace475f7084a9ffd4c23f7bede8fb5156677628d4f06b8522f
+  metadata.gz: 78b8cd87fcbc328aa5c5910ab26b201bb48cd2f19029bc7da944c50bccc4d1a21324507e4c762fe76221604fe303a0f6f5fab1cac18b513780619aa2bcbd1a51
+  data.tar.gz: 5c2f30b0e6ac5fc86bb116ad68dfe3e5b25b446742ad16e23cb0866f4f68582d1297b6027c4945c91e4dffeb69f7a9e962b78f7c2d3b4127a91bc780dda7d055

data/lib/linux_admin/disk.rb

@@ -6,7 +6,7 @@ module LinuxAdmin
       [:id, :start_sector, :end_sector,
        :size, :partition_type, :fs_type]
 
-    attr_accessor :path
+    attr_accessor :path, :model
 
     def self.local
       result = Common.run!(Common.cmd("lsblk"), :params => {:d => nil, :n => nil, :p => nil, :o => "NAME"})
@@ -16,7 +16,8 @@ module LinuxAdmin
     end
 
     def initialize(args = {})
-      @path = args[:path]
+      @path  = args[:path]
+      @model = "unknown"
     end
 
     def size
@@ -101,11 +102,20 @@ module LinuxAdmin
       self
     end
 
+    def partition_path(id)
+      case model
+      when "nvme"
+        "#{path}p#{id}"
+      else
+        "#{path}#{id}"
+      end
+    end
+
     private
 
     def str_to_bytes(val, unit)
       case unit
-      when 'K' then
+      when 'K', 'k' then
         val.to_f * 1_024 # 1.kilobytes
       when 'M' then
         val.to_f * 1_048_576 # 1.megabyte
@@ -152,11 +162,17 @@ module LinuxAdmin
       out.each_line do |l|
         if l =~ /^ [0-9].*/
           split << l.split
+        elsif l =~ /^Model:.*/
+          parse_model(l)
         end
       end
       split
     end
 
+    def parse_model(parted_line)
+      matches = parted_line.match(/^Model:.*\((?<model>\w+)\)$/)
+      @model = matches[:model] if matches
+    end
 
     def partition_from_parted(output_disk)
       args = {:disk => self}
@@ -164,7 +180,7 @@ module LinuxAdmin
         val = output_disk[i]
         case PARTED_FIELDS[i]
         when :start_sector, :end_sector, :size
-          if val =~ /([0-9\.]*)([KMG])B/
+          if val =~ /([0-9\.]*)([kKMG])B/
             val = str_to_bytes($1, $2)
           end
 

data/lib/linux_admin/partition.rb

@@ -22,7 +22,7 @@ module LinuxAdmin
     end
 
     def path
-      "#{disk.path}#{id}"
+      disk.partition_path(id)
     end
 
     def mount(mount_point=nil)

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.3".freeze
 end

data/spec/disk_spec.rb

@@ -58,43 +58,104 @@ eos
       expect(disk.partitions).to eq([])
     end
 
-    it "sets partitons" do
-      partitions = <<eos
-Model: ATA TOSHIBA MK5061GS (scsi)
-Disk /dev/sda: 500GB
-Sector size (logical/physical): 512B/512B
-Partition Table: msdos
-Disk Flags:
-
-Number  Start   End     Size    Type      File system     Flags
- 1      1259MB  81.8GB  80.5GB  primary   ntfs
- 2      81.8GB  162GB   80.5GB  primary   ext4
- 3      162GB   163GB   1074MB  logical   linux-swap(v1)
-eos
-      disk = LinuxAdmin::Disk.new
-      expect(LinuxAdmin::Common).to receive(:run).and_return(double(:output => partitions))
-
-      expect(disk.partitions[0].id).to eq(1)
-      expect(disk.partitions[0].disk).to eq(disk)
-      expect(disk.partitions[0].size).to eq(86_436_216_832.0) # 80.5.gigabytes
-      expect(disk.partitions[0].start_sector).to eq(1_320_157_184) # 1259.megabytes
-      expect(disk.partitions[0].end_sector).to eq(87_832_081_203.2) # 81.8.gigabytes
-      expect(disk.partitions[0].partition_type).to eq('primary')
-      expect(disk.partitions[0].fs_type).to eq('ntfs')
-      expect(disk.partitions[1].id).to eq(2)
-      expect(disk.partitions[1].disk).to eq(disk)
-      expect(disk.partitions[1].size).to eq(86_436_216_832.0) # 80.5.gigabytes
-      expect(disk.partitions[1].start_sector).to eq(87_832_081_203.2) # 81.8.gigabytes
-      expect(disk.partitions[1].end_sector).to eq(173_946_175_488) # 162.gigabytes
-      expect(disk.partitions[1].partition_type).to eq('primary')
-      expect(disk.partitions[1].fs_type).to eq('ext4')
-      expect(disk.partitions[2].id).to eq(3)
-      expect(disk.partitions[2].disk).to eq(disk)
-      expect(disk.partitions[2].size).to eq(1_126_170_624) # 1074.megabytes
-      expect(disk.partitions[2].start_sector).to eq(173_946_175_488) # 162.gigabytes
-      expect(disk.partitions[2].end_sector).to eq(175_019_917_312) # 163.gigabytes
-      expect(disk.partitions[2].partition_type).to eq('logical')
-      expect(disk.partitions[2].fs_type).to eq('linux-swap(v1)')
+    context "with nvme parted output" do
+      let(:parted_output) do
+        <<~PARTED
+          Model: NVMe Device (nvme)
+          Disk /dev/nvme0n1: 512GB
+          Sector size (logical/physical): 512B/512B
+          Partition Table: msdos
+          Disk Flags:
+
+          Number  Start   End     Size    Type     File system  Flags
+           1      1049kB  1075MB  1074MB  primary  ext4         boot
+           2      1075MB  17.7GB  16.6GB  primary
+           3      17.7GB  512GB   494GB   primary
+
+        PARTED
+      end
+
+      it "sets partitons" do
+        expect(LinuxAdmin::Common).to receive(:run).and_return(double(:output => parted_output))
+        disk = LinuxAdmin::Disk.new(:path => "/dev/nvme0n1")
+        partitions = disk.partitions
+
+        expect(disk.model).to eq("nvme")
+
+        expect(partitions[0].id).to eq(1)
+        expect(partitions[0].disk).to eq(disk)
+        expect(partitions[0].size).to eq(1_126_170_624.0)
+        expect(partitions[0].start_sector).to eq(1_074_176.0)
+        expect(partitions[0].end_sector).to eq(1_127_219_200.0)
+        expect(partitions[0].partition_type).to eq('primary')
+        expect(partitions[0].fs_type).to eq('ext4')
+        expect(partitions[0].path).to eq('/dev/nvme0n1p1')
+        expect(partitions[1].id).to eq(2)
+        expect(partitions[1].disk).to eq(disk)
+        expect(partitions[1].size).to eq(17_824_114_278.4)
+        expect(partitions[1].start_sector).to eq(1_127_219_200.0)
+        expect(partitions[1].end_sector).to eq(19_005_230_284.8)
+        expect(partitions[1].partition_type).to eq('primary')
+        expect(partitions[1].path).to eq('/dev/nvme0n1p2')
+        expect(partitions[2].id).to eq(3)
+        expect(partitions[2].disk).to eq(disk)
+        expect(partitions[2].size).to eq(530_428_461_056.0)
+        expect(partitions[2].start_sector).to eq(19_005_230_284.8)
+        expect(partitions[2].end_sector).to eq(549_755_813_888.0)
+        expect(partitions[2].partition_type).to eq('primary')
+        expect(partitions[2].path).to eq('/dev/nvme0n1p3')
+      end
+    end
+
+    context "with scsi parted output" do
+      let(:parted_output) do
+        <<~PARTED
+          Model: ATA TOSHIBA MK5061GS (scsi)
+          Disk /dev/sda: 500GB
+          Sector size (logical/physical): 512B/512B
+          Partition Table: msdos
+          Disk Flags:
+
+          Number  Start   End     Size    Type      File system     Flags
+           1      1259kB  81.8GB  80.5GB  primary   ntfs
+           2      81.8GB  162GB   80.5GB  primary   ext4
+           3      162GB   163GB   1074MB  logical   linux-swap(v1)
+
+        PARTED
+      end
+
+      it "sets partitons" do
+        expect(LinuxAdmin::Common).to receive(:run).and_return(double(:output => parted_output))
+        disk = LinuxAdmin::Disk.new(:path => "/dev/sda")
+        partitions = disk.partitions
+
+        expect(disk.model).to eq("scsi")
+
+        expect(partitions[0].id).to eq(1)
+        expect(partitions[0].disk).to eq(disk)
+        expect(partitions[0].size).to eq(86_436_216_832.0)
+        expect(partitions[0].start_sector).to eq(1_289_216.0)
+        expect(partitions[0].end_sector).to eq(87_832_081_203.2)
+        expect(partitions[0].partition_type).to eq('primary')
+        expect(partitions[0].fs_type).to eq('ntfs')
+        expect(partitions[0].path).to eq('/dev/sda1')
+        expect(partitions[1].id).to eq(2)
+        expect(partitions[1].disk).to eq(disk)
+        expect(partitions[1].size).to eq(86_436_216_832.0)
+        expect(partitions[1].start_sector).to eq(87_832_081_203.2)
+        expect(partitions[1].end_sector).to eq(173_946_175_488)
+        expect(partitions[1].partition_type).to eq('primary')
+        expect(partitions[1].fs_type).to eq('ext4')
+        expect(partitions[1].path).to eq('/dev/sda2')
+        expect(partitions[2].id).to eq(3)
+        expect(partitions[2].disk).to eq(disk)
+        expect(partitions[2].size).to eq(1_126_170_624)
+        expect(partitions[2].start_sector).to eq(173_946_175_488)
+        expect(partitions[2].end_sector).to eq(175_019_917_312)
+        expect(partitions[2].partition_type).to eq('logical')
+        expect(partitions[2].fs_type).to eq('linux-swap(v1)')
+        expect(partitions[2].path).to eq('/dev/sda3')
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Brandon Dunne
@@ -24,22 +24,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +130,38 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
-    - - "~>"
+        version: 1.8.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.10.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
-    - - "~>"
+        version: 1.8.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.10.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: openscap
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.