linux_admin 0.3.0 → 0.4.0

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in linux_admin.gemspec
 gemspec
+
+gem "more_core_extensions", "=1.1.0", :git => "git://github.com/ManageIQ/more_core_extensions.git", :tag => "v1.1.0"

data/lib/linux_admin.rb

@@ -12,6 +12,7 @@ require 'linux_admin/yum'
 
 require 'linux_admin/service'
 require 'linux_admin/disk'
+require 'linux_admin/hosts'
 require 'linux_admin/partition'
 require 'linux_admin/distro'
 require 'linux_admin/system'

data/lib/linux_admin/hosts.rb

@@ -0,0 +1,73 @@
+class LinuxAdmin
+  class Hosts < LinuxAdmin
+    attr_accessor :filename
+    attr_accessor :raw_lines
+    attr_accessor :parsed_file
+
+    def initialize(filename = "/etc/hosts")
+      @filename = filename
+      self.reload
+    end
+
+    def reload
+      @raw_lines = File.read(@filename).split("\n")
+      parse_file
+    end
+
+    def save
+      cleanup_empty
+      @raw_lines = assemble_lines
+      File.write(@filename, @raw_lines.join("\n"))
+    end
+
+    def update_entry(address, hostname, comment = nil)
+      # Delete entries for this hostname first
+      @parsed_file.each {|i| i[:hosts].to_a.delete(hostname)}
+
+      # Add entry
+      line_number = @parsed_file.find_path(address).first
+
+      if line_number.blank?
+        @parsed_file.push({:address => address, :hosts => [hostname], :comment => comment})
+      else
+        new_hosts = @parsed_file.fetch_path(line_number, :hosts).to_a.push(hostname)
+        @parsed_file.store_path(line_number, :hosts, new_hosts)
+        @parsed_file.store_path(line_number, :comment, comment) if comment
+      end
+    end
+
+  private
+    def parse_file
+      @parsed_file = []
+      @raw_lines.each { |line| @parsed_file.push(parse_line(line.strip)) }
+      @parsed_file.delete_blank_paths
+    end
+
+    def parse_line(line)
+      data, comment   = line.split("#", 2)
+      address, hosts  = data.to_s.split(" ", 2)
+      hostnames       = hosts.to_s.split(" ")
+
+      { :address => address.to_s, :hosts => hostnames, :comment => comment.to_s.strip, :blank => line.blank?}
+    end
+
+    def cleanup_empty
+      @parsed_file.each do |h|
+        h.delete(:hosts) if h[:address].blank?
+        h.delete(:address) if h[:hosts].blank?
+      end
+
+      @parsed_file.delete_blank_paths
+    end
+
+    def assemble_lines
+      @parsed_file.each_with_object([]) { |l, a| a.push(l[:blank] ? "" : build_line(l[:address], l[:hosts], l[:comment])) }
+    end
+
+    def build_line(address, hosts, comment)
+      line = [address.to_s.ljust(16), hosts.to_a.uniq]
+      line.push("##{comment}") if comment
+      line.flatten.join(" ").strip
+    end
+  end
+end

data/lib/linux_admin/registration_system/subscription_manager.rb

@@ -86,7 +86,7 @@ class LinuxAdmin
         group = group.split("\n").each_with_object({}) do |line, hash|
           next if line.blank?
           key, value = line.split(":", 2)
-          hash[key.strip.downcase.tr(" -", "_").to_sym] = value.strip
+          hash[key.strip.downcase.tr(" -", "_").to_sym] = value.strip unless value.blank?
         end
         group_array.push(format_values(group))
       end

data/lib/linux_admin/version.rb

@@ -1,3 +1,3 @@
 class LinuxAdmin
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/linux_admin/yum.rb

@@ -89,4 +89,6 @@ class LinuxAdmin
       end
     end
   end
-end
+end
+
+Dir.glob(File.join(File.dirname(__FILE__), "yum", "*.rb")).each { |f| require f }

data/lib/linux_admin/yum/repo_file.rb

@@ -0,0 +1,12 @@
+require 'inifile'
+
+class LinuxAdmin
+  class Yum
+    class RepoFile < IniFile
+      def self.create(filename)
+        File.write(filename, "")
+        self.new(:filename => filename)
+      end
+    end
+  end
+end

data/linux_admin.gemspec

@@ -33,6 +33,6 @@ registration, updates, etc.
 
   spec.add_dependency "activesupport",        "< 4.0"
   spec.add_dependency "inifile",              "~> 2.0.2"
-  spec.add_dependency "more_core_extensions"
+  spec.add_dependency "more_core_extensions", "~> 1.1.0"
   spec.add_dependency "nokogiri"
 end

data/spec/data/subscription_manager/output_list_installed_not_subscribed

@@ -15,5 +15,5 @@ Version:                2.1
 Arch:                   x86_64
 Status:                 Subscribed
 Starts:                 01/03/2013
-Ends:                   01/03/2014
+Ends:                   
 

data/spec/hosts_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe LinuxAdmin::Hosts do
+  etc_hosts = "\n #Some Comment\n127.0.0.1\tlocalhost localhost.localdomain # with a comment\n127.0.1.1  my.domain.local"
+  before do
+    File.stub(:read).and_return(etc_hosts)
+    @instance = LinuxAdmin::Hosts.new
+  end
+
+  describe "#reload" do
+    it "sets raw_lines" do
+      expected_array = ["", " #Some Comment", "127.0.0.1\tlocalhost localhost.localdomain # with a comment", "127.0.1.1  my.domain.local"]
+      expect(@instance.raw_lines).to eq(expected_array)
+    end
+
+    it "sets parsed_file" do
+      expected_hash = [{:blank=>true}, {:comment=>"Some Comment"}, {:address=>"127.0.0.1", :hosts=>["localhost", "localhost.localdomain"], :comment=>"with a comment"}, {:address=>"127.0.1.1", :hosts=>["my.domain.local"]}]
+      expect(@instance.parsed_file).to eq(expected_hash)
+    end
+  end
+
+  describe "#update_entry" do
+    it "removes an existing entry and creates a new one" do
+      expected_hash = [{:blank=>true}, {:comment=>"Some Comment"}, {:address=>"127.0.0.1", :hosts=>["localhost", "localhost.localdomain"], :comment=>"with a comment"}, {:address=>"127.0.1.1", :hosts=>[]}, {:address=>"1.2.3.4", :hosts=>["my.domain.local"], :comment=>nil}]
+      @instance.update_entry("1.2.3.4", "my.domain.local")
+      expect(@instance.parsed_file).to eq(expected_hash)
+    end
+
+    it "updates an existing entry" do
+      expected_hash = [{:blank=>true}, {:comment=>"Some Comment"}, {:address=>"127.0.0.1", :hosts=>["localhost", "localhost.localdomain", "new.domain.local"], :comment=>"with a comment"}, {:address=>"127.0.1.1", :hosts=>["my.domain.local"]}]
+      @instance.update_entry("127.0.0.1", "new.domain.local")
+      expect(@instance.parsed_file).to eq(expected_hash)
+    end
+  end
+
+  describe "#save" do
+    before do
+      File.stub(:write)
+    end
+
+    it "properly generates file with new content" do
+      expected_array = ["", "#Some Comment", "127.0.0.1        localhost localhost.localdomain #with a comment", "127.0.1.1        my.domain.local", "1.2.3.4          test"]
+      @instance.update_entry("1.2.3.4", "test")
+      @instance.save
+      expect(@instance.raw_lines).to eq(expected_array)
+    end
+
+    it "properly generates file with removed content" do
+      expected_array = ["", "#Some Comment", "127.0.0.1        localhost localhost.localdomain my.domain.local #with a comment"]
+      @instance.update_entry("127.0.0.1", "my.domain.local")
+      @instance.save
+      expect(@instance.raw_lines).to eq(expected_array)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linux_admin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,17 +115,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - lib/linux_admin/distro.rb
 - lib/linux_admin/exceptions.rb
 - lib/linux_admin/fstab.rb
+- lib/linux_admin/hosts.rb
 - lib/linux_admin/logical_volume.rb
 - lib/linux_admin/partition.rb
 - lib/linux_admin/physical_volume.rb
@@ -187,6 +188,7 @@ files:
 - lib/linux_admin/volume.rb
 - lib/linux_admin/volume_group.rb
 - lib/linux_admin/yum.rb
+- lib/linux_admin/yum/repo_file.rb
 - linux_admin.gemspec
 - spec/common_spec.rb
 - spec/data/rhn/output_rhn-channel_list
@@ -204,6 +206,7 @@ files:
 - spec/disk_spec.rb
 - spec/distro_spec.rb
 - spec/fstab_spec.rb
+- spec/hosts_spec.rb
 - spec/linux_admin_spec.rb
 - spec/logical_volume_spec.rb
 - spec/partition_spec.rb
@@ -259,6 +262,7 @@ test_files:
 - spec/disk_spec.rb
 - spec/distro_spec.rb
 - spec/fstab_spec.rb
+- spec/hosts_spec.rb
 - spec/linux_admin_spec.rb
 - spec/logical_volume_spec.rb
 - spec/partition_spec.rb