akaer 1.0.0 → 1.5.0

data/lib/akaer/application.rb

@@ -11,49 +11,44 @@ module Akaer
     # The {Configuration Configuration} of this application.
     attr_reader :config
 
-    # The arguments passed via command-line.
-    attr_reader :args
+    # The Mamertes command.
+    attr_reader :command
 
     # The logger for this application.
     attr_accessor :logger
 
     # Creates a new application.
     #
-    # @param globals [Hash] Global options.
-    # @param locals [Hash] Local command options.
-    # @param args [Array] Extra arguments.
-    def initialize(globals = {}, locals = {}, args = [])
-      @args = {
-        :global => globals,
-        :local => locals,
-        :args => args
-      }
+    # @param command [Mamertes::Command] The current Mamertes command.
+    def initialize(command)
+      @command = command
+      application = @command.application
 
       # Setup logger
       Bovem::Logger.start_time = Time.now
-      @logger = Bovem::Logger.create(Bovem::Logger.get_real_file(@args[:global][:log_file]) || Bovem::Logger.default_file, Logger::INFO)
+      @logger = Bovem::Logger.create(Bovem::Logger.get_real_file(application.options["log-file"].value) || Bovem::Logger.default_file, Logger::INFO)
 
       # Open configuration
       begin
         overrides = {
-          :interface => @args[:global][:interface],
-          :addresses => @args[:global][:addresses],
-          :start_address => @args[:global][:"start-address"],
-          :aliases => @args[:global][:aliases],
-          :add_command => @args[:global][:"add-command"],
-          :remove_command => @args[:global][:"remove-command"],
-          :log_file => @args[:global][:"log-file"],
-          :log_level => @args[:global][:"log-level"],
-          :dry_run => @args[:global][:"dry-run"],
-          :quiet => @args[:global][:quiet]
+          :interface => application.options["interface"].value,
+          :addresses => application.options["addresses"].value,
+          :start_address => application.options["start-address"].value,
+          :aliases => application.options["aliases"].value,
+          :add_command => application.options["add-command"].value,
+          :remove_command => application.options["remove-command"].value,
+          :log_file => application.options["log-file"].value,
+          :log_level => application.options["log-level"].value,
+          :dry_run => application.options["dry-run"].value,
+          :quiet => application.options["quiet"].value
         }.reject {|k,v| v.nil? }
 
-        @config = Akaer::Configuration.new(@args[:global][:config], overrides, @logger)
+        @config = Akaer::Configuration.new(application.options["configuration"].value, overrides, @logger)
 
         @logger = nil
         @logger = self.get_logger
       rescue Bovem::Errors::InvalidConfiguration => e
-        @logger ? @logger.fatal(e.message) : Bovem::Logger.create("STDERR").fatal("Cannot log to #{config.log_file}. Exiting...")
+        @logger ? @logger.fatal(e.message) : Bovem::Logger.create("STDERR").fatal("Cannot log to {mark=bright}#{config.log_file}{/mark}. Exiting...")
         raise ::SystemExit
       end
 
@@ -182,16 +177,15 @@ module Akaer
       @addresses ||= self.compute_addresses
       length = self.pad_number(@addresses.length)
       index = (@addresses.index(address) || 0) + 1
-      prefix = ["[".color(:cyan), self.pad_number(index, length.length).bright, "/".color(:cyan), length.bright, "]".color(:cyan)].join("")
+      prefix = "{mark=blue}[{mark=bright white}#{self.pad_number(index, length.length)}{mark=reset blue}/{/mark}#{length}{/mark}]{/mark}"
 
       # Now execute
       if !self.config.dry_run then
-        @logger.info("#{prefix} #{(type == :remove ? "Removing" : "Adding").bright} address #{address.bright} #{type != :remove ? "to" : "from"} interface #{self.config.interface.bright}...") if !self.config.quiet
+        @logger.info(@command.application.console.replace_markers("#{prefix} {mark=bright}#{(type == :remove ? "Removing" : "Adding")}{/mark} address {mark=bright}#{address}{/mark} #{type != :remove ? "to" : "from"} interface {mark=bright}#{self.config.interface}{/mark}...")) if !self.config.quiet
         rv = self.execute_command(command)
-
-        # TODO: The end badge.
+        @logger.error(@command.application.console.replace_markers("Cannot {mark=bright}#{(type == :remove ? "remove" : "add")}{/mark} address {mark=bright}#{address}{/mark} #{type != :remove ? "to" : "from"} interface {mark=bright}#{self.config.interface}{/mark}.")) if !rv
       else
-        @logger.info("#{prefix} I will #{(type == :remove ? "remove" : "add").bright} address #{address.bright} #{type != :remove ? "to" : "from"} interface #{self.config.interface.bright}.") if !self.config.quiet
+        @logger.info(@command.application.console.replace_markers("#{prefix} I will {mark=bright}#{(type == :remove ? "remove" : "add")}{/mark} address {mark=bright}#{address}{/mark} #{type != :remove ? "to" : "from"} interface {mark=bright}#{self.config.interface}{/mark}.")) if !self.config.quiet
       end
 
       rv
@@ -243,7 +237,7 @@ module Akaer
       launch_agent = self.launch_agent_path
 
       begin
-        logger.info("Creating the launch agent in #{launch_agent} ...") if !self.config.quiet
+        logger.info("Creating the launch agent in {mark=bright}#{launch_agent}{/mark} ...") if !self.config.quiet
 
         args = $ARGV ? $ARGV[0, $ARGV.length - 1] : []
 
@@ -302,14 +296,13 @@ module Akaer
     end
 
     # Returns a unique (singleton) instance of the application.
-    # @param globals [Hash] Global options.
-    # @param locals [Hash] Local command options.
-    # @param args [Array] Extra arguments.
+    #
+    # @param command [Mamertes::Command] The current Mamertes command.
     # @param force [Boolean] If to force recreation of the instance.
     # @return [Application] The unique (singleton) instance of the application.
-    def self.instance(globals = {}, locals = {}, args = [], force = false)
+    def self.instance(command, force = false)
       @instance = nil if force
-      @instance ||= Akaer::Application.new(globals, locals, args)
+      @instance ||= Akaer::Application.new(command)
     end
   end
 end

data/lib/akaer/version.rb

@@ -13,7 +13,7 @@ module Akaer
     MAJOR = 1
 
     # The minor version.
-    MINOR = 0
+    MINOR = 5
 
     # The patch version.
     PATCH = 0

data/lib/akaer.rb

@@ -4,7 +4,7 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-require "bovem"
+require "mamertes"
 require "ipaddr"
 
 require "akaer/version" if !defined?(Akaer::Version)

data/spec/akaer/application_spec.rb

@@ -7,12 +7,29 @@
 require "spec_helper"
 
 describe Akaer::Application do
+  def create_application(overrides)
+    mamertes_app = Mamertes::App(:run => false) do
+      option "configuration", [], {:default => overrides["configuration"] || "~/.akaer_config"}
+      option "interface", [], {:default => overrides["interface"] || "lo0"}
+      option "addresses", [], {:type => Array, :default => overrides["addresses"] || []}
+      option "start-address", [], {:default => overrides["start-address"] || "10.0.0.1"}
+      option "aliases", [:S], {:type => Integer, :default => overrides["aliases"] || 5}
+      option "add-command", [:A], {:default => overrides["add-command"] || "sudo ifconfig @INTERFACE@ alias @ALIAS@"}
+      option "remove-command", [:R], {:default => overrides["remove-command"] || "sudo ifconfig @INTERFACE@ -alias @ALIAS@"}
+      option "log-file", [], {:default => overrides["log-file"] || "STDOUT"}
+      option "log-level", [:L], {:type => Integer, :default => overrides["log-level"] || 1}
+      option "dry-run", [:n], {:default => overrides["dry-run"] || false}
+      option "quiet", [], {:default => overrides["quiet"] || false}
+    end
+
+    Akaer::Application.new(mamertes_app)
+  end
+
   before(:each) do
     Bovem::Logger.stub(:default_file).and_return("/dev/null")
   end
-
   let(:log_file) { "/dev/null" }
-  let(:application){ Akaer::Application.instance({:"log-file" => log_file}, true) }
+  let(:application){ create_application({"log-file" => log_file}) }
   let(:launch_agent_path) { "/tmp/akaer-test-agent-#{Time.now.strftime("%Y%m%d-%H%M%S")}" }
 
   describe "#initialize" do
@@ -30,7 +47,7 @@ describe Akaer::Application do
       file.write("config.aliases = ")
       file.close
 
-      expect { Akaer::Application.new({:config => file.path, :"log-file" => log_file}) }.to raise_error(::SystemExit)
+      expect { create_application({"configuration" => file.path, "log-file" => log_file}) }.to raise_error(::SystemExit)
       ::File.unlink(path)
     end
   end
@@ -94,7 +111,7 @@ describe Akaer::Application do
 
   describe "#compute_addresses" do
     describe "should use only the explicit list if given" do
-      let(:other_application){ Akaer::Application.new({:"log-file" => log_file, :addresses => ["10.0.0.1", "::1", "INVALID 1", "10.0.0.2", "INVALID 2", "2001:0db8:0::0:1428:57ab"]}) }
+      let(:other_application){ create_application({"log-file" => log_file, "addresses" => ["10.0.0.1", "::1", "INVALID 1", "10.0.0.2", "INVALID 2", "2001:0db8:0::0:1428:57ab"]}) }
 
       it "considering all address" do
         expect(other_application.compute_addresses).to eq(["10.0.0.1", "::1", "10.0.0.2", "2001:0db8:0::0:1428:57ab"])
@@ -102,28 +119,28 @@ describe Akaer::Application do
 
       it "considering only IPv4" do
         expect(other_application.compute_addresses(:ipv4)).to eq(["10.0.0.1", "10.0.0.2"])
-        expect(Akaer::Application.new({:"log-file" => log_file, :addresses => ["::1", "INVALID 1"]}).compute_addresses(:ipv4)).to eq([])
+        expect(create_application({"log-file" => log_file, "addresses" => ["::1", "INVALID 1"]}).compute_addresses(:ipv4)).to eq([])
       end
 
       it "considering only IPv6" do
         expect(other_application.compute_addresses(:ipv6)).to eq(["::1", "2001:0db8:0::0:1428:57ab"])
-        expect(Akaer::Application.new({:"log-file" => log_file, :addresses => ["10.0.0.1", "INVALID 1"]}).compute_addresses(:ipv6)).to eq([])
+        expect(create_application({"log-file" => log_file, "addresses" => ["10.0.0.1", "INVALID 1"]}).compute_addresses(:ipv6)).to eq([])
       end
     end
 
     describe "should compute a sequential list of address" do
       it "considering all address" do
-        expect(Akaer::Application.new({:"log-file" => log_file, :"start-address" => "10.0.1.1"}).compute_addresses).to eq(["10.0.1.1", "10.0.1.2", "10.0.1.3", "10.0.1.4", "10.0.1.5"])
-        expect(Akaer::Application.new({:"log-file" => log_file, :aliases => 3}).compute_addresses).to eq(["10.0.0.1", "10.0.0.2", "10.0.0.3"])
-        expect(Akaer::Application.new({:"log-file" => log_file, :"start-address" => "10.0.1.1", :aliases => -1}).compute_addresses).to eq(["10.0.1.1", "10.0.1.2", "10.0.1.3", "10.0.1.4", "10.0.1.5"])
+        expect(create_application({"log-file" => log_file, "start-address" => "10.0.1.1"}).compute_addresses).to eq(["10.0.1.1", "10.0.1.2", "10.0.1.3", "10.0.1.4", "10.0.1.5"])
+        expect(create_application({"log-file" => log_file, "aliases" => 3}).compute_addresses).to eq(["10.0.0.1", "10.0.0.2", "10.0.0.3"])
+        expect(create_application({"log-file" => log_file, "start-address" => "10.0.1.1", :aliases => -1}).compute_addresses).to eq(["10.0.1.1", "10.0.1.2", "10.0.1.3", "10.0.1.4", "10.0.1.5"])
       end
 
       it "considering only IPv4" do
-        expect(Akaer::Application.new({:"log-file" => log_file, :"start-address" => "::1"}).compute_addresses(:ipv4)).to eq([])
+        expect(create_application({"log-file" => log_file, "start-address" => "::1"}).compute_addresses(:ipv4)).to eq([])
       end
 
       it "considering only IPv6" do
-        expect(Akaer::Application.new({:"log-file" => log_file, :"start-address" => "10.0.0.1"}).compute_addresses(:ipv6)).to eq([])
+        expect(create_application({"log-file" => log_file, "start-address" => "10.0.0.1"}).compute_addresses(:ipv6)).to eq([])
       end
     end
   end
@@ -153,7 +170,7 @@ describe Akaer::Application do
     end
 
     it "should return true if the command succeded" do
-      other_application = Akaer::Application.new({:"add-command" => "echo @INTERFACE@", :quiet => true})
+      other_application = create_application({"add-command" => "echo @INTERFACE@", "quiet" => true})
       expect(other_application.manage(:add, "10.0.0.3")).to be_true
     end
 
@@ -162,7 +179,7 @@ describe Akaer::Application do
     end
 
     it "should respect dry-run mode" do
-      other_application = Akaer::Application.new({:"log-file" => log_file, :"dry-run" => true})
+      other_application = create_application({"log-file" => log_file, "dry-run" => true})
 
       other_application.logger.should_receive(:info).with(/.+.*03.*\/.*05.*.+ I will .*add.* address .*10.0.0.3.* to interface .*lo0.*/)
       other_application.should_not_receive(:execute_command)
@@ -174,7 +191,6 @@ describe Akaer::Application do
     end
   end
 
-
   describe "#action_add" do
     it("should compute addresses to manage") do
       application.should_receive(:compute_addresses)
@@ -192,7 +208,7 @@ describe Akaer::Application do
 
     it("should show an error there's no address to manage") do
       application.stub(:compute_addresses).and_return([])
-      other_application = Akaer::Application.new({:"log-file" => log_file, :quiet => true})
+      other_application = create_application({"log-file" => log_file, "quiet" => true})
       other_application.stub(:compute_addresses).and_return([])
 
       application.logger.should_receive(:error).with("No valid addresses to add to the interface found.")
@@ -219,7 +235,7 @@ describe Akaer::Application do
 
     it("should show an error there's no address to manage") do
       application.stub(:compute_addresses).and_return([])
-      other_application = Akaer::Application.new({:"log-file" => log_file, :quiet => true})
+      other_application = create_application({"log-file" => log_file, "quiet" => true})
       other_application.stub(:compute_addresses).and_return([])
 
       application.logger.should_receive(:error).with("No valid addresses to remove from the interface found.")

data/spec/coverage_helper.rb

@@ -4,10 +4,11 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
-require "simplecov"
 require "pathname"
 
-if ENV["AKAER_COVERAGE"] == "TRUE" then
+if ENV["AKAER_COVERAGE"] == "TRUE" && RUBY_VERSION >= "1.9" then
+  require "simplecov"
+  
   root = Pathname.new(File.dirname(__FILE__)) + ".."
 
   SimpleCov.start do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akaer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bovem
+  name: mamertes
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +156,28 @@ files:
 - Rakefile
 - akaer.gemspec
 - bin/akaer
+- doc/Akaer.html
+- doc/Akaer/Application.html
+- doc/Akaer/Configuration.html
+- doc/Akaer/Errors.html
+- doc/Akaer/Errors/InvalidConfiguration.html
+- doc/Akaer/Logger.html
+- doc/Akaer/Version.html
+- doc/Fixnum.html
+- doc/_index.html
+- doc/class_list.html
+- doc/css/common.css
+- doc/css/full_list.css
+- doc/css/style.css
+- doc/file.README.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/method_list.html
+- doc/top-level-namespace.html
 - lib/akaer.rb
 - lib/akaer/application.rb
 - lib/akaer/configuration.rb
@@ -194,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4081054337891207421
+      hash: -2611377790548200103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4081054337891207421
+      hash: -2611377790548200103
 requirements: []
 rubyforge_project: akaer
 rubygems_version: 1.8.24