linux_admin 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465fc671ee7e28055d44d997266062f945be74a1
-  data.tar.gz: 64039a49763ee0a7533e6039ec937f3a2b977806
+  metadata.gz: 6162494c6bbe50d72eb1ba5f6102b51ad3fef53d
+  data.tar.gz: 4a33bb3aa96008c3ca5b21f70456215d368077ed
 SHA512:
-  metadata.gz: c68f328d91cc68479ebf0b15aab6aadb34f579eda41386d5f9d68b6b75c77368aef516e04eafd49f0c5197dae306f87acdd2c5d1054ff209fb7b0e7dc5cdec91
-  data.tar.gz: e84c68b4ccc13211f82e8ae1e664f7e2841145512c7d51bac7bd8fddc344453fc5f91143291c35cd9ecac3574b5a84e9bbc24ce90c8bfce1c2bc769ad1ba8779
+  metadata.gz: b318a87324409d59dd08155db3bff3e4c076fc1ea289f21e8b449c3c670f1a96466d3d4d62003eeec33d8889c6b257080db0ceb64bfba2ed7c62f3a703235246
+  data.tar.gz: ac2029fe7890c370a2c30d2a5b46cfafb94bb5aa55838d9798632c870d20d42d3e2835ac25c3d9d4edef533bc65090447fe112fa983e8707f9348d777bd2e217

data/lib/linux_admin.rb

@@ -1,6 +1,4 @@
 require 'more_core_extensions/all'
-require 'active_support'
-require 'active_support/core_ext'
 
 require 'linux_admin/logging'
 require 'linux_admin/null_logger'

data/lib/linux_admin/disk.rb

@@ -13,23 +13,27 @@ module LinuxAdmin
     def str_to_bytes(val, unit)
       case unit
       when 'K' then
-        val.to_f.kilobytes
+        val.to_f * 1_024 # 1.kilobytes
       when 'M' then
-        val.to_f.megabytes
+        val.to_f * 1_048_576 # 1.megabyte
       when 'G' then
-        val.to_f.gigabytes
+        val.to_f * 1_073_741_824 # 1.gigabytes
       end
     end
-    
+
     def overlapping_ranges?(ranges)
       ranges.find do |range1|
         ranges.any? do |range2|
           range1 != range2 &&
-          range1.overlaps?(range2)
+            ranges_overlap?(range1, range2)
         end
       end
     end
 
+    def ranges_overlap?(range1, range2) # copied from activesupport Range#overlaps?
+      range1.cover?(range2.first) || range2.cover?(range1.first)
+    end
+
     def check_if_partitions_overlap(partitions)
       ranges =
         partitions.collect do |partition|

data/lib/linux_admin/logging.rb

@@ -1,5 +1,7 @@
 module LinuxAdmin
   module Logging
-    delegate :logger, :to => :LinuxAdmin
+    def logger
+      LinuxAdmin.logger
+    end
   end
 end

data/lib/linux_admin/logical_volume.rb

@@ -57,12 +57,12 @@ module LinuxAdmin
     private
 
     def self.bytes_to_string(bytes)
-      if bytes > 1.gigabytes
-        (bytes / 1.gigabytes).to_s + "G"
-      elsif bytes > 1.megabytes
-        (bytes / 1.megabytes).to_s + "M"
-      elsif bytes > 1.kilobytes
-        (bytes / 1.kilobytes).to_s + "K"
+      if bytes > 1_073_741_824 # 1.gigabytes
+        (bytes / 1_073_741_824).to_s + "G"
+      elsif bytes > 1_048_576 # 1.megabytes
+        (bytes / 1_048_576).to_s + "M"
+      elsif bytes > 1_024 # 1.kilobytes
+        (bytes / 1_024).to_s + "K"
       else
         bytes.to_s
       end

data/lib/linux_admin/registration_system/subscription_manager.rb

@@ -34,7 +34,7 @@ module LinuxAdmin
       params.merge!(proxy_params(options))
 
       result = run!(cmd, :params => params)
-      parse_output(result.output).index_by {|i| i[:name]}
+      parse_output(result.output).each_with_object({}) { |i, h| h[i[:name]] = i }
     end
 
     def register(options)
@@ -76,7 +76,7 @@ module LinuxAdmin
     def available_subscriptions
       cmd     = "subscription-manager list --all --available"
       output  = run!(cmd).output
-      parse_output(output).index_by {|i| i[:pool_id]}
+      parse_output(output).each_with_object({}) { |i, h| h[i[:pool_id]] = i }
     end
 
     def enable_repo(repo, options = nil)

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 module LinuxAdmin
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

data/lib/linux_admin/yum.rb

@@ -5,7 +5,7 @@ module LinuxAdmin
   class Yum
     def self.create_repo(path, options = {})
       raise ArgumentError, "path is required" unless path
-      options = options.reverse_merge(:database => true, :unique_file_names => true)
+      options = {:database => true, :unique_file_names => true}.merge(options)
 
       FileUtils.mkdir_p(path)
 
@@ -20,7 +20,7 @@ module LinuxAdmin
     def self.download_packages(path, packages, options = {})
       raise ArgumentError, "path is required"       unless path
       raise ArgumentError, "packages are required"  unless packages
-      options = options.reverse_merge(:mirror_type => :package)
+      options = {:mirror_type => :package}.merge(options)
 
       FileUtils.mkdir_p(path)
 

data/spec/disk_spec.rb

@@ -74,23 +74,23 @@ eos
 
       expect(disk.partitions[0].id).to eq(1)
       expect(disk.partitions[0].disk).to eq(disk)
-      expect(disk.partitions[0].size).to eq(80.5.gigabytes)
-      expect(disk.partitions[0].start_sector).to eq(1259.megabytes)
-      expect(disk.partitions[0].end_sector).to eq(81.8.gigabytes)
+      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(80.5.gigabytes)
-      expect(disk.partitions[1].start_sector).to eq(81.8.gigabytes)
-      expect(disk.partitions[1].end_sector).to eq(162.gigabytes)
+      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(1074.megabytes)
-      expect(disk.partitions[2].start_sector).to eq(162.gigabytes)
-      expect(disk.partitions[2].end_sector).to eq(163.gigabytes)
+      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)')
     end

data/spec/logical_volume_spec.rb

@@ -55,7 +55,7 @@ eos
               :params => {'-n' => 'lv',
                           nil  => 'vg',
                           '-L' => '256G'})
-      described_class.create 'lv', @vg, 256.gigabytes
+      described_class.create 'lv', @vg, 274_877_906_944 # 256.gigabytes
     end
 
     context "size is specified" do
@@ -66,7 +66,7 @@ eos
                 :params => {'-n' => 'lv',
                             nil  => 'vg',
                             '-L' => '256G'})
-        described_class.create 'lv', @vg, 256.gigabytes
+        described_class.create 'lv', @vg, 274_877_906_944 # 256.gigabytes
       end
     end
 
@@ -85,7 +85,7 @@ eos
     it "returns new logical volume" do
       allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
       allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
-      lv = described_class.create 'lv', @vg, 256.gigabytes
+      lv = described_class.create 'lv', @vg, 274_877_906_944 # 256.gigabytes
       expect(lv).to be_an_instance_of(described_class)
       expect(lv.name).to eq('lv')
     end
@@ -94,7 +94,7 @@ eos
       it "sets path under volume group" do
         allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
         allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
-        lv = described_class.create 'lv', @vg, 256.gigabytes
+        lv = described_class.create 'lv', @vg, 274_877_906_944 # 256.gigabytes
         expect(lv.path.to_s).to eq("#{described_class::DEVICE_PATH}#{@vg.name}/lv")
       end
     end
@@ -103,7 +103,7 @@ eos
       it "sets name" do
         allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
         allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
-        lv = described_class.create '/dev/lv', @vg, 256.gigabytes
+        lv = described_class.create '/dev/lv', @vg, 274_877_906_944 # 256.gigabytes
         expect(lv.name).to eq("lv")
       end
     end
@@ -113,7 +113,7 @@ eos
         require 'pathname'
         allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
         allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
-        lv = described_class.create Pathname.new("/dev/#{@vg.name}/lv"), @vg, 256.gigabytes
+        lv = described_class.create Pathname.new("/dev/#{@vg.name}/lv"), @vg, 274_877_906_944 # 256.gigabytes
         expect(lv.name).to eq("lv")
         expect(lv.path).to eq("/dev/vg/lv")
       end
@@ -122,7 +122,7 @@ eos
     it "adds logical volume to local registry" do
       allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
       allow(LinuxAdmin::Common).to receive_messages(:run! => double(:output => ""))
-      lv = described_class.create 'lv', @vg, 256.gigabytes
+      lv = described_class.create 'lv', @vg, 274_877_906_944 # 256.gigabytes
       expect(described_class.scan).to include(lv)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Brandon Dunne
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,19 +89,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: awesome_spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -122,28 +122,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: awesome_spawn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -300,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: LinuxAdmin is a module to simplify management of linux systems.